ridley 2.5.1 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7015d6698dd19c93412740e2ff16f5432025e0ef
-  data.tar.gz: 98f72e264ea4832ab085c887e71a001dad03ca35
+  metadata.gz: 507254a6cdf340a5c7e11ac8354043df5f66d5cf
+  data.tar.gz: bdea7bdd458295e87a7401968cba749a7aa8e738
 SHA512:
-  metadata.gz: 6513631b259a1909e6624c101b0cf2f64757992b754f8dfb51514e606aefacb6b28ba8720491f457daaccfc81a8f2288cb72e3249fc3470247bfda2412176b2e
-  data.tar.gz: e7a519e2bd14c9ed26be2bf9981e5d44003268589f8e3976ee4552af5d412f34a7d22d5a33e24871919720214fa64c9c71d54714db3ec3096215ee69d09a7e33
+  metadata.gz: a8f65480cb316c3b5ab316fa68687582a15014042003ed0d85a684af38aea0f10a83a39fb2fcb0514adfcaa7a41e18b9aff317a1fdf6390970ffea118389afd0
+  data.tar.gz: a9c3c56283f0873eaacee0fd5fbf6a9b9f09100886b704da43d83b96d9ebc6254665021c6516304adf02c5506dc5672247a25e0bfa1384e1130946340272daf6

data/lib/ridley/chef/chefignore.rb

@@ -18,8 +18,6 @@ module Ridley::Chef
 
       if ignore
         log.debug "Using '#{FILENAME}' at '#{ignore}'"
-      else
-        log.debug "Could not find '#{FILENAME}' at '#{path}'"
       end
 
       super(ignore, base: path)

data/lib/ridley/chef/cookbook/metadata.rb

@@ -239,8 +239,6 @@ module Ridley::Chef
         version = version_args.first
         @platforms[platform] = Solve::Constraint.new(version).to_s
         @platforms[platform]
-      rescue Solve::Errors::InvalidConstraintFormat => ex
-        raise InvalidVersionConstraint, ex.to_s
       end
 
       # Adds a dependency on another cookbook, with version checking strings.
@@ -257,8 +255,6 @@ module Ridley::Chef
         version = version_args.first
         @dependencies[cookbook] = Solve::Constraint.new(version).to_s
         @dependencies[cookbook]
-      rescue Solve::Errors::InvalidConstraintFormat => ex
-        raise InvalidVersionConstraint, ex.to_s
       end
 
       # Adds a recommendation for another cookbook, with version checking strings.
@@ -275,8 +271,6 @@ module Ridley::Chef
         version = version_args.first
         @recommendations[cookbook] = Solve::Constraint.new(version).to_s
         @recommendations[cookbook]
-      rescue Solve::Errors::InvalidConstraintFormat => ex
-        raise InvalidVersionConstraint, ex.to_s
       end
 
       # Adds a suggestion for another cookbook, with version checking strings.
@@ -293,8 +287,6 @@ module Ridley::Chef
         version = version_args.first
         @suggestions[cookbook] = Solve::Constraint.new(version).to_s
         @suggestions[cookbook]
-      rescue Solve::Errors::InvalidConstraintFormat => ex
-        raise InvalidVersionConstraint, ex.to_s
       end
 
       # Adds a conflict for another cookbook, with version checking strings.
@@ -311,8 +303,6 @@ module Ridley::Chef
         version = version_args.first
         @conflicting[cookbook] = Solve::Constraint.new(version).to_s
         @conflicting[cookbook]
-      rescue Solve::Errors::InvalidConstraintFormat => ex
-        raise InvalidVersionConstraint, ex.to_s
       end
 
       # Adds a recipe, definition, or resource provided by this cookbook.
@@ -333,8 +323,6 @@ module Ridley::Chef
         version = version_args.first
         @providing[cookbook] = Solve::Constraint.new(version).to_s
         @providing[cookbook]
-      rescue Solve::Errors::InvalidConstraintFormat => ex
-        raise InvalidVersionConstraint, ex.to_s
       end
 
       # Adds a cookbook that is replaced by this one, with version checking strings.
