chef 11.6.0.rc.0 → 11.6.0.rc.1

data/lib/chef/cookbook/file_system_file_vendor.rb

@@ -37,17 +37,14 @@ class Chef
         raise ArgumentError, "You must specify at least one repo path" if @repo_paths.empty?
       end
 
-      def cookbooks
-        @cookbooks ||= Chef::CookbookLoader.new(@repo_paths).load_cookbooks
-      end
-
       # Implements abstract base's requirement. It looks in the
       # Chef::Config.cookbook_path file hierarchy for the requested
       # file.
       def get_filename(filename)
-        if cookbooks.has_key?(@cookbook_name)
-          location = File.join(cookbooks[@cookbook_name].root_dir, filename)
-          location = nil unless File.exist?(location)
+        location = @repo_paths.inject(nil) do |memo, basepath|
+          candidate_location = File.join(basepath, @cookbook_name, filename)
+          memo = candidate_location if File.exist?(candidate_location)
+          memo
         end
         raise "File #{filename} does not exist for cookbook #{@cookbook_name}" unless location
 

data/lib/chef/cookbook/metadata.rb

@@ -91,7 +91,7 @@ class Chef
       # metadata<Chef::Cookbook::Metadata>
       def initialize(cookbook=nil, maintainer='YOUR_COMPANY_NAME', maintainer_email='YOUR_EMAIL', license='none')
         @cookbook = cookbook
-        @name = cookbook ? cookbook.name : nil
+        @name = cookbook ? cookbook.name : ""
         @long_description = ""
         self.maintainer(maintainer)
         self.maintainer_email(maintainer_email)
@@ -468,15 +468,6 @@ class Chef
         @groupings                    = o[GROUPINGS] if o.has_key?(GROUPINGS)
         @recipes                      = o[RECIPES] if o.has_key?(RECIPES)
         @version                      = o[VERSION] if o.has_key?(VERSION)
-        #
-        # XXX: When a client (berkshelf in particular) uploads metadata without a name field, the hosted chef
-        #      ruby server will subsequently return empty string ("") for the metadata.name.  In erchef uploading
-        #      metadata without a name field will simply not store or retrieve a name field so we get @name = nil.
-        #      During the migration from ruby to erchef, metadata.name of "" was migrated faithfully even though it
-        #      fails validation, and erchef will return this, so we still have to handle this case unless the
-        #      database is sanitized to remove metadata.name == "".
-        #
-        @name = nil if !@name.nil? && @name.empty?
         self
       end
 

data/lib/chef/cookbook/syntax_check.rb

@@ -85,14 +85,14 @@ class Chef
       # validated.
       attr_reader :validated_files
 
-      # Creates a new SyntaxCheck given the +cookbook_pathname+ and a +cookbook_path+.
+      # Creates a new SyntaxCheck given the +cookbook_name+ and a +cookbook_path+.
       # If no +cookbook_path+ is given, +Chef::Config.cookbook_path+ is used.
-      def self.for_cookbook(cookbook_pathname, cookbook_path=nil)
+      def self.for_cookbook(cookbook_name, cookbook_path=nil)
         cookbook_path ||= Chef::Config.cookbook_path
         unless cookbook_path
-          raise ArgumentError, "Cannot find cookbook #{cookbook_pathname} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
+          raise ArgumentError, "Cannot find cookbook #{cookbook_name} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
         end
-        new(File.join(cookbook_path, cookbook_pathname.to_s))
+        new(File.join(cookbook_path, cookbook_name.to_s))
       end
 
       # Create a new SyntaxCheck object

data/lib/chef/cookbook_uploader.rb

@@ -159,7 +159,7 @@ class Chef
 
     def validate_cookbooks
       cookbooks.each do |cb|
-        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cb.pathname, @user_cookbook_path)
+        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cb.name, @user_cookbook_path)
         Chef::Log.info("Validating ruby files")
         exit(1) unless syntax_checker.validate_ruby_files
         Chef::Log.info("Validating templates")

data/lib/chef/cookbook_version.rb

@@ -50,7 +50,7 @@ class Chef
     attr_accessor :resource_filenames
     attr_accessor :provider_filenames
     attr_accessor :root_filenames
