chef 12.4.3 → 12.5.0.alpha.1

data/spec/unit/provider/registry_key_spec.rb

@@ -77,6 +77,18 @@ shared_examples_for "a registry key" do
   end
 
   describe "action_create" do
+    context "when a case insensitive match for the key exists" do
+      before(:each) do
+        expect(@double_registry).to receive(:key_exists?).twice.with(keyname.downcase).and_return(true)
+      end
+      it "should do nothing if the if a case insensitive key and the value both exist" do
+        @provider.new_resource.key(keyname.downcase)
+        expect(@double_registry).to receive(:get_values).with(keyname.downcase).and_return( testval1 )
+        expect(@double_registry).not_to receive(:set_value)
+        @provider.load_current_resource
+        @provider.action_create
+      end
+    end
     context "when the key exists" do
       before(:each) do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)

data/spec/unit/provider/service/macosx_spec.rb

@@ -60,15 +60,15 @@ XML
 
     ["Daemon", "Agent"].each do |service_type|
       ["redis-server", "io.redis.redis-server"].each do |service_name|
-        ["10.9", "10.10"].each do |platform_version|
+        ["10.9", "10.10", "10.11"].each do |platform_version|
           let(:plist) {'/Library/LaunchDaemons/io.redis.redis-server.plist'}
           let(:session) { StringIO.new }
           if service_type == 'Agent'
             let(:plist) {'/Library/LaunchAgents/io.redis.redis-server.plist'}
             let(:session) {'-S Aqua '}
-            let(:su_cmd) {'su igor -c'}
-            if platform_version != "10.10"
-              let(:su_cmd) {'su -l igor -c'}
+            let(:su_cmd) {'su -l igor -c'}
+            if platform_version == "10.9"
+              let(:su_cmd) {'su igor -c'}
             end
           end
           let(:service_label) {'io.redis.redis-server'}

data/spec/unit/provider_spec.rb

@@ -114,9 +114,7 @@ describe Chef::Provider do
   end
 
   it "does not re-load recipes when creating the temporary run context" do
-    # we actually want to test that RunContext#load is never called, but we
-    # can't stub all instances of an object with rspec's mocks. :/
-    allow(Chef::RunContext).to receive(:new).and_raise("not supposed to happen")
+    expect_any_instance_of(Chef::RunContext).not_to receive(:load)
     snitch = Proc.new {temporary_collection = @run_context.resource_collection}
     @provider.send(:recipe_eval, &snitch)
   end

data/spec/unit/recipe_spec.rb

@@ -154,8 +154,6 @@ describe Chef::Recipe do
           end
 
           it "selects the first one alphabetically" do
-            expect(Chef::Log).to receive(:warn).with("You declared a new resource TottenhamHotspur for resource football, but it comes alphabetically after Sounders and has the same filters ({:platform=>\"nbc_sports\"}), so it will not be used. Use override: true if you want to use it for football.")
-
             Sounders.provides :football, platform: "nbc_sports"
             TottenhamHotspur.provides :football, platform: "nbc_sports"
 
@@ -165,8 +163,6 @@ describe Chef::Recipe do
           end
 
           it "selects the first one alphabetically even if the declaration order is reversed" do
-            expect(Chef::Log).to receive(:warn).with("You are overriding football2 on {:platform=>\"nbc_sports\"} with Sounders: used to be TottenhamHotspur. Use override: true if this is what you intended.")
-
             TottenhamHotspur.provides :football2, platform: "nbc_sports"
             Sounders.provides :football2, platform: "nbc_sports"
 

data/spec/unit/registry_helper_spec.rb

@@ -21,6 +21,7 @@ require 'spec_helper'
 describe Chef::Provider::RegistryKey do
 
   let(:value1) { { :name => "one", :type => :string, :data => "1" } }
+  let(:value1_upcase_name) { {:name => "ONE", :type => :string, :data => "1"} }
   let(:key_path) { 'HKCU\Software\OpscodeNumbers' }
   let(:key) { 'Software\OpscodeNumbers' }
   let(:key_parent) { 'Software' }
