chef 11.12.0.alpha.1 → 11.12.0.rc.1

data/spec/unit/policy_builder/expand_node_object_spec.rb

@@ -244,7 +244,7 @@ describe Chef::PolicyBuilder::ExpandNodeObject do
 
       it "sets the override run_list on the node" do
         expect(node.run_list).to eq([override_runlist])
-        expect(policy_builder.original_runlist).to eq(primary_runlist)
+        expect(node.primary_runlist).to eq(primary_runlist)
       end
 
       it "reports that a temporary policy is being used" do

data/spec/unit/provider/cron_spec.rb

@@ -19,15 +19,137 @@
 require 'spec_helper'
 
 describe Chef::Provider::Cron do
+  describe "when with special time string" do
+    before do
+      @node = Chef::Node.new
+      @events = Chef::EventDispatch::Dispatcher.new
+      @run_context = Chef::RunContext.new(@node, {}, @events)
+      
+      @new_resource = Chef::Resource::Cron.new("cronhole some stuff", @run_context)
+      @new_resource.user "root"
+      @new_resource.minute "30"
+      @new_resource.command "/bin/true"
+      @new_resource.time :reboot
+      @provider = Chef::Provider::Cron.new(@new_resource, @run_context)
+    end
+    
+    context "with a matching entry in the user's crontab" do
+      before :each do
+        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+0 2 * * * /some/other/command
+
+# Chef Name: cronhole some stuff
+@reboot /bin/true param1 param2
+# Chef Name: something else
+2 * 1 * * /bin/false
+
+# Another comment
+CRONTAB
+      end
+      
+      it "should set cron_exists" do
+        @provider.load_current_resource
+        @provider.cron_exists.should == true
+        @provider.cron_empty.should == false
+      end
+
+      it "should pull the details out of the cron line" do
+        cron = @provider.load_current_resource
+        cron.time.should == :reboot
+        cron.command.should == '/bin/true param1 param2'
+      end
+
+      it "should pull env vars out" do
+        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+0 2 * * * /some/other/command
+
+# Chef Name: cronhole some stuff
+MAILTO=foo@example.com
+SHELL=/bin/foosh
+PATH=/bin:/foo
+HOME=/home/foo
+@reboot /bin/true param1 param2
+# Chef Name: something else
+2 * 1 * * /bin/false
+
+# Another comment
+CRONTAB
+        cron = @provider.load_current_resource
+        cron.mailto.should == 'foo@example.com'
+        cron.shell.should == '/bin/foosh'
+        cron.path.should == '/bin:/foo'
+        cron.home.should == '/home/foo'
+        cron.time.should == :reboot
+        cron.command.should == '/bin/true param1 param2'
+      end
+
+      it "should parse and load generic and standard environment variables from cron entry" do
+        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+# Chef Name: cronhole some stuff
+MAILTO=warn@example.com
+TEST=lol
+FLAG=1
+@reboot /bin/true
+CRONTAB
+        cron = @provider.load_current_resource
+
+        cron.mailto.should == "warn@example.com"
+        cron.environment.should == {"TEST" => "lol", "FLAG" => "1"}
+      end
+
+      it "should not break with variables that match the cron resource internals" do
+        @provider.stub!(:read_crontab).and_return(<<-CRONTAB)
+# Chef Name: cronhole some stuff
+MINUTE=40
+REBOOT=midnight
+TEST=lol
+ENVIRONMENT=production
+@reboot /bin/true
+CRONTAB
+        cron = @provider.load_current_resource
+
+        cron.time.should == :reboot
+        cron.environment.should == {"MINUTE" => "40", "REBOOT" => "midnight", "TEST" => "lol", "ENVIRONMENT" => "production"}
+      end
+
+      it "should report the match" do
+        Chef::Log.should_receive(:debug).with("Found cron '#{@new_resource.name}'")
+        @provider.load_current_resource
+      end
+      
+      describe "action_create" do
+        before :each do
+          @provider.stub!(:write_crontab)
+          @provider.stub!(:read_crontab).and_return(nil)
+        end
+
+        context "when there is no existing crontab" do
+          before :each do
+            @provider.cron_exists = false
+            @provider.cron_empty = true
+          end
+    
+          it "should create a crontab with the entry" do
+            @provider.should_receive(:write_crontab).with(<<-ENDCRON)
+# Chef Name: cronhole some stuff
+@reboot /bin/true
+            ENDCRON
+            @provider.run_action(:create)
+          end
+        end
+      end
+    end
+  end
+  
   before do
     @node = Chef::Node.new
     @events = Chef::EventDispatch::Dispatcher.new
     @run_context = Chef::RunContext.new(@node, {}, @events)