-    attr_accessor :pathname
+    attr_accessor :name
     attr_accessor :metadata
     attr_accessor :metadata_filenames
     attr_accessor :status
@@ -83,8 +83,8 @@ class Chef
     #
     # === Returns
     # object<Chef::CookbookVersion>:: Duh. :)
-    def initialize(pathname)
-      @pathname = pathname
+    def initialize(name)
+      @name = name
       @frozen = false
       @attribute_filenames = Array.new
       @definition_filenames = Array.new
@@ -104,10 +104,6 @@ class Chef
       @metadata = Chef::Cookbook::Metadata.new
     end
 
-    def name
-      metadata.name || @pathname
-    end
-
     def version
       metadata.version
     end
@@ -602,11 +598,11 @@ class Chef
           specificity = "default"
 
           if segment == :root_files
-            matcher = segment_file.match(".+/#{Regexp.escape(pathname.to_s)}/(.+)")
+            matcher = segment_file.match(".+/#{Regexp.escape(name.to_s)}/(.+)")
             file_name = matcher[1]
             path = file_name
           elsif segment == :templates || segment == :files
-            matcher = segment_file.match("/#{Regexp.escape(pathname.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+?)/(.+))")
+            matcher = segment_file.match("/#{Regexp.escape(name.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+?)/(.+))")
             unless matcher
               Chef::Log.debug("Skipping file #{segment_file}, as it isn't in any of the proper directories (platform-version, platform or default)")
               Chef::Log.debug("You probably need to move #{segment_file} into the 'default' sub-directory")
@@ -616,7 +612,7 @@ class Chef
             specificity = matcher[2]
             file_name = matcher[3]
           else
-            matcher = segment_file.match("/#{Regexp.escape(pathname.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+))")
+            matcher = segment_file.match("/#{Regexp.escape(name.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+))")
             path = matcher[1]
             file_name = matcher[2]
           end

data/lib/chef/provider/file.rb

@@ -74,7 +74,7 @@ class Chef
         # Let children resources override constructing the @current_resource
         @current_resource ||= Chef::Resource::File.new(@new_resource.name)
         @current_resource.path(@new_resource.path)
-        if real_file?(@current_resource.path) && ::File.exists?(@current_resource.path)
+        if ::File.exists?(@current_resource.path) && ::File.file?(::File.realpath(@current_resource.path))
           if @action != :create_if_missing && @current_resource.respond_to?(:checksum)
             @current_resource.checksum(checksum(@current_resource.path))
           end
@@ -292,6 +292,7 @@ class Chef
             converge_by(description) do
               unlink(@new_resource.path)
             end
+            @current_resource.checksum = nil
             @file_unlinked = true
           end
         end

data/lib/chef/provider/package/yum.rb

@@ -759,7 +759,7 @@ class Chef
                 @rpmdb << pkg
               end
 
-              error = status.stderr.readlines
+              error = status.stderr
             rescue Mixlib::ShellOut::CommandTimeout => e
               Chef::Log.error("#{helper} exceeded timeout #{Chef::Config[:yum_timeout]}")
               raise(e)

data/lib/chef/resource/file.rb

@@ -36,6 +36,8 @@ class Chef
         state_attrs :checksum, :owner, :group, :mode
       end
 
+      attr_writer :checksum
+
       provides :file, :on_platforms => :all
 
       def initialize(name, run_context=nil)

data/lib/chef/scan_access_control.rb

@@ -127,7 +127,12 @@ class Chef
     end
 
     def stat
-      @stat ||= @new_resource.instance_of?(Chef::Resource::Link) ? ::File.lstat(@new_resource.path) : ::File.stat(@new_resource.path)
+      @stat ||= if @new_resource.instance_of?(Chef::Resource::Link)
+        ::File.lstat(@new_resource.path)
+      else
+        realpath = ::File.realpath(@new_resource.path)
+        ::File.stat(realpath)
+      end
     end
   end
 end

data/lib/chef/util/diff.rb

@@ -22,6 +22,10 @@ class Chef
     class Diff
       include Chef::Mixin::ShellOut
 
