chef 14.1.1 → 14.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e193b24c7dc5134566e81762e214f2defe9690571ea49d2b49eef0b42257700
-  data.tar.gz: c0605f463af589d03b64e3071d0a3ec3d645018c11ed80d22757825a0f4c4d0f
+  metadata.gz: 9a19bd139f5445bf506bae590535aeb2f88b4ad9afdfd1c33fa93433aca315b4
+  data.tar.gz: 84c7ecd4b5b4dc0c2e996031eaf7cd250c0cefb2d44c8c1fd9d811a5cea117d7
 SHA512:
-  metadata.gz: 4135361fe32d4964d317bbcef9d3b95a09bf2717a0c83c6e4149db536274e51973f9fe828d25d60b91f49322cf61eabf04741d2dfd2099889ef0338eb6091066
-  data.tar.gz: 70f608bfb4320f062b3aa4b85149919067c81070b197fc93d7f71c7abc752167de69615ab95ed4fd7112f077251cb9b167cb0770d97ee49eebfa30ff52da1c28
+  metadata.gz: 22a417c2427576c0f50d73e1ad2b2f73af7d1004e7de17f9c23ca944fa816c682daed3c830f70b517467071f532d6c092f80a9a165654e1f8fa093e1730dbce3
+  data.tar.gz: f1e674b823e0ecb1e476c7a6e4ab842e986d7d6380b6fb260f9b76331eed251a8b5a6033eac835ba5f142d724fc1de476f502a345fdc96b01b17920401bf6b42

data/VERSION

@@ -1 +1 @@
-14.1.1
+14.1.12

data/lib/chef/knife/configure.rb

@@ -75,7 +75,7 @@ class Chef
 
         config_file = File.expand_path(config_file)
         if File.exist?(config_file)
-          confirm("Overwrite #{config_file}?")
+          confirm("Overwrite #{config_file}")
         end
         ::File.open(config_file, "w") do |f|
           f.puts <<-EOH

data/lib/chef/node.rb

@@ -288,8 +288,11 @@ class Chef
     end
 
     # Returns true if this Node expects a given role, false if not.
+    #
+    # @param role_name [String] Role to check for
+    # @return [Boolean]
     def role?(role_name)
-      run_list.include?("role[#{role_name}]")
+      Array(self[:roles]).include?(role_name)
     end
 
     def primary_runlist

data/lib/chef/provider/apt_repository.rb

@@ -57,6 +57,8 @@ class Chef
           action :nothing
         end
 
+        cleanup_legacy_file!
+
         repo = build_repo(
           new_resource.uri,
           new_resource.distribution,
@@ -66,7 +68,7 @@ class Chef
           new_resource.deb_src
         )
 
-        declare_resource(:file, "/etc/apt/sources.list.d/#{new_resource.name}.list") do
+        declare_resource(:file, "/etc/apt/sources.list.d/#{new_resource.repo_name}.list") do
           owner "root"
           group "root"
           mode "0644"
@@ -79,9 +81,10 @@ class Chef
       end
 
       action :remove do
-        if ::File.exist?("/etc/apt/sources.list.d/#{new_resource.name}.list")
-          converge_by "Removing #{new_resource.name} repository from /etc/apt/sources.list.d/" do
-            declare_resource(:file, "/etc/apt/sources.list.d/#{new_resource.name}.list") do
+        cleanup_legacy_file!
+        if ::File.exist?("/etc/apt/sources.list.d/#{new_resource.repo_name}.list")
+          converge_by "Removing #{new_resource.repo_name} repository from /etc/apt/sources.list.d/" do
+            declare_resource(:file, "/etc/apt/sources.list.d/#{new_resource.repo_name}.list") do
               sensitive new_resource.sensitive
               action :delete
               notifies :update, "apt_update[#{new_resource.name}]", :immediately if new_resource.cache_rebuild
@@ -93,7 +96,7 @@ class Chef
             end
           end
         else
-          logger.trace("/etc/apt/sources.list.d/#{new_resource.name}.list does not exist. Nothing to do")
+          logger.trace("/etc/apt/sources.list.d/#{new_resource.repo_name}.list does not exist. Nothing to do")
         end
       end
 
