chef 11.10.2 → 11.10.4.ohai7.0

data/lib/chef/dsl/recipe.rb

@@ -31,20 +31,6 @@ class Chef
 
       include Chef::Mixin::ConvertToClassName
 
-      # Default +cookbook_name+ implementation, always returns "none". This
-      # should be overriden in including classes whenever a meaningful value
-      # can be provided.
-      def cookbook_name
-        "none"
-      end
-
-      # Default +recipe_name+ implementation, always returns "none". This
-      # should be overridden in including classes whenever a meaningful value
-      # can be provided.
-      def recipe_name
-        "none"
-      end
-
       def method_missing(method_symbol, *args, &block)
         # If we have a definition that matches, we want to use that instead.  This should
         # let you do some really crazy over-riding of "native" types, if you really want
@@ -119,12 +105,13 @@ class Chef
 
         resource = resource_class.new(name, run_context)
         resource.source_line = created_at
-        resource.cookbook_name = cookbook_name
-        resource.recipe_name = recipe_name
         # If we have a resource like this one, we want to steal its state
         # This behavior is very counter-intuitive and should be removed.
         # See CHEF-3694, https://tickets.opscode.com/browse/CHEF-3694
+        # Moved to this location to resolve CHEF-5052, https://tickets.opscode.com/browse/CHEF-5052
         resource.load_prior_resource
+        resource.cookbook_name = cookbook_name
+        resource.recipe_name = recipe_name
         # Determine whether this resource is being created in the context of an enclosing Provider
         resource.enclosing_provider = self.is_a?(Chef::Provider) ? self : nil
 

data/lib/chef/provider.rb

@@ -31,6 +31,9 @@ class Chef
     attr_accessor :current_resource
     attr_accessor :run_context
 
+    attr_reader :recipe_name
+    attr_reader :cookbook_name
+
     #--
     # TODO: this should be a reader, and the action should be passed in the
     # constructor; however, many/most subclasses override the constructor so
@@ -44,6 +47,9 @@ class Chef
       @current_resource = nil
       @run_context = run_context
       @converge_actions = nil
+
+      @recipe_name = nil
+      @cookbook_name = nil
     end
 
     def whyrun_mode?

data/lib/chef/version.rb

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

data/spec/support/lib/chef/resource/zen_master.rb

@@ -27,6 +27,7 @@ class Chef
       def initialize(name, run_context=nil)
         @resource_name = :zen_master
         super
+        allowed_actions << :win << :score
       end
 
       def peace(tf)

data/spec/unit/dsl/recipe_spec.rb

@@ -0,0 +1,70 @@
+#
+# Author:: Daniel DeLeo (<dan@getchef.com>)
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef/dsl/recipe'
+
+
+RecipeDSLExampleClass = Struct.new(:cookbook_name, :recipe_name)
+class RecipeDSLExampleClass
+  include Chef::DSL::Recipe
+end
+
+RecipeDSLBaseAPI = Struct.new(:cookbook_name, :recipe_name)
+class RecipeDSLExampleSubclass < RecipeDSLBaseAPI
+  include Chef::DSL::Recipe
+end
+
+# TODO: most of DSL::Recipe's implementation is tested in Chef::Recipe's tests,
+# move those to here.
+describe Chef::DSL::Recipe do
+
+  let(:cookbook_name) { "example_cb" }
+  let(:recipe_name) { "example_recipe" }
+
+  shared_examples_for "A Recipe DSL Implementation" do
+
+    it "responds to cookbook_name" do
+      expect(recipe.cookbook_name).to eq(cookbook_name)
+    end
+
+    it "responds to recipe_name" do
+      expect(recipe.recipe_name).to eq(recipe_name)
+    end
+  end
+
+  context "when included in a class that defines the required interface directly" do
+
+    let(:recipe) { RecipeDSLExampleClass.new(cookbook_name, recipe_name) }
+
+    include_examples "A Recipe DSL Implementation"
+
+  end
+
+  # This is the situation that occurs when the Recipe DSL gets mixed in to a
+  # resource, for example.
+  context "when included in a class that defines the required interface in a superclass" do
+
+    let(:recipe) { RecipeDSLExampleSubclass.new(cookbook_name, recipe_name) }
+
+    include_examples "A Recipe DSL Implementation"
+
+  end
+
+end
+

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -32,6 +32,10 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
     "rspec-example"
   end
 
