chef 12.0.3 → 12.1.0.rc.0

data/spec/unit/provider/remote_file/ftp_spec.rb

@@ -60,7 +60,7 @@ describe Chef::Provider::RemoteFile::FTP do
   let(:uri) { URI.parse("ftp://opscode.com/seattle.txt") }
 
   before(:each) do
-    allow(Net::FTP).to receive(:new).with().and_return(ftp)
+    allow(Net::FTP).to receive(:new).with(no_args).and_return(ftp)
     allow(Tempfile).to receive(:new).and_return(tempfile)
   end
 
@@ -89,13 +89,13 @@ describe Chef::Provider::RemoteFile::FTP do
     it "does not use passive mode when new_resource sets ftp_active_mode to true" do
       new_resource.ftp_active_mode(true)
       fetcher = Chef::Provider::RemoteFile::FTP.new(uri, new_resource, current_resource)
-      expect(fetcher.use_passive_mode?).to be_false
+      expect(fetcher.use_passive_mode?).to be_falsey
     end
 
     it "uses passive mode when new_resource sets ftp_active_mode to false" do
       new_resource.ftp_active_mode(false)
       fetcher = Chef::Provider::RemoteFile::FTP.new(uri, new_resource, current_resource)
-      expect(fetcher.use_passive_mode?).to be_true
+      expect(fetcher.use_passive_mode?).to be_truthy
     end
   end
 

data/spec/unit/provider/route_spec.rb

@@ -65,7 +65,7 @@ describe Chef::Provider::Route do
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
-        expect(provider.is_running).to be_false
+        expect(provider.is_running).to be_falsey
       end
 
       it "should detect existing routes and set is_running attribute correctly" do
@@ -75,7 +75,7 @@ describe Chef::Provider::Route do
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
-        expect(provider.is_running).to be_true
+        expect(provider.is_running).to be_truthy
       end
 
       it "should use gateway value when matching routes" do
@@ -85,7 +85,7 @@ describe Chef::Provider::Route do
         provider = Chef::Provider::Route.new(resource, @run_context)
 
         provider.load_current_resource
-        expect(provider.is_running).to be_false
+        expect(provider.is_running).to be_falsey
       end
     end
   end

data/spec/unit/provider/script_spec.rb

@@ -19,77 +19,95 @@
 require 'spec_helper'
 
 describe Chef::Provider::Script, "action_run" do
-  before(:each) do
-    @node = Chef::Node.new
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, {}, @events)
-    @new_resource = Chef::Resource::Script.new('run some perl code')
-    @new_resource.code "$| = 1; print 'i like beans'"
-    @new_resource.interpreter 'perl'
+  let(:node) { Chef::Node.new }
+
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+
+  let(:new_resource) {
+    new_resource = Chef::Resource::Script.new('run some perl code')
+    new_resource.code "$| = 1; print 'i like beans'"
+    new_resource.interpreter 'perl'
+    new_resource
+  }
 
-    @provider = Chef::Provider::Script.new(@new_resource, @run_context)
+  let(:provider) { Chef::Provider::Script.new(new_resource, run_context) }
 
-    @script_file = StringIO.new
-    allow(@script_file).to receive(:path).and_return('/tmp/the_script_file')
+  let(:tempfile) { Tempfile.open("rspec-provider-script") }
 
-    allow(@provider).to receive(:shell_out!).and_return(true)
+  before(:each) do
+    allow(provider).to receive(:shell_out!).and_return(true)
+    allow(provider).to receive(:script_file).and_return(tempfile)
   end
 
-  it "creates a temporary file to store the script" do
-    expect(@provider.script_file).to be_an_instance_of(Tempfile)
+  context "#script_file" do
+    it "creates a temporary file to store the script" do
+      allow(provider).to receive(:script_file).and_call_original
+      expect(provider.script_file).to be_an_instance_of(Tempfile)
+    end
   end
 
-  it "unlinks the tempfile when finished" do
-    tempfile_path = @provider.script_file.path
-    @provider.unlink_script_file
-    expect(File.exist?(tempfile_path)).to be_false
+  context "#unlink_script_file" do
+    it "unlinks the tempfile" do
+      tempfile_path = tempfile.path
+      provider.unlink_script_file
+      expect(File.exist?(tempfile_path)).to be false
+    end
   end
 
-  it "sets the owner and group for the script file" do
-    @new_resource.user 'toor'
-    @new_resource.group 'wheel'
-    allow(@provider).to receive(:script_file).and_return(@script_file)
-    expect(FileUtils).to receive(:chown).with('toor', 'wheel', "/tmp/the_script_file")
-    @provider.set_owner_and_group
+  context "#set_owner_and_group" do
+    it "sets the owner and group for the script file" do
+      new_resource.user 'toor'
+      new_resource.group 'wheel'
+      expect(FileUtils).to receive(:chown).with('toor', 'wheel', tempfile.path)
+      provider.set_owner_and_group
+    end
   end
 
   context "with the script file set to the correct owner and group" do
     before do
-      allow(@provider).to receive(:set_owner_and_group)
-      allow(@provider).to receive(:script_file).and_return(@script_file)
+      allow(provider).to receive(:set_owner_and_group)
     end
+
     describe "when writing the script to the file" do
       it "should put the contents of the script in the temp file" do
-        @provider.action_run
-        @script_file.rewind
-        expect(@script_file.string).to eq("$| = 1; print 'i like beans'\n")
+        allow(provider).to receive(:unlink_script_file)  # stub to avoid remove
+        provider.action_run
+        expect(IO.read(tempfile.path)).to eq("$| = 1; print 'i like beans'\n")
+        provider.unlink_script_file
       end
 
       it "closes before executing the script and unlinks it when finished" do
-        @provider.action_run
-        expect(@script_file).to be_closed
+        tempfile_path = tempfile.path
+        provider.action_run
+        expect(tempfile).to be_closed
+        expect(File.exist?(tempfile_path)).to be false
       end
-
     end
 
     describe "when running the script" do
-      it 'should set the command to "interpreter"  "tempfile"' do
-        @provider.action_run
-        expect(@new_resource.command).to eq('"perl"  "/tmp/the_script_file"')
-      end
+      let (:default_opts) {
+        {timeout: 3600, returns: 0, log_level: :info, log_tag: "script[run some perl code]", live_stream: STDOUT}
+      }
 
-      describe "with flags set on the resource" do
-        before do
-          @new_resource.flags '-f'
-        end
+      before do
+        allow(STDOUT).to receive(:tty?).and_return(true)
+      end
 
-        it "should set the command to 'interpreter flags tempfile'" do
-          @provider.action_run
-          expect(@new_resource.command).to eq('"perl" -f "/tmp/the_script_file"')
-        end
+      it 'should set the command to "interpreter"  "tempfile"' do
+        expect(provider.command).to eq(%Q{"perl"  "#{tempfile.path}"})
+      end
 
+      it 'should call shell_out! with the command' do
+        expect(provider).to receive(:shell_out!).with(provider.command, default_opts).and_return(true)
+        provider.action_run
       end
 
+      it "should set the command to 'interpreter flags tempfile'" do
+        new_resource.flags '-f'
+        expect(provider.command).to eq(%Q{"perl" -f "#{tempfile.path}"})
+      end
     end
   end
 

data/spec/unit/provider/service/aix_service_spec.rb

@@ -55,7 +55,7 @@ describe Chef::Provider::Service::Aix do
         expect(@provider).to receive(:is_resource_group?).with(["chef chef 12345 active"])
 
         @provider.load_current_resource
-        expect(@current_resource.running).to be_true
+        expect(@current_resource.running).to be_truthy
       end
     end
 
@@ -69,7 +69,7 @@ describe Chef::Provider::Service::Aix do
         expect(@provider).to receive(:is_resource_group?).with(["chef chef inoperative"])
 
         @provider.load_current_resource
-        expect(@current_resource.running).to be_false
+        expect(@current_resource.running).to be_falsey
       end
     end
   end
@@ -83,7 +83,7 @@ describe Chef::Provider::Service::Aix do
       it "service is a group" do
         expect(@provider).to receive(:shell_out!).with("lssrc -a | grep -w chef").and_return(@status)
         @provider.load_current_resource
-        expect(@provider.instance_eval("@is_resource_group")).to be_true
+        expect(@provider.instance_eval("@is_resource_group")).to be_truthy
       end
     end
 
@@ -95,7 +95,7 @@ describe Chef::Provider::Service::Aix do
       it "service is a group" do
         expect(@provider).to receive(:shell_out!).with("lssrc -a | grep -w chef").and_return(@status)
         @provider.load_current_resource
-        expect(@provider.instance_eval("@is_resource_group")).to be_true
+        expect(@provider.instance_eval("@is_resource_group")).to be_truthy
       end
     end
 
@@ -107,7 +107,7 @@ describe Chef::Provider::Service::Aix do
       it "service is a subsystem" do
         expect(@provider).to receive(:shell_out!).with("lssrc -a | grep -w chef").and_return(@status)
         @provider.load_current_resource
-        expect(@provider.instance_eval("@is_resource_group")).to be_false
+        expect(@provider.instance_eval("@is_resource_group")).to be_falsey
       end
     end
   end

data/spec/unit/provider/service/arch_service_spec.rb

@@ -62,19 +62,19 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
     it "should set running to true if the status command returns 0" do
       allow(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 0))
       @provider.load_current_resource