@@ -71,7 +72,20 @@ describe Chef::Provider::RegistryKey do
       expect(@registry).to receive(:data_exists?).with(key_path, value1).and_return(true)
       @registry.set_value(key_path, value1)
     end
-
+    it "does nothing if case insensitive key and hive and value exist" do
+      expect(@registry).to receive(:key_exists!).with(key_path.downcase).and_return(true)
+      expect(@registry).to receive(:get_hive_and_key).with(key_path.downcase).and_return([@hive_mock, key])
+      expect(@registry).to receive(:value_exists?).with(key_path.downcase, value1).and_return(true)
+      expect(@registry).to receive(:data_exists?).with(key_path.downcase, value1).and_return(true)
+      @registry.set_value(key_path.downcase, value1)
+    end
+    it "does nothing if key and hive and value with a case insensitive name exist" do
+      expect(@registry).to receive(:key_exists!).with(key_path.downcase).and_return(true)
+      expect(@registry).to receive(:get_hive_and_key).with(key_path.downcase).and_return([@hive_mock, key])
+      expect(@registry).to receive(:value_exists?).with(key_path.downcase, value1_upcase_name).and_return(true)
+      expect(@registry).to receive(:data_exists?).with(key_path.downcase, value1_upcase_name).and_return(true)
+      @registry.set_value(key_path.downcase, value1_upcase_name)
+    end
     it "updates value if key and hive and value exist, but data is different" do
       expect(@registry).to receive(:key_exists!).with(key_path).and_return(true)
       expect(@registry).to receive(:get_hive_and_key).with(key_path).and_return([@hive_mock, key])

data/spec/unit/resource/file/verification_spec.rb

@@ -69,12 +69,40 @@ describe Chef::Resource::File::Verification do
     end
 
     context "with a verification command(String)" do
+      before(:each) do
+        allow(Chef::Log).to receive(:deprecation).and_return(nil)
+      end
+
+      def platform_specific_verify_command(variable_name)
+        if windows?
+          "if \"#{temp_path}\" == \"%{#{variable_name}}\" (exit 0) else (exit 1)"
+        else
+          "test #{temp_path} = %{#{variable_name}}"
+        end
+      end
+
       it "substitutes \%{file} with the path" do
-        test_command = if windows?
-                         "if \"#{temp_path}\" == \"%{file}\" (exit 0) else (exit 1)"
-                       else
-                         "test #{temp_path} = %{file}"
-                       end
+        test_command = platform_specific_verify_command('file')
+        v = Chef::Resource::File::Verification.new(parent_resource, test_command, {})
+        expect(v.verify(temp_path)).to eq(true)
+      end
+
+      it "warns about deprecation when \%{file} is used" do
+        expect(Chef::Log).to receive(:deprecation).with(/%{file} is deprecated/)
+        test_command = platform_specific_verify_command('file')
+        Chef::Resource::File::Verification.new(parent_resource, test_command, {})
+          .verify(temp_path)
+      end
+
+      it "does not warn about deprecation when \%{file} is not used" do
+        expect(Chef::Log).to_not receive(:deprecation)
+        test_command = platform_specific_verify_command('path')
+        Chef::Resource::File::Verification.new(parent_resource, test_command, {})
+          .verify(temp_path)
+      end
+
+      it "substitutes \%{path} with the path" do
+        test_command = platform_specific_verify_command('path')
         v = Chef::Resource::File::Verification.new(parent_resource, test_command, {})
         expect(v.verify(temp_path)).to eq(true)
       end

data/spec/unit/resource_spec.rb

@@ -59,8 +59,8 @@ describe Chef::Resource do
   end
 
   describe "when declaring the identity attribute" do
-    it "has no identity attribute by default" do
-      expect(Chef::Resource.identity_attr).to be_nil
+    it "has :name as identity attribute by default" do
+      expect(Chef::Resource.identity_attr).to eq(:name)
     end
 
     it "sets an identity attribute" do

data/spec/unit/run_context/child_run_context_spec.rb

@@ -0,0 +1,133 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Copyright:: Copyright (c) 2008, 2010 Opscode, 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 'support/lib/library_load_order'
+
+describe Chef::RunContext::ChildRunContext do
+  context "with a run context with stuff in it" do
+    let(:chef_repo_path) { File.expand_path(File.join(CHEF_SPEC_DATA, "run_context", "cookbooks")) }
+    let(:cookbook_collection) {
+      cl = Chef::CookbookLoader.new(chef_repo_path)
+      cl.load_cookbooks
+      Chef::CookbookCollection.new(cl)
+    }
+    let(:node) {
+      node = Chef::Node.new
+      node.run_list << "test" << "test::one" << "test::two"
+      node
+    }
+    let(:events) { Chef::EventDispatch::Dispatcher.new }
+    let(:run_context) { Chef::RunContext.new(node, cookbook_collection, events) }
+
+    context "and a child run context" do
+      let(:child) { run_context.create_child }
+
+      it "parent_run_context is set to the parent" do
+        expect(child.parent_run_context).to eq run_context
+      end
+
+      it "audits is not the same as the parent" do
+        expect(child.audits.object_id).not_to eq run_context.audits.object_id
+        child.audits['hi'] = 'lo'
+        expect(child.audits['hi']).to eq('lo')
+        expect(run_context.audits['hi']).not_to eq('lo')
+      end
+
+      it "resource_collection is not the same as the parent" do
+        expect(child.resource_collection.object_id).not_to eq run_context.resource_collection.object_id
+        f = Chef::Resource::File.new('hi', child)
+        child.resource_collection.insert(f)
+        expect(child.resource_collection).to include f
+        expect(run_context.resource_collection).not_to include f
+      end
+
+      it "immediate_notification_collection is not the same as the parent" do
+        expect(child.immediate_notification_collection.object_id).not_to eq run_context.immediate_notification_collection.object_id
+        src = Chef::Resource::File.new('hi', child)
+        dest = Chef::Resource::File.new('argh', child)
+        notification = Chef::Resource::Notification.new(dest, :create, src)
+        child.notifies_immediately(notification)
+        expect(child.immediate_notification_collection['file[hi]']).to eq([notification])
+        expect(run_context.immediate_notification_collection['file[hi]']).not_to eq([notification])
+      end
+
+      it "immediate_notifications is not the same as the parent" do
+        src = Chef::Resource::File.new('hi', child)
+        dest = Chef::Resource::File.new('argh', child)
+        notification = Chef::Resource::Notification.new(dest, :create, src)
+        child.notifies_immediately(notification)
+        expect(child.immediate_notifications(src)).to eq([notification])
+        expect(run_context.immediate_notifications(src)).not_to eq([notification])
+      end
+
+      it "delayed_notification_collection is not the same as the parent" do
+        expect(child.delayed_notification_collection.object_id).not_to eq run_context.delayed_notification_collection.object_id
+        src = Chef::Resource::File.new('hi', child)
+        dest = Chef::Resource::File.new('argh', child)
+        notification = Chef::Resource::Notification.new(dest, :create, src)
+        child.notifies_delayed(notification)
+        expect(child.delayed_notification_collection['file[hi]']).to eq([notification])
+        expect(run_context.delayed_notification_collection['file[hi]']).not_to eq([notification])
+      end
+
+      it "delayed_notifications is not the same as the parent" do
+        src = Chef::Resource::File.new('hi', child)
+        dest = Chef::Resource::File.new('argh', child)
+        notification = Chef::Resource::Notification.new(dest, :create, src)
+        child.notifies_delayed(notification)
+        expect(child.delayed_notifications(src)).to eq([notification])
+        expect(run_context.delayed_notifications(src)).not_to eq([notification])
+      end
+
+      it "create_child creates a child-of-child" do
+        c = child.create_child
+        expect(c.parent_run_context).to eq child
+      end
+
+      context "after load('include::default')" do
+        before do
+          run_list = Chef::RunList.new('include::default').expand('_default')
+          # TODO not sure why we had to do this to get everything to work ...
+          node.automatic_attrs[:recipes] = []
+          child.load(run_list)
+        end
+
+        it "load_recipe loads into the child" do
+          expect(child.resource_collection).to be_empty
+          child.load_recipe("include::includee")
+          expect(child.resource_collection).not_to be_empty
+        end
+
+        it "include_recipe loads into the child" do
+          expect(child.resource_collection).to be_empty
+          child.include_recipe("include::includee")
+          expect(child.resource_collection).not_to be_empty
+        end
+
+        it "load_recipe_file loads into the child" do
+          expect(child.resource_collection).to be_empty
+          child.load_recipe_file(File.expand_path("include/recipes/includee.rb", chef_repo_path))
+          expect(child.resource_collection).not_to be_empty
+        end
+      end
+    end
+  end
+end