@@ -325,6 +328,23 @@ class Chef
         repo << "deb-src  #{info}\n" if add_src
         repo
       end
+
+      # clean up a potentially legacy file from before we fixed the usage of
+      # new_resource.name vs. new_resource.repo_name. We might have the
+      # name.list file hanging around and need to clean it up.
+      #
+      # @return [void]
+      def cleanup_legacy_file!
+        legacy_path = "/etc/apt/sources.list.d/#{new_resource.name}.list"
+        if new_resource.name != new_resource.repo_name && ::File.exist?(legacy_path)
+          converge_by "Cleaning up legacy #{legacy_path} repo file" do
+            declare_resource(:file, legacy_path) do
+              action :delete
+              # Not triggering an update since it isn't super likely to be needed.
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/chef/provider/git.rb

@@ -195,7 +195,7 @@ class Chef
           # since we're in a local branch already, just reset to specified revision rather than merge
           logger.trace "Fetching updates from #{new_resource.remote} and resetting to revision #{target_revision}"
           git("fetch", "--prune", new_resource.remote, cwd: cwd)
-          git("fetch", "--prune-tags", new_resource.remote, "--tags", cwd: cwd)
+          git("fetch", new_resource.remote, "--tags", cwd: cwd)
           git("reset", "--hard", target_revision, cwd: cwd)
         end
       end

data/lib/chef/provider/windows_task.rb

@@ -114,6 +114,9 @@ class Chef
         end
 
         def action_create
+          if new_resource.command && new_resource.command.split.size > 1
+            set_command_and_arguments
+          end
           if current_resource.exists
             logger.trace "#{new_resource} task exist."
             unless (task_needs_update?(current_resource.task)) || (new_resource.force)
@@ -136,6 +139,7 @@ class Chef
                 task.new_work_item(new_resource.task_name, trigger)
               end
               task.application_name = new_resource.command
+              task.parameters = new_resource.command_arguments if new_resource.command_arguments
               task.working_directory = new_resource.cwd if new_resource.cwd
               task.configure_settings(config_settings)
               task.configure_principals(principal_settings)
@@ -225,6 +229,13 @@ class Chef
 
         private
 
+        # seprated command arguments from :command property
+        def set_command_and_arguments
+          cmd, *args = Shellwords.split(new_resource.command)
+          new_resource.command = cmd
+          new_resource.command_arguments = args.join(" ")
+        end
+
         def set_start_day_and_time
           new_resource.start_day = Time.now.strftime("%m/%d/%Y") unless new_resource.start_day
           new_resource.start_time = Time.now.strftime("%H:%M") unless new_resource.start_time
@@ -234,6 +245,7 @@ class Chef
           converge_by("#{new_resource} task updated") do
             task.set_account_information(new_resource.user, new_resource.password)
             task.application_name = new_resource.command if new_resource.command
+            task.parameters = new_resource.command_arguments if new_resource.command_arguments
             task.working_directory = new_resource.cwd if new_resource.cwd
             task.trigger = trigger unless new_resource.frequency == :none
             task.configure_settings(config_settings)
@@ -315,6 +327,7 @@ class Chef
           if new_resource.frequency == :none
             flag = (task.account_information != new_resource.user ||
             task.application_name != new_resource.command ||
+            task.parameters != new_resource.command_arguments.to_s ||
             task.principals[:run_level] != run_level)
           else
             current_task_trigger = task.trigger(0)
@@ -334,6 +347,7 @@ class Chef
                   current_task_trigger[:minutes_interval].to_i != new_task_trigger[:minutes_interval].to_i ||
                   task.account_information != new_resource.user ||
                   task.application_name != new_resource.command ||
+                  task.parameters != new_resource.command_arguments.to_s ||
                   task.working_directory != new_resource.cwd.to_s ||
                   task.principals[:logon_type] != logon_type ||
                   task.principals[:run_level] != run_level

data/lib/chef/resource/remote_directory.rb

@@ -56,7 +56,7 @@ class Chef
       property :source, String, default: lazy { ::File.basename(path) }
       property :files_backup, [ Integer, FalseClass ], default: 5, desired_state: false
       property :purge, [ TrueClass, FalseClass ], default: false, desired_state: false