@@ -350,8 +338,6 @@ module Ridley::Chef
         version = version_args.first
         @replacing[cookbook] = Solve::Constraint.new(version).to_s
         @replacing[cookbook]
-      rescue Solve::Errors::InvalidConstraintFormat => ex
-        raise InvalidVersionConstraint, ex.to_s
       end
 
       # Adds a description for a recipe.

data/lib/ridley/chef/cookbook.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Ridley::Chef
   class Cookbook
     require_relative 'cookbook/metadata'
@@ -24,24 +26,24 @@ module Ridley::Chef
       # @param [#to_s] path
       #   a path on disk to the location of a Cookbook
       #
-      # @option options [String] :name
-      #   explicitly supply the name of the cookbook we are loading. This is useful if
-      #   you are dealing with a cookbook that does not have well-formed metadata
-      #
       # @raise [IOError] if the path does not contain a metadata.rb or metadata.json file
       #
       # @return [Ridley::Chef::Cookbook]
-      def from_path(path, options = {})
-        path     = Pathname.new(path)
-        metadata = if (metadata_file = path.join(Metadata::COMPILED_FILE_NAME)).exist?
-          Cookbook::Metadata.from_json(File.read(metadata_file))
-        elsif (metadata_file = path.join(Metadata::RAW_FILE_NAME)).exist?
-          Cookbook::Metadata.from_file(metadata_file)
+      def from_path(path)
+        path = Pathname.new(path)
+
+        if (file = path.join(Metadata::COMPILED_FILE_NAME)).exist?
+          metadata = Metadata.from_json(File.read(file))
+        elsif (file = path.join(Metadata::RAW_FILE_NAME)).exist?
+          metadata = Metadata.from_file(file)
         else
           raise IOError, "no #{Metadata::COMPILED_FILE_NAME} or #{Metadata::RAW_FILE_NAME} found at #{path}"
         end
 
-        metadata.name(options[:name].presence || metadata.name.presence || File.basename(path))
+        unless metadata.name.presence
+          raise Ridley::Errors::MissingNameAttribute.new(path)
+        end
+
         new(metadata.name, path, metadata)
       end
     end

data/lib/ridley/client.rb

@@ -140,7 +140,7 @@ module Ridley
         @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
-      
+
       @connection_registry   = Celluloid::Registry.new
       @resources_registry    = Celluloid::Registry.new
       @connection_supervisor = ConnectionSupervisor.new(@connection_registry, @options)
@@ -276,8 +276,8 @@ module Ridley
       end
 
       def finalize_callback
-        @connection_supervisor.terminate if @connection_supervisor && @connection_supervisor.alive?
-        @resources_supervisor.terminate if @resources_supervisor && @resources_supervisor.alive?
+        @connection_supervisor.async.terminate if @connection_supervisor
+        @resources_supervisor.async.terminate if @resources_supervisor
       end
   end
 end

data/lib/ridley/connection.rb

@@ -44,10 +44,10 @@ module Ridley
       options         = options.reverse_merge(retries: 5, retry_interval: 0.5)
       @client_name    = client_name
       @client_key     = client_key
-      @retries        = options[:retries]
-      @retry_interval = options[:retry_interval]
+      @retries        = options.delete(:retries)
+      @retry_interval = options.delete(:retry_interval)
 
-      options[:builder] = Faraday::Builder.new do |b|
+      options[:builder] = Faraday::RackBuilder.new do |b|
         b.request :retry,
           max: @retries,
           interval: @retry_interval,

data/lib/ridley/errors.rb

@@ -42,6 +42,29 @@ module Ridley
         "no encrypted data bag secret was set for this Ridley connection"
       end
     end
+    class FromFileParserError < RidleyError
+      def initialize(filename, error)
+        super "Could not parse `#{filename}': #{error.message}"
+
+        # Populate the backtrace with the actual error though
+        set_backtrace(error.backtrace)
+      end
+    end
+
+    class MissingNameAttribute < RidleyError
+      def initialize(path)
+        @path = path
+      end
+
+      def to_s
+        out =  "The metadata at '#{@path}' does not contain a 'name' "
+        out << "attribute. While Chef does not strictly enforce this "
+        out << "requirement, Ridley cannot continue without a valid metadata "
+        out << "'name' entry."
+        out
+      end
+      alias_method :message, :to_s
+    end
 
     class BootstrapError < RidleyError; end
     class ClientKeyFileNotFoundOrInvalid < BootstrapError; end

