chef 11.12.8-x86-mingw32 → 11.14.0.alpha.2-x86-mingw32

data/spec/support/shared/unit/api_error_inspector.rb

@@ -37,8 +37,8 @@ shared_examples_for "an api error inspector" do
       :client_key => "/etc/chef/client.pem"
     }
     @description = Chef::Formatters::ErrorDescription.new("Error registering the node:")
-    @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
-    #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+    @outputter = Chef::Formatters::IndentableOutputStream.new(StringIO.new, STDERR)
+    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
 
   end
 

data/spec/unit/api_client_spec.rb

@@ -197,11 +197,11 @@ describe Chef::ApiClient do
     end
 
     it "preserves the admin status" do
-      @client.admin.should be_a_kind_of(Chef::TrueClass)
+      @client.admin.should be_a_kind_of(TrueClass)
     end
 
     it "preserves the 'validator' status" do
-      @client.validator.should be_a_kind_of(Chef::TrueClass)
+      @client.validator.should be_a_kind_of(TrueClass)
     end
 
     it "includes the private key if present" do

data/spec/unit/application/client_spec.rb

@@ -19,10 +19,13 @@ require 'spec_helper'
 
 describe Chef::Application::Client, "reconfigure" do
   before do
+    Kernel.stub(:trap).and_return(:ok)
+
     @original_argv = ARGV.dup
     ARGV.clear
 
     @app = Chef::Application::Client.new
+    @app.stub(:trap)
     @app.stub(:configure_opt_parser).and_return(true)
     @app.stub(:configure_chef).and_return(true)
     @app.stub(:configure_logging).and_return(true)
@@ -131,6 +134,8 @@ describe Chef::Application::Client, "run_application", :unix_only do
     Chef::Config[:daemonize] = true
     @pipe = IO.pipe
     @app = Chef::Application::Client.new
+    # Default logger doesn't work correctly when logging from a trap handler.
+    @app.configure_logging
     Chef::Daemon.stub(:daemonize).and_return(true)
     @app.stub(:run_chef_client) do
       @pipe[1].puts 'started'
@@ -139,7 +144,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
     end
   end
 
-  it "should exit gracefully when sent SIGTERM" do
+  it "should exit gracefully when sent SIGTERM", :volatile_on_solaris do
     pid = fork do
       @app.run_application
     end

data/spec/unit/application/knife_spec.rb

@@ -34,8 +34,12 @@ describe Chef::Application::Knife do
   end
 
   before(:each) do
+    # Prevent code from getting loaded on every test invocation.
+    Chef::Knife.stub(:load_commands)
+
     @knife = Chef::Application::Knife.new
     @knife.stub(:puts)
+    @knife.stub(:trap)
     Chef::Knife.stub(:list_commands)
   end
 

data/spec/unit/application/solo_spec.rb

@@ -19,10 +19,12 @@ require 'spec_helper'
 
 describe Chef::Application::Solo do
   before do
+    Kernel.stub(:trap).and_return(:ok)
     @app = Chef::Application::Solo.new
     @app.stub(:configure_opt_parser).and_return(true)
     @app.stub(:configure_chef).and_return(true)
     @app.stub(:configure_logging).and_return(true)
+    @app.stub(:trap)
     Chef::Config[:recipe_url] = false
     Chef::Config[:json_attribs] = false
     Chef::Config[:solo] = true

data/spec/unit/application_spec.rb

@@ -24,6 +24,7 @@ describe Chef::Application do
     ARGV.clear
     Chef::Log.logger = Logger.new(StringIO.new)
     @app = Chef::Application.new
+    @app.stub(:trap)
     Dir.stub(:chdir).and_return(0)
     @app.stub(:reconfigure)
     Chef::Log.init(STDERR)
@@ -84,6 +85,9 @@ describe Chef::Application do
 
   describe "configure_chef" do
     before do
+      # Silence warnings when no config file exists
+      Chef::Log.stub(:warn)
+
       @app = Chef::Application.new
       #Chef::Config.stub(:merge!).and_return(true)
       @app.stub(:parse_options).and_return(true)
@@ -107,6 +111,9 @@ describe Chef::Application do
 
       before do
         @app.config[:config_file] = config_location
