ridley 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693d3b020cb5366d57481f79708376cefba8209c
-  data.tar.gz: 56163c381348636326fbc231087d068ba0d2c5d3
+  metadata.gz: d868df34840cd47fd59e935cd829407bc0bf528d
+  data.tar.gz: 60b9b0e0f5b2214df516d92b6e5f9e5238879408
 SHA512:
-  metadata.gz: 23915d3e57d0533f7c7d6af90272fb830aa9acf956ab08617d298d8f439d67d5e8e1bf9d7dfcb9b0e7e7f1f5fb2493bc8674e68656e3f132e5385b62bb9b2d58
-  data.tar.gz: a792da783a486a4ad3de98e11e0bf0d49751bfdc66ca6e591ad4d88f920f005b638ec0e9da2486992dd5736c447e484a2da9497e41ad6ec4cfeaf30b7b1bfece
+  metadata.gz: 66474151072d89a2ecaa988a66c185eabbbc4b50b0b072fd8fd33baf931b3d0008c1f027951efb5ca386c8dc372a317b7163f720704ac4bdd7245aca0474584e
+  data.tar.gz: 7c07e8dceef19387f4e8bda86cef751c9a14cd12f3d72d99b112a1381a55a7bf577ac30896ce3f03e91dff5cd02f9efbd00bab1448f0a6a5c1f7e4149ea758ba

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.1.2
+
+* Fixed: permission denied errors on Windows while uploading cookbooks
+* Fixed: no proc error when evaluating client_key option
+* Bump required version of retryable
+
 # 4.1.1
 
 * Enhancements

data/lib/ridley/client.rb

@@ -139,6 +139,7 @@ module Ridley
       end
 
       unless verify_client_key(@options[:client_key])
+        @options[:client_key] = @options[:client_key].call if @options[:client_key].kind_of? Proc
         @options[:client_key] = File.expand_path(@options[:client_key])
         raise Errors::ClientKeyFileNotFoundOrInvalid, "client key is invalid or not found at: '#{@options[:client_key]}'" unless File.exist?(@options[:client_key]) && verify_client_key(::IO.read(@options[:client_key]))
       end

data/lib/ridley/connection.rb

@@ -145,7 +145,7 @@ module Ridley
       local = Tempfile.new('ridley-stream')
       local.binmode
 
-      retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
+      Retryable.retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
         open(target, 'rb', headers) do |remote|
           body = remote.read
           case remote.content_encoding

data/lib/ridley/resources/cookbook_resource.rb

@@ -230,7 +230,17 @@ module Ridley
       update(cookbook, Ridley::Helpers.options_slice(options, :force, :freeze))
     ensure
       # Destroy the compiled metadata only if it was created
-      File.delete(compiled_metadata) unless compiled_metadata.nil?
+      if compiled_metadata
+        # The garbage collector still has a reference to the file we'd
+        # like to delete. On *nix this isn't a big deal, but on Windows
+        # [ ruby 2.0.0p451 (2014-02-24) [i386-mingw32] ] open files
+        # cannot be deleted, so we're forced to garbage collect to
+        # ensure we can delete the file. This is CRITICAL to ensure that
+        # a stale metadata file isn't left on disk because next time we
+        # would use that file instead of recompiling.
+        GC.start
+        File.delete(compiled_metadata)
+      end
     end
 
     # Return a list of versions for the given cookbook present on the remote Chef server

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

data/ridley.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'json',                    '>= 1.7.7'
   s.add_dependency 'mixlib-authentication',   '>= 1.3.0'
   s.add_dependency 'net-http-persistent',     '>= 2.8'
-  s.add_dependency 'retryable'
+  s.add_dependency 'retryable',               '>= 2.0.0'
   s.add_dependency 'semverse',                '~> 1.1'
 
   s.add_development_dependency 'buff-ruby_engine', '~> 0.1'

data/spec/unit/ridley/resources/cookbook_resource_spec.rb

@@ -126,17 +126,17 @@ describe Ridley::CookbookResource do
     end
 
     it 'does not include files that are ignored' do
-      # These are the SHAs for the files. It's not possible to check that
+      # These are the MD5s for the files. It's not possible to check that
       # the ignored files weren't uploaded, so we just check that the
       # non-ignored files are the ONLY thing uploaded
       sandbox_resource.should_receive(:create).with([
         "211a3a8798d4acd424af15ff8a2e28a5",
+        "64ac6346672c6bea4ade983e3d58cd14",
         "75077ba33d2887cc1746d1ef716bf8b7",
         "7b1ebd2ff580ca9dc46fb27ec1653bf2",
         "84e12365e6f4ebe7db6a0e6a92473b16",
         "a39eb80def9804f4b118099697cc2cd2",
         "b70ba735f3af47e5d6fc71b91775b34c",
-        "b946e579ba3640470c16f6fb3445e346",
         "cafb6869fca13f5c36f24a60de8fb982",
         "dbf3a6c4ab68a86172be748aced9f46e",
         "dc6461b5da25775f3ef6a9cc1f6cff9f",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -219,14 +219,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: semverse
   requirement: !ruby/object:Gem::Requirement