+  def recipe_name
+    "rspec-example-recipe"
+  end
+
   before do
     @description = Chef::Formatters::ErrorDescription.new("Error Converging Resource:")
     @stdout = StringIO.new
@@ -43,7 +47,6 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
 
   describe "when explaining an error converging a resource" do
     before do
-      source_line = caller(0)[0]
       @resource = package("non-existing-package") do
 
         only_if do

data/spec/unit/recipe_spec.rb

@@ -22,28 +22,38 @@
 require 'spec_helper'
 
 describe Chef::Recipe do
-  before(:each) do
-    @cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
-    cl = Chef::CookbookLoader.new(@cookbook_repo)
-    cl.load_cookbooks
-    @cookbook_collection = Chef::CookbookCollection.new(cl)
-    @node = Chef::Node.new
-    @node.normal[:tags] = Array.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
-    @recipe = Chef::Recipe.new("hjk", "test", @run_context)
-
-    # Shell/ext.rb is on the run path, and it defines
-    # Chef::Recipe#resources to call pp, which we don't want when
-    # we're running tests.
-    @recipe.stub(:pp)
+
+  let(:cookbook_repo) { File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks")) }
+
+  let(:cookbook_loader) do
+    loader = Chef::CookbookLoader.new(cookbook_repo)
+    loader.load_cookbooks
+    loader
+  end
+
+  let(:cookbook_collection) { Chef::CookbookCollection.new(cookbook_loader) }
+
+  let(:node) do
+    Chef::Node.new.tap {|n| n.normal[:tags] = [] }
+  end
+
+  let(:events) do
+    Chef::EventDispatch::Dispatcher.new
+  end
+
+  let(:run_context) do
+    Chef::RunContext.new(node, cookbook_collection, events)
+  end
+
+  let(:recipe) do
+    Chef::Recipe.new("hjk", "test", run_context)
   end
 
   describe "method_missing" do
     describe "resources" do
       it "should load a two word (zen_master) resource" do
         lambda do
-          @recipe.zen_master "monkey" do
+          recipe.zen_master "monkey" do
             peace true
           end
         end.should_not raise_error
@@ -51,7 +61,7 @@ describe Chef::Recipe do
 
       it "should load a one word (cat) resource" do
         lambda do
-          @recipe.cat "loulou" do
+          recipe.cat "loulou" do
             pretty_kitty true
           end
         end.should_not raise_error
@@ -59,47 +69,47 @@ describe Chef::Recipe do
 
       it "should load a four word (one_two_three_four) resource" do
         lambda do
-          @recipe.one_two_three_four "numbers" do
+          recipe.one_two_three_four "numbers" do
             i_can_count true
           end
         end.should_not raise_error
       end
 
       it "should throw an error if you access a resource that we can't find" do
-        lambda { @recipe.not_home("not_home_resource") }.should raise_error(NameError)
+        lambda { recipe.not_home("not_home_resource") }.should raise_error(NameError)
       end
 
       it "should require a name argument" do
         lambda {
-          @recipe.cat
+          recipe.cat
         }.should raise_error(ArgumentError, "You must supply a name when declaring a cat resource")
       end
 
       it "should allow regular errors (not NameErrors) to pass unchanged" do
         lambda {
-          @recipe.cat("felix") { raise ArgumentError, "You Suck" }
+          recipe.cat("felix") { raise ArgumentError, "You Suck" }
         }.should raise_error(ArgumentError)
       end
 
       it "should add our zen_master to the collection" do
-        @recipe.zen_master "monkey" do
+        recipe.zen_master "monkey" do
           peace true
         end
-        @run_context.resource_collection.lookup("zen_master[monkey]").name.should eql("monkey")
+        run_context.resource_collection.lookup("zen_master[monkey]").name.should eql("monkey")
       end
 
       it "should add our zen masters to the collection in the order they appear" do
         %w{monkey dog cat}.each do |name|
-          @recipe.zen_master name do
+          recipe.zen_master name do
             peace true
           end
         end
 
-        @run_context.resource_collection.map{|r| r.name}.should eql(["monkey", "dog", "cat"])
+        run_context.resource_collection.map{|r| r.name}.should eql(["monkey", "dog", "cat"])
       end
 
       it "should return the new resource after creating it" do
-        res = @recipe.zen_master "makoto" do
+        res = recipe.zen_master "makoto" do
           peace true
         end
         res.resource_name.should eql(:zen_master)
@@ -110,16 +120,16 @@ describe Chef::Recipe do
 
         it "locate resource for particular platform" do
           Object.const_set('ShaunTheSheep', Class.new(Chef::Resource){ provides :laughter, :on_platforms => ["television"] })
-          @node.automatic[:platform] = "television"
-          @node.automatic[:platform_version] = "123"
-          res = @recipe.laughter "timmy"
+          node.automatic[:platform] = "television"
+          node.automatic[:platform_version] = "123"
+          res = recipe.laughter "timmy"
           res.name.should eql("timmy")
           res.kind_of?(ShaunTheSheep)
         end
 
         it "locate a resource for all platforms" do
           Object.const_set("YourMom", Class.new(Chef::Resource){ provides :love_and_caring })
-          res = @recipe.love_and_caring "mommy"
+          res = recipe.love_and_caring "mommy"
           res.name.should eql("mommy")
           res.kind_of?(YourMom)
         end
@@ -129,7 +139,7 @@ describe Chef::Recipe do
 
     describe "creating resources via build_resource" do
       let(:zm_resource) do
-        @recipe.build_resource(:zen_master, "klopp") do
+        recipe.build_resource(:zen_master, "klopp") do
           something "bvb"
         end
       end
@@ -146,14 +156,14 @@ describe Chef::Recipe do
 
       it "does not add the resource to the resource collection" do
         zm_resource # force let binding evaluation
-        expect { @run_context.resource_collection.resources(:zen_master => "klopp") }.to raise_error(Chef::Exceptions::ResourceNotFound)
+        expect { run_context.resource_collection.resources(:zen_master => "klopp") }.to raise_error(Chef::Exceptions::ResourceNotFound)
       end
 
     end
 
     describe "creating resources via declare_resource" do
       let(:zm_resource) do
-        @recipe.declare_resource(:zen_master, "klopp") do
+        recipe.declare_resource(:zen_master, "klopp") do
           something "bvb"
         end
       end
@@ -170,7 +180,7 @@ describe Chef::Recipe do
 
       it "adds the resource to the resource collection" do
         zm_resource # force let binding evaluation
-        @run_context.resource_collection.resources(:zen_master => "klopp").should == zm_resource
+        run_context.resource_collection.resources(:zen_master => "klopp").should == zm_resource
       end
 
     end
@@ -179,13 +189,13 @@ describe Chef::Recipe do
 
       it "gives a sane error message when using method_missing" do
         lambda do
-          @recipe.no_such_resource("foo")
+          recipe.no_such_resource("foo")
         end.should raise_error(NoMethodError, %q[No resource or method named `no_such_resource' for `Chef::Recipe "test"'])
       end
 
       it "gives a sane error message when using method_missing 'bare'" do
         lambda do
-          @recipe.instance_eval do
+          recipe.instance_eval do
             # Giving an argument will change this from NameError to NoMethodError
             no_such_resource
           end
@@ -193,11 +203,11 @@ describe Chef::Recipe do
       end
 
       it "gives a sane error message when using build_resource" do
-        expect { @recipe.build_resource(:no_such_resource, "foo") }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+        expect { recipe.build_resource(:no_such_resource, "foo") }.to raise_error(Chef::Exceptions::NoSuchResourceType)
       end
 
       it "gives a sane error message when using declare_resource" do
-        expect { @recipe.declare_resource(:no_such_resource, "bar") }.to raise_error(Chef::Exceptions::NoSuchResourceType)
+        expect { recipe.declare_resource(:no_such_resource, "bar") }.to raise_error(Chef::Exceptions::NoSuchResourceType)
       end
 
     end
@@ -206,7 +216,7 @@ describe Chef::Recipe do
 
       it "does not obfuscate the error source" do
         lambda do
-          @recipe.zen_master("klopp") do
+          recipe.zen_master("klopp") do
             this_method_doesnt_exist
           end
         end.should raise_error(NoMethodError, "undefined method `this_method_doesnt_exist' for Chef::Resource::ZenMaster")
@@ -215,6 +225,53 @@ describe Chef::Recipe do
 
     end
 
+    describe "resource cloning" do
+
+      let(:second_recipe) do
+        Chef::Recipe.new("second_cb", "second_recipe", run_context)
+      end
+
+      let(:original_resource) do
+        recipe.zen_master("klopp") do
+          something "bvb09"
+          action :score
+        end
+      end
+
+      let(:duplicated_resource) do
+        original_resource
+        second_recipe.zen_master("klopp") do
+          # attrs should be cloned
+        end
+      end
+
+      it "copies attributes from the first resource" do
+        duplicated_resource.something.should == "bvb09"
+      end
+
+      it "does not copy the action from the first resource" do
+        original_resource.action.should == [:score]
+        duplicated_resource.action.should == :nothing
+      end
+
+      it "does not copy the source location of the first resource" do
+        # sanity check source location:
+        original_resource.source_line.should include(__FILE__)
+        duplicated_resource.source_line.should include(__FILE__)
+        # actual test:
+        original_resource.source_line.should_not == duplicated_resource.source_line
+      end
+
+      it "sets the cookbook name on the cloned resource to that resource's cookbook" do
+        duplicated_resource.cookbook_name.should == "second_cb"
+      end
+
+      it "sets the recipe name on the cloned resource to that resoure's recipe" do
+        duplicated_resource.recipe_name.should == "second_recipe"
+      end
+
+    end
+
     describe "resource definitions" do
       it "should execute defined resources" do
         crow_define = Chef::ResourceDefinition.new
@@ -224,12 +281,12 @@ describe Chef::Recipe do
             something params[:something]
           end
         end
-        @run_context.definitions[:crow] = crow_define
-        @recipe.crow "mine" do
+        run_context.definitions[:crow] = crow_define
+        recipe.crow "mine" do
           peace true
         end
-        @run_context.resource_collection.resources(:zen_master => "lao tzu").name.should eql("lao tzu")
-        @run_context.resource_collection.resources(:zen_master => "lao tzu").something.should eql(true)
+        run_context.resource_collection.resources(:zen_master => "lao tzu").name.should eql("lao tzu")
+        run_context.resource_collection.resources(:zen_master => "lao tzu").something.should eql(true)
       end
 
       it "should set the node on defined resources" do
@@ -240,12 +297,12 @@ describe Chef::Recipe do
             something params[:something]
           end
         end
-        @run_context.definitions[:crow] = crow_define
-        @node.normal[:foo] = false
-        @recipe.crow "mine" do
+        run_context.definitions[:crow] = crow_define
+        node.normal[:foo] = false
+        recipe.crow "mine" do
           something node[:foo]
         end
-        @recipe.resources(:zen_master => "lao tzu").something.should eql(false)
+        recipe.resources(:zen_master => "lao tzu").something.should eql(false)
       end
     end
 
@@ -258,15 +315,15 @@ describe Chef::Recipe do
     peace = true
   end
   CODE
-      lambda { @recipe.instance_eval(code) }.should_not raise_error
-      @recipe.resources(:zen_master => "gnome").name.should eql("gnome")
+      lambda { recipe.instance_eval(code) }.should_not raise_error
+      recipe.resources(:zen_master => "gnome").name.should eql("gnome")
     end
   end
 
   describe "from_file" do
     it "should load a resource from a ruby file" do
-      @recipe.from_file(File.join(CHEF_SPEC_DATA, "recipes", "test.rb"))
-      res = @recipe.resources(:file => "/etc/nsswitch.conf")
+      recipe.from_file(File.join(CHEF_SPEC_DATA, "recipes", "test.rb"))
+      res = recipe.resources(:file => "/etc/nsswitch.conf")
       res.name.should eql("/etc/nsswitch.conf")
       res.action.should eql([:create])
       res.owner.should eql("root")
@@ -275,88 +332,88 @@ describe Chef::Recipe do
     end
 
     it "should raise an exception if the file cannot be found or read" do
-      lambda { @recipe.from_file("/tmp/monkeydiving") }.should raise_error(IOError)
+      lambda { recipe.from_file("/tmp/monkeydiving") }.should raise_error(IOError)
     end
   end
 
   describe "include_recipe" do
     it "should evaluate another recipe with include_recipe" do
-      @node.should_receive(:loaded_recipe).with(:openldap, "gigantor")
-      @run_context.include_recipe "openldap::gigantor"
-      res = @run_context.resource_collection.resources(:cat => "blanket")
+      node.should_receive(:loaded_recipe).with(:openldap, "gigantor")
+      run_context.include_recipe "openldap::gigantor"
+      res = run_context.resource_collection.resources(:cat => "blanket")
       res.name.should eql("blanket")
       res.pretty_kitty.should eql(false)
     end
 
     it "should load the default recipe for a cookbook if include_recipe is called without a ::" do
-      @node.should_receive(:loaded_recipe).with(:openldap, "default")
-      @run_context.include_recipe "openldap"
-      res = @run_context.resource_collection.resources(:cat => "blanket")
+      node.should_receive(:loaded_recipe).with(:openldap, "default")
+      run_context.include_recipe "openldap"
+      res = run_context.resource_collection.resources(:cat => "blanket")
       res.name.should eql("blanket")
       res.pretty_kitty.should eql(true)
     end
 
     it "should store that it has seen a recipe in the run_context" do
-      @node.should_receive(:loaded_recipe).with(:openldap, "default")
-      @run_context.include_recipe "openldap"
-      @run_context.loaded_recipe?("openldap").should be_true
+      node.should_receive(:loaded_recipe).with(:openldap, "default")
+      run_context.include_recipe "openldap"
+      run_context.loaded_recipe?("openldap").should be_true
     end
 
     it "should not include the same recipe twice" do
-      @node.should_receive(:loaded_recipe).with(:openldap, "default").exactly(:once)
-      @cookbook_collection[:openldap].should_receive(:load_recipe).with("default", @run_context)
-      @recipe.include_recipe "openldap"
-      @cookbook_collection[:openldap].should_not_receive(:load_recipe).with("default", @run_context)
-      @recipe.include_recipe "openldap"
+      node.should_receive(:loaded_recipe).with(:openldap, "default").exactly(:once)
+      cookbook_collection[:openldap].should_receive(:load_recipe).with("default", run_context)
+      recipe.include_recipe "openldap"
+      cookbook_collection[:openldap].should_not_receive(:load_recipe).with("default", run_context)
+      recipe.include_recipe "openldap"
     end
   end
 
   describe "tags" do
     it "should set tags via tag" do
-      @recipe.tag "foo"
-      @node[:tags].should include("foo")
+      recipe.tag "foo"
+      node[:tags].should include("foo")
     end
 
     it "should set multiple tags via tag" do
-      @recipe.tag "foo", "bar"
-      @node[:tags].should include("foo")
-      @node[:tags].should include("bar")
+      recipe.tag "foo", "bar"
+      node[:tags].should include("foo")
+      node[:tags].should include("bar")
     end
 
     it "should not set the same tag twice via tag" do
-      @recipe.tag "foo"
-      @recipe.tag "foo"
-      @node[:tags].should eql([ "foo" ])
+      recipe.tag "foo"
+      recipe.tag "foo"
+      node[:tags].should eql([ "foo" ])
     end
 
     it "should return the current list of tags from tag with no arguments" do
-      @recipe.tag "foo"
-      @recipe.tag.should eql([ "foo" ])
+      recipe.tag "foo"
+      recipe.tag.should eql([ "foo" ])
     end
 
     it "should return true from tagged? if node is tagged" do
-      @recipe.tag "foo"
-      @recipe.tagged?("foo").should be(true)
+      recipe.tag "foo"
+      recipe.tagged?("foo").should be(true)
     end
 
     it "should return false from tagged? if node is not tagged" do
-      @recipe.tagged?("foo").should be(false)
+      recipe.tagged?("foo").should be(false)
     end
 
     it "should return false from tagged? if node is not tagged" do
-      @recipe.tagged?("foo").should be(false)
+      recipe.tagged?("foo").should be(false)
     end
 
     it "should remove a tag from the tag list via untag" do
-      @recipe.tag "foo"
-      @recipe.untag "foo"
-      @node[:tags].should eql([])
+      recipe.tag "foo"
+      recipe.untag "foo"
+      node[:tags].should eql([])
     end
 
     it "should remove multiple tags from the tag list via untag" do
-      @recipe.tag "foo", "bar"
-      @recipe.untag "bar", "foo"
-      @node[:tags].should eql([])
+      recipe.tag "foo", "bar"
+      recipe.untag "bar", "foo"
+      node[:tags].should eql([])
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.10.2
-  prerelease: 
+  version: 11.10.4.ohai7.0
+  prerelease: 8
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0.rc.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 7.0.0.rc.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -1566,6 +1566,7 @@ files:
 - spec/unit/digester_spec.rb
 - spec/unit/dsl/data_query_spec.rb
 - spec/unit/dsl/platform_introspection_spec.rb
+- spec/unit/dsl/recipe_spec.rb
 - spec/unit/dsl/regsitry_helper_spec.rb
 - spec/unit/encrypted_data_bag_item_spec.rb
 - spec/unit/environment_spec.rb
@@ -1888,9 +1889,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23