+
+        # force let binding to get evaluated or else we stub Pathname.new before we try to use it.
+        config_location_pathname
         Pathname.stub(:new).with(config_location).and_return(config_location_pathname)
         File.should_receive(:read).
           with(config_location).

data/spec/unit/client_spec.rb

@@ -488,6 +488,22 @@ describe Chef::Client do
       node[:recipes].length.should == 1
       node[:recipes].should include("cookbook1")
     end
+
+    it "should set the environment from the specified configuration value" do
+      node.chef_environment.should == "_default"
+      Chef::Config[:environment] = "A"
+
+      test_env = Chef::Environment.new
+      test_env.name("A")
+
+      mock_chef_rest = double("Chef::REST")
+      mock_chef_rest.should_receive(:get_rest).with("environments/A").and_return(test_env)
+      Chef::REST.should_receive(:new).and_return(mock_chef_rest)
+      client.policy_builder.stub(:node).and_return(node)
+      client.build_node.should == node
+
+      node.chef_environment.should == "A"
+    end
   end
 
   describe "windows_admin_check" do

data/spec/unit/config_spec.rb

@@ -21,10 +21,6 @@ require 'spec_helper'
 require 'chef/exceptions'
 
 describe Chef::Config do
-  before(:all) do
-    @original_env = { 'HOME' => ENV['HOME'], 'SYSTEMDRIVE' => ENV['SYSTEMDRIVE'], 'HOMEPATH' => ENV['HOMEPATH'], 'USERPROFILE' => ENV['USERPROFILE'] }
-  end
-
   describe "config attribute writer: chef_server_url" do
     before do
       Chef::Config.chef_server_url = "https://junglist.gen.nz"
@@ -132,7 +128,7 @@ describe Chef::Config do
     it "should return a windows path on windows systems" do
       platform_mock :windows do
         path = "/etc/chef/cookbooks"
-        ENV.stub(:[]).with('SYSTEMDRIVE').and_return('C:')
+        Chef::Config.stub(:env).and_return({ 'SYSTEMDRIVE' => 'C:' })
         # match on a regex that looks for the base path with an optional
         # system drive at the beginning (c:)
         # system drive is not hardcoded b/c it can change and b/c it is not present on linux systems
@@ -283,23 +279,14 @@ describe Chef::Config do
 
   describe "Chef::Config[:user_home]" do
     it "should set when HOME is provided" do
-      ENV['HOME'] = "/home/kitten"
-      load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "chef", "config.rb"))
+      Chef::Config.stub(:env).and_return({ 'HOME' => "/home/kitten" })
       Chef::Config[:user_home].should == "/home/kitten"
     end
 
     it "should be set when only USERPROFILE is provided" do
-      ENV['HOME'], ENV['SYSTEMDRIVE'],  ENV['HOMEPATH'] = nil, nil, nil
-      ENV['USERPROFILE'] = "/users/kitten"
-      load File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "chef", "config.rb"))
+      Chef::Config.stub(:env).and_return({ 'USERPROFILE' => "/users/kitten" })
       Chef::Config[:user_home].should == "/users/kitten"
     end
-
-    after(:each) do
-      @original_env.each do |env_setting|
-        ENV[env_setting[0]] = env_setting[1]
-      end
-    end
   end
 
   describe "Chef::Config[:encrypted_data_bag_secret]" do
@@ -310,10 +297,6 @@ describe Chef::Config do
 
     before do
       File.stub(:exist?).with(db_secret_default_path).and_return(secret_exists)
-      # ugh...the only way to properly test this since the conditional
-      # is evaluated at file load/require time.
-      $LOADED_FEATURES.delete_if{|f| f =~ /chef\/config\.rb/}
-      require 'chef/config'
     end
 
     context "#{db_secret_default_path} exists" do

data/spec/unit/cookbook_version_spec.rb

@@ -20,7 +20,7 @@ require 'spec_helper'
 describe Chef::CookbookVersion do
   describe "when first created" do
     before do
-      @cookbook_version = Chef::CookbookVersion.new("tatft")
+      @cookbook_version = Chef::CookbookVersion.new("tatft", '/tmp/blah')
     end
 
     it "has a name" do