+      # @todo: to_a, to_s, to_json, inspect defs, accessors for @diff and @error
+      # @todo: move coercion to UTF-8 into to_json
+      # @todo: replace shellout to diff -u with diff-lcs gem
+
       def for_output
         # formatted output to a terminal uses arrays of strings and returns error strings
         @diff.nil? ? [ @error ] : @diff
@@ -75,8 +79,13 @@ class Chef
 
         begin
           # -u: Unified diff format
+          # LC_ALL: in ruby 1.9 we want to set nil which is a magic option to mixlib-shellout to
+          #         pass through the LC_ALL locale.  in ruby 1.8 we force to 7-bit 'C' locale
+          #         (which is the mixlib-shellout default for all rubies all the time).
           Chef::Log.debug("running: diff -u #{old_file} #{new_file}")
-          result = shell_out("diff -u #{old_file} #{new_file}")
+          locale = ( Object.const_defined? :Encoding ) ? nil : 'C'
+          result = shell_out("diff -u #{old_file} #{new_file}", :env => {'LC_ALL' => locale})
+
         rescue Exception => e
           # Should *not* receive this, but in some circumstances it seems that
           # an exception can be thrown even using shell_out instead of shell_out!
@@ -94,7 +103,18 @@ class Chef
           if result.stdout.length > diff_output_threshold
             return "(long diff of over #{diff_output_threshold} characters, diff output suppressed)"
           else