-      property :overwrite, [ TrueClass, FalseClass ], default: false
+      property :overwrite, [ TrueClass, FalseClass ], default: true
       property :cookbook, String
 
       def files_group(arg = nil)

data/lib/chef/resource/rhsm_repo.rb

@@ -34,20 +34,20 @@ class Chef
       action :enable do
         description "Enable a RHSM repository"
 
-        execute "Enable repository #{repo_name}" do
-          command "subscription-manager repos --enable=#{repo_name}"
+        execute "Enable repository #{new_resource.repo_name}" do
+          command "subscription-manager repos --enable=#{new_resource.repo_name}"
           action :run
-          not_if { repo_enabled?(repo_name) }
+          not_if { repo_enabled?(new_resource.repo_name) }
         end
       end
 
       action :disable do
         description "Disable a RHSM repository"
 
-        execute "Enable repository #{repo_name}" do
-          command "subscription-manager repos --disable=#{repo_name}"
+        execute "Enable repository #{new_resource.repo_name}" do
+          command "subscription-manager repos --disable=#{new_resource.repo_name}"
           action :run
-          only_if { repo_enabled?(repo_name) }
+          only_if { repo_enabled?(new_resource.repo_name) }
         end
       end
 

data/lib/chef/resource/windows_task.rb

@@ -60,7 +60,7 @@ class Chef
       property :minutes_duration, [String, Integer]
       property :minutes_interval, [String, Integer]
 
-      attr_accessor :exists, :task
+      attr_accessor :exists, :task, :command_arguments
 
       SYSTEM_USERS = ['NT AUTHORITY\SYSTEM', "SYSTEM", 'NT AUTHORITY\LOCALSERVICE', 'NT AUTHORITY\NETWORKSERVICE', 'BUILTIN\USERS', "USERS"].freeze
       VALID_WEEK_DAYS = %w{ mon tue wed thu fri sat sun * }

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("14.1.1")
+  VERSION = Chef::VersionString.new("14.1.12")
 end
 
 #

data/spec/functional/resource/windows_task_spec.rb

@@ -20,7 +20,8 @@ require "spec_helper"
 require "chef/provider/windows_task"
 
 describe Chef::Resource::WindowsTask, :windows_only do
-  let(:task_name) { "chef-client" }
+  # resource.task.application_name will default to task_name unless resource.command is set
+  let(:task_name) { "chef-client-functional-test" }
   let(:new_resource) { Chef::Resource::WindowsTask.new(task_name) }
   let(:windows_task_provider) do
     node = Chef::Node.new
@@ -31,6 +32,90 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
   describe "action :create" do
     after { delete_task }
