berkshelf-api-client 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24984684bc4e74fd8c9e4c74a96e7387075c235
-  data.tar.gz: 37fa9b61254d333c6b10abb5aff3638c807f09fa
+  metadata.gz: 1ae52121b8a453496aed06a502cf6f1a04db8064
+  data.tar.gz: acc3706fad1bf844627501bd60f2ccd1ddccbf0e
 SHA512:
-  metadata.gz: a2687d666f257c2ec25c9786f1f25e12fc8c5cbcec50717b09c4b2570975013ca5a5d77502e6d6c1ee196d992d98669cb2334b03915f9397e6738b6933e203f1
-  data.tar.gz: 3c210c34674982c6ec7411d2cdfb6520eae51349e711e8a81205bf64990cdef7af55860f1a31a8a01e1d343277152cf5253611e03fbebc32e87f087ca66e8522
+  metadata.gz: 9844b0690e99f908e45293c2ba693768379bb40d49097566d47a54fba3efa170dd9139a09bc2c97b3cb1e76c48d576f81e458c42a09dda2c59d938ce4f3a3ba1
+  data.tar.gz: e9ad01a91d38dfd169be53795fe351491eda4b0b6a8ab4b452aa6797940cae8aee2d63eec3caf0e9e6211e0f903e345d2ee8976aaff3e32fd3e6695c29f69f2b

data/.travis.yml

@@ -8,4 +8,6 @@ notifications:
       - "irc.freenode.org#berkshelf"
     skip_join: true
     use_notice: true
+before_install:
+  - sudo apt-get install -qq libarchive12 libarchive-dev
 script: bundle exec rake spec

data/lib/berkshelf/api_client/connection.rb

@@ -1,6 +1,8 @@
 require 'faraday'
 
 module Berkshelf::APIClient
+  require_relative 'errors'
+
   class Connection < Faraday::Connection
     # @return [String]
     attr_reader :url
@@ -36,7 +38,10 @@ module Berkshelf::APIClient
         b.request :retry,
           max: self.retries,
           interval: self.retry_interval,
-          exceptions: [ Faraday::Error::TimeoutError, Errno::ETIMEDOUT ]
+          exceptions: [
+            Faraday::Error::TimeoutError,
+            Errno::ETIMEDOUT
+          ]
 
         b.adapter :net_http
       end
@@ -62,14 +67,16 @@ module Berkshelf::APIClient
           end
         end
       when 404
-        raise APIClient::ServiceNotFound, "service not found at: #{url}"
+        raise ServiceNotFound, "service not found at: #{url}"
       when 500..504
-        raise APIClient::ServiceUnavaiable, "service unavailable at: #{url}"
+        raise ServiceUnavaiable, "service unavailable at: #{url}"
       else
-        raise APIClient::BadResponse, "bad response #{response.inspect}"
+        raise BadResponse, "bad response #{response.inspect}"
       end
     rescue Faraday::Error::TimeoutError, Errno::ETIMEDOUT
-      raise APIClient::TimeoutError, "Unable to connect to: #{url}"
+      raise TimeoutError, "Unable to connect to: #{url}"
+    rescue Faraday::Error::ConnectionFailed => ex
+      raise ServiceUnavaiable, ex
     end
   end
 end

data/lib/berkshelf/api_client/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module APIClient
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/unit/berkshelf/api_client/connection_spec.rb

@@ -53,5 +53,15 @@ describe Berkshelf::APIClient::Connection do
         expect(remote.location_type).to_not be_nil
       end
     end
+
+    context "when the connection to the service fails" do
+      before do
+        instance.should_receive(:get).and_raise(Faraday::Error::ConnectionFailed.new(StandardError))
+      end
+
+      it "raises a Berkshelf::APIClient::ServiceUnavaiable" do
+        expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavaiable)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday