chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/spec/functional/resource/aix_service_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,24 +17,24 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'functional/resource/base'
-require 'chef/mixin/shell_out'
+require "spec_helper"
+require "functional/resource/base"
+require "chef/mixin/shell_out"
 
 shared_examples "src service" do
 
   include Chef::Mixin::ShellOut
 
   def service_should_be_started
-    expect(shell_out!("lssrc -a | grep #{new_resource.service_name}").stdout.split(' ').last).to eq("active")
+    expect(shell_out!("lssrc -a | grep #{new_resource.service_name}").stdout.split(" ").last).to eq("active")
   end
 
   def service_should_be_stopped
-    expect(shell_out!("lssrc -a | grep #{new_resource.service_name}").stdout.split(' ').last).to eq("inoperative")
+    expect(shell_out!("lssrc -a | grep #{new_resource.service_name}").stdout.split(" ").last).to eq("inoperative")
   end
 
   def get_service_pid
-    args = shell_out!("lssrc -a | grep #{new_resource.service_name}").stdout.split(' ')
+    args = shell_out!("lssrc -a | grep #{new_resource.service_name}").stdout.split(" ")
     if args.length == 3
       args[1]
     else
@@ -94,7 +94,6 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
       shell_out!("rmssys -s ctestsys")
     end
 
-
     let(:new_resource) do
       new_resource = Chef::Resource::Service.new("ctestsys", run_context)
       new_resource

data/spec/functional/resource/aixinit_service_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +17,10 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'functional/resource/base'
-require 'chef/mixin/shell_out'
-require 'fileutils'
+require "spec_helper"
+require "functional/resource/base"
+require "chef/mixin/shell_out"
+require "fileutils"
 
 describe Chef::Resource::Service, :requires_root, :aix_only do
 
@@ -29,17 +29,17 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
   # Platform specific validation routines.
   def service_should_be_started(file_name)
     # The existence of this file indicates that the service was started.
-    expect(File.exists?("/tmp/#{file_name}")).to be_truthy
+    expect(File.exists?("#{Dir.tmpdir}/#{file_name}")).to be_truthy
   end
 
   def service_should_be_stopped(file_name)
-    expect(File.exists?("/tmp/#{file_name}")).to be_falsey
+    expect(File.exists?("#{Dir.tmpdir}/#{file_name}")).to be_falsey
   end
 
   def valide_symlinks(expected_output, run_level = nil, status = nil, priority = nil)
     directory = []
-    if priority.is_a?Hash
-      priority.each do |level,o|
+    if priority.is_a? Hash
+      priority.each do |level, o|
         directory << "/etc/rc.d/rc#{level}.d/#{(o[0] == :start ? 'S' : 'K')}#{o[1]}#{new_resource.service_name}"
       end
       directory
@@ -51,7 +51,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
   end
 
   def delete_test_files
-    files = Dir.glob("/tmp/chefinit[a-z_]*.txt")
+    files = Dir.glob("#{Dir.tmpdir}/chefinit[a-z_]*.txt")
     File.delete(*files)
   end
 
@@ -59,7 +59,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
   let(:new_resource) do
     new_resource = Chef::Resource::Service.new("chefinittest", run_context)
     new_resource.provider Chef::Provider::Service::AixInit
-    new_resource.supports({:status => true, :restart => true, :reload => true})
+    new_resource.supports({ :status => true, :restart => true, :reload => true })
     new_resource
   end
 
@@ -70,7 +70,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
   before(:all) do
     File.delete("/etc/rc.d/init.d/chefinittest") if File.exists?("/etc/rc.d/init.d/chefinittest")
-    FileUtils.cp("#{File.join(File.dirname(__FILE__), "/../assets/chefinittest")}",  "/etc/rc.d/init.d/chefinittest")
+    FileUtils.cp("#{File.join(File.dirname(__FILE__), "/../assets/chefinittest")}", "/etc/rc.d/init.d/chefinittest")
   end
 
   after(:all) do
@@ -130,7 +130,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
     context "when the service doesn't set a priority" do
       it "creates symlink with status S" do
         new_resource.run_action(:enable)
-        valide_symlinks(["/etc/rc.d/rc2.d/Schefinittest"],2,'S')
+        valide_symlinks(["/etc/rc.d/rc2.d/Schefinittest"], 2, "S")
       end
     end
 
@@ -141,19 +141,19 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
       it "creates a symlink with status S and a priority" do
         new_resource.run_action(:enable)
-        valide_symlinks(["/etc/rc.d/rc2.d/S75chefinittest"], 2,'S',75)
+        valide_symlinks(["/etc/rc.d/rc2.d/S75chefinittest"], 2, "S", 75)
       end
     end
 
     context "when the service sets complex priorities (hash)" do
       before do
-        priority = {2 => [:start, 20], 3 => [:stop, 10]}
+        priority = { 2 => [:start, 20], 3 => [:stop, 10] }
         new_resource.priority(priority)
       end
 
       it "create symlink with status start (S) or stop (K) and a priority " do
         new_resource.run_action(:enable)
-        valide_symlinks(["/etc/rc.d/rc2.d/S20chefinittest", "/etc/rc.d/rc3.d/K10chefinittest"], 2,'S',new_resource.priority)
+        valide_symlinks(["/etc/rc.d/rc2.d/S20chefinittest", "/etc/rc.d/rc3.d/K10chefinittest"], 2, "S", new_resource.priority)
       end
     end
   end
@@ -171,7 +171,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
       it "creates symlink with status K" do
         new_resource.run_action(:disable)
-        valide_symlinks(["/etc/rc.d/rc2.d/Kchefinittest"], 2,'K')
+        valide_symlinks(["/etc/rc.d/rc2.d/Kchefinittest"], 2, "K")
       end
     end
 
@@ -187,13 +187,13 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
       it "creates a symlink with status K and a priority" do
         new_resource.run_action(:disable)
-        valide_symlinks(["/etc/rc.d/rc2.d/K25chefinittest"], 2,'K',25)
+        valide_symlinks(["/etc/rc.d/rc2.d/K25chefinittest"], 2, "K", 25)
       end
     end
 
     context "when the service sets complex priorities (hash)" do
       before do
-        @priority = {2 => [:stop, 20], 3 => [:start, 10]}
+        @priority = { 2 => [:stop, 20], 3 => [:start, 10] }
         new_resource.priority(@priority)
         File.symlink("/etc/rc.d/init.d/chefinittest", "/etc/rc.d/rc2.d/Schefinittest")
       end
@@ -204,7 +204,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
       it "create symlink with status stop (K) and a priority " do
         new_resource.run_action(:disable)
-        valide_symlinks(["/etc/rc.d/rc2.d/K80chefinittest"], 2,'K',80)
+        valide_symlinks(["/etc/rc.d/rc2.d/K80chefinittest"], 2, "K", 80)
       end
     end
   end

data/spec/functional/resource/base.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-
 def run_context
   @run_context ||= begin
     node = Chef::Node.new
@@ -27,4 +26,3 @@ def run_context
     Chef::RunContext.new(node, {}, events)
   end
 end
-

data/spec/functional/resource/bash_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright 2014-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'functional/resource/base'
+require "spec_helper"
+require "functional/resource/base"
 
 describe Chef::Resource::Bash, :unix_only do
   let(:code) { "echo hello" }
@@ -28,7 +28,7 @@ describe Chef::Resource::Bash, :unix_only do
   }
 
   describe "when setting the command attribute" do
-    let (:command) { 'wizard racket' }
+    let (:command) { "wizard racket" }
 
     # in Chef-12 the `command` attribute is largely useless, but does set the identity attribute
     # so that notifications need to target the value of the command.  it will not run the `command`
@@ -81,7 +81,7 @@ describe Chef::Resource::Bash, :unix_only do
   end
 
   it "times out when a timeout is set on the resource" do
-    resource.code 'sleep 600'
+    resource.code "sleep 600"
     resource.timeout 0.1
     expect { resource.run_action(:run) }.to raise_error(Mixlib::ShellOut::CommandTimeout)
   end