@@ -96,156 +96,258 @@ describe Chef::CookbookVersion do
     end
   end
 
-  describe "after the cookbook has been loaded" do
+  describe "with a cookbook directory named tatft" do
     MD5 = /[0-9a-f]{32}/
 
     before do
-      # Currently the cookbook loader finds all the files then tells CookbookVersion
-      # where they are.
-      @cookbook_version = Chef::CookbookVersion.new("tatft")
-
       @cookbook = Hash.new { |hash, key| hash[key] = [] }
 
-      cookbook_root = File.join(CHEF_SPEC_DATA, 'cb_version_cookbooks', 'tatft')
+      @cookbook_root = File.join(CHEF_SPEC_DATA, 'cb_version_cookbooks', 'tatft')
 
       # Dunno if the paths here are representitive of what is set by CookbookLoader...
-      @cookbook[:attribute_filenames]   = Dir[File.join(cookbook_root, 'attributes', '**', '*.rb')]
-      @cookbook[:definition_filenames]  = Dir[File.join(cookbook_root, 'definitions', '**', '*.rb')]
-      @cookbook[:file_filenames]        = Dir[File.join(cookbook_root, 'files', '**', '*.tgz')]
-      @cookbook[:recipe_filenames]      = Dir[File.join(cookbook_root, 'recipes', '**', '*.rb')]
-      @cookbook[:template_filenames]    = Dir[File.join(cookbook_root, 'templates', '**', '*.erb')]
-      @cookbook[:library_filenames]     = Dir[File.join(cookbook_root, 'libraries', '**', '*.rb')]
-      @cookbook[:resource_filenames]    = Dir[File.join(cookbook_root, 'resources', '**', '*.rb')]
-      @cookbook[:provider_filenames]    = Dir[File.join(cookbook_root, 'providers', '**', '*.rb')]
-      @cookbook[:root_filenames]        = Array(File.join(cookbook_root, 'README.rdoc'))
-      @cookbook[:metadata_filenames]    = Array(File.join(cookbook_root, 'metadata.json'))
-
-      @cookbook_version.attribute_filenames  = @cookbook[:attribute_filenames]
-      @cookbook_version.definition_filenames = @cookbook[:definition_filenames]
-      @cookbook_version.recipe_filenames     = @cookbook[:recipe_filenames]
-      @cookbook_version.template_filenames   = @cookbook[:template_filenames]
-      @cookbook_version.file_filenames       = @cookbook[:file_filenames]
-      @cookbook_version.library_filenames    = @cookbook[:library_filenames]
-      @cookbook_version.resource_filenames   = @cookbook[:resource_filenames]
-      @cookbook_version.provider_filenames   = @cookbook[:provider_filenames]
-      @cookbook_version.root_filenames       = @cookbook[:root_filenames]
-      @cookbook_version.metadata_filenames   = @cookbook[:metadata_filenames]
-
-      # Used to test file-specificity related file lookups
-      @node = Chef::Node.new
-      @node.set[:platform] = "ubuntu"
-      @node.set[:platform_version] = "13.04"
-      @node.name("testing")
+      @cookbook[:attribute_filenames]   = Dir[File.join(@cookbook_root, 'attributes', '**', '*.rb')]
+      @cookbook[:definition_filenames]  = Dir[File.join(@cookbook_root, 'definitions', '**', '*.rb')]
+      @cookbook[:file_filenames]        = Dir[File.join(@cookbook_root, 'files', '**', '*.tgz')]
+      @cookbook[:recipe_filenames]      = Dir[File.join(@cookbook_root, 'recipes', '**', '*.rb')]
+      @cookbook[:template_filenames]    = Dir[File.join(@cookbook_root, 'templates', '**', '*.erb')]
+      @cookbook[:library_filenames]     = Dir[File.join(@cookbook_root, 'libraries', '**', '*.rb')]
+      @cookbook[:resource_filenames]    = Dir[File.join(@cookbook_root, 'resources', '**', '*.rb')]
+      @cookbook[:provider_filenames]    = Dir[File.join(@cookbook_root, 'providers', '**', '*.rb')]
+      @cookbook[:root_filenames]        = Array(File.join(@cookbook_root, 'README.rdoc'))
+      @cookbook[:metadata_filenames]    = Array(File.join(@cookbook_root, 'metadata.json'))
+
     end
 