+    
     @new_resource = Chef::Resource::Cron.new("cronhole some stuff", @run_context)
     @new_resource.user "root"
     @new_resource.minute "30"
     @new_resource.command "/bin/true"
-
     @provider = Chef::Provider::Cron.new(@new_resource, @run_context)
   end
 
@@ -110,6 +232,7 @@ CRONTAB
         cron.day.should == '*'
         cron.month.should == '1'
         cron.weekday.should == '*'
+        cron.time.should == nil
         cron.command.should == '/bin/true param1 param2'
       end
 
@@ -138,6 +261,7 @@ CRONTAB
         cron.day.should == '*'
         cron.month.should == '1'
         cron.weekday.should == '*'
+        cron.time.should == nil
         cron.command.should == '/bin/true param1 param2'
       end
 
@@ -227,6 +351,7 @@ CRONTAB
         cron.day.should == '*'
         cron.month.should == '*'
         cron.weekday.should == '*'
+        cron.time.should == nil
         cron.command.should == nil
       end
 
@@ -244,6 +369,7 @@ CRONTAB
         cron.day.should == '*'
         cron.month.should == '*'
         cron.weekday.should == '*'
+        cron.time.should == nil
         cron.command.should == nil
       end
 
@@ -265,6 +391,7 @@ CRONTAB
         cron.day.should == '*'
         cron.month.should == '*'
         cron.weekday.should == '*'
+        cron.time.should == nil
         cron.command.should == nil
       end
     end
@@ -286,6 +413,11 @@ CRONTAB
       end
     end
 
+    it "should return true if special time string doesn't match" do
+      @new_resource.send(:time, :reboot)
+      @provider.cron_different?.should eql(true)
+    end
+    
     it "should return true if environment doesn't match" do
       @new_resource.environment "FOO" => "something_else"
       @provider.cron_different?.should eql(true)
@@ -833,4 +965,46 @@ MAILTO=foo@example.com
     end
 
   end
+
+  describe "weekday_in_crontab" do
+    context "when weekday is symbol" do
+      it "should return weekday in crontab format" do
+        @new_resource.weekday :wednesday
+        @provider.send(:weekday_in_crontab).should eq("3")
+      end
+
+      it "should raise an error with an unknown weekday" do
+        expect { @new_resource.weekday :caturday }.to raise_error(RangeError)
+      end
+    end
+
+    context "when weekday is a number in a string" do
+      it "should return the string" do
+        @new_resource.weekday "3"
+        @provider.send(:weekday_in_crontab).should eq("3")
+      end
+
+      it "should raise an error with an out of range number" do
+        expect { @new_resource.weekday "-1" }.to raise_error(RangeError)
+      end
+    end
+
+    context "when weekday is string with the name of the week" do
+      it "should return the string" do
+        @new_resource.weekday "mon"
+        @provider.send(:weekday_in_crontab).should eq("mon")
+      end
+    end
+
+    context "when weekday is an integer" do
+      it "should return the integer" do
+        @new_resource.weekday 1
+        @provider.send(:weekday_in_crontab).should eq("1")
+      end
+
+      it "should raise an error with an out of range integer" do
+        expect { @new_resource.weekday 45 }.to raise_error(RangeError)
+      end
+    end
+  end
 end

