chef 14.14.29 → 14.15.6

data/spec/unit/provider/dsc_resource_spec.rb

@@ -36,7 +36,8 @@ describe Chef::Provider::DscResource do
     it "raises a ProviderNotFound exception" do
       expect(provider).not_to receive(:meta_configuration)
       expect { provider.run_action(:run) }.to raise_error(
-              Chef::Exceptions::ProviderNotFound, /5\.0\.10018\.0/)
+        Chef::Exceptions::ProviderNotFound, /5\.0\.10018\.0/
+      )
     end
   end
 
@@ -52,7 +53,8 @@ describe Chef::Provider::DscResource do
         it "raises an exception" do
           expect(provider).to receive(:dsc_refresh_mode_disabled?).and_return(false)
           expect { provider.run_action(:run) }.to raise_error(
-            Chef::Exceptions::ProviderNotFound, /Disabled/)
+            Chef::Exceptions::ProviderNotFound, /Disabled/
+          )
         end
       end
       context "and the WMF is 5 RTM or newer" do
@@ -157,7 +159,8 @@ describe Chef::Provider::DscResource do
           [
           { "Module" => { "Name" => "ModuleName1", "Version" => "1.0.0.0" } },
           { "Module" => { "Name" => "ModuleName1", "Version" => "2.0.0.0" } },
-        ] end
+        ]
+        end
 
         it "raises MultipleDscResourcesFound" do
           expect { provider.run_action(:run) }.to raise_error(Chef::Exceptions::MultipleDscResourcesFound)

data/spec/unit/provider/dsc_script_spec.rb

@@ -99,7 +99,7 @@ describe Chef::Provider::DscScript do
       it "should noop if neither code or command are provided" do
         allow(provider).to receive(:load_current_resource)
         generator = double("Chef::Util::DSC::ConfigurationGenerator")
-        expect(generator).to receive(:configuration_document_from_script_code).with("", anything(), anything(), anything())
+        expect(generator).to receive(:configuration_document_from_script_code).with("", anything, anything, anything)
         allow(Chef::Util::DSC::ConfigurationGenerator).to receive(:new).and_return(generator)
         provider.send(:generate_configuration_document, "tmp", nil)
       end

data/spec/unit/provider/execute_spec.rb

@@ -30,11 +30,11 @@ describe Chef::Provider::Execute do
 
   let(:opts) do
     {
-      timeout:      3600,
-      returns:      0,
-      log_level:    :info,
-      default_env:  false,
-      log_tag:      new_resource.to_s,
+      timeout: 3600,
+      returns: 0,
+      log_level: :info,
+      default_env: false,
+      log_tag: new_resource.to_s,
     }
   end
 

data/spec/unit/provider/git_spec.rb

@@ -259,7 +259,7 @@ describe Chef::Provider::Git do
         d7b9957f67236fa54e660cc3ab45ffecd6e0ba38\trefs/tags/0.7.8
         b7d19519a1c15f1c1a324e2683bd728b6198ce5a\trefs/tags/0.7.8^{}
         ebc1b392fe7e8f0fbabc305c299b4d365d2b4d9b\trefs/tags/chef-server-package
-SHAS
+      SHAS
       @resource.revision ""
       expect(@provider).to receive(:shell_out!).with(@git_ls_remote + "\"HEAD\"", { log_tag: "git[web2.0 app]" }).and_return(double("ShellOut result", stdout: @stdout))
       expect(@provider.target_revision).to eql("28af684d8460ba4793eda3e7ac238c864a5d029a")
@@ -377,7 +377,7 @@ SHAS
     version_response = double("shell_out")
     allow(version_response).to receive(:stdout) { "git version 1.7.9" }
     expect(@provider).to receive(:shell_out!).with("git --version",
-                                               log_tag: "git[web2.0 app]").and_return(version_response)
+      log_tag: "git[web2.0 app]").and_return(version_response)
     expect(@provider).to receive(:shell_out!).with(expected_cmd, log_tag: "git[web2.0 app]")
     @provider.clone
   end
@@ -388,7 +388,7 @@ SHAS
     version_response = double("shell_out")
     allow(version_response).to receive(:stdout) { "git version 1.7.10" }
     expect(@provider).to receive(:shell_out!).with("git --version",
-                                               log_tag: "git[web2.0 app]").and_return(version_response)
+      log_tag: "git[web2.0 app]").and_return(version_response)
     expect(@provider).to receive(:shell_out!).with(expected_cmd, log_tag: "git[web2.0 app]")
     @provider.clone
   end
@@ -489,13 +489,13 @@ SHAS
       allow(command_response).to receive(:exitstatus) { 1 }
       expected_command = "git config --get remote.#{@resource.remote}.url"
       expect(@provider).to receive(:shell_out!).with(expected_command,
-                                                 cwd: "/my/deploy/dir",
-                                                 log_tag: "git[web2.0 app]",
-                                                 returns: [0, 1, 2]).and_return(command_response)
+        cwd: "/my/deploy/dir",
+        log_tag: "git[web2.0 app]",
+        returns: [0, 1, 2]).and_return(command_response)
       add_remote_command = "git remote add #{@resource.remote} #{@resource.repository}"
       expect(@provider).to receive(:shell_out!).with(add_remote_command,
-                                                 cwd: "/my/deploy/dir",
-                                                 log_tag: "git[web2.0 app]")
+        cwd: "/my/deploy/dir",
+        log_tag: "git[web2.0 app]")
       @provider.setup_remote_tracking_branches(@resource.remote, @resource.repository)
     end
 
@@ -507,19 +507,19 @@ SHAS
       allow(command_response).to receive(:exitstatus) { 1 }
       expected_command = "git config --get remote.#{@resource.remote}.url"
       expect(@provider).to receive(:shell_out!).with(expected_command,
-                                                 cwd: "/my/deploy/dir",
-                                                 log_tag: "git[web2.0 app]",
-                                                 user: "whois",
-                                                 group: "thisis",
-                                                 environment: { "HOME" => "/home/whois" },
-                                                 returns: [0, 1, 2]).and_return(command_response)
+        cwd: "/my/deploy/dir",
+        log_tag: "git[web2.0 app]",
+        user: "whois",
+        group: "thisis",
+        environment: { "HOME" => "/home/whois" },
+        returns: [0, 1, 2]).and_return(command_response)
       add_remote_command = "git remote add #{@resource.remote} #{@resource.repository}"
       expect(@provider).to receive(:shell_out!).with(add_remote_command,
-                                                 cwd: "/my/deploy/dir",
-                                                 log_tag: "git[web2.0 app]",
-                                                 user: "whois",
-                                                 group: "thisis",
-                                                 environment: { "HOME" => "/home/whois" })
+        cwd: "/my/deploy/dir",
+        log_tag: "git[web2.0 app]",
+        user: "whois",
+        group: "thisis",
+        environment: { "HOME" => "/home/whois" })
       @provider.setup_remote_tracking_branches(@resource.remote, @resource.repository)
     end
 
@@ -529,13 +529,13 @@ SHAS
         allow(command_response).to receive(:exitstatus) { 1 }
         check_remote_command = "git config --get remote.#{@resource.remote}.url"
         expect(@provider).to receive(:shell_out!).with(check_remote_command,
-                                                   cwd: "/my/deploy/dir",
-                                                   log_tag: "git[web2.0 app]",
-                                                   returns: [0, 1, 2]).and_return(command_response)
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]",
+          returns: [0, 1, 2]).and_return(command_response)
         expected_command = "git remote add #{@resource.remote} #{@resource.repository}"
         expect(@provider).to receive(:shell_out!).with(expected_command,
-                                                   cwd: "/my/deploy/dir",
-                                                   log_tag: "git[web2.0 app]")
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]")
         @provider.setup_remote_tracking_branches(@resource.remote, @resource.repository)
       end
     end
@@ -547,13 +547,13 @@ SHAS
         allow(command_response).to receive(:stdout) { "some_other_url" }
         check_remote_command = "git config --get remote.#{@resource.remote}.url"
         expect(@provider).to receive(:shell_out!).with(check_remote_command,
-                                                   cwd: "/my/deploy/dir",
-                                                   log_tag: "git[web2.0 app]",
-                                                   returns: [0, 1, 2]).and_return(command_response)
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]",
+          returns: [0, 1, 2]).and_return(command_response)
         expected_command = "git config --replace-all remote.#{@resource.remote}.url \"#{@resource.repository}\""
         expect(@provider).to receive(:shell_out!).with(expected_command,
-                                                   cwd: "/my/deploy/dir",
-                                                   log_tag: "git[web2.0 app]")
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]")
         @provider.setup_remote_tracking_branches(@resource.remote, @resource.repository)
       end
 
