chef 15.7.32-universal-mingw32 → 15.8.23-universal-mingw32

data/lib/chef/search/query.rb

@@ -63,7 +63,7 @@ class Chef
 
         args_h = hashify_args(*args)
         if args_h[:fuzz]
-          if type == :node
+          if type.to_sym == :node
             query = fuzzify_node_query(query)
           end
           # FIXME: can i haz proper ruby-2.x named parameters someday plz?

data/lib/chef/shell.rb

@@ -159,11 +159,10 @@ module Shell
 
     puts "run `help' for help, `exit' or ^D to quit."
     puts
-    puts "Ohai2u#{greeting}!"
   end
 
   def self.greeting
-    " #{Etc.getlogin}@#{Shell.session.node["fqdn"]}"
+    "#{Etc.getlogin}@#{Shell.session.node["fqdn"]}"
   rescue NameError, ArgumentError
     ""
   end
@@ -241,7 +240,7 @@ module Shell
     option :standalone,
       short: "-a",
       long: "--standalone",
-      description: "standalone session",
+      description: "Standalone session",
       default: true,
       boolean: true
 
@@ -255,7 +254,7 @@ module Shell
     option :client,
       short: "-z",
       long: "--client",
-      description: "#{Chef::Dist::CLIENT} session",
+      description: "#{Chef::Dist::PRODUCT} session",
       boolean: true
 
     option :solo_legacy_shell,
@@ -273,7 +272,7 @@ module Shell
     option :chef_server_url,
       short: "-S CHEFSERVERURL",
       long: "--server CHEFSERVERURL",
-      description: "The #{Chef::Dist::PRODUCT} server URL",
+      description: "The #{Chef::Dist::SERVER_PRODUCT} URL",
       proc: nil
 
     option :version,

data/lib/chef/shell/ext.rb

@@ -204,16 +204,14 @@ module Shell
         else
           puts help_banner
         end
-        :ucanhaz_halp
+        :help
       end
       alias :halp :help
 
       desc "prints information about #{Chef::Dist::PRODUCT}"
       def version
-        puts "This is the #{Chef::Dist::SHELL}.\n" +
-          " #{Chef::Dist::PRODUCT} Version: #{::Chef::VERSION}\n" +
-          " #{Chef::Dist::WEBSITE}\n" +
-          " https://docs.chef.io/"
+        puts "Welcome to the #{Chef::Dist::SHELL} #{::Chef::VERSION}\n" +
+          "For usage see https://docs.chef.io/chef_shell.html"
         :ucanhaz_automation
       end
       alias :shell :version

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("15.7.32")
+  VERSION = Chef::VersionString.new("15.8.23")
 end
 
 #

data/spec/unit/cookbook_uploader_spec.rb

@@ -17,6 +17,7 @@
 #
 
 require "spec_helper"
+require_relative "../../lib/chef/cookbook_uploader"
 
 describe Chef::CookbookUploader do
 

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -325,7 +325,7 @@ describe Chef::Knife::CookbookUpload do
           it "should warn users that no cookbooks exist" do
             knife.config[:cookbook_path] = ["/chef-repo/cookbooks", "/home/user/cookbooks"]
             expect(knife.ui).to receive(:warn).with(
-              /Could not find any cookbooks in your cookbook path: #{knife.config[:cookbook_path].join(', ')}\. Use --cookbook-path to specify the desired path\./
+              /Could not find any cookbooks in your cookbook path: '#{knife.config[:cookbook_path].join(', ')}'\. Use --cookbook-path to specify the desired path\./
             )
             knife.run
           end
@@ -335,7 +335,7 @@ describe Chef::Knife::CookbookUpload do
           it "should warn users that no cookbooks exist" do
             knife.config[:cookbook_path] = "/chef-repo/cookbooks"
             expect(knife.ui).to receive(:warn).with(
-              /Could not find any cookbooks in your cookbook path: #{knife.config[:cookbook_path]}\. Use --cookbook-path to specify the desired path\./
+              /Could not find any cookbooks in your cookbook path: '#{knife.config[:cookbook_path]}'\. Use --cookbook-path to specify the desired path\./
             )
             knife.run
           end

data/spec/unit/provider/ifconfig_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Prajakta Purohit (prajakta@chef.io)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2020, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,19 +46,48 @@ describe Chef::Provider::Ifconfig do
       ifconfig 1.42 (2001-04-13)
     EOS
 
-    before do
-      ifconfig = double(stdout: "", exitstatus: 1)
-      allow(@provider).to receive(:shell_out_compacted).and_return(ifconfig)
-      ifconfig_version = double(stdout: "", stderr: net_tools_version, exitstatus: 4)
-      allow(@provider).to receive(:shell_out_compacted).with("ifconfig", "--version").and_return(ifconfig_version)
-      @provider.load_current_resource
-    end
-    it "should track state of ifconfig failure" do
-      expect(@provider.instance_variable_get("@status").exitstatus).not_to eq(0)
-    end
-    it "should thrown an exception when ifconfig fails" do
-      @provider.define_resource_requirements
-      expect { @provider.process_resource_requirements }.to raise_error Chef::Exceptions::Ifconfig
+    let(:net_tools_version2) { StringIO.new <<~EOS }
+      net-tools 2.10-alpha
+    EOS
+
+    context "when ifconfig returns its version on stdout" do
+      before do
+        ifconfig = double(stdout: "", exitstatus: 1)
+        allow(@provider).to receive(:shell_out_compacted).and_return(ifconfig)
+        ifconfig_version = double(stdout: net_tools_version2, stderr: "", exitstatus: 4)
+        allow(@provider).to receive(:shell_out_compacted).with("ifconfig", "--version").and_return(ifconfig_version)
+        @provider.load_current_resource
+      end
+      it "should track state of ifconfig failure" do
+        expect(@provider.instance_variable_get("@status").exitstatus).not_to eq(0)
+      end
+      it "should thrown an exception when ifconfig fails" do
+        @provider.define_resource_requirements
+        expect { @provider.process_resource_requirements }.to raise_error Chef::Exceptions::Ifconfig
+      end
+      it "should grab the correct major.minor version of net-tools" do
+        expect(@provider.ifconfig_version).to eql("2.10")
+      end
+    end
+
+    context "when ifconfig returns its version on stderr" do
+      before do
+        ifconfig = double(stdout: "", exitstatus: 1)
+        allow(@provider).to receive(:shell_out_compacted).and_return(ifconfig)
+        ifconfig_version = double(stdout: "", stderr: net_tools_version, exitstatus: 4)
+        allow(@provider).to receive(:shell_out_compacted).with("ifconfig", "--version").and_return(ifconfig_version)
+        @provider.load_current_resource
+      end
+      it "should track state of ifconfig failure" do
+        expect(@provider.instance_variable_get("@status").exitstatus).not_to eq(0)
+      end
+      it "should thrown an exception when ifconfig fails" do
+        @provider.define_resource_requirements
+        expect { @provider.process_resource_requirements }.to raise_error Chef::Exceptions::Ifconfig
+      end
+      it "should grab the correct major.minor version of net-tools" do
+        expect(@provider.ifconfig_version).to eql("1.60")
+      end
     end
   end
   describe Chef::Provider::Ifconfig, "action_add" do

data/spec/unit/resource/notify_group_spec.rb

@@ -0,0 +1,34 @@
+#
+# Copyright:: 2019-2020, 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"
+
+describe Chef::Resource::NotifyGroup do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::NotifyGroup.new("whatever", run_context) }
+
+  it "sets the default action as :run" do
+    expect(resource.action).to eql([:nothing])
+  end
+
+  it "is always updated" do
+    resource.run_action(:run)
+    expect(resource.updated_by_last_action?).to be true
+  end
+end

data/spec/unit/resource/sysctl_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2018, Chef Software, Inc.
+# Copyright:: Copyright 2018-2020, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@ require "spec_helper"
 
 describe Chef::Resource::Sysctl do
   let(:resource) { Chef::Resource::Sysctl.new("fakey_fakerton") }
+  let(:provider) { resource.provider_for_action(:create) }
 
   it "sets resource name as :sysctl" do
     expect(resource.resource_name).to eql(:sysctl)
@@ -51,4 +52,25 @@ describe Chef::Resource::Sysctl do
     resource.value 1.1
     expect(resource.value).to eql("1.1")
   end
+
+  context "#contruct_sysctl_content" do
+    before do
+      resource.key("foo")
+      resource.value("bar")
+    end
+
+    context "when comment is a String" do
+      it "Returns content for use with a file resource" do
+        resource.comment("This sets foo / bar on our system")
+        expect(provider.contruct_sysctl_content).to eql("# This sets foo / bar on our system\nfoo = bar")
+      end
+    end
+
+    context "when comment is an Array" do
+      it "Returns content for use with a file resource" do
+        resource.comment(["This sets foo / bar on our system", "We need for baz"])
+        expect(provider.contruct_sysctl_content).to eql("# This sets foo / bar on our system\n# We need for baz\nfoo = bar")
+      end
+    end
+  end
 end

data/spec/unit/search/query_spec.rb

@@ -233,13 +233,20 @@ describe Chef::Search::Query do
       end
     end
 
-    it "fuzzifies node searches when fuzz is set" do
+    it "fuzzifies node searches when fuzz is set and type is a symbol" do
       expect(rest).to receive(:get).with(
         "search/node?q=tags:*free.messi*%20OR%20roles:*free.messi*%20OR%20fqdn:*free.messi*%20OR%20addresses:*free.messi*%20OR%20policy_name:*free.messi*%20OR%20policy_group:*free.messi*&start=0&rows=#{default_rows}"
       ).and_return(response)
       query.search(:node, "free.messi", fuzz: true)
     end
 
+    it "fuzzifies node searches when fuzz is set and type is a string" do
+      expect(rest).to receive(:get).with(
+        "search/node?q=tags:*free.messi*%20OR%20roles:*free.messi*%20OR%20fqdn:*free.messi*%20OR%20addresses:*free.messi*%20OR%20policy_name:*free.messi*%20OR%20policy_group:*free.messi*&start=0&rows=#{default_rows}"
+      ).and_return(response)
+      query.search("node", "free.messi", fuzz: true)
+    end
+
     it "does not fuzzify node searches when fuzz is not set" do
       expect(rest).to receive(:get).with(
         "search/node?q=free.messi&start=0&rows=#{default_rows}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 15.7.32
+  version: 15.8.23
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.7.32
+        version: 15.8.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.7.32
+        version: 15.8.23
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.7.32
+        version: 15.8.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.7.32
+        version: 15.8.23
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -620,7 +620,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -630,7 +630,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -1400,6 +1400,7 @@ files:
 - lib/chef/resource/mdadm.rb
 - lib/chef/resource/mount.rb
 - lib/chef/resource/msu_package.rb
+- lib/chef/resource/notify_group.rb
 - lib/chef/resource/ohai.rb
 - lib/chef/resource/ohai_hint.rb
 - lib/chef/resource/openbsd_package.rb
@@ -2655,6 +2656,7 @@ files:
 - spec/unit/resource/mdadm_spec.rb
 - spec/unit/resource/mount_spec.rb
 - spec/unit/resource/msu_package_spec.rb
+- spec/unit/resource/notify_group_spec.rb
 - spec/unit/resource/ohai_hint_spec.rb
 - spec/unit/resource/ohai_spec.rb
 - spec/unit/resource/openbsd_package_spec.rb