data/spec/unit/provider/mount/mount_spec.rb

@@ -131,12 +131,27 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should set mounted true if the symlink target of the device is found in the mounts list" do
-      target = "/dev/mapper/target"
+      # expand the target path to correct specs on Windows
+      target = ::File.expand_path('/dev/mapper/target')
+
+      ::File.stub(:symlink?).with("#{@new_resource.device}").and_return(true)
+      ::File.stub(:readlink).with("#{@new_resource.device}").and_return(target)
+
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "#{target} on /tmp/foo type ext3 (rw)\n"))
+      @provider.load_current_resource()
+      @provider.current_resource.mounted.should be_true
+    end
+
+    it "should set mounted true if the symlink target of the device is relative and is found in the mounts list - CHEF-4957" do
+      target = "xsdz1"
+
+      # expand the target path to correct specs on Windows
+      absolute_target = ::File.expand_path("/dev/xsdz1")
 
       ::File.stub(:symlink?).with("#{@new_resource.device}").and_return(true)
       ::File.stub(:readlink).with("#{@new_resource.device}").and_return(target)
 
-      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "/dev/mapper/target on /tmp/foo type ext3 (rw)\n"))
+      @provider.stub(:shell_out!).and_return(OpenStruct.new(:stdout => "#{absolute_target} on /tmp/foo type ext3 (rw)\n"))
       @provider.load_current_resource()
       @provider.current_resource.mounted.should be_true
     end
@@ -199,6 +214,20 @@ describe Chef::Provider::Mount::Mount do
       @provider.current_resource.enabled.should be_true
     end
 
+    it "should set enabled to true if the symlink target is relative and is in fstab - CHEF-4957" do
+      target = "xsdz1"
+
+      ::File.stub(:symlink?).with("#{@new_resource.device}").and_return(true)
+      ::File.stub(:readlink).with("#{@new_resource.device}").and_return(target)
+
+      fstab = "/dev/sdz1  /tmp/foo ext3  defaults  1 2\n"
+
+      ::File.stub(:foreach).with("/etc/fstab").and_yield fstab
+
+      @provider.load_current_resource
+      @provider.current_resource.enabled.should be_true
+    end
+
     it "should set enabled to false if the mount point is not in fstab" do
       fstab = "/dev/sdy1  #{@new_resource.mount_point}  ext3  defaults  1 2\n"
       ::File.stub(:foreach).with("/etc/fstab").and_yield fstab
@@ -225,6 +254,7 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should not mangle the mount options if the device in fstab is a symlink" do
+      # expand the target path to correct specs on Windows
       target = "/dev/mapper/target"
       options = "rw,noexec,noauto"
 
@@ -238,7 +268,7 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should not mangle the mount options if the symlink target is in fstab" do
-      target = "/dev/mapper/target"
+      target = ::File.expand_path("/dev/mapper/target")
       options = "rw,noexec,noauto"
 
       ::File.stub(:symlink?).with(@new_resource.device).and_return(true)

data/spec/unit/provider/package/dpkg_spec.rb

@@ -72,6 +72,10 @@ describe Chef::Provider::Package::Dpkg do
       it 'if distro-specific version provided' do
         check_version('1.11.4-1ubuntu1~lucid')
       end
+
+      it 'returns the version if an epoch is used' do
+        check_version('1:1.8.3-2')
+      end
     end
 
     it "gets the source package name from dpkg-deb correctly when the package name has `-', `+' or `.' characters" do

data/spec/unit/provider/package/windows/msi_spec.rb