data/spec/unit/run_context_spec.rb

@@ -68,6 +68,9 @@ describe Chef::RunContext do
         "dependency2" => {
           "version" => "0.0.0",
         },
+        "include" => {
+          "version" => "0.0.0",
+        },
         "no-default-attr" => {
           "version" => "0.0.0",
         },
@@ -84,6 +87,10 @@ describe Chef::RunContext do
     )
   end
 
+  it "has a nil parent_run_context" do
+    expect(run_context.parent_run_context).to be_nil
+  end
+
   describe "loading cookbooks for a run list" do
     before do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.4.3
+  version: 12.5.0.alpha.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.4.3
+        version: 12.5.0.alpha.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.4.3
+        version: 12.5.0.alpha.1
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
         version: 2.0.0.rc.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: 2.0.0.rc.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
@@ -93,9 +93,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '8.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,9 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '8.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.6'
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -212,9 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -225,9 +216,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -675,6 +663,7 @@ files:
 - lib/chef/client.rb
 - lib/chef/config.rb
 - lib/chef/config_fetcher.rb
+- lib/chef/constants.rb
 - lib/chef/cookbook/chefignore.rb
 - lib/chef/cookbook/cookbook_collection.rb
 - lib/chef/cookbook/cookbook_version_loader.rb
@@ -692,6 +681,7 @@ files:
 - lib/chef/daemon.rb
 - lib/chef/data_bag.rb
 - lib/chef/data_bag_item.rb
+- lib/chef/delayed_evaluator.rb
 - lib/chef/deprecation/mixin/template.rb
 - lib/chef/deprecation/provider/cookbook_file.rb
 - lib/chef/deprecation/provider/file.rb
@@ -725,6 +715,7 @@ files:
 - lib/chef/environment.rb
 - lib/chef/event_dispatch/base.rb
 - lib/chef/event_dispatch/dispatcher.rb
+- lib/chef/event_dispatch/dsl.rb
 - lib/chef/event_dispatch/events_output_stream.rb
 - lib/chef/event_loggers/base.rb
 - lib/chef/event_loggers/windows_eventlog.rb
@@ -985,6 +976,7 @@ files:
 - lib/chef/policy_builder.rb
 - lib/chef/policy_builder/expand_node_object.rb
 - lib/chef/policy_builder/policyfile.rb
+- lib/chef/property.rb
 - lib/chef/provider.rb
 - lib/chef/provider/batch.rb
 - lib/chef/provider/breakpoint.rb
@@ -1503,6 +1495,8 @@ files:
 - spec/data/run_context/cookbooks/dependency2/providers/provider.rb
 - spec/data/run_context/cookbooks/dependency2/recipes/default.rb
 - spec/data/run_context/cookbooks/dependency2/resources/resource.rb
+- spec/data/run_context/cookbooks/include/recipes/default.rb
+- spec/data/run_context/cookbooks/include/recipes/includee.rb
 - spec/data/run_context/cookbooks/no-default-attr/attributes/server.rb
 - spec/data/run_context/cookbooks/no-default-attr/definitions/no_default-attr_res.rb
 - spec/data/run_context/cookbooks/no-default-attr/providers/provider.rb
