chef 12.13.37 → 12.14.60

data/spec/unit/user_v1_spec.rb

@@ -332,7 +332,7 @@ describe Chef::UserV1 do
         @user.password "some_password"
       end
 
-      let(:payload) {
+      let(:payload) do
         {
           :username => "some_username",
           :display_name => "some_display_name",
@@ -342,7 +342,7 @@ describe Chef::UserV1 do
           :email => "some_email",
           :password => "some_password",
         }
-      }
+      end
 
       context "when server API V1 is valid on the Chef Server receiving the request" do
         context "when the user submits valid data" do
@@ -354,7 +354,7 @@ describe Chef::UserV1 do
       end
 
       context "when server API V1 is not valid on the Chef Server receiving the request" do
-        let(:payload) {
+        let(:payload) do
           {
             :username => "some_username",
             :display_name => "some_display_name",
@@ -365,7 +365,7 @@ describe Chef::UserV1 do
             :password => "some_password",
             :public_key => "some_public_key",
           }
-        }
+        end
 
         before do
           @user.public_key "some_public_key"
@@ -442,7 +442,7 @@ describe Chef::UserV1 do
     end # update
 
     describe "create" do
-      let(:payload) {
+      let(:payload) do
         {
           :username => "some_username",
           :display_name => "some_display_name",
@@ -451,7 +451,7 @@ describe Chef::UserV1 do
           :email => "some_email",
           :password => "some_password",
         }
-      }
+      end
       before do
         @user.username "some_username"
         @user.display_name "some_display_name"
@@ -506,11 +506,11 @@ describe Chef::UserV1 do
     # DEPRECATION
     # This can be removed after API V0 support is gone
     describe "reregister" do
-      let(:payload) {
+      let(:payload) do
         {
           "username" => "some_username",
         }
-      }
+      end
 
       before do
         @user.username "some_username"

data/spec/unit/util/dsc/configuration_generator_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Util::DSC::ConfigurationGenerator do
     Chef::Util::DSC::ConfigurationGenerator.new(node, "tmp")
   end
 
-  describe '#validate_configuration_name!' do
+  describe "#validate_configuration_name!" do
     it "should not raise an error if a name contains all upper case letters" do
       conf_man.send(:validate_configuration_name!, "HELLO")
     end
