Raise a UserError if the name attribute isn't in metadata.rb.

References test-kitchen#116
thommay · May 30, 2013 · 66e4013 · 66e4013
1 parent 8bed0ff
commit 66e4013
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/lib/kitchen/chef_data_uploader.rb b/lib/kitchen/chef_data_uploader.rb
@@ -162,9 +162,9 @@ def cp_cookbooks(tmpdir)
 
     def cp_this_cookbook(tmpdir)
       metadata_rb = File.join(kitchen_root, "metadata.rb")
-      cb_name = MetadataChopper.extract(metadata_rb).first
-
-      raise TestKitchen::Errors::MissingCookbookName.new(name) if cb_name.nil?
+      cb_name = MetadataChopper.extract(metadata_rb).first or raise(UserError,
+        "The metadata.rb does not define the 'name' key." +
+          " Please add: `name '<cookbook_name>'` to metadata.rb and try again")
 
       cb_path = File.join(tmpdir, cb_name)
       glob = Dir.glob("#{kitchen_root}/{metadata.rb,README.*," +

diff --git a/lib/kitchen/errors.rb b/lib/kitchen/errors.rb
@@ -74,24 +74,6 @@ class ActionFailed < TransientFailure ; end
   # Exception class capturing what caused an instance to die.
   class InstanceFailure < TransientFailure ; end
 
-  # Exception class raised when a cookbook's metadata is missing the name
-  # attribute.
-  class MissingCookbookName  < StandardError
-    def initialize(name)
-      @name = name
-    end
-
-    def to_s
-      [
-        "The metadata.rb does not define the 'name' key. Please add:",
-        "",
-        "  name '#{@name}'",
-        "",
-        "to the metadata.rb for '#{@name}' and try again."
-      ].join("\n")
-    end
-  end
-
   def self.with_friendly_errors
     yield
   rescue Kitchen::InstanceFailure => e