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

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.hotfix.1'
+  VERSION = '11.6.0.rc.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/lib/chef/win32/api/file.rb

@@ -471,13 +471,6 @@ BOOL WINAPI DeviceIoControl(
         # ensures the handle is closed on exit of the block
         def file_search_handle(path, &block)
           begin
-            # Workaround for CHEF-4419:
-            # Make sure paths starting with "/" has a drive letter
-            # assigned from the current working diretory.
-            # Note: In chef 11.8 and beyond this issue will be fixed with a
-            # broader fix to map all the paths starting with "/" to
-            # SYSTEM_DRIVE on windows.
-            path = ::File.expand_path(path) if path.start_with? "/"
             path = encode_path(path)
             find_data = WIN32_FIND_DATA.new
             handle = FindFirstFileW(path, find_data)

data/spec/data/cookbooks/not-nginx/attributes/default.rb

@@ -0,0 +1 @@
+default[:cheese] = 'mr whiskers'

data/spec/data/cookbooks/not-nginx/metadata.rb

@@ -0,0 +1 @@
+name "nginx"

data/spec/data/kitchen/no-really-not-nginx/attributes/default.rb

@@ -0,0 +1 @@
+default[:wine] = 'captain socks'

data/spec/data/kitchen/no-really-not-nginx/metadata.rb

@@ -0,0 +1 @@
+name "nginx"

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_gte_19_only do
+  it "executes a script in the context of the chef-shell main context", :ruby_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"
+    code = "$output.puts nodes.all.inspect"
     @knife.config[:exec] = code
     @knife.run
     $output.string.should match(%r{node\[ohai-world\]})

data/spec/functional/resource/user_spec.rb

@@ -20,15 +20,15 @@
 require 'spec_helper'
 require 'chef/mixin/shell_out'
 
-metadata = { :unix_only => true,
-  :requires_root => true,
-  :provider => {:user => Chef::Provider::User::Useradd}
-}
-
-describe Chef::Resource::User, metadata do
+describe Chef::Resource::User, :unix_only, :requires_root do
 
   include Chef::Mixin::ShellOut
 
+  # User provider is platform-dependent, we need platform ohai data:
+  OHAI_SYSTEM = Ohai::System.new
+  OHAI_SYSTEM.require_plugin("os")
+  OHAI_SYSTEM.require_plugin("platform")
+
 
   # Utility code for /etc/passwd interaction, avoid any caching of user records:
   PwEntry = Struct.new(:name, :passwd, :uid, :gid, :gecos, :home, :shell)
@@ -56,6 +56,14 @@ describe Chef::Resource::User, metadata do
   before do
     # Silence shell_out live stream
     Chef::Log.level = :warn
+
+    # Tests only implemented for a subset of platforms currently.
+    user_provider = Chef::Platform.find_provider(OHAI_SYSTEM["platform"],
+                                                 OHAI_SYSTEM["platform_version"],
+                                                 :user)
+    unless user_provider == Chef::Provider::User::Useradd
+      pending "Only the useradd provider is supported at this time"
+    end
   end
 
   after do

data/spec/spec_helper.rb

@@ -83,13 +83,6 @@ Dir["spec/support/**/*.rb"].
   map { |f| f.gsub(%r[spec/], '')}.
   each { |f| require f }
 
-
-OHAI_SYSTEM = Ohai::System.new
-OHAI_SYSTEM.require_plugin("os")
-OHAI_SYSTEM.require_plugin("platform")
-TEST_PLATFORM = OHAI_SYSTEM["platform"].dup.freeze
-TEST_PLATFORM_VERSION = OHAI_SYSTEM["platform_version"].dup.freeze
-
 RSpec.configure do |config|
   config.include(Matchers)
   config.filter_run :focus => true
@@ -111,35 +104,10 @@ 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?
 
-  running_platform_arch = `uname -m`.strip
-
-  config.filter_run_excluding :arch => lambda {|target_arch|
-    running_platform_arch != target_arch
-  }
-
-  # Functional Resource tests that are provider-specific:
-  # context "on platforms that use useradd", :provider => {:user => Chef::Provider::User::Useradd}} do #...
-  config.filter_run_excluding :provider => lambda {|criteria|
-    type, target_provider = criteria.first
-
-    platform = TEST_PLATFORM.dup
-    platform_version = TEST_PLATFORM_VERSION.dup
-
-    begin
-      provider_for_running_platform = Chef::Platform.find_provider(platform, platform_version, type)
-      provider_for_running_platform != target_provider
-    rescue ArgumentError # no provider for platform
-      true
-    end
-  }
-
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 end

data/spec/support/platform_helpers.rb

@@ -1,17 +1,5 @@
 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,8 +523,15 @@ 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:
@@ -532,56 +539,9 @@ shared_examples_for "a configured file resource" do
           FileUtils.rm_rf(link_path)
         end
 
-        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"
-
+        it "does not replace the symlink with a real file" do
+          resource.run_action(:create)
+          File.should be_symlink(link_path)
         end
 
       end
@@ -895,43 +855,6 @@ shared_examples_for "a configured file resource" do
     end
   end
 
-  # Regression test for http://tickets.opscode.com/browse/CHEF-4419
-  context "when the path starts with '/' and target file exists", :windows_only do
-    let(:path) do
-      File.join(test_file_dir[2..test_file_dir.length], make_tmpname(file_base))
-    end
-
-    before do
-      File.open(path, "wb") { |f| f.print expected_content }
-      now = Time.now.to_i
-      File.utime(now - 9000, now - 9000, path)
-
-      @expected_mtime = File.stat(path).mtime
-      @expected_checksum = sha256_checksum(path)
-    end
-
-    describe ":create action should run without any updates" do
-      before do
-        # Assert starting state is as expected
-        File.should exist(path)
-        sha256_checksum(path).should == @expected_checksum
-        resource.run_action(:create)
-      end
-
-      it "does not overwrite the original when the :create action is run" do
-        sha256_checksum(path).should == @expected_checksum
-      end
-
-      it "does not update the mtime of the file when the :create action is run" do
-        File.stat(path).mtime.should == @expected_mtime
-      end
-
-      it "is not marked as updated by last action" do
-        resource.should_not be_updated_by_last_action
-      end
-    end
-  end
-
 end
 
 shared_context Chef::Resource::File  do

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

@@ -146,8 +146,7 @@ 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)
-        resource_real_path = File.realpath(resource.path)
-        File.should_receive(:stat).with(resource_real_path).at_least(:once).and_return(stat_struct)
+        File.should_receive(:stat).with(resource.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
@@ -271,8 +270,7 @@ 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)
-      resource_real_path = File.realpath(resource.path)
-      File.stub!(:stat).with(resource_real_path).and_return(stat_struct)
+      File.stub!(:stat).with(resource.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,6 +585,12 @@ 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,