+    context "when command is with arguments" do
+      subject do
+        new_resource = Chef::Resource::WindowsTask.new(task_name, run_context)
+        new_resource.execution_time_limit = 259200 / 60 # converting "PT72H" into minutes and passing here since win32-taskscheduler accespts this
+        # Make sure MM/DD/YYYY is accepted
+
+        new_resource.start_day "09/20/2017"
+        new_resource.frequency :hourly
+        new_resource
+      end
+
+      it "creates scheduled task and sets command arguments" do
+        subject.command "chef-client -W"
+        call_for_create_action
+        #loading current resource again to check new task is creted and it matches task parameters
+        current_resource = call_for_load_current_resource
+        expect(current_resource.exists).to eq(true)
+        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.parameters).to eq("-W")
+      end
+
+      it "does not converge the resource if it is already converged" do
+        subject.command "chef-client -W"
+        subject.run_action(:create)
+        subject.command "chef-client -W"
+        subject.run_action(:create)
+        expect(subject).not_to be_updated_by_last_action
+      end
+
+      it "creates scheduled task and sets command arguments" do
+        subject.command "chef-client -W -L 'C:\\chef\\chef-ad-join.log'"
+        call_for_create_action
+        #loading current resource again to check new task is creted and it matches task parameters
+        current_resource = call_for_load_current_resource
+        expect(current_resource.exists).to eq(true)
+        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.parameters).to eq("-W -L C:\\chef\\chef-ad-join.log")
+      end
+
+      it "does not converge the resource if it is already converged" do
+        subject.command "chef-client -W -L 'C:\\chef\\chef-ad-join.log'"
+        subject.run_action(:create)
+        subject.command "chef-client -W -L 'C:\\chef\\chef-ad-join.log'"
+        subject.run_action(:create)
+        expect(subject).not_to be_updated_by_last_action
+      end
+
+      it "creates scheduled task and sets command arguments" do
+        subject.command '"C:\\Program Files\\example\program.exe" -arg1 --arg2'
+        call_for_create_action
+        #loading current resource again to check new task is creted and it matches task parameters
+        current_resource = call_for_load_current_resource
+        expect(current_resource.exists).to eq(true)
+        expect(current_resource.task.application_name).to eq("C:\\Program Files\\example\\program.exe")
+        expect(current_resource.task.parameters).to eq("-arg1 --arg2")
+      end
+
+      it "does not converge the resource if it is already converged" do
+        subject.command '"C:\\Program Files\\example\program.exe" -arg1 --arg2'
+        subject.run_action(:create)
+        subject.command '"C:\\Program Files\\example\program.exe" -arg1 --arg2'
+        subject.run_action(:create)
+        expect(subject).not_to be_updated_by_last_action
+      end
+
+      it "creates scheduled task and sets command arguments" do
+        subject.command "ping http://www.google.com"
+        call_for_create_action
+        #loading current resource again to check new task is creted and it matches task parameters
+        current_resource = call_for_load_current_resource
+        expect(current_resource.exists).to eq(true)
+        expect(current_resource.task.application_name).to eq("ping")
+        expect(current_resource.task.parameters).to eq("http://www.google.com")
+      end
+
+      it "does not converge the resource if it is already converged" do
+        subject.command "ping http://www.google.com"
+        subject.run_action(:create)
+        subject.command "ping http://www.google.com"
+        subject.run_action(:create)
+        expect(subject).not_to be_updated_by_last_action
+      end
+    end
+
     context "when frequency_modifier are not passed" do
       subject do
         new_resource = Chef::Resource::WindowsTask.new(task_name, run_context)
@@ -47,7 +132,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         #loading current resource again to check new task is creted and it matches task parameters
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         trigger_details = current_resource.task.trigger(0)
         expect(trigger_details[:start_year]).to eq("2017")
         expect(trigger_details[:start_month]).to eq("09")
@@ -80,7 +165,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(trigger_details[:minutes_interval]).to eq(15)
         expect(trigger_details[:trigger_type]).to eq(1)
         expect(current_resource.task.principals[:run_level]).to eq(1)
@@ -104,7 +189,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(trigger_details[:minutes_interval]).to eq(20)
         expect(trigger_details[:trigger_type]).to eq(1)
         expect(current_resource.task.principals[:run_level]).to eq(1)
@@ -128,7 +213,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(trigger_details[:minutes_interval]).to eq(180)
         expect(trigger_details[:trigger_type]).to eq(1)
       end
@@ -151,7 +236,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(trigger_details[:minutes_interval]).to eq(300)
         expect(trigger_details[:trigger_type]).to eq(1)
       end
@@ -173,7 +258,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(trigger_details[:trigger_type]).to eq(2)
         expect(current_resource.task.principals[:run_level]).to eq(1)
         expect(trigger_details[:type][:days_interval]).to eq(1)
@@ -208,7 +293,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(1)
@@ -228,7 +313,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(7)
@@ -249,7 +334,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(1209548943) #TODO:: windows_task_provider.send(:days_of_month)
@@ -271,7 +356,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(538443919) #TODO:windows_task_provider.send(:days_of_month)
@@ -294,7 +379,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(5)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days_of_week]).to eq(35)
@@ -362,7 +447,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(5)
           expect(trigger_details[:type][:months]).to eq(4095)
           expect(trigger_details[:type][:weeks_of_month]).to eq(7)
@@ -385,7 +470,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(trigger_details[:type][:months]).to eq(2080)
           expect(trigger_details[:type][:days]).to eq(3)
@@ -417,7 +502,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(trigger_details[:type][:months]).to eq(4095)
           expect(trigger_details[:type][:days]).to eq(0)
@@ -438,7 +523,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(trigger_details[:type][:months]).to eq(4095)
           expect(trigger_details[:type][:days]).to eq(0)
