chef 11.12.0 → 11.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829790278adb839ad7d668ef5a257314bac6454d
-  data.tar.gz: 814e2692f845803a88cca7d3dc7dcd1838dbd132
+  metadata.gz: 449cee80fe86f7cf38cec91a1fa6fd5819e0dd8e
+  data.tar.gz: db2d1079c61c5729a797a2ff206d21f1d153a464
 SHA512:
-  metadata.gz: 08e3371e0f9d2cddb8ceae27163b2e5d311547c9e3bc32ed40ad6a3cc7becc50980d4ea777cb2623519162602edcba53cba2d297fa1b661344e76c262c8a1a32
-  data.tar.gz: 14dab9fde00fadf1e1c24b89fc9f43740874115d97f04676f3013bec8ae1ddb057b4081f05253a6a3cfc078bbd0320d4112002b341404c6b3106b4c25c4f8de4
+  metadata.gz: 4ea1b4d2a4000773b48e3fab9fa7cdf4c3c9d310dcc3ab7b00556de4e80d281c845c352fe4c9a4863fcf3c822daff1f3bd954e0913c1eade582838c855eb6f83
+  data.tar.gz: 0dac4b7f9168ec295bd427d3a701288fd1ed2692e08bc778c138419fbf98b884ba7f998286e6185e855af0d0f7d7665e54983ee2e1d659427bb3343c6f933c97

data/lib/chef/cookbook/syntax_check.rb

@@ -247,7 +247,12 @@ class Chef
         tmp_stderr = $stderr = StringIO.new
         abs_path = File.expand_path(ruby_file)
         file_content = IO.read(abs_path)
-        RubyVM::InstructionSequence.new(file_content, ruby_file, abs_path, 0)
+        # 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

data/lib/chef/http.rb

@@ -50,7 +50,10 @@ class Chef
       end
 
       def handle_chunk(next_chunk)
-        @stream_handlers.inject(next_chunk) do |chunk, handler|
+        # stream handlers handle responses so must be applied in reverse order
+        # (same as #apply_stream_complete_middleware or #apply_response_midddleware)
+        @stream_handlers.reverse.inject(next_chunk) do |chunk, handler|
+          Chef::Log.debug("Chef::HTTP::StreamHandler calling #{handler.class}#handle_chunk")
           handler.handle_chunk(chunk)
         end
       end
@@ -210,18 +213,21 @@ class Chef
 
     def apply_request_middleware(method, url, headers, data)
       middlewares.inject([method, url, headers, data]) do |req_data, middleware|
+        Chef::Log.debug("Chef::HTTP calling #{middleware.class}#handle_request")
         middleware.handle_request(*req_data)
       end
     end
 
     def apply_response_middleware(response, rest_request, return_value)
       middlewares.reverse.inject([response, rest_request, return_value]) do |res_data, middleware|
+        Chef::Log.debug("Chef::HTTP calling #{middleware.class}#handle_response")
         middleware.handle_response(*res_data)
       end
     end
 
     def apply_stream_complete_middleware(response, rest_request, return_value)
       middlewares.reverse.inject([response, rest_request, return_value]) do |res_data, middleware|
+        Chef::Log.debug("Chef::HTTP calling #{middleware.class}#handle_stream_complete")
         middleware.handle_stream_complete(*res_data)
       end
     end
@@ -253,14 +259,6 @@ class Chef
         end
         @last_response = response
 
-        Chef::Log.debug("---- HTTP Status and Header Data: ----")
-        Chef::Log.debug("HTTP #{response.http_version} #{response.code} #{response.msg}")
-
-        response.each do |header, value|
-          Chef::Log.debug("#{header}: #{value}")
-        end
-        Chef::Log.debug("---- End HTTP Status/Header Data ----")
-
         if response.kind_of?(Net::HTTPSuccess)
           [response, request, return_value]
         elsif response.kind_of?(Net::HTTPNotModified) # Must be tested before Net::HTTPRedirection because it's subclass.

data/lib/chef/http/basic_client.rb

@@ -61,7 +61,16 @@ class Chef
         base_headers.each do |name, value|
           Chef::Log.debug("#{name}: #{value}")
         end
+        Chef::Log.debug("---- End HTTP Request Header Data ----")
         http_client.request(http_request) do |response|
+          Chef::Log.debug("---- HTTP Status and Header Data: ----")
+          Chef::Log.debug("HTTP #{response.http_version} #{response.code} #{response.msg}")
+
+          response.each do |header, value|
+            Chef::Log.debug("#{header}: #{value}")
+          end
+          Chef::Log.debug("---- End HTTP Status/Header Data ----")
+
           yield response if block_given?
           # http_client.request may not have the return signature we want, so
           # force the issue:

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.12.0'
+  VERSION = '11.12.2'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/data/cookbooks/openldap/recipes/default.rb

@@ -1,3 +1,4 @@
+
 cat "blanket" do
   pretty_kitty true
 end

data/spec/data/cookbooks/openldap/recipes/return.rb

@@ -0,0 +1,2 @@
+# CHEF-5199 regression test.
+return nil

data/spec/unit/cookbook/syntax_check_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Cookbook::SyntaxCheck do
   let(:cookbook_path) { File.join(CHEF_SPEC_DATA, 'cookbooks', 'openldap') }
   let(:syntax_check) { Chef::Cookbook::SyntaxCheck.new(cookbook_path) }
 
-  let(:open_ldap_cookbook_files) {
+  let(:open_ldap_cookbook_files) do
     %w{ attributes/default.rb 
         attributes/smokey.rb
         definitions/client.rb
@@ -32,8 +32,9 @@ describe Chef::Cookbook::SyntaxCheck do
         metadata.rb
         recipes/default.rb
         recipes/gigantor.rb
-        recipes/one.rb }.map{ |f| File.join(cookbook_path, f) }
-}
+        recipes/one.rb
+        recipes/return.rb }.map{ |f| File.join(cookbook_path, f) }
+  end
 
   before do
     Chef::Log.logger = Logger.new(StringIO.new)
@@ -41,7 +42,7 @@ describe Chef::Cookbook::SyntaxCheck do
 
     @attr_files = %w{default.rb smokey.rb}.map { |f| File.join(cookbook_path, 'attributes', f) }
     @defn_files = %w{client.rb server.rb}.map { |f| File.join(cookbook_path, 'definitions', f)}
-    @recipes = %w{default.rb gigantor.rb one.rb}.map { |f| File.join(cookbook_path, 'recipes', f) }
+    @recipes = %w{default.rb gigantor.rb one.rb return.rb}.map { |f| File.join(cookbook_path, 'recipes', f) }
     @ruby_files = @attr_files + @defn_files + @recipes + [File.join(cookbook_path, "metadata.rb")]
     basenames = %w{ helpers_via_partial_test.erb
                     helper_test.erb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.12.0
+  version: 11.12.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -1247,6 +1247,7 @@ files:
 - spec/data/cookbooks/openldap/recipes/default.rb
 - spec/data/cookbooks/openldap/recipes/gigantor.rb
 - spec/data/cookbooks/openldap/recipes/one.rb
+- spec/data/cookbooks/openldap/recipes/return.rb
 - spec/data/cookbooks/openldap/templates/default/all_windows_line_endings.erb
 - spec/data/cookbooks/openldap/templates/default/helper_test.erb
 - spec/data/cookbooks/openldap/templates/default/helpers_via_partial_test.erb