-            @diff = result.stdout.split("\n")
+            diff_str = result.stdout
+            if  Object.const_defined? :Encoding  # ruby >= 1.9
+              if ( diff_str.encoding == Encoding::ASCII_8BIT &&
+                diff_str.encoding != Encoding.default_external &&
+                RUBY_VERSION.to_f < 2.0 )
+                # @todo mixlib-shellout under ruby 1.9 hands back an ASCII-8BIT encoded string, which needs to
+                # be fixed to the default external encoding -- this should be moved into mixlib-shellout
+                diff_str = diff_str.force_encoding(Encoding.default_external)
+              end
+              diff_str.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
+            end
+            @diff = diff_str.split("\n")
             @diff.delete("\")
             return "(diff available)"
           end
@@ -106,10 +126,16 @@ class Chef
       end
 
       def is_binary?(path)
-        ::File.open(path) do |file|
-          buff = file.read(Chef::Config[:diff_filesize_threshold])
+        File.open(path) do |file|
+          # XXX: this slurps into RAM, but we should have already checked our diff has a reasonable size
+          buff = file.read
           buff = "" if buff.nil?
-          return buff !~ /^[\r[:print:]]*$/
+          begin
+            return buff !~ /\A[\s[:print:]]*\z/m
+          rescue ArgumentError => e
+            return true if e.message =~ /invalid byte sequence/
+            raise
+          end
         end
       end
 

data/lib/chef/version.rb

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

data/spec/functional/knife/exec_spec.rb

@@ -46,12 +46,12 @@ describe Chef::Knife::Exec do
 
   pending "executes a script in the context of the chef-shell main context", :ruby_18_only
 
-  it "executes a script in the context of the chef-shell main context", :ruby_19_only do
+  it "executes a script in the context of the chef-shell main context", :ruby_gte_19_only do
     @node = Chef::Node.new
     @node.name("ohai-world")
     response = {"rows" => [@node],"start" => 0,"total" => 1}
     @api.get(%r{^/search/node}, 200, response.to_json)
-    code = "$output.puts nodes.all.inspect"
+    code = "$output.puts nodes.all"
     @knife.config[:exec] = code
     @knife.run
     $output.string.should match(%r{node\[ohai-world\]})

data/spec/spec_helper.rb

@@ -104,6 +104,9 @@ RSpec.configure do |config|
   config.filter_run_excluding :selinux_only => true unless selinux_enabled?
   config.filter_run_excluding :ruby_18_only => true unless ruby_18?
   config.filter_run_excluding :ruby_19_only => true unless ruby_19?
+  config.filter_run_excluding :ruby_gte_19_only => true unless ruby_gte_19?
+  config.filter_run_excluding :ruby_20_only => true unless ruby_20?
+  config.filter_run_excluding :ruby_gte_20_only => true unless ruby_gte_20?
   config.filter_run_excluding :requires_root => true unless ENV['USER'] == 'root'
   config.filter_run_excluding :requires_unprivileged_user => true if ENV['USER'] == 'root'
   config.filter_run_excluding :uses_diff => true unless has_diff?

data/spec/support/platform_helpers.rb

@@ -1,5 +1,17 @@
 require 'fcntl'
 
+def ruby_gte_20?
+  RUBY_VERSION.to_f >= 2.0
+end
+
+def ruby_gte_19?
+  RUBY_VERSION.to_f >= 1.9
+end
+
+def ruby_20?
+  !!(RUBY_VERSION =~ /^2.0/)
+end
+
 def ruby_19?
   !!(RUBY_VERSION =~ /^1.9/)
 end

data/spec/support/shared/functional/file_resource.rb

@@ -523,15 +523,8 @@ shared_examples_for "a configured file resource" do
           resource.path(link_path)
           # create symlinks for test context
           File.symlink(path, link_path)
-
-          # Create source (real) file
-          File.open(path, "wb") { |f| f.write(wrong_content) }
         end
 
-        include_context "setup broken permissions"
-
-        include_examples "a securable resource with existing target"
-
         after(:each) do
           # shared examples should not change our test setup of a file resource
           # pointing at a symlink:
@@ -539,9 +532,56 @@ shared_examples_for "a configured file resource" do
           FileUtils.rm_rf(link_path)
         end
 
-        it "does not replace the symlink with a real file" do
-          resource.run_action(:create)
-          File.should be_symlink(link_path)
+        context "and the permissions are incorrect" do
+          before do
+            # Create source (real) file
+            File.open(path, "wb") { |f| f.write(expected_content) }
+          end
+
+
+          include_context "setup broken permissions"
+
+          include_examples "a securable resource with existing target"
+
+          it "does not replace the symlink with a real file" do
+            resource.run_action(:create)
+            File.should be_symlink(link_path)
+          end
+
+        end
+
+        context "and the content is incorrect" do
+          before do
+            # Create source (real) file
+            File.open(path, "wb") { |f| f.write(wrong_content) }
+          end
+
+          it "updates the source file content" do
+            pending
+          end
+
+          it "marks the resource as updated" do
+            resource.run_action(:create)
+            resource.should be_updated_by_last_action
+          end
+
+          it "does not replace the symlink with a real file" do
+            resource.run_action(:create)
+            File.should be_symlink(link_path)
+          end
+        end
+
+        context "and the content and permissions are correct" do
+          let(:expect_updated?) { false }
+
+          before do
+            # Create source (real) file
+            File.open(path, "wb") { |f| f.write(expected_content) }
+          end
+          include_context "setup correct permissions"
+
+          include_examples "a securable resource with existing target"
+
         end
 
       end

data/spec/support/shared/unit/provider/file.rb

@@ -146,7 +146,8 @@ shared_examples_for Chef::Provider::File do
         # mock up the filesystem to behave like unix
         setup_normal_file
         stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
-        File.should_receive(:stat).with(resource.path).at_least(:once).and_return(stat_struct)
+        resource_real_path = File.realpath(resource.path)
+        File.should_receive(:stat).with(resource_real_path).at_least(:once).and_return(stat_struct)
         Etc.stub!(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
         Etc.stub!(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
       end
@@ -270,7 +271,8 @@ shared_examples_for Chef::Provider::File do
       # mock up the filesystem to behave like unix
       setup_normal_file
       stat_struct = mock("::File.stat", :mode => 0600, :uid => 0, :gid => 0, :mtime => 10000)
-      File.stub!(:stat).with(resource.path).and_return(stat_struct)
+      resource_real_path = File.realpath(resource.path)
+      File.stub!(:stat).with(resource_real_path).and_return(stat_struct)
       Etc.stub!(:getgrgid).with(0).and_return(mock("Group Ent", :name => "wheel"))
       Etc.stub!(:getpwuid).with(0).and_return(mock("User Ent", :name => "root"))
       provider.send(:load_resource_attributes_from_file, resource)

data/spec/unit/cookbook/metadata_spec.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -20,7 +20,7 @@
 require 'spec_helper'
 require 'chef/cookbook/metadata'
 
-describe Chef::Cookbook::Metadata do
+describe Chef::Cookbook::Metadata do 
   before(:each) do
     @cookbook = Chef::CookbookVersion.new('test_cookbook')
     @meta = Chef::Cookbook::Metadata.new(@cookbook)
@@ -86,7 +86,7 @@ describe Chef::Cookbook::Metadata do
     it "should return a Chef::Cookbook::Metadata object" do
       @meta.should be_a_kind_of(Chef::Cookbook::Metadata)
     end
-
+    
     it "should allow a cookbook as the first argument" do
       lambda { Chef::Cookbook::Metadata.new(@cookbook) }.should_not raise_error
     end
@@ -96,7 +96,7 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the maintainer name from the second argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown')
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown') 
       md.maintainer.should == 'Bobo T. Clown'
     end
 
@@ -105,7 +105,7 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the maintainer email from the third argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co')
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co') 
       md.maintainer_email.should == 'bobo@clown.co'
     end
 
@@ -114,10 +114,10 @@ describe Chef::Cookbook::Metadata do
     end
 
     it "should set the license from the fourth argument" do
-      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co', 'Clown License v1')
+      md = Chef::Cookbook::Metadata.new(@cookbook, 'Bobo T. Clown', 'bobo@clown.co', 'Clown License v1') 
       md.license.should == 'Clown License v1'
     end
-  end
+  end 
 
   describe "cookbook" do
     it "should return the cookbook we were initialized with" do
@@ -133,7 +133,7 @@ describe Chef::Cookbook::Metadata do
 
   describe "platforms" do
     it "should return the current platform hash" do
-      @meta.platforms.should be_a_kind_of(Hash)
+      @meta.platforms.should be_a_kind_of(Hash)  
     end
   end
 
@@ -235,7 +235,7 @@ describe Chef::Cookbook::Metadata do
       end
     end
   end
-
+  
   describe "attribute groupings" do
     it "should allow you set a grouping" do
       group = {
@@ -312,7 +312,7 @@ describe Chef::Cookbook::Metadata do
       @meta.attribute("db/mysql/databases", {})
       @meta.attributes["db/mysql/databases"][:choice].should == []
     end
-
+    
      it "should let calculated be true or false" do
        lambda {
          @meta.attribute("db/mysql/databases", :calculated => true)
@@ -324,7 +324,7 @@ describe Chef::Cookbook::Metadata do
          @meta.attribute("db/mysql/databases", :calculated => Hash.new)
        }.should raise_error(ArgumentError)
      end
-
+ 
      it "should set calculated to false by default" do
        @meta.attribute("db/mysql/databases", {})
        @meta.attributes["db/mysql/databases"][:calculated].should == false
@@ -350,7 +350,7 @@ describe Chef::Cookbook::Metadata do
         @meta.attribute("db/mysql/databases", :type => "symbol")
       }.should_not raise_error(ArgumentError)
     end
-
+    
      it "should let type be hash (backwards compatability only)" do
       lambda {
         @meta.attribute("db/mysql/databases", :type => "hash")
@@ -375,7 +375,7 @@ describe Chef::Cookbook::Metadata do
       }.should_not raise_error(ArgumentError)
       #attrib = @meta.attributes["db/mysql/databases"][:required].should == "required"
     end
-
+    
     it "should convert required false to optional" do
       lambda {
         @meta.attribute("db/mysql/databases", :required => false)
@@ -387,7 +387,7 @@ describe Chef::Cookbook::Metadata do
       @meta.attribute("db/mysql/databases", {})
       @meta.attributes["db/mysql/databases"][:required].should == 'optional'
     end
-
+  
     it "should make sure recipes is an array" do
       lambda {
         @meta.attribute("db/mysql/databases", :recipes => [])
@@ -399,7 +399,7 @@ describe Chef::Cookbook::Metadata do
 
     it "should set recipes to an empty array by default" do
       @meta.attribute("db/mysql/databases", {})
-      @meta.attributes["db/mysql/databases"][:recipes].should == []
+      @meta.attributes["db/mysql/databases"][:recipes].should == [] 
     end
 
     it "should allow the default value to be a string, array, or hash" do
@@ -438,14 +438,14 @@ describe Chef::Cookbook::Metadata do
       lambda {
         attrs = {
           :choice => [ "a", "b", "c"],
-          :default => "b"
+          :default => "b" 
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should_not raise_error(ArgumentError)
       lambda {
         attrs = {
           :choice => [ "a", "b", "c", "d", "e"],
-          :default => ["b", "d"]
+          :default => ["b", "d"] 
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should_not raise_error(ArgumentError)
@@ -455,7 +455,7 @@ describe Chef::Cookbook::Metadata do
       lambda {
         attrs = {
           :choice => [ "a", "b", "c"],
-          :default => "d"
+          :default => "d" 
         }
         @meta.attribute("db/mysql/databases", attrs)
       }.should raise_error(ArgumentError)
@@ -470,11 +470,11 @@ describe Chef::Cookbook::Metadata do
   end
 
   describe "recipes" do
-    before(:each) do
+    before(:each) do 
       @cookbook.recipe_files = [ "default.rb", "enlighten.rb" ]
       @meta = Chef::Cookbook::Metadata.new(@cookbook)
     end
-
+    
     it "should have the names of the recipes" do
       @meta.recipes["test_cookbook"].should == ""
       @meta.recipes["test_cookbook::enlighten"].should == ""
@@ -493,7 +493,7 @@ describe Chef::Cookbook::Metadata do
   end
 
   describe "json" do
-    before(:each) do
+    before(:each) do 
       @cookbook.recipe_files = [ "default.rb", "enlighten.rb" ]
       @meta = Chef::Cookbook::Metadata.new(@cookbook)
       @meta.version "1.0"
@@ -509,8 +509,8 @@ describe Chef::Cookbook::Metadata do
       @meta.provides "foo(:bar, :baz)"
       @meta.replaces "snarkitron"
       @meta.recipe "test_cookbook::enlighten", "is your buddy"
-      @meta.attribute "bizspark/has_login",
-        :display_name => "You have nothing"
+      @meta.attribute "bizspark/has_login", 
+        :display_name => "You have nothing" 
       @meta.version "1.2.3"
     end
 
@@ -524,23 +524,23 @@ describe Chef::Cookbook::Metadata do
       end
 
       %w{
-        name
-        description
-        long_description
-        maintainer
-        maintainer_email
+        name 
+        description 
+        long_description 
+        maintainer 
+        maintainer_email 
         license
-        platforms
-        dependencies
-        suggestions
-        recommendations
-        conflicting
+        platforms 
+        dependencies 
+        suggestions 
+        recommendations 
+        conflicting 
         providing
-        replacing
-        attributes
+        replacing 
+        attributes 
         recipes
         version
-      }.each do |t|
+      }.each do |t| 
         it "should include '#{t}'" do
           @serial[t].should == @meta.send(t.to_sym)
         end
@@ -557,23 +557,23 @@ describe Chef::Cookbook::Metadata do
       end
 
       %w{
-        name
-        description
-        long_description
-        maintainer
-        maintainer_email
+        name 
+        description 
+        long_description 
+        maintainer 
+        maintainer_email 
         license
-        platforms
-        dependencies
-        suggestions
-        recommendations
-        conflicting
+        platforms 
+        dependencies 
+        suggestions 
+        recommendations 
+        conflicting 
         providing
-        replacing
-        attributes
+        replacing 
+        attributes 
         recipes
         version
-      }.each do |t|
+      }.each do |t| 
         it "should match '#{t}'" do
           @deserial.send(t.to_sym).should == @meta.send(t.to_sym)
         end
@@ -585,12 +585,6 @@ describe Chef::Cookbook::Metadata do
         @hash = @meta.to_hash
       end
 
-      it "should convert a name field containing the empty string to nil" do
-        @hash['name'] = ""
-        deserial = Chef::Cookbook::Metadata.from_hash(@hash)
-        deserial.name.should be_nil
-      end
-
       [:dependencies,
        :recommendations,
        :suggestions,