Slightly friendlier error reporting

2 files changed, 7 insertions, 4 deletions

diff --git a/lib/hcl/app.rb b/lib/hcl/app.rb
index ec2ecd3..6d514da 100644
--- a/lib/hcl/app.rb
+++ b/lib/hcl/app.rb
@@ -80,8 +80,11 @@ module HCl
       rescue RuntimeError => e
         STDERR.puts "Error: #{e}"
         exit 1
+      rescue SocketError => e
+        STDERR.puts "Connection failed. (#{e.message})"
+        exit 1
       rescue TimesheetResource::Failure => e
-        STDERR.puts "Internal failure. #{e}"
+        STDERR.puts "API failure: #{e}"
         exit 1
       end
     end
diff --git a/lib/hcl/timesheet_resource.rb b/lib/hcl/timesheet_resource.rb
index cb5e9bd..b9ba99a 100644
--- a/lib/hcl/timesheet_resource.rb
+++ b/lib/hcl/timesheet_resource.rb
@@ -1,6 +1,6 @@
 module HCl
   class TimesheetResource
-    class Failure < Exception; end
+    class Failure < StandardError; end
 
     def self.configure opts = nil
       if opts
@@ -48,9 +48,9 @@ module HCl
       if response.kind_of? Net::HTTPSuccess
         response.body
       elsif response.kind_of? Net::HTTPFound
-        raise "Redirected in the request. Perhaps your ssl configuration variable is set incorrectly?"
+        raise Failure, "Redirected in the request. Perhaps your ssl configuration variable is set incorrectly?"
       else
-        raise 'failure'
+        raise Failure, "Unexpected response from the upstream API"
       end
     end