ridley 0.0.4 → 0.0.5

data/lib/ridley/connection.rb

@@ -34,6 +34,8 @@ module Ridley
     def_delegator :conn, :port
     def_delegator :conn, :path_prefix
 
+    def_delegator :conn, :url_prefix=
+
     def_delegator :conn, :get
     def_delegator :conn, :put
     def_delegator :conn, :post
@@ -79,6 +81,10 @@ module Ridley
       @organization = options.fetch(:organization, nil)
       @thread_count = options.fetch(:thread_count, DEFAULT_THREAD_COUNT)
 
+      unless @client_key.present? && File.exist?(@client_key)
+        raise Errors::ClientKeyFileNotFound, "client key not found at: '#{@client_key}'"
+      end
+
       faraday_options = options.slice(:params, :headers, :request, :ssl, :proxy)
       uri_hash = Addressable::URI.parse(options[:server_url]).to_hash.slice(:scheme, :host, :port)
 

data/lib/ridley/errors.rb

@@ -17,6 +17,8 @@ module Ridley
       alias_method :to_s, :message
     end
 
+    class ClientKeyFileNotFound < RidleyError; end
+
     class HTTPError < RidleyError
       class << self
         def fabricate(env)

data/lib/ridley/resources/sandbox.rb

@@ -75,11 +75,23 @@ module Ridley
       }
       contents = File.open(path, 'rb') { |f| f.read }
 
-      if connection.hosted?
-        Faraday.put(checksum[:url], contents, headers)
-      else
-        connection.put(URI(checksum[:url]).path, contents, headers)
-      end
+      # Hosted Chef returns Amazon S3 URLs for where to upload
+      # checksums to. OSS Chef Server and Hosted Chef return URLs
+      # to the same Chef API that the Sandbox creation request was
+      # sent to.
+      #
+      # The connection object is duplicated to ensure all of our connection
+      # settings persist, but the scheme, host, and port are set to the
+      # value of the given checksum.
+      conn = connection.send(:conn).dup
+
+      url = URI(checksum[:url])
+      upload_path = url.path
+      url.path = ""
+
+      conn.url_prefix = url.to_s
+
+      conn.put(upload_path, contents, headers)
     end
 
     def commit

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/unit/ridley/connection_spec.rb

@@ -88,6 +88,14 @@ describe Ridley::Connection do
           )
         }.should raise_error(ArgumentError, "Missing required option(s): 'client_key'")
       end
+
+      it "raises a ClientKeyFileNotFound if the filepath for client_key is not found" do
+        config[:client_key] = "/tmp/nofile.xxsa"
+
+        lambda {
+          subject.new(config)
+        }.should raise_error(Ridley::Errors::ClientKeyFileNotFound)
+      end
     end
 
     describe "::sync" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -418,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2069225012835502679
+      hash: 3051717703450695836
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23