chef 14.2.0 → 14.3.37

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

@@ -1,6 +1,6 @@
 #
 # Author:: Dreamcat4 (<dreamcat4@gmail.com>)
-# Copyright:: Copyright 2009-2016, Chef Software Inc.
+# Copyright:: Copyright 2009-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,11 +32,11 @@ describe Chef::Provider::Group::Dscl do
     @provider.current_resource = @current_resource
 
     @status = double(stdout: "\n", stderr: "", exitstatus: 0)
-    allow(@provider).to receive(:shell_out).and_return(@status)
+    allow(@provider).to receive(:shell_out_compacted).and_return(@status)
   end
 
   it "should run shell_out with the supplied array of arguments appended to the dscl command" do
-    expect(@provider).to receive(:shell_out).with("dscl", ".", "-cmd", "/Path", "arg1", "arg2")
+    expect(@provider).to receive(:shell_out_compacted).with("dscl", ".", "-cmd", "/Path", "arg1", "arg2")
     @provider.dscl("cmd", "/Path", "arg1", "arg2")
   end
 
@@ -116,11 +116,11 @@ describe Chef::Provider::Group::Dscl do
 
   describe "gid_used?" do
     before do
-      allow(@provider).to receive(:safe_dscl).and_return(<<-eos
+      allow(@provider).to receive(:safe_dscl).and_return(<<-EOS
         someprogram		somethingElse:gid = (
             500
         )
-        eos
+        EOS
       )
     end
 
@@ -309,19 +309,19 @@ describe "Test DSCL loading" do
     @new_resource = Chef::Resource::Group.new("group name aj")
     @new_resource.group_name("aj")
     @provider = Chef::Provider::Group::Dscl.new(@new_resource, @run_context)
-    @output = <<-EOF
-AppleMetaNodeLocation: /Local/Default
-Comment:
- Test Group
-GeneratedUID: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA
-NestedGroups: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAB
-Password: *
-PrimaryGroupID: 999
-RealName:
- TestGroup
-RecordName: com.apple.aj
-RecordType: dsRecTypeStandard:Groups
-GroupMembership: waka bar
+    @output = <<~EOF
+      AppleMetaNodeLocation: /Local/Default
+      Comment:
+       Test Group
+      GeneratedUID: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA
+      NestedGroups: AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAB
+      Password: *
+      PrimaryGroupID: 999
+      RealName:
+       TestGroup
+      RecordName: com.apple.aj
+      RecordType: dsRecTypeStandard:Groups
+      GroupMembership: waka bar
 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/gpasswd_spec.rb

@@ -69,7 +69,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
 
       it "logs a message and sets group's members to 'none'" do
         expect(logger).to receive(:trace).with("group[wheel] setting group members to: none")
-        expect(@provider).to receive(:shell_out!).with("gpasswd", "-M", "", "wheel")
+        expect(@provider).to receive(:shell_out_compacted!).with("gpasswd", "-M", "", "wheel")
         @provider.modify_group_members
       end
     end
@@ -81,7 +81,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
       end
 
       it "does not modify group membership" do
-        expect(@provider).not_to receive(:shell_out!)
+        expect(@provider).not_to receive(:shell_out_compacted!)
         @provider.modify_group_members
       end
     end
@@ -89,12 +89,12 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
     describe "when the resource specifies group members" do
       it "should log an appropriate debug message" do
         expect(logger).to receive(:trace).with("group[wheel] setting group members to: lobster, rage, fist")
-        allow(@provider).to receive(:shell_out!)
+        allow(@provider).to receive(:shell_out_compacted!)
         @provider.modify_group_members
       end
 
       it "should run gpasswd with the members joined by ',' followed by the target group" do
-        expect(@provider).to receive(:shell_out!).with("gpasswd", "-M", "lobster,rage,fist", "wheel")
+        expect(@provider).to receive(:shell_out_compacted!).with("gpasswd", "-M", "lobster,rage,fist", "wheel")
         @provider.modify_group_members
       end
 
@@ -107,9 +107,9 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
 
         it "should run gpasswd individually for each user when the append option is set" do
           @new_resource.append(true)
-          expect(@provider).to receive(:shell_out!).with("gpasswd", "-a", "lobster", "wheel")
-          expect(@provider).to receive(:shell_out!).with("gpasswd", "-a", "rage", "wheel")
-          expect(@provider).to receive(:shell_out!).with("gpasswd", "-a", "fist", "wheel")
+          expect(@provider).to receive(:shell_out_compacted!).with("gpasswd", "-a", "lobster", "wheel")
+          expect(@provider).to receive(:shell_out_compacted!).with("gpasswd", "-a", "rage", "wheel")
+          expect(@provider).to receive(:shell_out_compacted!).with("gpasswd", "-a", "fist", "wheel")
           @provider.modify_group_members
         end
       end

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

@@ -108,14 +108,14 @@ describe Chef::Provider::Group::Groupadd do
 
   describe "#create_group" do
     before do
-      allow(provider).to receive(:shell_out!).and_return(true)
+      allow(provider).to receive(:shell_out_compacted!).and_return(true)
       allow(provider).to receive(:set_options).and_return("monkey")
       allow(provider).to receive(:groupadd_options).and_return([])
       allow(provider).to receive(:modify_group_members).and_return(true)
     end
 
     it "should run groupadd with the return of set_options" do
-      expect(provider).to receive(:shell_out!).with("groupadd", "monkey").and_return(true)
+      expect(provider).to receive(:shell_out_compacted!).with("groupadd", "monkey").and_return(true)
       provider.create_group
     end
 
@@ -127,13 +127,13 @@ describe Chef::Provider::Group::Groupadd do
 
   describe "#manage_group" do
     before do
-      allow(provider).to receive(:shell_out!).and_return(true)
+      allow(provider).to receive(:shell_out_compacted!).and_return(true)
       allow(provider).to receive(:set_options).and_return("monkey")
     end
 
     it "should run groupmod with the return of set_options" do
       allow(provider).to receive(:modify_group_members).and_return(true)
-      expect(provider).to receive(:shell_out!).with("groupmod", "monkey").and_return(true)
+      expect(provider).to receive(:shell_out_compacted!).with("groupmod", "monkey").and_return(true)
       provider.manage_group
     end
 
@@ -145,12 +145,12 @@ describe Chef::Provider::Group::Groupadd do
 
   describe "#remove_group" do
     before do
-      allow(provider).to receive(:shell_out!).and_return(true)
+      allow(provider).to receive(:shell_out_compacted!).and_return(true)
       allow(provider).to receive(:set_options).and_return("monkey")
     end
 
     it "should run groupdel with the new resources group name" do
-      expect(provider).to receive(:shell_out!).with("groupdel", "aj").and_return(true)
+      expect(provider).to receive(:shell_out_compacted!).with("groupdel", "aj").and_return(true)
       provider.remove_group
     end
   end
@@ -163,7 +163,7 @@ describe Chef::Provider::Group::Groupadd do
 
   describe "#load_current_resource" do
     before do
-      allow(provider).to receive(:shell_out!).and_return(true)
+      allow(provider).to receive(:shell_out_compacted!).and_return(true)
       allow(provider).to receive(:set_options).and_return("monkey")
     end
 

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

@@ -65,9 +65,9 @@ describe Chef::Provider::Group::Groupmod do
 
         it "logs a message and sets group's members to 'none', then removes existing group members" do
           expect(logger).to receive(:trace).with("group[wheel] setting group members to: none")
-          expect(@provider).to receive(:shell_out!).with("group", "mod", "-n", "wheel_bak", "wheel")
-          expect(@provider).to receive(:shell_out!).with("group", "add", "-g", "123", "-o", "wheel")
-          expect(@provider).to receive(:shell_out!).with("group", "del", "wheel_bak")
+          expect(@provider).to receive(:shell_out_compacted!).with("group", "mod", "-n", "wheel_bak", "wheel")
+          expect(@provider).to receive(:shell_out_compacted!).with("group", "add", "-g", "123", "-o", "wheel")
+          expect(@provider).to receive(:shell_out_compacted!).with("group", "del", "wheel_bak")
           @provider.manage_group
         end
       end
@@ -80,7 +80,7 @@ describe Chef::Provider::Group::Groupmod do
 
         it "logs a message and does not modify group membership" do
           expect(logger).to receive(:trace).with("group[wheel] not changing group members, the group has no members to add")
-          expect(@provider).not_to receive(:shell_out!)
+          expect(@provider).not_to receive(:shell_out_compacted!)
           @provider.manage_group
         end
       end
@@ -93,10 +93,10 @@ describe Chef::Provider::Group::Groupmod do
 
         it "updates group membership correctly" do
           allow(logger).to receive(:trace)
-          expect(@provider).to receive(:shell_out!).with("group", "mod", "-n", "wheel_bak", "wheel")
-          expect(@provider).to receive(:shell_out!).with("user", "mod", "-G", "wheel", "lobster")
-          expect(@provider).to receive(:shell_out!).with("group", "add", "-g", "123", "-o", "wheel")
-          expect(@provider).to receive(:shell_out!).with("group", "del", "wheel_bak")
+          expect(@provider).to receive(:shell_out_compacted!).with("group", "mod", "-n", "wheel_bak", "wheel")
+          expect(@provider).to receive(:shell_out_compacted!).with("user", "mod", "-G", "wheel", "lobster")
+          expect(@provider).to receive(:shell_out_compacted!).with("group", "add", "-g", "123", "-o", "wheel")
+          expect(@provider).to receive(:shell_out_compacted!).with("group", "del", "wheel_bak")
           @provider.manage_group
         end
       end
@@ -111,10 +111,10 @@ describe Chef::Provider::Group::Groupmod do
       end
 
       it "should run a group add command and some user mod commands" do
-        expect(@provider).to receive(:shell_out!).with("group", "add", "-g", "123", "wheel")
-        expect(@provider).to receive(:shell_out!).with("user", "mod", "-G", "wheel", "lobster")
-        expect(@provider).to receive(:shell_out!).with("user", "mod", "-G", "wheel", "rage")
-        expect(@provider).to receive(:shell_out!).with("user", "mod", "-G", "wheel", "fist")
+        expect(@provider).to receive(:shell_out_compacted!).with("group", "add", "-g", "123", "wheel")
+        expect(@provider).to receive(:shell_out_compacted!).with("user", "mod", "-G", "wheel", "lobster")
+        expect(@provider).to receive(:shell_out_compacted!).with("user", "mod", "-G", "wheel", "rage")
+        expect(@provider).to receive(:shell_out_compacted!).with("user", "mod", "-G", "wheel", "fist")
         @provider.create_group
       end
     end
@@ -128,7 +128,7 @@ describe Chef::Provider::Group::Groupmod do
       end
 
       it "should run a group del command" do
-        expect(@provider).to receive(:shell_out!).with("group", "del", "wheel")
+        expect(@provider).to receive(:shell_out_compacted!).with("group", "del", "wheel")
         @provider.remove_group
       end
     end

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

@@ -52,7 +52,7 @@ describe Chef::Provider::Group::Pw do
   describe "when creating a group" do
     it "should run pw groupadd with the return of set_options and set_members_option" do
       @new_resource.gid(23)
-      expect(@provider).to receive(:shell_out!).with("pw", "groupadd", "wheel", "-g", "23", "-M", "root,aj").and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with("pw", "groupadd", "wheel", "-g", "23", "-M", "root,aj").and_return(true)
       @provider.create_group
     end
   end
@@ -62,8 +62,8 @@ describe Chef::Provider::Group::Pw do
     it "should run pw groupmod with the return of set_options" do
       @new_resource.gid(42)
       @new_resource.members(["someone"])
-      expect(@provider).to receive(:shell_out!).with("pw", "groupmod", "wheel", "-g", "42", "-m", "someone").and_return(true)
-      expect(@provider).to receive(:shell_out!).with("pw", "groupmod", "wheel", "-g", "42", "-d", "root,aj").and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with("pw", "groupmod", "wheel", "-g", "42", "-m", "someone").and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with("pw", "groupmod", "wheel", "-g", "42", "-d", "root,aj").and_return(true)
       @provider.manage_group
     end
 
@@ -71,7 +71,7 @@ describe Chef::Provider::Group::Pw do
 
   describe "when removing the group" do
     it "should run pw groupdel with the new resources group name" do
-      expect(@provider).to receive(:shell_out!).with("pw", "groupdel", "wheel").and_return(true)
+      expect(@provider).to receive(:shell_out_compacted!).with("pw", "groupdel", "wheel").and_return(true)
       @provider.remove_group
     end
   end

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

@@ -76,14 +76,14 @@ describe Chef::Provider::Group::Suse do
 
   describe "#add_member" do
     it "should call out to groupmod to add user" do
-      expect(provider).to receive(:shell_out!).with("groupmod", "-A", "new_user", "new_group")
+      expect(provider).to receive(:shell_out_compacted!).with("groupmod", "-A", "new_user", "new_group")
       provider.add_member("new_user")
     end
   end
 
   describe "#remove_member" do
     it "should call out to groupmod to remove user" do
-      expect(provider).to receive(:shell_out!).with("groupmod", "-R", "new_user", "new_group")
+      expect(provider).to receive(:shell_out_compacted!).with("groupmod", "-R", "new_user", "new_group")
       provider.remove_member("new_user")
     end
   end

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

@@ -39,7 +39,7 @@ describe Chef::Provider::Group::Usermod do
       end
 
       it "should log an appropriate message" do
-        expect(@provider).not_to receive(:shell_out!)
+        expect(@provider).not_to receive(:shell_out_compacted!)
         @provider.modify_group_members
       end
     end
@@ -85,9 +85,9 @@ describe Chef::Provider::Group::Usermod do
           @provider.current_resource = current_resource
           @node.automatic_attrs[:platform] = platform
           @new_resource.append(true)
-          expect(@provider).to receive(:shell_out!).with("usermod", *flags, "wheel", "all")
-          expect(@provider).to receive(:shell_out!).with("usermod", *flags, "wheel", "your")
-          expect(@provider).to receive(:shell_out!).with("usermod", *flags, "wheel", "base")
+          expect(@provider).to receive(:shell_out_compacted!).with("usermod", *flags, "wheel", "all")
+          expect(@provider).to receive(:shell_out_compacted!).with("usermod", *flags, "wheel", "your")
+          expect(@provider).to receive(:shell_out_compacted!).with("usermod", *flags, "wheel", "base")
           @provider.modify_group_members
         end
       end

data/spec/unit/provider/group_spec.rb

@@ -37,9 +37,9 @@ describe Chef::Provider::User do
     @provider.current_resource = @current_resource
 
     @pw_group = double("Struct::Group",
-      :name => "wheel",
-      :gid => 20,
-      :mem => %w{root aj}
+      name: "wheel",
+      gid: 20,
+      mem: %w{root aj}
       )
     allow(Etc).to receive(:getgrnam).with("wheel").and_return(@pw_group)
   end

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

@@ -22,16 +22,16 @@ require "chef/exceptions"
 describe Chef::Provider::Ifconfig::Aix do
 
   before(:all) do
-    @ifconfig_output = <<-IFCONFIG
-en1: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN>
-        inet 10.153.11.59 netmask 0xffff0000 broadcast 10.153.255.255
-         tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
-en0: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN> metric 1
-        inet 172.29.174.58 netmask 0xffffc000 broadcast 172.29.191.255
-         tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
-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_output = <<~IFCONFIG
+      en1: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN>
+              inet 10.153.11.59 netmask 0xffff0000 broadcast 10.153.255.255
+               tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
+      en0: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN> metric 1
+              inet 172.29.174.58 netmask 0xffffc000 broadcast 172.29.191.255
+               tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
+      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
   end
 
@@ -49,7 +49,7 @@ IFCONFIG
   describe "#load_current_resource" do
     before do
       @status = double(stdout: @ifconfig_output, exitstatus: 0)
-      allow(@provider).to receive(:shell_out).and_return(@status)
+      allow(@provider).to receive(:shell_out_compacted).and_return(@status)
       @new_resource.device "en0"
     end
 
@@ -72,7 +72,7 @@ IFCONFIG
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
       command = "chdev -l #{@new_resource.device} -a netaddr=#{@new_resource.name}"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
 
       @provider.run_action(:add)
       expect(@new_resource).to be_updated
@@ -98,7 +98,7 @@ IFCONFIG
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
       command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
-      expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+      expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
 
       @provider.run_action(:enable)
       expect(@new_resource).to be_updated
@@ -114,7 +114,7 @@ IFCONFIG
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
-      expect(@provider).not_to receive(:shell_out!)
+      expect(@provider).not_to receive(:shell_out_compacted!)
 
       @provider.run_action(:disable)
       expect(@new_resource).not_to be_updated
@@ -133,7 +133,7 @@ IFCONFIG
 
       it "should disable an interface if it exists" do
         command = "ifconfig #{@new_resource.device} down"
-        expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+        expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
 
         @provider.run_action(:disable)
         expect(@new_resource).to be_updated
@@ -151,7 +151,7 @@ IFCONFIG
         @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
-      expect(@provider).not_to receive(:shell_out!)
+      expect(@provider).not_to receive(:shell_out_compacted!)
 
       @provider.run_action(:delete)
       expect(@new_resource).not_to be_updated
@@ -170,7 +170,7 @@ IFCONFIG
 
       it "should delete an interface if it exists" do
         command = "chdev -l #{@new_resource.device} -a state=down"
-        expect(@provider).to receive(:shell_out!).with(*command.split(" "))
+        expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
 
         @provider.run_action(:delete)
         expect(@new_resource).to be_updated

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

@@ -119,10 +119,10 @@ describe Chef::Provider::Ifconfig::Debian do
 
       context "when the /etc/network/interfaces file has the source line" do
         let(:expected_string) do
-          <<-EOF
-a line
-source #{tempdir_path}/*
-another line
+          <<~EOF
+            a line
+            source #{tempdir_path}/*
+            another line
 EOF
         end
 
@@ -142,10 +142,10 @@ EOF
 
       context "when the /etc/network/interfaces file does not have the source line" do
         let(:expected_string) do
-          <<-EOF
-a line
-another line
-source #{tempdir_path}/*
+          <<~EOF
+            a line
+            another line
+            source #{tempdir_path}/*
 EOF
         end
 
@@ -246,10 +246,10 @@ EOF
 
         context "when the /etc/network/interfaces file has the source line" do
           let(:expected_string) do
-            <<-EOF
-a line
-source #{tempdir_path}/*
-another line
+            <<~EOF
+              a line
+              source #{tempdir_path}/*
+              another line
             EOF
           end
 
@@ -267,10 +267,10 @@ another line
 
         context "when the /etc/network/interfaces file does not have the source line" do
           let(:expected_string) do
-            <<-EOF
-a line
-another line
-source #{tempdir_path}/*
+            <<~EOF
+              a line
+              another line
+              source #{tempdir_path}/*
             EOF
           end