@@ -462,7 +547,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(5)
           expect(trigger_details[:type][:months]).to eq(4095)
           expect(trigger_details[:type][:days_of_week]).to eq(34)
@@ -486,7 +571,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(trigger_details[:type][:months]).to eq(4095)
           expect(trigger_details[:type][:days]).to eq(1)
@@ -525,7 +610,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(2)
@@ -547,7 +632,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(7)
@@ -568,7 +653,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(1)
@@ -591,7 +676,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
           #loading current resource
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(4)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:type][:days]).to eq(1)
@@ -633,7 +718,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(1)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect("#{trigger_details[:start_hour]}:#{trigger_details[:start_minute]}" ).to eq(subject.start_time)
@@ -664,7 +749,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(current_resource.task.principals[:run_level]).to eq(1)
         expect(trigger_details[:trigger_type]).to eq(3)
         expect(trigger_details[:type][:weeks_interval]).to eq(1)
@@ -684,7 +769,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:trigger_type]).to eq(3)
           expect(trigger_details[:type][:weeks_interval]).to eq(1)
@@ -708,7 +793,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:trigger_type]).to eq(3)
           expect(trigger_details[:type][:weeks_interval]).to eq(2)
@@ -731,7 +816,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:trigger_type]).to eq(3)
           expect(trigger_details[:type][:weeks_interval]).to eq(3)
@@ -788,7 +873,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:trigger_type]).to eq(3)
           expect(trigger_details[:type][:weeks_interval]).to eq(1)
@@ -813,7 +898,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(current_resource.task.principals[:run_level]).to eq(1)
         expect(trigger_details[:trigger_type]).to eq(8)
       end
@@ -833,7 +918,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(8)
           expect(trigger_details[:start_year]).to eq("2018")
           expect(trigger_details[:start_month]).to eq("09")
@@ -860,7 +945,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(current_resource.task.principals[:run_level]).to eq(1)
         expect(trigger_details[:trigger_type]).to eq(9)
       end
@@ -880,7 +965,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(9)
           expect(trigger_details[:start_year]).to eq("2018")
           expect(trigger_details[:start_month]).to eq("09")
@@ -915,7 +1000,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(current_resource.task.principals[:run_level]).to eq(1)
           expect(trigger_details[:trigger_type]).to eq(6)
           expect(current_resource.task.settings[:idle_settings][:idle_duration]).to eq("PT20M")
@@ -940,7 +1025,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
           trigger_details = current_resource.task.trigger(0)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(task_name)
           expect(trigger_details[:trigger_type]).to eq(6)
           expect(trigger_details[:start_year]).to eq("2018")
           expect(trigger_details[:start_month]).to eq("09")
@@ -968,7 +1053,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
         trigger_details = current_resource.task.trigger(0)
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(current_resource.task.principals[:run_level]).to eq(1)
         expect(trigger_details[:trigger_type]).to eq(1)
         expect(trigger_details[:random_minutes_interval]).to eq(20)
@@ -1011,7 +1096,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         current_resource = call_for_load_current_resource
         expect(current_resource.exists).to eq(true)
 
-        expect(current_resource.task.application_name).to eq("chef-client")
+        expect(current_resource.task.application_name).to eq(task_name)
         expect(current_resource.task.principals[:run_level]).to eq(1)
         expect(current_resource.task.trigger_count).to eq(0)
       end
@@ -1380,6 +1465,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
   end
 
   describe "action :enable" do
+    let(:task_name) { "chef-client-functional-test-enable" }
     after { delete_task }
 
     subject do
@@ -1402,6 +1488,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
   end
 
   describe "action :disable" do
+    let(:task_name) { "chef-client-functional-test-disable" }
     after { delete_task }
 
     subject do

data/spec/unit/node_spec.rb

@@ -1160,16 +1160,16 @@ describe Chef::Node do
 
   describe "roles" do
     it "should allow you to query whether or not it has a recipe applied with role?" do
-      node.run_list << "role[sunrise]"
+      node.automatic["roles"] = %w{sunrise}
       expect(node.role?("sunrise")).to eql(true)
       expect(node.role?("not at home")).to eql(false)
     end
 
     it "should allow you to set roles with arguments" do