-    it "generates a manifest containing the cookbook's files" do
-      manifest = @cookbook_version.manifest
+    describe "and a cookbook with the same name" do
+      before do
+        # Currently the cookbook loader finds all the files then tells CookbookVersion
+        # where they are.
+        @cookbook_version = Chef::CookbookVersion.new("tatft", @cookbook_root)
+
+        @cookbook_version.attribute_filenames  = @cookbook[:attribute_filenames]
+        @cookbook_version.definition_filenames = @cookbook[:definition_filenames]
+        @cookbook_version.recipe_filenames     = @cookbook[:recipe_filenames]
+        @cookbook_version.template_filenames   = @cookbook[:template_filenames]
+        @cookbook_version.file_filenames       = @cookbook[:file_filenames]
+        @cookbook_version.library_filenames    = @cookbook[:library_filenames]
+        @cookbook_version.resource_filenames   = @cookbook[:resource_filenames]
+        @cookbook_version.provider_filenames   = @cookbook[:provider_filenames]
+        @cookbook_version.root_filenames       = @cookbook[:root_filenames]
+        @cookbook_version.metadata_filenames   = @cookbook[:metadata_filenames]
+
+        # Used to test file-specificity related file lookups
+        @node = Chef::Node.new
+        @node.set[:platform] = "ubuntu"
+        @node.set[:platform_version] = "13.04"
+        @node.name("testing")
+      end
 
-      manifest["metadata"].should == Chef::Cookbook::Metadata.new
-      manifest["cookbook_name"].should == "tatft"
+      it "generates a manifest containing the cookbook's files" do
+        manifest = @cookbook_version.manifest
 
-      manifest["recipes"].should have(1).recipe_file
+        manifest["metadata"].should == Chef::Cookbook::Metadata.new
+        manifest["cookbook_name"].should == "tatft"
 
-      recipe = manifest["recipes"].first
-      recipe["name"].should == "default.rb"
-      recipe["path"].should == "recipes/default.rb"
-      recipe["checksum"].should match(MD5)
-      recipe["specificity"].should == "default"
+        manifest["recipes"].should have(1).recipe_file
 
-      manifest["definitions"].should have(1).definition_file
+        recipe = manifest["recipes"].first
+        recipe["name"].should == "default.rb"
+        recipe["path"].should == "recipes/default.rb"
+        recipe["checksum"].should match(MD5)
+        recipe["specificity"].should == "default"
 
-      definition = manifest["definitions"].first
-      definition["name"].should == "runit_service.rb"
-      definition["path"].should == "definitions/runit_service.rb"
-      definition["checksum"].should match(MD5)
-      definition["specificity"].should == "default"
+        manifest["definitions"].should have(1).definition_file
 
-      manifest["libraries"].should have(1).library_file
+        definition = manifest["definitions"].first
+        definition["name"].should == "runit_service.rb"
+        definition["path"].should == "definitions/runit_service.rb"
+        definition["checksum"].should match(MD5)
+        definition["specificity"].should == "default"
 
-      library = manifest["libraries"].first
-      library["name"].should == "ownage.rb"
-      library["path"].should == "libraries/ownage.rb"
-      library["checksum"].should match(MD5)
-      library["specificity"].should == "default"
+        manifest["libraries"].should have(1).library_file
 
-      manifest["attributes"].should have(1).attribute_file
+        library = manifest["libraries"].first
+        library["name"].should == "ownage.rb"
+        library["path"].should == "libraries/ownage.rb"
+        library["checksum"].should match(MD5)
+        library["specificity"].should == "default"
 
-      attribute_file = manifest["attributes"].first
-      attribute_file["name"].should == "default.rb"
-      attribute_file["path"].should == "attributes/default.rb"
-      attribute_file["checksum"].should match(MD5)
-      attribute_file["specificity"].should == "default"
+        manifest["attributes"].should have(1).attribute_file
 