@@ -563,13 +563,13 @@ SHAS
         allow(command_response).to receive(:stdout) { @resource.repository }
         check_remote_command = "git config --get remote.#{@resource.remote}.url"
         expect(@provider).to receive(:shell_out!).with(check_remote_command,
-                                                   cwd: "/my/deploy/dir",
-                                                   log_tag: "git[web2.0 app]",
-                                                   returns: [0, 1, 2]).and_return(command_response)
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]",
+          returns: [0, 1, 2]).and_return(command_response)
         unexpected_command = "git config --replace-all remote.#{@resource.remote}.url \"#{@resource.repository}\""
         expect(@provider).not_to receive(:shell_out!).with(unexpected_command,
-                                                       cwd: "/my/deploy/dir",
-                                                       log_tag: "git[web2.0 app]")
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]")
         @provider.setup_remote_tracking_branches(@resource.remote, @resource.repository)
       end
 
@@ -578,13 +578,13 @@ SHAS
         allow(command_response).to receive(:exitstatus) { 2 }
         check_remote_command = "git config --get remote.#{@resource.remote}.url"
         expect(@provider).to receive(:shell_out!).with(check_remote_command,
-                                                   cwd: "/my/deploy/dir",
-                                                   log_tag: "git[web2.0 app]",
-                                                   returns: [0, 1, 2]).and_return(command_response)
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]",
+          returns: [0, 1, 2]).and_return(command_response)
         expected_command = "git config --replace-all remote.#{@resource.remote}.url \"#{@resource.repository}\""
         expect(@provider).to receive(:shell_out!).with(expected_command,
-                                                   cwd: "/my/deploy/dir",
-                                                   log_tag: "git[web2.0 app]")
+          cwd: "/my/deploy/dir",
+          log_tag: "git[web2.0 app]")
         @provider.setup_remote_tracking_branches(@resource.remote, @resource.repository)
       end
     end

data/spec/unit/provider/group/dscl_spec.rb

@@ -120,8 +120,8 @@ describe Chef::Provider::Group::Dscl do
         someprogram		somethingElse:gid = (
             500
         )
-        EOS
-      )
+      EOS
+                                                        )
     end
 
     it "should run safe_dscl with search /Groups gid" do
@@ -322,7 +322,7 @@ describe "Test DSCL loading" do
       RecordName: com.apple.aj
       RecordType: dsRecTypeStandard:Groups
       GroupMembership: waka bar
-EOF
+    EOF
     allow(@provider).to receive(:safe_dscl).with(*"read /Groups/aj".split(" ")).and_return(@output)
     @current_resource = @provider.load_current_resource
 

data/spec/unit/provider/group/groupadd_spec.rb

@@ -155,7 +155,7 @@ describe Chef::Provider::Group::Groupadd do
     end
   end
 
-  [:add_member, :remove_member, :set_members].each do |m|
+  %i{add_member remove_member set_members}.each do |m|
     it "should raise an error when calling #{m}" do
       expect { provider.send(m, [ ]) }.to raise_error(Chef::Exceptions::Group, "you must override #{m} in #{provider}")
     end

data/spec/unit/provider/group_spec.rb

@@ -39,8 +39,7 @@ describe Chef::Provider::User do
     @pw_group = double("Struct::Group",
       name: "wheel",
       gid: 20,
-      mem: %w{root aj}
-      )
+      mem: %w{root aj})
     allow(Etc).to receive(:getgrnam).with("wheel").and_return(@pw_group)
   end
 
@@ -85,7 +84,7 @@ describe Chef::Provider::User do
   end
 
   describe "when determining if the system is already in the target state" do
-    [ :gid, :members ].each do |property|
+    %i{gid members}.each do |property|
       it "should return true if #{property} doesn't match" do
         allow(@current_resource).to receive(property).and_return("looooooooooooooooooool")
         expect(@provider.compare_group).to be_truthy