-      expect(@provider.current_resource.running).to be_true
+      expect(@provider.current_resource.running).to be_truthy
     end
 
     it "should set running to false if the status command returns anything except 0" do
       allow(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_return(OpenStruct.new(:exitstatus => 1))
       @provider.load_current_resource
-      expect(@provider.current_resource.running).to be_false
+      expect(@provider.current_resource.running).to be_falsey
     end
 
     it "should set running to false if the status command raises" do
       allow(@provider).to receive(:shell_out).with("/etc/rc.d/chef status").and_raise(Mixlib::ShellOut::ShellCommandFailed)
       @provider.load_current_resource
-      expect(@provider.current_resource.running).to be_false
+      expect(@provider.current_resource.running).to be_falsey
     end
 
   end
@@ -135,13 +135,13 @@ aj        7842  5057  0 21:26 pts/2    00:00:06 poos
 RUNNING_PS
       allow(@status).to receive(:stdout).and_return(@stdout)
       @provider.load_current_resource
-      expect(@provider.current_resource.running).to be_true
+      expect(@provider.current_resource.running).to be_truthy
     end
 
     it "determines the service is not running when it does not appear in ps" do
       allow(@provider).to receive(:shell_out!).and_return(@status)
       @provider.load_current_resource
-      expect(@provider.current_resource.running).to be_false
+      expect(@provider.current_resource.running).to be_falsey
     end
 
     it "should raise an exception if ps fails" do

data/spec/unit/provider/service/debian_service_spec.rb

@@ -67,13 +67,13 @@ describe Chef::Provider::Service::Debian do
       end
 
       it "says the service is enabled" do
-        expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_true
+        expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_truthy
       end
 
       it "stores the 'enabled' state" do
         allow(Chef::Resource::Service).to receive(:new).and_return(@current_resource)
         expect(@provider.load_current_resource).to equal(@current_resource)
-        expect(@current_resource.enabled).to be_true
+        expect(@current_resource.enabled).to be_truthy
       end
     end
 
@@ -90,13 +90,13 @@ describe Chef::Provider::Service::Debian do
       end
 
       it "says the service is disabled" do
-        expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_false
+        expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_falsey
       end
 
       it "stores the 'disabled' state" do
         allow(Chef::Resource::Service).to receive(:new).and_return(@current_resource)
         expect(@provider.load_current_resource).to equal(@current_resource)
-        expect(@current_resource.enabled).to be_false
+        expect(@current_resource.enabled).to be_falsey
       end
     end
 
@@ -206,13 +206,13 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
           end
 
           it "says the service is enabled" do
-            expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_true
+            expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_truthy
           end
 
           it "stores the 'enabled' state" do
             allow(Chef::Resource::Service).to receive(:new).and_return(@current_resource)
             expect(@provider.load_current_resource).to equal(@current_resource)
-            expect(@current_resource.enabled).to be_true
+            expect(@current_resource.enabled).to be_truthy
           end
 
           it "stores the start/stop priorities of the service" do
@@ -232,13 +232,13 @@ insserv: dryrun, not creating .depend.boot, .depend.start, and .depend.stop
           end
 
           it "says the service is disabled" do
-            expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_false
+            expect(@provider.service_currently_enabled?(@provider.get_priority)).to be_falsey
           end
 
           it "stores the 'disabled' state" do
             allow(Chef::Resource::Service).to receive(:new).and_return(@current_resource)
             expect(@provider.load_current_resource).to equal(@current_resource)
-            expect(@current_resource.enabled).to be_false
+            expect(@current_resource.enabled).to be_falsey
           end
         end
       end

data/spec/unit/provider/service/freebsd_service_spec.rb

@@ -172,14 +172,14 @@ PS_SAMPLE
         it "should set running to true" do
           allow(provider).to receive(:shell_out!).and_return(status)
           provider.determine_current_status!
-          expect(current_resource.running).to be_true
+          expect(current_resource.running).to be_truthy
         end
       end
 
       it "should set running to false if the regex doesn't match" do
         allow(provider).to receive(:shell_out!).and_return(status)
         provider.determine_current_status!
-        expect(current_resource.running).to be_false
+        expect(current_resource.running).to be_falsey
       end
 
       it "should set running to nil if ps fails" do
@@ -580,6 +580,13 @@ EOF
       expect(provider).not_to receive(:write_rc_conf)
       provider.enable_service
     end
+
+    it "should remove commented out versions of it being enabled" do
+      allow(current_resource).to receive(:enabled).and_return(false)
+      expect(provider).to receive(:read_rc_conf).and_return([ "foo", "bar", "\# #{new_resource.service_name}_enable=\"YES\"", "\# #{new_resource.service_name}_enable=\"NO\""])
+      expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""])
+      provider.enable_service()
+    end
   end
 
   describe Chef::Provider::Service::Freebsd, "disable_service" do
@@ -607,5 +614,12 @@ EOF
       expect(provider).not_to receive(:write_rc_conf)
       provider.disable_service()
     end
+
+    it "should remove commented out versions of it being disabled or enabled" do
+      allow(current_resource).to receive(:enabled).and_return(true)
+      expect(provider).to receive(:read_rc_conf).and_return([ "foo", "bar", "\# #{new_resource.service_name}_enable=\"YES\"", "\# #{new_resource.service_name}_enable=\"NO\""])
+      expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"NO\""])
+      provider.disable_service()
+    end
   end
 end

data/spec/unit/provider/service/gentoo_service_spec.rb

@@ -48,13 +48,13 @@ describe Chef::Provider::Service::Gentoo do
 
     it "should track when service file is not found in /etc/runlevels" do
       @provider.load_current_resource
-      expect(@provider.instance_variable_get("@found_script")).to be_false
+      expect(@provider.instance_variable_get("@found_script")).to be_falsey
     end
 
     it "should track when service file is found in /etc/runlevels/**/" do
       allow(Dir).to receive(:glob).with("/etc/runlevels/**/chef").and_return(["/etc/runlevels/default/chef"])
       @provider.load_current_resource
-      expect(@provider.instance_variable_get("@found_script")).to be_true
+      expect(@provider.instance_variable_get("@found_script")).to be_truthy
     end
 
     describe "when detecting the service enable state" do
@@ -70,7 +70,7 @@ describe Chef::Provider::Service::Gentoo do
           end
           it "should set enabled to true" do
             @provider.load_current_resource
-            expect(@current_resource.enabled).to be_true
+            expect(@current_resource.enabled).to be_truthy
           end
         end
 
@@ -82,7 +82,7 @@ describe Chef::Provider::Service::Gentoo do
 
           it "should set enabled to false" do
             @provider.load_current_resource
-            expect(@current_resource.enabled).to be_false
+            expect(@current_resource.enabled).to be_falsey
           end
         end
 
@@ -94,7 +94,7 @@ describe Chef::Provider::Service::Gentoo do
 
           it "should set enabled to false" do
             @provider.load_current_resource
-            expect(@current_resource.enabled).to be_false
+            expect(@current_resource.enabled).to be_falsey
           end
 
         end
@@ -108,17 +108,17 @@ describe Chef::Provider::Service::Gentoo do
 
     it "should support the status command automatically" do
       @provider.load_current_resource
-      expect(@new_resource.supports[:status]).to be_true
+      expect(@new_resource.supports[:status]).to be_truthy
     end
 
     it "should support the restart command automatically" do
       @provider.load_current_resource
-      expect(@new_resource.supports[:restart]).to be_true
+      expect(@new_resource.supports[:restart]).to be_truthy
     end
 
     it "should not support the reload command automatically" do
       @provider.load_current_resource
-      expect(@new_resource.supports[:reload]).not_to be_true
+      expect(@new_resource.supports[:reload]).not_to be_truthy
     end
 
   end

data/spec/unit/provider/service/init_service_spec.rb

@@ -64,20 +64,20 @@ PS
     it "should set running to true if the status command returns 0" do
       allow(@provider).to receive(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
       @provider.load_current_resource
-      expect(@current_resource.running).to be_true
+      expect(@current_resource.running).to be_truthy
     end
 
     it "should set running to false if the status command returns anything except 0" do
       allow(@status).to receive(:exitstatus).and_return(1)
       allow(@provider).to receive(:shell_out).with("/etc/init.d/#{@current_resource.service_name} status").and_return(@status)
       @provider.load_current_resource
-      expect(@current_resource.running).to be_false
+      expect(@current_resource.running).to be_falsey
     end
 
     it "should set running to false if the status command raises" do
       allow(@provider).to receive(:shell_out).and_raise(Mixlib::ShellOut::ShellCommandFailed)
       @provider.load_current_resource
-      expect(@current_resource.running).to be_false
+      expect(@current_resource.running).to be_falsey
     end
   end
 
@@ -139,13 +139,13 @@ aj        7842  5057  0 21:26 pts/2    00:00:06 poos
 RUNNING_PS
       allow(@status).to receive(:stdout).and_return(@stdout)
       @provider.load_current_resource
-      expect(@current_resource.running).to be_true
+      expect(@current_resource.running).to be_truthy
     end
 
     it "should set running to false if the regex doesn't match" do
       allow(@provider).to receive(:shell_out!).and_return(@status)
       @provider.load_current_resource
-      expect(@current_resource.running).to be_false
+      expect(@current_resource.running).to be_falsey
     end
 
     it "should raise an exception if ps fails" do