-      manifest["files"].should have(1).cookbook_file
+        attribute_file = manifest["attributes"].first
+        attribute_file["name"].should == "default.rb"
+        attribute_file["path"].should == "attributes/default.rb"
+        attribute_file["checksum"].should match(MD5)
+        attribute_file["specificity"].should == "default"
 
-      cookbook_file = manifest["files"].first
-      cookbook_file["name"].should == "giant_blob.tgz"
-      cookbook_file["path"].should == "files/default/giant_blob.tgz"
-      cookbook_file["checksum"].should match(MD5)
-      cookbook_file["specificity"].should == "default"
+        manifest["files"].should have(1).cookbook_file
 
-      manifest["templates"].should have(1).template
+        cookbook_file = manifest["files"].first
+        cookbook_file["name"].should == "giant_blob.tgz"
+        cookbook_file["path"].should == "files/default/giant_blob.tgz"
+        cookbook_file["checksum"].should match(MD5)
+        cookbook_file["specificity"].should == "default"
 
-      template = manifest["templates"].first
-      template["name"].should == "configuration.erb"
-      template["path"].should == "templates/default/configuration.erb"
-      template["checksum"].should match(MD5)
-      template["specificity"].should == "default"
+        manifest["templates"].should have(1).template
 
-      manifest["resources"].should have(1).lwr
+        template = manifest["templates"].first
+        template["name"].should == "configuration.erb"
+        template["path"].should == "templates/default/configuration.erb"
+        template["checksum"].should match(MD5)
+        template["specificity"].should == "default"
 
-      lwr = manifest["resources"].first
-      lwr["name"].should == "lwr.rb"
-      lwr["path"].should == "resources/lwr.rb"
-      lwr["checksum"].should match(MD5)
-      lwr["specificity"].should == "default"
+        manifest["resources"].should have(1).lwr
 
-      manifest["providers"].should have(1).lwp
+        lwr = manifest["resources"].first
+        lwr["name"].should == "lwr.rb"
+        lwr["path"].should == "resources/lwr.rb"
+        lwr["checksum"].should match(MD5)
+        lwr["specificity"].should == "default"
 
-      lwp = manifest["providers"].first
-      lwp["name"].should == "lwp.rb"
-      lwp["path"].should == "providers/lwp.rb"
-      lwp["checksum"].should match(MD5)
-      lwp["specificity"].should == "default"
+        manifest["providers"].should have(1).lwp
 
-      manifest["root_files"].should have(1).file_in_the_cookbook_root
+        lwp = manifest["providers"].first
+        lwp["name"].should == "lwp.rb"
+        lwp["path"].should == "providers/lwp.rb"
+        lwp["checksum"].should match(MD5)
+        lwp["specificity"].should == "default"
 
-      readme = manifest["root_files"].first
-      readme["name"].should == "README.rdoc"
-      readme["path"].should == "README.rdoc"
-      readme["checksum"].should match(MD5)
-      readme["specificity"].should == "default"
-    end
+        manifest["root_files"].should have(1).file_in_the_cookbook_root
 
-    it "determines whether a template is available for a given node" do
-      @cookbook_version.should have_template_for_node(@node, "configuration.erb")
-      @cookbook_version.should_not have_template_for_node(@node, "missing.erb")
-    end
+        readme = manifest["root_files"].first
+        readme["name"].should == "README.rdoc"
+        readme["path"].should == "README.rdoc"
+        readme["checksum"].should match(MD5)
+        readme["specificity"].should == "default"
+      end
 
-    it "determines whether a cookbook_file is available for a given node" do
-      @cookbook_version.should have_cookbook_file_for_node(@node, "giant_blob.tgz")
-      @cookbook_version.should_not have_cookbook_file_for_node(@node, "missing.txt")
-    end
+      it "determines whether a template is available for a given node" do
+        @cookbook_version.should have_template_for_node(@node, "configuration.erb")
+        @cookbook_version.should_not have_template_for_node(@node, "missing.erb")
+      end
 