data/lib/ridley/logging.rb

@@ -3,7 +3,6 @@ require 'logger'
 module Ridley
   module Logging
     class << self
-
       # @return [Logger]
       def logger
         @logger ||= begin

data/lib/ridley/middleware/chef_auth.rb

@@ -87,4 +87,4 @@ module Ridley
   end
 end
 
-Faraday.register_middleware(:request, chef_auth: Ridley::Middleware::ChefAuth)
+Faraday::Request.register_middleware chef_auth: Ridley::Middleware::ChefAuth

data/lib/ridley/middleware/chef_response.rb

@@ -28,4 +28,4 @@ module Ridley
   end
 end
 
-Faraday.register_middleware(:response, chef_response: Ridley::Middleware::ChefResponse)
+Faraday::Response.register_middleware chef_response: Ridley::Middleware::ChefResponse

data/lib/ridley/middleware/follow_redirects.rb

@@ -132,4 +132,4 @@ module Ridley
   end
 end
 
-Faraday.register_middleware(:response, follow_redirects: Ridley::Middleware::FollowRedirects)
+Faraday::Response.register_middleware follow_redirects: Ridley::Middleware::FollowRedirects

data/lib/ridley/middleware/gzip.rb

@@ -15,4 +15,4 @@ module Ridley
   end
 end
 
-Faraday.register_middleware(:response, gzip: Ridley::Middleware::Gzip)
+Faraday::Response.register_middleware gzip: Ridley::Middleware::Gzip

data/lib/ridley/middleware/parse_json.rb

@@ -106,4 +106,4 @@ module Ridley
   end
 end
 
-Faraday.register_middleware(:response, parse_json: Ridley::Middleware::ParseJson)
+Faraday::Response.register_middleware parse_json: Ridley::Middleware::ParseJson

data/lib/ridley/mixin/from_file.rb

@@ -25,11 +25,11 @@ module Ridley::Mixin
     def from_file(filename)
       filename = filename.to_s
 
-      if File.exists?(filename) && File.readable?(filename)
+      ensure_presence!(filename)
+
+      with_error_handling(filename) do
         self.instance_eval(IO.read(filename), filename, 1)
         self
-      else
-        raise IOError, "Could not open or read: '#{filename}'"
       end
     end
 
@@ -42,12 +42,38 @@ module Ridley::Mixin
     def class_from_file(filename)
       filename = filename.to_s
 
-      if File.exists?(filename) && File.readable?(filename)
+      ensure_presence!(filename)
+
+      with_error_handling(filename) do
         self.class_eval(IO.read(filename), filename, 1)
         self
-      else
+      end
+    end
+
+    private
+
+    # Ensure the given filename and path is readable
+    #
+    # @param [String] filename
+    #
+    # @raise [IOError]
+    #   if the target file does not exist or is not readable
+    def ensure_presence!(filename)
+      unless File.exists?(filename) && File.readable?(filename)
         raise IOError, "Could not open or read: '#{filename}'"
       end
     end
+
+    # Execute the given block, handling any exceptions that occur
+    #
+    # @param [String] filename
+    #
+    # @raise [Ridley::Errors::FromFileParserError]
+    #   if any exceptions if raised
+    def with_error_handling(filename)
+      yield
+    rescue => e
+      raise Ridley::Errors::FromFileParserError.new(filename, e)
+    end
   end
 end

data/lib/ridley/resources/cookbook_resource.rb

@@ -171,10 +171,6 @@ module Ridley
     # @param [String] path
     #   path to a cookbook on local disk
     #
-    # @option options [String] :name
-    #   automatically populated by the metadata of the cookbook at the given path, but
-    #   in the event that the metadata does not contain a name it can be specified with
-    #   this option
     # @option options [Boolean] :force (false)
     #   Upload the Cookbook even if the version already exists and is frozen on
     #   the target Chef Server
