summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2014-02-19 15:45:43 -0800
committersersut <serdar@opscode.com>2014-02-19 15:55:56 -0800
commita973d0fc232d2e8c5cf44d318108d0739818cad8 (patch)
treeacb31c069334ce46a94143ae299f8d6ec2130bf8
parent24132e2daf64333f3fa3425307b83e7c3278b3df (diff)
downloadchef-a973d0fc232d2e8c5cf44d318108d0739818cad8.tar.gz
Merge branch 'CHEF-5048'
fixes https://tickets.opscode.com/browse/CHEF-5048
-rw-r--r--lib/chef/dsl/recipe.rb14
-rw-r--r--lib/chef/provider.rb6
-rw-r--r--spec/unit/dsl/recipe_spec.rb70
-rw-r--r--spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb5
4 files changed, 80 insertions, 15 deletions
diff --git a/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb
index c64291decc..ebf19c7f23 100644
--- a/lib/chef/dsl/recipe.rb
+++ b/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
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index 3fb86d72c0..152a067f03 100644
--- a/lib/chef/provider.rb
+++ b/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?
diff --git a/spec/unit/dsl/recipe_spec.rb b/spec/unit/dsl/recipe_spec.rb
new file mode 100644
index 0000000000..14ee30be44
--- /dev/null
+++ b/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
+
diff --git a/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb b/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
index 588e56ec6b..8cafbcc9d6 100644
--- a/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
+++ b/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