Cookstyle fixes

tas50 · tas50 · commit 69ecc84ec458 · 2019-10-30T14:05:59.000-07:00
Signed-off-by: Tim Smith &lt;tsmith@chef.io&gt;
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Attribute:: default
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-if node['platform_family'] == 'windows'
+if platform_family?('windows')
   # INSTALLATION_REBOOT_MODE = "no_reboot". It skips reboot required after powershell installation.
   # INSTALLATION_REBOOT_MODE = "immediate_reboot". Used for immediate node reboot after powershell installation.
   # INSTALLATION_REBOOT_MODE = "delayed_reboot". Used for node reboot after chef-client run.
diff --git a/attributes/powershell3.rb b/attributes/powershell3.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Attribute:: powershell3
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-if node['platform_family'] == 'windows'
+if platform_family?('windows')
   case node['platform_version'].split('.')[0..1].join('.')
   when '6.1'
     case node['kernel']['machine']
diff --git a/attributes/powershell4.rb b/attributes/powershell4.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Attribute:: powershell4
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-if node['platform_family'] == 'windows'
+if platform_family?('windows')
   case node['platform_version'].split('.')[0..1].join('.')
   when '6.1'
     case node['kernel']['machine']
diff --git a/attributes/powershell5.rb b/attributes/powershell5.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Attribute:: powershell5
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-if node['platform_family'] == 'windows'
+if platform?('windows')
   default['powershell']['powershell5']['version'] = '5.1'
 
   # Make sure .NET 4.5 (minimum) is available.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -4,7 +4,7 @@
 # Cookbook:: powershell
 # Recipe:: default
 #
-# Copyright:: 2011-2017, Chef Software, Inc.
+# Copyright:: 2011-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/disable_lcm.rb b/recipes/disable_lcm.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: disable_lcm
 #
-# Copyright:: 2015-2017, Chef Software, Inc.
+# Copyright:: 2015-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/dsc.rb b/recipes/dsc.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: dsc
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/enable_dsc_script.rb b/recipes/enable_dsc_script.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: enable_lcm
 #
-# Copyright:: 2015-2017, Chef Software, Inc.
+# Copyright:: 2015-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/enable_lcm.rb b/recipes/enable_lcm.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: enable_lcm
 #
-# Copyright:: 2015-2017, Chef Software, Inc.
+# Copyright:: 2015-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/powershell2.rb b/recipes/powershell2.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: powershell2
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/powershell3.rb b/recipes/powershell3.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: powershell3
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/powershell4.rb b/recipes/powershell4.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: powershell4
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/powershell5.rb b/recipes/powershell5.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: powershell5
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/recipes/winrm.rb b/recipes/winrm.rb
@@ -3,7 +3,7 @@
 # Cookbook:: powershell
 # Recipe:: winrm
 #
-# Copyright:: 2014-2018, Chef Software, Inc.
+# Copyright:: 2014-2019, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Attribute:: default`
`5`	`5`	`#`
`6`		`-# Copyright:: 2014-2018, Chef Software, Inc.`
	`6`	`+# Copyright:: 2014-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
`@@ -17,7 +17,7 @@`
`17`	`17`	`# See the License for the specific language governing permissions and`
`18`	`18`	`# limitations under the License.`
`19`	`19`	`#`
`20`		`-if node['platform_family'] == 'windows'`
	`20`	`+if platform_family?('windows')`
`21`	`21`	`# INSTALLATION_REBOOT_MODE = "no_reboot". It skips reboot required after powershell installation.`
`22`	`22`	`# INSTALLATION_REBOOT_MODE = "immediate_reboot". Used for immediate node reboot after powershell installation.`
`23`	`23`	`# INSTALLATION_REBOOT_MODE = "delayed_reboot". Used for node reboot after chef-client run.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Attribute:: powershell3`
`5`	`5`	`#`
`6`		`-# Copyright:: 2014-2018, Chef Software, Inc.`
	`6`	`+# Copyright:: 2014-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
`@@ -18,7 +18,7 @@`
`18`	`18`	`# limitations under the License.`
`19`	`19`	`#`
`20`	`20`
`21`		`-if node['platform_family'] == 'windows'`
	`21`	`+if platform_family?('windows')`
`22`	`22`	`case node['platform_version'].split('.')[0..1].join('.')`
`23`	`23`	`when '6.1'`
`24`	`24`	`case node['kernel']['machine']`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Attribute:: powershell4`
`5`	`5`	`#`
`6`		`-# Copyright:: 2014-2018, Chef Software, Inc.`
	`6`	`+# Copyright:: 2014-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
`@@ -18,7 +18,7 @@`
`18`	`18`	`# limitations under the License.`
`19`	`19`	`#`
`20`	`20`
`21`		`-if node['platform_family'] == 'windows'`
	`21`	`+if platform_family?('windows')`
`22`	`22`	`case node['platform_version'].split('.')[0..1].join('.')`
`23`	`23`	`when '6.1'`
`24`	`24`	`case node['kernel']['machine']`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Attribute:: powershell5`
`5`	`5`	`#`
`6`		`-# Copyright:: 2014-2018, Chef Software, Inc.`
	`6`	`+# Copyright:: 2014-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
`@@ -18,7 +18,7 @@`
`18`	`18`	`# limitations under the License.`
`19`	`19`	`#`
`20`	`20`
`21`		`-if node['platform_family'] == 'windows'`
	`21`	`+if platform?('windows')`
`22`	`22`	`default['powershell']['powershell5']['version'] = '5.1'`
`23`	`23`
`24`	`24`	`# Make sure .NET 4.5 (minimum) is available.`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Cookbook:: powershell`
`5`	`5`	`# Recipe:: default`
`6`	`6`	`#`
`7`		`-# Copyright:: 2011-2017, Chef Software, Inc.`
	`7`	`+# Copyright:: 2011-2019, Chef Software, Inc.`
`8`	`8`	`#`
`9`	`9`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`10`	`10`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Recipe:: disable_lcm`
`5`	`5`	`#`
`6`		`-# Copyright:: 2015-2017, Chef Software, Inc.`
	`6`	`+# Copyright:: 2015-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Recipe:: dsc`
`5`	`5`	`#`
`6`		`-# Copyright:: 2014-2018, Chef Software, Inc.`
	`6`	`+# Copyright:: 2014-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Recipe:: enable_lcm`
`5`	`5`	`#`
`6`		`-# Copyright:: 2015-2017, Chef Software, Inc.`
	`6`	`+# Copyright:: 2015-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Recipe:: powershell2`
`5`	`5`	`#`
`6`		`-# Copyright:: 2014-2018, Chef Software, Inc.`
	`6`	`+# Copyright:: 2014-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Cookbook:: powershell`
`4`	`4`	`# Recipe:: powershell3`
`5`	`5`	`#`
`6`		`-# Copyright:: 2014-2018, Chef Software, Inc.`
	`6`	`+# Copyright:: 2014-2019, Chef Software, Inc.`
`7`	`7`	`#`
`8`	`8`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`9`	`9`	`# you may not use this file except in compliance with the License.`