@@ -187,7 +183,7 @@ module Ridley
     # @return [Hash]
     def upload(path, options = {})
       options  = options.reverse_merge(validate: true, force: false, freeze: false)
-      cookbook = Ridley::Chef::Cookbook.from_path(path, options.slice(:name))
+      cookbook = Ridley::Chef::Cookbook.from_path(path)
 
       unless (existing = find(cookbook.cookbook_name, cookbook.version)).nil?
         if existing.frozen? && options[:force] == false

data/lib/ridley/resources/data_bag_resource.rb

@@ -31,7 +31,7 @@ module Ridley
     private
 
       def finalize_callback
-        item_resource.terminate if item_resource && item_resource.alive?
+        item_resource.async.terminate if item_resource
       end
   end
 end

data/lib/ridley/resources/sandbox_resource.rb

@@ -8,7 +8,7 @@ module Ridley
     def initialize(connection_registry, client_name, client_key, options = {})
       super(connection_registry)
       options   = options.reverse_merge(pool_size: 4)
-      @uploader = SandboxUploader.pool(size: options[:pool_size], args: [ client_name, client_key, options ])
+      @uploader = SandboxUploader.pool(size: options.delete(:pool_size), args: [ client_name, client_key, options ])
     end
 
     # Create a new Sandbox on the client's Chef Server. A Sandbox requires an
@@ -98,7 +98,7 @@ module Ridley
       attr_reader :uploader
 
       def finalize_callback
-        uploader.terminate if uploader && uploader.alive?
+        uploader.async.terminate if uploader
       end
   end
 end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "2.5.1"
+  VERSION = "3.0.0.rc1"
 end

data/ridley.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'buff-extensions',         '~> 0.3'
   s.add_dependency 'buff-ignore',             '~> 1.1'
   s.add_dependency 'buff-shell_out',          '~> 0.1'
-  s.add_dependency 'celluloid',               '~> 0.15'
-  s.add_dependency 'celluloid-io',            '~> 0.15'
+  s.add_dependency 'celluloid',               '~> 0.16.0.pre'
+  s.add_dependency 'celluloid-io',            '~> 0.16.0.pre'
   s.add_dependency 'erubis'
-  s.add_dependency 'faraday',                 '~> 0.8.4'
+  s.add_dependency 'faraday',                 '~> 0.9.0'
   s.add_dependency 'hashie',                  '>= 2.0.2'
   s.add_dependency 'json',                    '>= 1.7.7'
   s.add_dependency 'mixlib-authentication',   '>= 1.3.0'

data/spec/support/actor_mocking.rb

@@ -1,5 +1,5 @@
 RSpec.configuration.before(:each) do
-  class Celluloid::ActorProxy
+  class Celluloid::CellProxy
     unless @rspec_compatible
       @rspec_compatible = true
       undef_method :should_receive if method_defined?(:should_receive)

data/spec/unit/ridley/chef/cookbook_spec.rb

@@ -15,10 +15,6 @@ describe Ridley::Chef::Cookbook do
         subject.from_path(cookbook_path).cookbook_name.should eql("example_cookbook")
       end
 