-      node.run_list << "role[one]"
-      node.run_list << "role[two]"
+      node.automatic["roles"] = %w{one two}
       expect(node.role?("one")).to eql(true)
       expect(node.role?("two")).to eql(true)
+      expect(node.role?("three")).to eql(false)
     end
   end
 

data/spec/unit/provider/git_spec.rb

@@ -427,7 +427,7 @@ SHAS
     expect(@provider).to receive(:setup_remote_tracking_branches).with(@resource.remote, @resource.repository)
     expected_cmd1 = "git fetch --prune origin"
     expect(@provider).to receive(:shell_out!).with(expected_cmd1, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
-    expected_cmd2 = "git fetch --prune-tags origin --tags"
+    expected_cmd2 = "git fetch origin --tags"
     expect(@provider).to receive(:shell_out!).with(expected_cmd2, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
     expected_cmd3 = "git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c"
     expect(@provider).to receive(:shell_out!).with(expected_cmd3, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
@@ -445,7 +445,7 @@ SHAS
                                                                   :user => "whois", :group => "thisis",
                                                                   :log_tag => "git[web2.0 app]",
                                                                   :environment => { "HOME" => "/home/whois" })
-    expected_cmd2 = "git fetch --prune-tags origin --tags"
+    expected_cmd2 = "git fetch origin --tags"
     expect(@provider).to receive(:shell_out!).with(expected_cmd2, :cwd => "/my/deploy/dir",
                                                                   :user => "whois", :group => "thisis",
                                                                   :log_tag => "git[web2.0 app]",
@@ -463,7 +463,7 @@ SHAS
     expect(@provider).to receive(:setup_remote_tracking_branches).with(@resource.remote, @resource.repository)
     fetch_command1 = "git fetch --prune origin"
     expect(@provider).to receive(:shell_out!).with(fetch_command1, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
-    fetch_command2 = "git fetch --prune-tags origin --tags"
+    fetch_command2 = "git fetch origin --tags"
     expect(@provider).to receive(:shell_out!).with(fetch_command2, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
     fetch_command3 = "git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c"
     expect(@provider).to receive(:shell_out!).with(fetch_command3, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
@@ -475,7 +475,7 @@ SHAS
     expect(@provider).to receive(:setup_remote_tracking_branches).with(@resource.remote, @resource.repository)
     fetch_command1 = "git fetch --prune opscode"
     expect(@provider).to receive(:shell_out!).with(fetch_command1, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
-    fetch_command2 = "git fetch --prune-tags opscode --tags"
+    fetch_command2 = "git fetch opscode --tags"
     expect(@provider).to receive(:shell_out!).with(fetch_command2, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")
     fetch_command3 = "git reset --hard d35af14d41ae22b19da05d7d03a0bafc321b244c"
     expect(@provider).to receive(:shell_out!).with(fetch_command3, :cwd => "/my/deploy/dir", :log_tag => "git[web2.0 app]")

data/spec/unit/provider/windows_task_spec.rb

@@ -35,6 +35,15 @@ describe Chef::Provider::WindowsTask, :windows_only do
     end
   end
 
+  describe "#set_command_and_arguments" do
+    it "sets the command arguments if command has arguments passed in it" do
+      new_resource.command = "chef-client -W"
+      provider.send(:set_command_and_arguments)
+      expect(new_resource.command).to eq("chef-client")
+      expect(new_resource.command_arguments).to eq("-W")
+    end
+  end
+
   describe "#set_start_day_and_time" do
     it "sets the curret date and time start_day and start_time if nothing is provided by user" do
       new_resource.start_day = nil

data/spec/unit/resource/remote_directory_spec.rb

@@ -67,6 +67,10 @@ describe Chef::Resource::RemoteDirectory do
     expect(resource.files_owner).to eql(1000)
   end
 
+  it "overwrites by default" do
+    expect(resource.overwrite).to be true
+  end
+
   describe "when it has cookbook, files owner, files mode, and source" do
     before do
       resource.path("/var/path/")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 14.1.1
+  version: 14.1.12
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.1.1
+        version: 14.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.1.1
+        version: 14.1.12
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement