ridley 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcfcaeea81633ef129ccef6ff8f1f2ffe02c3862
-  data.tar.gz: 193f02dd4c48240a88730a325364f7a467a3377e
+  metadata.gz: a8f779adc3b49cb4e56e8c3ec7be31f9c9d4d578
+  data.tar.gz: 567f7dfd4825123df48ba3481b925de1d99e2dfc
 SHA512:
-  metadata.gz: ff2323596b824efadefe1b9b6e795f07e81464f70a62a53271719662413ab6c195eedff29e499c63e8a6bb454db4235d2818b7fffa028baa1c2daec43522507a
-  data.tar.gz: 7193d8513449c3cef68faaa95776519fcf819c1c17cdf9764ccb3889ca126afc4814a609a1616538bf87795a8ed67c6decf50daeb0151d1db5e3683b7b626938
+  metadata.gz: 19d7b37325d54cba04a0685999cdb753b2bec68c8361e83736049a62a3b99410dfff57ab42757943395ce3f66075725dd9b479f44d4930e08f9b9300c04de839
+  data.tar.gz: 15f13659355c879b27e1b5e5388f7b055baef746d5474e2478557f771f7d152727d4c609e540855a901b7d92d4360d0e3424e9fda3de542adfdfe3249682996a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.1.0
+
+* Fix monkey patching issue with options#slice when running under Vagrant
+* Bump required version of Celluloid `~> 0.16.0`
+* Bump required version of Celluloid-IO `~> 0.16.1`
+
 # 4.0.0
 
 * Update many out of date dependencies

data/lib/ridley/chef/config.rb

@@ -43,13 +43,13 @@ module Ridley::Chef
     set_assignment_mode :carefree
 
     attribute :node_name,
-      default: Socket.gethostname
+      default: -> { Socket.gethostname }
     attribute :chef_server_url,
       default: 'http://localhost:4000'
     attribute :client_key,
-      default: platform_specific_path('/etc/chef/client.pem')
+      default: -> { platform_specific_path('/etc/chef/client.pem') }
     attribute :validation_key,
-      default: platform_specific_path('/etc/chef/validation.pem')
+      default: -> { platform_specific_path('/etc/chef/validation.pem') }
     attribute :validation_client_name,
       default: 'chef-validator'
 
@@ -70,9 +70,9 @@ module Ridley::Chef
     # deprecated in chef/config.rb but doesn't currently trigger a warning.
     # See also: CHEF-3715
     attribute :syntax_check_cache_path,
-      default: Dir.mktmpdir
+      default: -> { Dir.mktmpdir }
     attribute :cache_options,
-      default: { path: defined?(syntax_check_cache_path) ? syntax_check_cache_path : Dir.mktmpdir }
+      default: -> { { path: defined?(syntax_check_cache_path) ? syntax_check_cache_path : Dir.mktmpdir } }
 
     # Create a new Chef Config object.
     #

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

@@ -1,5 +1,4 @@
-require 'shellwords'
-require 'buff/shell_out'
+require 'erubis'
 
 module Ridley::Chef
   class Cookbook
@@ -68,7 +67,6 @@ module Ridley::Chef
           end
       end
 
-      include Buff::ShellOut
       include Ridley::Logging
       include Ridley::Mixin::Checksum
 
@@ -131,30 +129,55 @@ module Ridley::Chef
         true
       end
 
+      # Borrowed from: https://github.com/opscode/chef/blob/d111e82/lib/chef/cookbook/syntax_check.rb#L191-L215
       def validate_template(erb_file)
-        result = shell_out("erubis -x #{erb_file.shellescape} | ruby -c")
+        old_stderr = $stderr
 
-        if result.error?
-          file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
-          log.error { "Erb template #{file_relative_path} has a syntax error:" }
-          result.stderr.each_line { |l| Ridley.log.fatal(l.chomp) }
-          return false
-        end
+        engine = Erubis::Eruby.new
+        engine.convert!(IO.read(erb_file))
+
+        ruby_code = engine.src
+
+        # Even when we're compiling the code w/ RubyVM, syntax errors just
+        # print to $stderr. We want to capture this and handle the printing
+        # ourselves, so we must temporarily swap $stderr to capture the output.
+        tmp_stderr = $stderr = StringIO.new
+
+        abs_path = File.expand_path(erb_file)
+        RubyVM::InstructionSequence.new(ruby_code, erb_file, abs_path, 0)
 
         true
+      rescue SyntaxError
+        $stderr = old_stderr
+        invalid_erb_file(erb_file, tmp_stderr.string)
+        false
+      ensure
+        $stderr = old_stderr if defined?(old_stderr) && old_stderr
       end
 
+      # Borrowed from: https://github.com/opscode/chef/blob/d111e82/lib/chef/cookbook/syntax_check.rb#L242-L264
       def validate_ruby_file(ruby_file)
-        result = shell_out("ruby -c #{ruby_file.shellescape}")
-
-        if result.error?
-          file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
-          log.error { "Cookbook file #{file_relative_path} has a ruby syntax error:" }
-          result.stderr.each_line { |l| Ridley.log.error(l.chomp) }
-          return false
-        end
-
+        # Even when we're compiling the code w/ RubyVM, syntax errors just
+        # print to $stderr. We want to capture this and handle the printing
+        # ourselves, so we must temporarily swap $stderr to capture the output.
+        old_stderr = $stderr
+        tmp_stderr = $stderr = StringIO.new
+        abs_path = File.expand_path(ruby_file)
+        file_content = IO.read(abs_path)
+
+        # We have to wrap this in a block so the user code evaluates in a
+        # similar context as what Chef does normally. Otherwise RubyVM
+        # will reject some common idioms, like using `return` to end evaluation
+        # of a recipe. See also CHEF-5199
+        wrapped_content = "Object.new.instance_eval do\n#{file_content}\nend\n"
+        RubyVM::InstructionSequence.new(wrapped_content, ruby_file, abs_path, 0)
         true
+      rescue SyntaxError
+        $stderr = old_stderr
+        invalid_ruby_file(ruby_file, tmp_stderr.string)
+        false
+      ensure
+        $stderr = old_stderr if defined?(old_stderr) && old_stderr
       end
 
       private
@@ -165,6 +188,21 @@ module Ridley::Chef
         def ignored?(file)
           !!chefignore && chefignore.ignored?(file)
         end
+
+        # Debug a syntax error in a template.
+        def invalid_erb_file(erb_file, error_message)
+          log.error("Erb template #{erb_file} has a syntax error:")
+          error_message.each_line { |l| log.error(l.chomp) }
+          nil
+        end
+
+        # Debugs ruby syntax errors by printing the path to the file and any
+        # diagnostic info given in +error_message+
+        def invalid_ruby_file(ruby_file, error_message)
+          log.error("Cookbook file #{ruby_file} has a ruby syntax error:")
+          error_message.each_line { |l| log.error(l.chomp) }
+          false
+        end
     end
   end
 end

data/lib/ridley/chef/digester.rb

@@ -40,7 +40,9 @@ module Ridley::Chef
     private
 
       def checksum_file(file, digest)
-        File.open(file, 'rb') { |f| checksum_io(f, digest) }
+        File.open(file, 'rb') do |f|
+          checksum_io(f, digest)
+        end
       end
 
       def checksum_io(io, digest)

data/lib/ridley/client.rb

@@ -1,3 +1,5 @@
+require 'ridley/helpers'
+
 module Ridley
   class Client
     class ConnectionSupervisor < ::Celluloid::SupervisionGroup
@@ -7,7 +9,7 @@ module Ridley
           options[:server_url],
           options[:client_name],
           options[:client_key],
-          options.slice(*Ridley::Connection::VALID_OPTIONS)
+          Ridley::Helpers.options_slice(options, *Ridley::Connection::VALID_OPTIONS)
         ], as: :connection_pool)
       end
     end
@@ -17,14 +19,14 @@ module Ridley
         super(registry)
         supervise_as :client_resource, Ridley::ClientResource, connection_registry
         supervise_as :cookbook_resource, Ridley::CookbookResource, connection_registry,
-          options[:client_name], options[:client_key], options.slice(*Ridley::Connection::VALID_OPTIONS)
+          options[:client_name], options[:client_key], Ridley::Helpers.options_slice(options, *Ridley::Connection::VALID_OPTIONS)
         supervise_as :data_bag_resource, Ridley::DataBagResource, connection_registry,
           options[:encrypted_data_bag_secret]
         supervise_as :environment_resource, Ridley::EnvironmentResource, connection_registry
         supervise_as :node_resource, Ridley::NodeResource, connection_registry, options
         supervise_as :role_resource, Ridley::RoleResource, connection_registry
         supervise_as :sandbox_resource, Ridley::SandboxResource, connection_registry,
-          options[:client_name], options[:client_key], options.slice(*Ridley::Connection::VALID_OPTIONS)
+          options[:client_name], options[:client_key], Ridley::Helpers.options_slice(options, *Ridley::Connection::VALID_OPTIONS)
         supervise_as :search_resource, Ridley::SearchResource, connection_registry
         supervise_as :user_resource, Ridley::UserResource, connection_registry
       end

data/lib/ridley/connection.rb

@@ -3,6 +3,8 @@ require 'retryable'
 require 'tempfile'
 require 'zlib'
 
+require 'ridley/helpers'
+
 module Ridley
   class Connection < Faraday::Connection
     include Celluloid
@@ -65,7 +67,7 @@ module Ridley
         b.adapter :net_http_persistent
       end
 
-      uri_hash = Addressable::URI.parse(server_url).to_hash.slice(:scheme, :host, :port)
+      uri_hash = Ridley::Helpers.options_slice(Addressable::URI.parse(server_url).to_hash, :scheme, :host, :port)
 
       unless uri_hash[:port]
         uri_hash[:port] = (uri_hash[:scheme] == "https" ? 443 : 80)

data/lib/ridley/helpers.rb

@@ -0,0 +1,10 @@
+module Ridley
+  module Helpers
+    def self.options_slice(options, *keys)
+      keys.inject({}) do |memo, key|
+        memo[key] = options[key] if options.include?(key)
+        memo
+      end
+    end
+  end
+end

data/lib/ridley/resources/cookbook_resource.rb

@@ -1,3 +1,5 @@
+require 'ridley/helpers'
+
 module Ridley
   class CookbookResource < Ridley::Resource
     task_class TaskThread
@@ -225,7 +227,7 @@ module Ridley
 
       sandbox.upload(checksums)
       sandbox.commit
-      update(cookbook, options.slice(:force, :freeze))
+      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?

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

data/ridley.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'buff-extensions',         '~> 1.0'
   s.add_dependency 'buff-ignore',             '~> 1.1'
   s.add_dependency 'buff-shell_out',          '~> 0.1'
-  s.add_dependency 'celluloid',               '~> 0.16.0.pre'
-  s.add_dependency 'celluloid-io',            '~> 0.16.0.pre'
+  s.add_dependency 'celluloid',               '~> 0.16.0'
+  s.add_dependency 'celluloid-io',            '~> 0.16.1'
   s.add_dependency 'erubis'
   s.add_dependency 'faraday',                 '~> 0.9.0'
   s.add_dependency 'hashie',                  '>= 2.0.2', '< 3.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ files:
 - lib/ridley/client.rb
 - lib/ridley/connection.rb
 - lib/ridley/errors.rb
+- lib/ridley/helpers.rb
 - lib/ridley/logger.rb
 - lib/ridley/logging.rb
 - lib/ridley/middleware.rb