-      it "sets the cookbook_name attribute to the value of the :name option if given" do
-        subject.from_path(cookbook_path, name: "rspec_tester").cookbook_name.should eql("rspec_tester")
-      end
-
       context "given a path that does not contain a metadata file" do
         it "raises an IOError" do
           lambda {
@@ -35,8 +31,10 @@ describe Ridley::Chef::Cookbook do
           FileUtils.touch(File.join(cookbook_path, 'metadata.rb'))
         end
 
-        it "sets the name of the cookbook to the name of the directory containing it" do
-          subject.from_path(cookbook_path).cookbook_name.should eql("directory_name")
+        it "raises an exception" do
+          expect {
+            subject.from_path(cookbook_path)
+          }.to raise_error(Ridley::Errors::MissingNameAttribute)
         end
       end
 
@@ -158,7 +156,14 @@ describe Ridley::Chef::Cookbook do
     end
 
     context "when a metadata.json file is not present" do
-      before { FileUtils.rm_f(File.join(cookbook_path, "metadata.json")) }
+      before do
+        FileUtils.rm_f(File.join(cookbook_path, 'metadata.json'))
+
+        File.open(File.join(cookbook_path, 'metadata.rb'), 'w+') do |f|
+          f.write "name 'cookbook'"
+        end
+      end
+
       its(:compiled_metadata?) { should be_false }
     end
   end

data/spec/unit/ridley/mixins/from_file_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module Ridley
+  describe Mixin::FromFile do
+    describe '.from_file' do
+      context 'when there is bad Ruby in the file' do
+        let(:instance) { Class.new { include Ridley::Mixin::FromFile }.new }
+
+        before do
+          File.stub(:exists?).and_return(true)
+          File.stub(:readable?).and_return(true)
+          IO.stub(:read).and_return('invalid Ruby code')
+        end
+
+        it 'raises a FromFileParserError' do
+          expect {
+            instance.from_file('/path')
+          }.to raise_error(Errors::FromFileParserError)
+        end
+
+        it 'includes the backtrace from the original error' do
+          expect { instance.from_file('/path') }.to raise_error { |error|
+            expect(error.message).to include("undefined local variable or method `code' for")
+            expect(error.backtrace).to include("/path:1:in `block in from_file'")
+          }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -304,7 +304,6 @@ files:
 - lib/ridley/middleware/follow_redirects.rb
 - lib/ridley/middleware/gzip.rb
 - lib/ridley/middleware/parse_json.rb
-- lib/ridley/middleware/retry.rb
 - lib/ridley/mixin.rb
 - lib/ridley/mixin/checksum.rb
 - lib/ridley/mixin/from_file.rb
@@ -388,6 +387,7 @@ files:
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
+- spec/unit/ridley/mixins/from_file_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb
@@ -416,9 +416,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
@@ -488,6 +488,7 @@ test_files:
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
+- spec/unit/ridley/mixins/from_file_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb

data/lib/ridley/middleware/retry.rb

@@ -1,60 +0,0 @@
-module Ridley
-  # Catches exceptions and retries each request a limited number of times.
-  #
-  # @example
-  #
-  #   Faraday.new do |conn|
-  #     conn.request :retry, max: 2, interval: 0.05, exceptions: [CustomException, Faraday::Timeout::Error]
-  #     conn.adapter ...
-  #   end
-  #
-  # @note Borrowed and modified from: {https://github.com/lostisland/faraday/blob/master/lib/faraday/request/retry.rb}
-  #   use the Faraday official middleware after the release of 0.9.x
-  class Middleware::Retry < Faraday::Middleware
-    # @option options [Integer] :max
-    #   maximum number of retries
-    # @option options [Float] :interval
-    #   pause in seconds between retries
-    # @option options [Array] :exceptions
-    #   the list of exceptions to handle
-    def initialize(app, options = {})
-      super(app)
-      @options  = options.slice(:max, :interval, :exceptions)
-      @errmatch = build_exception_matcher(@options[:exceptions])
-    end
-
-    def call(env)
-      retries = @options[:max]
-      begin
-        @app.call(env)
-      rescue @errmatch
-        if retries > 0
-          retries -= 1
-          sleep @options[:interval] if @options[:interval] > 0
-          retry
-        end
-        raise
-      end
-    end
-
-    # construct an exception matcher object.
-    #
-    # An exception matcher for the rescue clause can usually be any object that
-    # responds to `===`, but for Ruby 1.8 it has to be a Class or Module.
-    def build_exception_matcher(exceptions)
-      matcher = Module.new
-      (class << matcher; self; end).class_eval do
-        define_method(:===) do |error|
-          exceptions.any? do |ex|
-            if ex.is_a? Module then error.is_a? ex
-            else error.class.to_s == ex.to_s
-            end
-          end
-        end
-      end
-      matcher
-    end
-  end
-end
-
-Faraday.register_middleware(:request, retry: Ridley::Middleware::Retry)