@@ -1600,7 +1594,7 @@ files:
 - spec/functional/resource/mount_spec.rb
 - spec/functional/resource/ohai_spec.rb
 - spec/functional/resource/package_spec.rb
-- spec/functional/resource/powershell_spec.rb
+- spec/functional/resource/powershell_script_spec.rb
 - spec/functional/resource/reboot_spec.rb
 - spec/functional/resource/registry_spec.rb
 - spec/functional/resource/remote_directory_spec.rb
@@ -1646,6 +1640,7 @@ files:
 - spec/integration/recipes/lwrp_spec.rb
 - spec/integration/recipes/provider_choice.rb
 - spec/integration/recipes/recipe_dsl_spec.rb
+- spec/integration/recipes/resource_action_spec.rb
 - spec/integration/solo/solo_spec.rb
 - spec/rcov.opts
 - spec/scripts/ssl-serve.rb
@@ -1731,6 +1726,7 @@ files:
 - spec/unit/chef_fs/file_system/operation_failed_error_spec.rb
 - spec/unit/chef_fs/file_system_spec.rb
 - spec/unit/chef_fs/parallelizer.rb
+- spec/unit/chef_fs/path_util_spec.rb
 - spec/unit/chef_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/config_fetcher_spec.rb
@@ -1763,6 +1759,7 @@ files:
 - spec/unit/encrypted_data_bag_item_spec.rb
 - spec/unit/environment_spec.rb
 - spec/unit/event_dispatch/dispatcher_spec.rb
+- spec/unit/event_dispatch/dsl_spec.rb
 - spec/unit/exceptions_spec.rb
 - spec/unit/file_access_control_spec.rb
 - spec/unit/file_cache_spec.rb
@@ -1929,6 +1926,9 @@ files:
 - spec/unit/policy_builder/expand_node_object_spec.rb
 - spec/unit/policy_builder/policyfile_spec.rb
 - spec/unit/policy_builder_spec.rb
+- spec/unit/property/state_spec.rb
+- spec/unit/property/validation_spec.rb
+- spec/unit/property_spec.rb
 - spec/unit/provider/breakpoint_spec.rb
 - spec/unit/provider/cookbook_file/content_spec.rb
 - spec/unit/provider/cookbook_file_spec.rb
@@ -1993,7 +1993,7 @@ files:
 - spec/unit/provider/package/zypper_spec.rb
 - spec/unit/provider/package_spec.rb
 - spec/unit/provider/package_spec.rbe
-- spec/unit/provider/powershell_spec.rb
+- spec/unit/provider/powershell_script_spec.rb
 - spec/unit/provider/registry_key_spec.rb
 - spec/unit/provider/remote_directory_spec.rb
 - spec/unit/provider/remote_file/cache_control_data_spec.rb
@@ -2081,7 +2081,7 @@ files:
 - spec/unit/resource/pacman_package_spec.rb
 - spec/unit/resource/perl_spec.rb
 - spec/unit/resource/portage_package_spec.rb
-- spec/unit/resource/powershell_spec.rb
+- spec/unit/resource/powershell_script_spec.rb
 - spec/unit/resource/python_spec.rb
 - spec/unit/resource/registry_key_spec.rb
 - spec/unit/resource/remote_directory_spec.rb
@@ -2115,6 +2115,7 @@ files:
 - spec/unit/rest/auth_credentials_spec.rb
 - spec/unit/rest_spec.rb
 - spec/unit/role_spec.rb
+- spec/unit/run_context/child_run_context_spec.rb
 - spec/unit/run_context/cookbook_compiler_spec.rb
 - spec/unit/run_context_spec.rb
 - spec/unit/run_list/run_list_expansion_spec.rb
@@ -2150,7 +2151,6 @@ files:
 - spec/unit/version_constraint/platform_spec.rb
 - spec/unit/version_constraint_spec.rb
 - spec/unit/windows_service_spec.rb
-- spec/unit/workstation_config_loader_spec.rb
 - tasks/external_tests.rb
 - tasks/maintainers.rb
 - tasks/rspec.rb
@@ -2169,12 +2169,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration