Set unified_mode on custom resources

Rework nssm_install resource to remove :before notification which does
not work in unified mode in that case.

Author: josqu4red

metadata.rb

@@ -5,11 +5,10 @@
 maintainer_email 'systems-services-team@criteo.com'
 license 'MIT'
 description 'Installs/Configures NSSM'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 source_url 'https://github.com/criteo-cookbooks/nssm'
 issues_url 'https://github.com/criteo-cookbooks/nssm/issues'
-version '5.0.0'
+version '5.1.0'
 
-chef_version '>= 15.0'
+chef_version '>= 15.3'
 
 supports 'windows'

resources/install.rb

@@ -1,5 +1,7 @@
 provides :nssm_install, platform: 'windows'
 
+unified_mode true
+
 property :source, String, identity: true, name_property: true
 property :sha256, String, required: true
 
@@ -8,29 +10,21 @@
 action :install do
   src = new_resource.source
   basename = src.slice(src.rindex('/') + 1, src.rindex('.') - src.rindex('/') - 1)
-  download_path = "#{Chef::Config[:file_cache_path]}/#{basename}.zip"
-  extract_path = "#{Chef::Config[:file_cache_path]}/#{basename}"
   system = node['kernel']['machine'] == 'x86_64' ? 'win64' : 'win32'
+  download_path = "#{Chef::Config[:file_cache_path]}/#{basename}.zip"
+  extract_path = "#{Chef::Config[:file_cache_path]}/nssm"
   system_file = "#{extract_path}/#{basename}/#{system}/nssm.exe"
 
   remote_file 'download nssm' do
-    checksum new_resource.sha256
     path download_path
+    checksum new_resource.sha256
     source src
-    notifies :create, 'remote_file[install nssm]', :immediately
-  end
-
-  directory extract_path do
-    action :nothing
-    recursive true
-    subscribes :delete, 'remote_file[download nssm]', :before
   end
 
   archive_file 'extract nssm' do
-    action :extract
-    destination extract_path
-    overwrite false
     path download_path
+    destination extract_path
+    overwrite :auto
   end
 
   remote_file 'install nssm' do
@@ -39,9 +33,3 @@
     only_if { ::File.exist? system_file }
   end
 end
-
-action_class do
-  def whyrun_supported?
-    true
-  end
-end

resources/install_noop.rb

@@ -1,5 +1,7 @@
 provides :nssm_install
 
+unified_mode true
+
 property :source, String, identity: true, name_property: true
 property :sha256, String, required: true
 
@@ -8,9 +10,3 @@
 action :install do
   ::Chef::Log.warn('NSSM service can only be installed on Windows platforms!')
 end
-
-action_class do
-  def whyrun_supported?
-    true
-  end
-end

resources/service.rb

@@ -2,12 +2,14 @@
 # TODO: migrate to nssm_service with a breaking change notice
 provides :nssm, platform: 'windows'
 
+unified_mode true
+
 property :servicename, String, name_property: true
 property :program, String, required: true
 property :args, String
 property :parameters, Hash, default: lazy { ::Mash.new }
 property :nssm_binary, [String, NilClass], default: lazy { ::NSSM.binary_path node }
-property :start, [TrueClass, FalseClass], default: true
+property :start, [true, false], default: true
 # TODO: add start as default action with a breaking change
 default_action :install
 
@@ -96,9 +98,3 @@
     not_if { current_resource.nil? }
   end
 end
-
-action_class do
-  def whyrun_supported?
-    true
-  end
-end

resources/service_noop.rb

@@ -1,13 +1,15 @@
 provides :nssm_service
 provides :nssm # TODO: migrate to nssm_service with a breaking change notice
 
+unified_mode true
+
 property :servicename, String, identity: true, name_property: true
 property :program, String, required: true
 property :args, String
 property :parameters, Hash, default: lazy { ::Mash.new }
-property :nssm_binary, [String, NilClass], default: nil
+property :nssm_binary, [String, NilClass]
 # TODO: remove this
-property :start, [TrueClass, FalseClass], default: true
+property :start, [true, false], default: true
 
 action :install do
   ::Chef::Log.warn('NSSM service can only be installed on Windows platforms!')
@@ -28,9 +30,3 @@
 action :stop do
   ::Chef::Log.warn('NSSM service can only be stopped on Windows platforms!')
 end
-
-action_class do
-  def whyrun_supported?
-    true
-  end
-end

spec/unit/default_spec.rb

@@ -26,13 +26,20 @@
       )
     end
 
+    it 'extracts nssm' do
+      expect(chef_run).to extract_archive_file('extract nssm').with(
+        path: "#{CACHE}/nssm-#{VERSION}.zip",
+        destination: "#{CACHE}/nssm"
+      )
+    end
+
     it 'installs nssm' do
       allow(::File).to receive(:exist?).and_call_original
-      expect(::File).to receive(:exist?).with("#{CACHE}/nssm-#{VERSION}/nssm-#{VERSION}/win64/nssm.exe").and_return true
+      expect(::File).to receive(:exist?).with("#{CACHE}/nssm/nssm-#{VERSION}/win64/nssm.exe").and_return true
 
       expect(chef_run).to create_remote_file('install nssm').with(
         path: "C:\\tmp\\nssm-#{VERSION}.exe",
-        source: "file:///#{CACHE}/nssm-#{VERSION}/nssm-#{VERSION}/win64/nssm.exe"
+        source: "file:///#{CACHE}/nssm/nssm-#{VERSION}/win64/nssm.exe"
       )
     end
   end