@@ -0,0 +1,60 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 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::Provider::Package::Windows::MSI, :windows_only do
+  let(:node) { double('Chef::Node') }
+  let(:events) { double('Chef::Events').as_null_object }  # mock all the methods
+  let(:run_context) { double('Chef::RunContext', :node => node, :events => events) }
+  let(:new_resource) { Chef::Resource::WindowsPackage.new("calculator.msi") }
+  let(:provider) { Chef::Provider::Package::Windows::MSI.new(new_resource) }
+
+  describe "expand_options" do
+    it "returns an empty string if passed no options" do
+      expect(provider.expand_options(nil)).to eql ""
+    end
+
+    it "returns a string with a leading space if passed options" do
+      expect(provider.expand_options("--train nope --town no_way")).to eql(" --train nope --town no_way")
+    end
+  end
+
+  describe "installed_version" do
+    it "returns the installed version" do
+      provider.stub(:get_product_property).and_return("{23170F69-40C1-2702-0920-000001000000}")
+      provider.stub(:get_installed_version).with("{23170F69-40C1-2702-0920-000001000000}").and_return("3.14159.1337.42")
+      expect(provider.installed_version).to eql("3.14159.1337.42")
+    end
+  end
+
+  describe "package_version" do
+    it "returns the version of a package" do
+      provider.stub(:get_product_property).with(/calculator.msi$/, "ProductVersion").and_return(42)
+      expect(provider.package_version).to eql(42)
+    end
+  end
+
+  describe "install_package" do
+    # calls shell_out!
+  end
+
+  describe "remove_package" do
+    # calls shell_out!
+  end
+end

data/spec/unit/provider/package/windows_spec.rb

@@ -0,0 +1,80 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 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::Provider::Package::Windows, :windows_only do
+  let(:node) { double('Chef::Node') }
+  let(:events) { double('Chef::Events').as_null_object }  # mock all the methods
+  let(:run_context) { double('Chef::RunContext', :node => node, :events => events) }
+  let(:new_resource) { Chef::Resource::WindowsPackage.new("calculator.msi") }
+  let(:provider) { Chef::Provider::Package::Windows.new(new_resource, run_context) }
+
+  describe "load_current_resource" do
+    before(:each) do
+      provider.stub(:package_provider).and_return(double('package_provider',
+          :installed_version => "1.0", :package_version => "2.0"))
+    end
+
+    it "creates a current resource with the name of the new resource" do
+      provider.load_current_resource
+      expect(provider.current_resource).to be_a(Chef::Resource::WindowsPackage)
+      expect(provider.current_resource.name).to eql("calculator.msi")
+    end
+
+    it "sets the current version if the package is installed" do
+      provider.load_current_resource
+      expect(provider.current_resource.version).to eql("1.0")
+    end
+
+    it "sets the version to be installed" do
+      provider.load_current_resource
+      expect(provider.new_resource.version).to eql("2.0")
+    end
+  end
+
+  describe "package_provider" do
+    it "sets the package provider to MSI if the the installer type is :msi" do
+      provider.stub(:installer_type).and_return(:msi)
+      expect(provider.package_provider).to be_a(Chef::Provider::Package::Windows::MSI)
+    end
+
+    it "raises an error if the installer_type is unknown" do
+      provider.stub(:installer_type).and_return(:apt_for_windows)
+      expect { provider.package_provider }.to raise_error
+    end
+  end
+
+  describe "installer_type" do
+    it "it returns @installer_type if it is set" do
+      provider.new_resource.installer_type("downeaster")
+      expect(provider.installer_type).to eql("downeaster")
+    end
+
+    it "sets installer_type to msi if the source ends in .msi" do
+      provider.new_resource.source("microsoft_installer.msi")
+      expect(provider.installer_type).to eql(:msi)
+    end
+
+    it "raises an error if it cannot determine the installer type" do
+      provider.new_resource.installer_type(nil)
+      provider.new_resource.source("tomfoolery.now")
+      expect { provider.installer_type }.to raise_error(ArgumentError)
+    end
+  end
+end