@@ -40,9 +40,9 @@ describe Chef::Util::DSC::ConfigurationGenerator do
 
     %w{! @ # $ % ^ & * & * ( ) - = + \{ \} . ? < > \\ /}.each do |sym|
       it "raises an Argument error if it configuration name contains #{sym}" do
-        expect {
+        expect do
           conf_man.send(:validate_configuration_name!, "Hello#{sym}")
-        }.to raise_error(ArgumentError)
+        end.to raise_error(ArgumentError)
       end
     end
   end
@@ -57,15 +57,15 @@ describe Chef::Util::DSC::ConfigurationGenerator do
       end
 
       it "should raise an ArgumentError if you try to override outputpath" do
-        expect {
+        expect do
           conf_man.send(:get_merged_configuration_flags!, { "outputpath" => "a" }, "hello")
-        }.to raise_error(ArgumentError)
+        end.to raise_error(ArgumentError)
       end
 
       it "should be case insensitive for switches that are not allowed" do
-        expect {
+        expect do
           conf_man.send(:get_merged_configuration_flags!, { "OutputPath" => "a" }, "hello")
-        }.to raise_error(ArgumentError)
+        end.to raise_error(ArgumentError)
       end
 
       it "should be case insensitive to switches that are allowed" do
@@ -83,15 +83,15 @@ describe Chef::Util::DSC::ConfigurationGenerator do
       end
 
       it "should raise an ArgumentError if you try to override outputpath" do
-        expect {
+        expect do
           conf_man.send(:get_merged_configuration_flags!, { :outputpath => "a" }, "hello")
-        }.to raise_error(ArgumentError)
+        end.to raise_error(ArgumentError)
       end
 
       it "should be case insensitive for switches that are not allowed" do
-        expect {
+        expect do
           conf_man.send(:get_merged_configuration_flags!, { :OutputPath => "a" }, "hello")
-        }.to raise_error(ArgumentError)
+        end.to raise_error(ArgumentError)
       end
 
       it "should be case insensitive to switches that are allowed" do
@@ -121,7 +121,7 @@ describe Chef::Util::DSC::ConfigurationGenerator do
     #
   end
 
-  describe '#write_document_generation_script' do
+  describe "#write_document_generation_script" do
     let(:file_like_object) { double("file like object") }
 
     it "should write the input to a file" do

data/spec/unit/util/dsc/local_configuration_manager_spec.rb

@@ -23,15 +23,17 @@ describe Chef::Util::DSC::LocalConfigurationManager do
 
   let(:lcm) { Chef::Util::DSC::LocalConfigurationManager.new(nil, "tmp") }
 
-  let(:normal_lcm_output) { <<-EOH
+  let(:normal_lcm_output) do
+    <<-EOH
 logtype: [machinename]: LCM:  [ Start  Set      ]
 logtype: [machinename]: LCM:  [ Start  Resource ] [name]
 logtype: [machinename]: LCM:  [ End    Resource ] [name]
 logtype: [machinename]: LCM:  [ End    Set      ]
 EOH
-  }
+  end
 
-  let(:no_whatif_lcm_output) { <<-EOH
+  let(:no_whatif_lcm_output) do
+    <<-EOH
 Start-DscConfiguration : A parameter cannot be found\r\n that matches parameter name 'whatif'.
 At line:1 char:123
 + run-somecommand -whatif
@@ -39,16 +41,17 @@ At line:1 char:123
     + CategoryInfo          : InvalidArgument: (:) [Start-DscConfiguration], ParameterBindingException
     + FullyQualifiedErrorId : NamedParameterNotFound,SomeCompany.SomeAssembly.Commands.RunSomeCommand
 EOH
-  }
+  end
 
-  let(:dsc_resource_import_failure_output) { <<-EOH
+  let(:dsc_resource_import_failure_output) do
+    <<-EOH
 PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . PowerShell provider MSFT_xWebsite failed to execute Test-TargetResource functionality with error message: Please ensure that WebAdministration module is installed. + CategoryInfo : InvalidOperation: (:) [], CimException + FullyQualifiedErrorId : ProviderOperationExecutionFailure + PSComputerName : . The SendConfigurationApply function did not succeed. + CategoryInfo : NotSpecified: (root/Microsoft/...gurationManager:String) [], CimException + FullyQualifiedErrorId : MI RESULT 1 + PSComputerName : .
 EOH
-  }
+  end
 
-  let(:lcm_status) {
+  let(:lcm_status) do
     double("LCM cmdlet status", :stderr => lcm_standard_error, :return_value => lcm_standard_output, :succeeded? => lcm_cmdlet_success)
-  }
+  end
 
   describe "test_configuration method invocation" do
     context "when interacting with the LCM using a PowerShell cmdlet" do
@@ -77,7 +80,7 @@ EOH
         let(:lcm_standard_error) { no_whatif_lcm_output }
         let(:lcm_cmdlet_success) { false }
 
-        it 'returns true when passed to #whatif_not_supported?' do
+        it "returns true when passed to #whatif_not_supported?" do
           expect(lcm.send(:whatif_not_supported?, no_whatif_lcm_output)).to be_truthy
         end
 

data/spec/unit/util/dsc/resource_store.rb

@@ -21,28 +21,30 @@ require "chef/util/dsc/resource_store"
 
 describe Chef::Util::DSC::ResourceStore do
   let(:resource_store) { Chef::Util::DSC::ResourceStore.new }
-  let(:resource_a) { {
+  let(:resource_a) do
+    {
     "ResourceType" => "AFoo",
     "Name" => "Foo",
     "Module" => { "Name" => "ModuleA" },
     }
-  }
+  end
 
-  let(:resource_b) { {
+  let(:resource_b) do
+    {
     "ResourceType" => "BFoo",
     "Name" => "Foo",
     "Module" => { "Name" => "ModuleB" },
     }
-  }
+  end
 
   context "when resources are not cached" do
-    context 'when calling #resources' do
+    context "when calling #resources" do
       it "returns an empty array" do
         expect(resource_store.resources).to eql([])
       end
     end
 
-    context 'when calling #find' do
+    context "when calling #find" do
       it "returns an empty list if it cannot find any matching resources" do
         expect(resource_store).to receive(:query_resource).and_return([])
         expect(resource_store.find("foo")).to eql([])

data/spec/unit/util/editor_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "chef/util/editor"
 
 describe Chef::Util::Editor do
-  describe '#initialize' do
+  describe "#initialize" do
     it "takes an Enumerable of lines" do
       editor = described_class.new(File.open(__FILE__))
       expect(editor.lines).to be == IO.readlines(__FILE__)
@@ -18,7 +18,7 @@ describe Chef::Util::Editor do
   subject(:editor) { described_class.new(input_lines) }
   let(:input_lines) { %w{one two two three} }
 
-  describe '#append_line_after' do
+  describe "#append_line_after" do
     context "when there is no match" do
       subject(:execute) { editor.append_line_after("missing", "new") }
 
@@ -44,7 +44,7 @@ describe Chef::Util::Editor do
     end
   end
 
-  describe '#append_line_if_missing' do
+  describe "#append_line_if_missing" do
     context "when there is no match" do
       subject(:execute) { editor.append_line_if_missing("missing", "new") }
 
@@ -70,7 +70,7 @@ describe Chef::Util::Editor do
     end
   end
 
-  describe '#remove_lines' do
+  describe "#remove_lines" do
     context "when there is no match" do
       subject(:execute) { editor.remove_lines("missing") }
 
@@ -96,7 +96,7 @@ describe Chef::Util::Editor do
     end
   end
 
-  describe '#replace' do
+  describe "#replace" do
     context "when there is no match" do
       subject(:execute) { editor.replace("missing", "new") }
 
@@ -123,7 +123,7 @@ describe Chef::Util::Editor do
     end
   end
 
-  describe '#replace_lines' do
+  describe "#replace_lines" do
     context "when there is no match" do
       subject(:execute) { editor.replace_lines("missing", "new") }
 

data/spec/unit/util/powershell/cmdlet_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Util::Powershell::Cmdlet do
     @cmdlet = Chef::Util::Powershell::Cmdlet.new(@node, "Some-Commandlet")
   end
 
-  describe '#validate_switch_name!' do
+  describe "#validate_switch_name!" do
     it "should not raise an error if a name contains all upper case letters" do
       @cmdlet.send(:validate_switch_name!, "HELLO")
     end
@@ -40,14 +40,14 @@ describe Chef::Util::Powershell::Cmdlet do
 
     %w{! @ # $ % ^ & * & * ( ) - = + \{ \} . ? < > \\ /}.each do |sym|
       it "raises an Argument error if it configuration name contains #{sym}" do
-        expect {
+        expect do
           @cmdlet.send(:validate_switch_name!, "Hello#{sym}")
-        }.to raise_error(ArgumentError)
+        end.to raise_error(ArgumentError)
       end
     end
   end
 
-  describe '#escape_parameter_value' do
+  describe "#escape_parameter_value" do
     # Is this list really complete?
     %w{` " # '}.each do |c|
       it "escapse #{c}" do
@@ -60,23 +60,23 @@ describe Chef::Util::Powershell::Cmdlet do
     end
   end
 
-  describe '#escape_string_parameter_value' do
+  describe "#escape_string_parameter_value" do
     it "surrounds a string with ''" do
       expect(@cmdlet.send(:escape_string_parameter_value, "stuff")).to eql("'stuff'")
     end
   end
 
-  describe '#command_switches_string' do
+  describe "#command_switches_string" do
     it "raises an ArgumentError if the key is not a symbol" do
-      expect {
+      expect do
         @cmdlet.send(:command_switches_string, { "foo" => "bar" })
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it "does not allow invalid switch names" do
-      expect {
+      expect do
         @cmdlet.send(:command_switches_string, { :foo! => "bar" })
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it "ignores switches with a false value" do

data/tasks/bin/bundle-platform

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require_relative "bundler_patch"
 
 platforms = ARGV.shift
 platforms = platforms.split(" ").map { |p| Gem::Platform.new(p) }

data/tasks/bin/bundler_patch.rb

@@ -0,0 +1,27 @@
+# This is a temporary monkey patch to address https://github.com/bundler/bundler/issues/4896
+# the heart of the fix is line #18 with the addition of:
+# && (possibility.activated - existing_node.payload.activated).empty?
+# This ensures we do not mis linux platform gems in some scenarios like ffi in kitchen-test.
+# There is a permanent fix to bundler (See https://github.com/bundler/bundler/pull/4836) which
+# is due to ship in v1.14. Once we adopt that version, we can remove this file
+
+require "bundler"
+require "bundler/vendor/molinillo/lib/molinillo/resolution"
+
+module Bundler::Molinillo
+  class Resolver
+    # A specific resolution from a given {Resolver}
+    class Resolution
+      def attempt_to_activate
+        debug(depth) { "Attempting to activate " + possibility.to_s }
+        existing_node = activated.vertex_named(name)
+        if existing_node.payload && (possibility.activated - existing_node.payload.activated).empty?
+          debug(depth) { "Found existing spec (#{existing_node.payload})" }
+          attempt_to_activate_existing_spec(existing_node)
+        else
+          attempt_to_activate_new_spec
+        end
+      end
+    end
+  end
+end

data/tasks/cbgb.rb

@@ -44,9 +44,9 @@ begin
       out << cbgb(cbgb["corporations"], cbgb["Org"]["Corporate-Contributors"]["governers"]) + "\n\n"
       out << "### " + cbgb["Org"]["Lieutenants"]["title"] + "\n\n"
       out << cbgb(cbgb["people"], cbgb["Org"]["Lieutenants"]["governers"]) + "\n\n"
-      File.open(CBGB_TARGET, "w") { |fn|
+      File.open(CBGB_TARGET, "w") do |fn|
         fn.write out
-      }
+      end
     end
   end
 

data/tasks/maintainers.rb

@@ -46,9 +46,9 @@ begin
       out << format_person(source["Org"]["Lead"]["person"]) + "\n\n"
 
       out << format_components(source["Org"]["Components"])
-      File.open(TARGET, "w") { |fn|
+      File.open(TARGET, "w") do |fn|
         fn.write out
-      }
+      end
     end
 
     desc "Synchronize GitHub teams"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.13.37
+  version: 12.14.60
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-09-09 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.13.37
+        version: 12.14.60
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.13.37
+        version: 12.14.60
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +240,14 @@ dependencies:
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.8'
 - !ruby/object:Gem::Dependency
@@ -278,6 +278,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -456,6 +470,7 @@ files:
 - acceptance/basics/.kitchen.yml
 - acceptance/basics/test/integration/chef-current-install/serverspec/chef_client_spec.rb
 - acceptance/basics/test/integration/chef-current-install/serverspec/spec_helper.rb
+- acceptance/basics/test/integration/helpers/serverspec/Gemfile
 - acceptance/data-collector/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/data-collector/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/data-collector/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -475,6 +490,7 @@ files:
 - acceptance/data-collector/.kitchen.yml
 - acceptance/data-collector/Berksfile
 - acceptance/data-collector/test/integration/default/serverspec/default_spec.rb
+- acceptance/data-collector/test/integration/helpers/serverspec/Gemfile
 - acceptance/fips/.acceptance/acceptance-cookbook/.gitignore
 - acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb
 - acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb
@@ -1304,6 +1320,7 @@ files:
 - lib/chef/provider/service/upstart.rb
 - lib/chef/provider/service/windows.rb
 - lib/chef/provider/subversion.rb
+- lib/chef/provider/support/yum_repo.erb
 - lib/chef/provider/systemd_unit.rb
 - lib/chef/provider/template.rb
 - lib/chef/provider/template/content.rb
@@ -1311,12 +1328,14 @@ files:
 - lib/chef/provider/user.rb
 - lib/chef/provider/user/aix.rb
 - lib/chef/provider/user/dscl.rb
+- lib/chef/provider/user/linux.rb
 - lib/chef/provider/user/pw.rb
 - lib/chef/provider/user/solaris.rb
 - lib/chef/provider/user/useradd.rb
 - lib/chef/provider/user/windows.rb
 - lib/chef/provider/whyrun_safe_ruby_block.rb
 - lib/chef/provider/windows_script.rb
+- lib/chef/provider/yum_repository.rb
 - lib/chef/provider_resolver.rb
 - lib/chef/providers.rb
 - lib/chef/recipe.rb
@@ -1396,11 +1415,18 @@ files:
 - lib/chef/resource/template.rb
 - lib/chef/resource/timestamped_deploy.rb
 - lib/chef/resource/user.rb
+- lib/chef/resource/user/aix_user.rb
+- lib/chef/resource/user/dscl_user.rb
+- lib/chef/resource/user/linux_user.rb
+- lib/chef/resource/user/pw_user.rb
+- lib/chef/resource/user/solaris_user.rb
+- lib/chef/resource/user/windows_user.rb
 - lib/chef/resource/whyrun_safe_ruby_block.rb
 - lib/chef/resource/windows_package.rb
 - lib/chef/resource/windows_script.rb
 - lib/chef/resource/windows_service.rb
 - lib/chef/resource/yum_package.rb
+- lib/chef/resource/yum_repository.rb
 - lib/chef/resource/zypper_package.rb
 - lib/chef/resource_builder.rb
 - lib/chef/resource_collection.rb
@@ -2380,12 +2406,13 @@ files:
 - spec/unit/provider/template/content_spec.rb
 - spec/unit/provider/template_spec.rb
 - spec/unit/provider/user/dscl_spec.rb
+- spec/unit/provider/user/linux_spec.rb
 - spec/unit/provider/user/pw_spec.rb
 - spec/unit/provider/user/solaris_spec.rb
-- spec/unit/provider/user/useradd_spec.rb
 - spec/unit/provider/user/windows_spec.rb
 - spec/unit/provider/user_spec.rb
 - spec/unit/provider/whyrun_safe_ruby_block_spec.rb
+- spec/unit/provider/yum_repository_spec.rb
 - spec/unit/provider_resolver_spec.rb
 - spec/unit/provider_spec.rb
 - spec/unit/pure_application_spec.rb
@@ -2460,6 +2487,7 @@ files:
 - spec/unit/resource/windows_package_spec.rb
 - spec/unit/resource/windows_service_spec.rb
 - spec/unit/resource/yum_package_spec.rb
+- spec/unit/resource/yum_repository_spec.rb
 - spec/unit/resource_builder_spec.rb
 - spec/unit/resource_collection/resource_list_spec.rb
 - spec/unit/resource_collection/resource_set_spec.rb
@@ -2511,6 +2539,7 @@ files:
 - spec/unit/windows_service_spec.rb
 - tasks/bin/bundle-platform
 - tasks/bin/bundle-platform.bat
+- tasks/bin/bundler_patch.rb
 - tasks/bin/create-override-gemfile
 - tasks/bin/gem-version-diff
 - tasks/bin/run_external_test
@@ -2535,7 +2564,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="