-    describe "raises an error when attempting to load a missing cookbook_file and" do
-      before do
-        node = Chef::Node.new.tap do |n|
-          n.name("sample.node")
-          n.automatic_attrs[:fqdn] = "sample.example.com"
-          n.automatic_attrs[:platform] = "ubuntu"
-          n.automatic_attrs[:platform_version] = "10.04"
+      it "determines whether a cookbook_file is available for a given node" do
+        @cookbook_version.should have_cookbook_file_for_node(@node, "giant_blob.tgz")
+        @cookbook_version.should_not have_cookbook_file_for_node(@node, "missing.txt")
+      end
+
+      describe "raises an error when attempting to load a missing cookbook_file and" do
+        before do
+          node = Chef::Node.new.tap do |n|
+            n.name("sample.node")
+            n.automatic_attrs[:fqdn] = "sample.example.com"
+            n.automatic_attrs[:platform] = "ubuntu"
+            n.automatic_attrs[:platform_version] = "10.04"
+          end
+          @attempt_to_load_file = lambda { @cookbook_version.preferred_manifest_record(node, :files, "no-such-thing.txt") }
+        end
+
+        it "describes the cookbook and version" do
+          useful_explanation = Regexp.new(Regexp.escape("Cookbook 'tatft' (0.0.0) does not contain"))
+          @attempt_to_load_file.should raise_error(Chef::Exceptions::FileNotFound, useful_explanation)
+        end
+
+        it "lists suggested places to look" do
+          useful_explanation = Regexp.new(Regexp.escape("files/default/no-such-thing.txt"))
+          @attempt_to_load_file.should raise_error(Chef::Exceptions::FileNotFound, useful_explanation)
         end
-        @attempt_to_load_file = lambda { @cookbook_version.preferred_manifest_record(node, :files, "no-such-thing.txt") }
       end
+    end
 
-      it "describes the cookbook and version" do
-        useful_explanation = Regexp.new(Regexp.escape("Cookbook 'tatft' (0.0.0) does not contain"))
-        @attempt_to_load_file.should raise_error(Chef::Exceptions::FileNotFound, useful_explanation)
+    describe "and a cookbook_version with a different name" do
+      before do
+        # Currently the cookbook loader finds all the files then tells CookbookVersion
+        # where they are.
+        @cookbook_version = Chef::CookbookVersion.new("blarghle", @cookbook_root)
+        @cookbook_version.attribute_filenames  = @cookbook[:attribute_filenames]
+        @cookbook_version.definition_filenames = @cookbook[:definition_filenames]
+        @cookbook_version.recipe_filenames     = @cookbook[:recipe_filenames]
+        @cookbook_version.template_filenames   = @cookbook[:template_filenames]
+        @cookbook_version.file_filenames       = @cookbook[:file_filenames]
+        @cookbook_version.library_filenames    = @cookbook[:library_filenames]
+        @cookbook_version.resource_filenames   = @cookbook[:resource_filenames]
+        @cookbook_version.provider_filenames   = @cookbook[:provider_filenames]
+        @cookbook_version.root_filenames       = @cookbook[:root_filenames]
+        @cookbook_version.metadata_filenames   = @cookbook[:metadata_filenames]
       end
 
-      it "lists suggested places to look" do
-        useful_explanation = Regexp.new(Regexp.escape("files/default/no-such-thing.txt"))
-        @attempt_to_load_file.should raise_error(Chef::Exceptions::FileNotFound, useful_explanation)
+      it "generates a manifest containing the cookbook's files" do
+        manifest = @cookbook_version.manifest
+
+        manifest["metadata"].should == Chef::Cookbook::Metadata.new
+        manifest["cookbook_name"].should == "blarghle"
+
+        manifest["recipes"].should have(1).recipe_file
+
+        recipe = manifest["recipes"].first
+        recipe["name"].should == "default.rb"
+        recipe["path"].should == "recipes/default.rb"
+        recipe["checksum"].should match(MD5)
+        recipe["specificity"].should == "default"
+
+        manifest["definitions"].should have(1).definition_file
+
+        definition = manifest["definitions"].first
+        definition["name"].should == "runit_service.rb"
+        definition["path"].should == "definitions/runit_service.rb"
+        definition["checksum"].should match(MD5)
+        definition["specificity"].should == "default"
+
+        manifest["libraries"].should have(1).library_file
+
+        library = manifest["libraries"].first
+        library["name"].should == "ownage.rb"
+        library["path"].should == "libraries/ownage.rb"
+        library["checksum"].should match(MD5)
+        library["specificity"].should == "default"
+
+        manifest["attributes"].should have(1).attribute_file
+
+        attribute_file = manifest["attributes"].first
+        attribute_file["name"].should == "default.rb"
+        attribute_file["path"].should == "attributes/default.rb"
+        attribute_file["checksum"].should match(MD5)
+        attribute_file["specificity"].should == "default"
+
+        manifest["files"].should have(1).cookbook_file
+
+        cookbook_file = manifest["files"].first
+        cookbook_file["name"].should == "giant_blob.tgz"
+        cookbook_file["path"].should == "files/default/giant_blob.tgz"
+        cookbook_file["checksum"].should match(MD5)
+        cookbook_file["specificity"].should == "default"
+
+        manifest["templates"].should have(1).template
+
+        template = manifest["templates"].first
+        template["name"].should == "configuration.erb"
+        template["path"].should == "templates/default/configuration.erb"
+        template["checksum"].should match(MD5)
+        template["specificity"].should == "default"
+
+        manifest["resources"].should have(1).lwr
+
+        lwr = manifest["resources"].first
+        lwr["name"].should == "lwr.rb"
+        lwr["path"].should == "resources/lwr.rb"
+        lwr["checksum"].should match(MD5)
+        lwr["specificity"].should == "default"
+
+        manifest["providers"].should have(1).lwp
+
+        lwp = manifest["providers"].first
+        lwp["name"].should == "lwp.rb"
+        lwp["path"].should == "providers/lwp.rb"
+        lwp["checksum"].should match(MD5)
+        lwp["specificity"].should == "default"
+
+        manifest["root_files"].should have(1).file_in_the_cookbook_root
+
+        readme = manifest["root_files"].first
+        readme["name"].should == "README.rdoc"
+        readme["path"].should == "README.rdoc"
+        readme["checksum"].should match(MD5)
+        readme["specificity"].should == "default"
       end
     end
 
@@ -270,8 +372,8 @@ describe Chef::CookbookVersion do
                   ["1.2", "2.1"]
                  ]
       examples.each do |smaller, larger|
-        sm = Chef::CookbookVersion.new("foo")
-        lg = Chef::CookbookVersion.new("foo")
+        sm = Chef::CookbookVersion.new("foo", '/tmp/blah')
+        lg = Chef::CookbookVersion.new("foo", '/tmp/blah')
         sm.version = smaller
         lg.version = larger
         sm.should be < lg
@@ -281,8 +383,8 @@ describe Chef::CookbookVersion do
     end
 
     it "should equate versions 1.2 and 1.2.0" do
-      a = Chef::CookbookVersion.new("foo")
-      b = Chef::CookbookVersion.new("foo")
+      a = Chef::CookbookVersion.new("foo", '/tmp/blah')
+      b = Chef::CookbookVersion.new("foo", '/tmp/blah')
       a.version = "1.2"
       b.version = "1.2.0"
       a.should == b
@@ -290,9 +392,9 @@ describe Chef::CookbookVersion do
 
 
     it "should not allow you to sort cookbooks with different names" do
-      apt = Chef::CookbookVersion.new "apt"
+      apt = Chef::CookbookVersion.new "apt", '/tmp/blah'
       apt.version = "1.0"
-      god = Chef::CookbookVersion.new "god"
+      god = Chef::CookbookVersion.new "god", '/tmp/blah'
       god.version = "2.0"
       lambda {apt <=> god}.should raise_error(Chef::Exceptions::CookbookVersionNameMismatch)
     end
@@ -300,7 +402,7 @@ describe Chef::CookbookVersion do
 
   describe "when you set a version" do
     before do
-      @cbv = Chef::CookbookVersion.new("version validation")
+      @cbv = Chef::CookbookVersion.new("version validation", '/tmp/blah')
     end
     it "should accept valid cookbook versions" do
       good_versions = %w(1.2 1.2.3 1000.80.50000 0.300.25)