data/spec/functional/resource/batch_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Edwards (<adamed@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Adam Edwards (<adamed@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Chef::Resource::WindowsScript::Batch, :windows_only do
   include_context Chef::Resource::WindowsScript
 
-  let(:output_command) { ' > ' }
+  let(:output_command) { " > " }
 
-  let (:architecture_command) { '@echo %PROCESSOR_ARCHITECTURE%' }
+  let (:architecture_command) { "@echo %PROCESSOR_ARCHITECTURE%" }
 
   it_behaves_like "a Windows script running on Windows"
 

data/spec/functional/resource/bff_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-require 'functional/resource/base'
-require 'chef/mixin/shell_out'
+require "functional/resource/base"
+require "chef/mixin/shell_out"
 
 # Run the test only for AIX platform.
-describe Chef::Resource::BffPackage, :requires_root, :external => ohai[:platform] != 'aix' do
+describe Chef::Resource::BffPackage, :requires_root, :external => ohai[:platform] != "aix" do
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do
@@ -39,11 +39,10 @@ describe Chef::Resource::BffPackage, :requires_root, :external => ohai[:platform
     !::File.exists?("/usr/PkgA/bin/acommand")
   end
 
-
   before(:all) do
     @pkg_name = "PkgA.rte"
-    @pkg_path = "/tmp/PkgA.1.0.0.0.bff"
-    FileUtils.cp 'spec/functional/assets/PkgA.1.0.0.0.bff' , @pkg_path
+    @pkg_path = "#{Dir.tmpdir}/PkgA.1.0.0.0.bff"
+    FileUtils.cp "spec/functional/assets/PkgA.1.0.0.0.bff" , @pkg_path
   end
 
   after(:all) do
@@ -70,15 +69,15 @@ describe Chef::Resource::BffPackage, :requires_root, :external => ohai[:platform
 
     after(:each) do
       shell_out("installp -u #{@pkg_name}")
-      FileUtils.rm "/tmp/installp.log"
+      FileUtils.rm "#{Dir.tmpdir}/installp.log"
     end
   end
 
   context "package upgrade action" do
     before(:each) do
       shell_out("installp -aYF -d #{@pkg_path} #{@pkg_name}")
-      @pkg_path = "/tmp/PkgA.2.0.0.0.bff"
-      FileUtils.cp 'spec/functional/assets/PkgA.2.0.0.0.bff' , @pkg_path
+      @pkg_path = "#{Dir.tmpdir}/PkgA.2.0.0.0.bff"
+      FileUtils.cp "spec/functional/assets/PkgA.2.0.0.0.bff" , @pkg_path
     end
 
     it "should upgrade package" do
@@ -115,8 +114,7 @@ describe Chef::Resource::BffPackage, :requires_root, :external => ohai[:platform
     end
 
     after(:each) do
-      FileUtils.rm "/tmp/installp.log"
+      FileUtils.rm "#{Dir.tmpdir}/installp.log"
     end
   end
 end
-

data/spec/functional/resource/chocolatey_package_spec.rb

@@ -0,0 +1,124 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 2016 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"
+require "chef/mixin/powershell_out"
+
+describe Chef::Resource::ChocolateyPackage, :windows_only do
+  include Chef::Mixin::PowershellOut
+
+  before(:all) do
+    powershell_out!("iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))")
+    unless ENV["PATH"] =~ /chocolatey\\bin/
+      ENV["PATH"] = "C:\\ProgramData\\chocolatey\\bin;#{ENV["PATH"]}"
+    end
+  end
+
+  let(:package_name) { "test-A" }
+  let(:package_list) { proc { powershell_out!("choco list -lo -r #{Array(package_name).join(' ')}").stdout.chomp } }
+  let(:package_source) { File.join(CHEF_SPEC_ASSETS, "chocolatey_feed") }
+
+  subject do
+    new_resource = Chef::Resource::ChocolateyPackage.new("test choco package", run_context)
+    new_resource.package_name package_name
+    new_resource.source package_source if package_source
+    new_resource
+  end
+
+  context "installing a package" do
+    after { Chef::Resource::ChocolateyPackage.new(package_name, run_context).run_action(:remove) }
+
+    it "installs the latest version" do
+      subject.run_action(:install)
+      expect(package_list.call).to eq("#{package_name}|2.0")
+    end
+
+    it "does not install if already installed" do
+      subject.run_action(:install)
+      subject.run_action(:install)
+      expect(subject).not_to be_updated_by_last_action
+    end
+
+    it "installs version given" do
+      subject.version "1.0"
+      subject.run_action(:install)
+      expect(package_list.call).to eq("#{package_name}|1.0")
+    end
+
+    it "installs new version if one is already installed" do
+      subject.version "1.0"
+      subject.run_action(:install)
+      expect(package_list.call).to eq("#{package_name}|1.0")
+
+      subject.version "2.0"
+      subject.run_action(:install)
+      expect(package_list.call).to eq("#{package_name}|2.0")
+    end
+
+    context "installing multiple packages" do
+      let(:package_name) { [ "test-A", "test-B" ] }
+
+      it "installs both packages" do
+        subject.run_action(:install)
+        expect(package_list.call).to eq("test-A|2.0\r\ntest-B|1.0")
+      end
+    end
+
+    it "raises if package is not found" do
+      subject.package_name "blah"
+      expect { subject.run_action(:install) }.to raise_error Chef::Exceptions::Package
+    end
+
+    it "raises if package version is not found" do
+      subject.version "3.0"
+      expect { subject.run_action(:install) }.to raise_error Chef::Exceptions::Package
+    end
+  end
+
+  context "upgrading a package" do
+    after { Chef::Resource::ChocolateyPackage.new(package_name, run_context).run_action(:remove) }
+
+    it "upgrades to a specific version" do
+      subject.version "1.0"
+      subject.run_action(:install)
+      expect(package_list.call).to eq("#{package_name}|1.0")
+
+      subject.version "1.5"
+      subject.run_action(:upgrade)
+      expect(package_list.call).to eq("#{package_name}|1.5")
+    end
+
+    it "upgrades to the latest version if no version given" do
+      subject.version "1.0"
+      subject.run_action(:install)
+      expect(package_list.call).to eq("#{package_name}|1.0")
+
+      subject2 = Chef::Resource::ChocolateyPackage.new("test-A", run_context)
+      subject2.source package_source
+      subject2.run_action(:upgrade)
+      expect(package_list.call).to eq("#{package_name}|2.0")
+    end
+  end
+
+  context "removing a package" do
+    it "removes an installed package" do
+      subject.run_action(:install)
+      Chef::Resource::ChocolateyPackage.new(package_name, run_context).run_action(:remove)
+      expect(package_list.call).to eq("")
+    end
+  end
+end