data/spec/unit/provider/ifconfig/aix_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Provider::Ifconfig::Aix do
       lo0: flags=e08084b,c0<UP,BROADCAST,LOOPBACK,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,LARGESEND,CHAIN>
               inet 127.0.0.1 netmask 0xff000000 broadcast 127.255.255.255
               inet6 ::1%1/0
-IFCONFIG
+    IFCONFIG
   end
 
   before(:each) do

data/spec/unit/provider/ifconfig/debian_spec.rb

@@ -123,7 +123,7 @@ describe Chef::Provider::Ifconfig::Debian do
             a line
             source #{tempdir_path}/*
             another line
-EOF
+          EOF
         end
 
         before do
@@ -146,7 +146,7 @@ EOF
             a line
             another line
             source #{tempdir_path}/*
-EOF
+          EOF
         end
 
         before do

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");
@@ -44,21 +44,50 @@ describe Chef::Provider::Ifconfig do
     let(:net_tools_version) { StringIO.new <<~EOS }
       net-tools 1.60
       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
+    EOS
+
+    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/provider/launchd_spec.rb

@@ -49,7 +49,7 @@ describe Chef::Provider::Launchd do
       \t<integer>300</integer>
       </dict>
       </plist>
-XML
+    XML
     let(:test_plist_multiple_intervals) { String.new <<~XML }
       <?xml version="1.0" encoding="UTF-8"?>
       <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -78,7 +78,7 @@ XML
       \t<integer>300</integer>
       </dict>
       </plist>
-XML
+    XML
 
     let(:test_hash) do
       {
@@ -89,7 +89,8 @@ XML
         "Weekday" => 7,
       },
       "TimeOut" => 300,
-    } end
+    }
+    end
 
     before(:each) do
       provider.load_current_resource
@@ -139,7 +140,7 @@ XML
         it "should allow array of Hashes" do
           allowed = (1..2).collect do |num|
             {
-              "Hour"    => 10 + num,
+              "Hour" => 10 + num,
               "Weekday" => num,
             }
           end
@@ -152,11 +153,11 @@ XML
 
         it "should allow all StartCalendarInterval keys" do
           allowed = {
-            "Minute"  => 1,
-            "Hour"    => 1,
-            "Day"     => 1,
+            "Minute" => 1,
+            "Hour" => 1,
+            "Day" => 1,
             "Weekday" => 1,
-            "Month"   => 1,
+            "Month" => 1,
           }
           new_resource.program "/Library/scripts/call_mom.sh"
           new_resource.time_out 300
@@ -197,9 +198,11 @@ XML
       describe "and the file has been updated" do
         before(:each) do
           allow(provider).to receive(
-            :manage_plist).with(:create).and_return(true)
+            :manage_plist
+          ).with(:create).and_return(true)
           allow(provider).to receive(
-            :manage_service).with(:restart).and_return(true)
+            :manage_service
+          ).with(:restart).and_return(true)
         end
 
         it "should call manage_service with a :restart action" do
@@ -215,9 +218,11 @@ XML
       describe "and the file has not been updated" do
         before(:each) do
           allow(provider).to receive(
-            :manage_plist).with(:create).and_return(nil)
+            :manage_plist
+          ).with(:create).and_return(nil)
           allow(provider).to receive(
-            :manage_service).with(:enable).and_return(true)
+            :manage_service
+          ).with(:enable).and_return(true)
         end
 
         it "should call manage_service with a :enable action" do
@@ -236,9 +241,11 @@ XML
         before(:each) do
           allow(File).to receive(:exists?).and_return(true)
           allow(provider).to receive(
-            :manage_service).with(:disable).and_return(true)
+            :manage_service
+          ).with(:disable).and_return(true)
           allow(provider).to receive(
-            :manage_plist).with(:delete).and_return(true)
+            :manage_plist
+          ).with(:delete).and_return(true)
         end
 
         it "should call manage_service with a :disable action" do
@@ -255,7 +262,8 @@ XML
         before(:each) do
           allow(File).to receive(:exists?).and_return(false)
           allow(provider).to receive(
-            :manage_plist).with(:delete).and_return(true)
+            :manage_plist
+          ).with(:delete).and_return(true)
         end
 
         it "works with action :delete" do