chef 15.4.45 → 15.5.9

data/spec/unit/role_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ require "chef/role"
 
 describe Chef::Role do
   before(:each) do
-    allow(ChefConfig).to receive(:windows?) { false }
+    allow(ChefUtils).to receive(:windows?) { false }
     @role = Chef::Role.new
     @role.name("ops_master")
   end

data/spec/unit/shell_spec.rb

@@ -42,7 +42,7 @@ describe Shell do
   before do
     Shell.irb_conf = {}
     allow(Shell::ShellSession.instance).to receive(:reset!)
-    allow(ChefConfig).to receive(:windows?).and_return(false)
+    allow(ChefUtils).to receive(:windows?).and_return(false)
     allow(Chef::Util::PathHelper).to receive(:home).and_return("/home/foo")
   end
 

data/spec/unit/util/selinux_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Serdar Sutay (<serdar@chef.io>)
-# Copyright:: Copyright 2013-2018, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,7 @@ describe Chef::Util::Selinux do
   it "each part of ENV['PATH'] should be checked" do
     expected_paths = ENV["PATH"].split(File::PATH_SEPARATOR) + [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
 
-    expected_paths.each do |bin_path|
+    expected_paths.uniq.each do |bin_path|
       selinux_path = File.join(bin_path, "selinuxenabled")
       expect(File).to receive(:executable?).with(selinux_path).and_return(false)
     end

data/spec/unit/win32/error_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/error"
   require "chef/win32/api/error"
 end

data/spec/unit/win32/link_spec.rb

@@ -16,7 +16,7 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/api/file"
   require "chef/win32/file"
   require "chef/win32/version"

data/spec/unit/win32/security_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/win32/error"
   require "chef/win32/security"
   require "chef/win32/api/error"

data/spec/unit/windows_service_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 require "spec_helper"
-if Chef::Platform.windows?
+if ChefUtils.windows?
   require "chef/application/windows_service"
 end
 

data/tasks/docs.rb

@@ -24,7 +24,9 @@ namespace :docs_site do
       return nil if default.nil? || default == "" || default == "lazy default"
 
       if default.is_a?(String)
-        return default.inspect unless default[0] == ":"
+
+        # .inspect wraps the value in quotes which we want for strings, but not sentences or symbols as strings
+        return default.inspect unless default[0] == ":" || default.end_with?('.')
       end
       default
     end
@@ -101,7 +103,13 @@ namespace :docs_site do
     def bolded_description(name, description)
       return nil if description.nil? # handle resources missing descriptions
 
-      description.gsub( "#{name} ", "**#{name}** ").split("Note: ").first.strip
+      # we only want to bold occurences of the resource name in the first 5 words so treat it as an array
+      desc_array = description.split(" ")
+
+      desc_array = desc_array[0..4].map! { |x| name == x ? "**#{x}**" : x } + desc_array[5..-1]
+
+      # strip out notes and return just the description
+      desc_array.join(" ").split("Note: ").first.strip
     end
 
     def note_text(description)

data/tasks/rspec.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,12 +25,14 @@ CHEF_ROOT = File.join(File.dirname(__FILE__), "..")
 begin
   require "rspec/core/rake_task"
 
-  desc "Run specs for Chef's Components (chef-config)"
+  desc "Run specs for Chef's Components"
   task :component_specs do
-    Dir.chdir("chef-config") do
-      Bundler.with_clean_env do
-        sh("bundle install")
-        sh("bundle exec rake spec")
+    %w{chef-utils chef-config}.each do |gem|
+      Dir.chdir(gem) do
+        Bundler.with_clean_env do
+          sh("bundle install")
+          sh("bundle exec rake spec")
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 15.4.45
+  version: 15.5.9
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.4.45
+        version: 15.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.4.45
+        version: 15.5.9
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 15.5.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 15.5.9
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -116,16 +130,22 @@ dependencies:
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -935,7 +955,6 @@ files:
 - lib/chef/mixin/shell_out.rb
 - lib/chef/mixin/subclass_directive.rb
 - lib/chef/mixin/template.rb
-- lib/chef/mixin/train_helpers.rb
 - lib/chef/mixin/unformatter.rb
 - lib/chef/mixin/uris.rb
 - lib/chef/mixin/user_context.rb
@@ -1153,6 +1172,7 @@ files:
 - lib/chef/resource/cab_package.rb
 - lib/chef/resource/chef_gem.rb
 - lib/chef/resource/chef_handler.rb
+- lib/chef/resource/chef_sleep.rb
 - lib/chef/resource/chocolatey_config.rb
 - lib/chef/resource/chocolatey_feature.rb
 - lib/chef/resource/chocolatey_package.rb
@@ -1547,6 +1567,10 @@ files:
 - spec/data/cookbooks/preseed/metadata.rb
 - spec/data/cookbooks/preseed/templates/default/preseed-template-variables.seed
 - spec/data/cookbooks/preseed/templates/default/preseed-template.seed
+- spec/data/cookbooks/starter/chefignore
+- spec/data/cookbooks/starter/files/sample.txt
+- spec/data/cookbooks/starter/metadata.rb
+- spec/data/cookbooks/starter/recipes/default.rb
 - spec/data/cookbooks/supports-platform-constraints/metadata.rb
 - spec/data/cookbooks/wget/files/default/wget.response
 - spec/data/definitions/test.rb
@@ -2220,7 +2244,6 @@ files:
 - spec/unit/log/winevt_spec.rb
 - spec/unit/log_spec.rb
 - spec/unit/lwrp_spec.rb
-- spec/unit/mash_spec.rb
 - spec/unit/mixin/api_version_request_handling_spec.rb
 - spec/unit/mixin/checksum_spec.rb
 - spec/unit/mixin/convert_to_class_name_spec.rb
@@ -2403,6 +2426,7 @@ files:
 - spec/unit/resource/cab_package_spec.rb
 - spec/unit/resource/chef_gem_spec.rb
 - spec/unit/resource/chef_handler_spec.rb
+- spec/unit/resource/chef_sleep_spec.rb
 - spec/unit/resource/chocolatey_config_spec.rb
 - spec/unit/resource/chocolatey_feature_spec.rb
 - spec/unit/resource/chocolatey_package_spec.rb

data/lib/chef/mixin/train_helpers.rb

@@ -1,60 +0,0 @@
-#--
-# Author:: Lamont Granquist <lamont@chef.io>
-# Copyright:: Copyright 2019, Chef Software 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 "stringio" unless defined?(StringIO)
-
-class Chef
-  module Mixin
-    module TrainHelpers
-
-      #
-      # FIXME: generally these helpers all use the pattern of checking for target_mode?
-      # and then if it is we use train.  That approach should likely be flipped so that
-      # even when we're running without target mode we still use inspec in its local
-      # mode.
-      #
-
-      # Train wrapper around File.exist? to make it local mode aware.
-      #
-      # @param filename filename to check
-      # @return [Boolean] if it exists
-      #
-      def file_exist?(filename)
-        if Chef::Config.target_mode?
-          Chef.run_context.transport_connection.file(filename).exist?
-        else
-          File.exist?(filename)
-        end
-      end
-
-      # XXX: modifications to the StringIO won't get written back
-      # FIXME: this is very experimental and may be a bad idea and may break at any time
-      # @api private
-      #
-      def file_open(*args, &block)
-        if Chef::Config.target_mode?
-          content = Chef.run_context.transport_connection.file(args[0]).content
-          string_io = StringIO.new content
-          yield string_io if block_given?
-          string_io
-        else
-          File.open(*args, &block)
-        end
-      end
-    end
-  end
-end

data/spec/unit/mash_spec.rb

@@ -1,51 +0,0 @@
-#
-# Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright 2011-2016, Chef Software 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 "chef/mash"
-
-describe Mash do
-  it "should duplicate a simple key/value mash to a new mash" do
-    data = { x: "one", y: "two", z: "three" }
-    @orig = Mash.new(data)
-    @copy = @orig.dup
-    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
-    @copy[:x] = "four"
-    expect(@orig[:x]).to eq("one")
-  end
-
-  it "should duplicate a mash with an array to a new mash" do
-    data = { x: "one", y: "two", z: [1, 2, 3] }
-    @orig = Mash.new(data)
-    @copy = @orig.dup
-    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
-    @copy[:z] << 4
-    expect(@orig[:z]).to eq([1, 2, 3])
-  end
-
-  it "should duplicate a nested mash to a new mash" do
-    data = { x: "one", y: "two", z: Mash.new({ a: [1, 2, 3] }) }
-    @orig = Mash.new(data)
-    @copy = @orig.dup
-    expect(@copy.to_hash).to eq(Mash.new(data).to_hash)
-    @copy[:z][:a] << 4
-    expect(@orig[:z][:a]).to eq([1, 2, 3])
-  end
-
-  # add more!
-end