diff options
Diffstat (limited to 'lib/chef/util')
-rw-r--r-- | lib/chef/util/backup.rb | 4 | ||||
-rw-r--r-- | lib/chef/util/dsc/resource_store.rb | 8 | ||||
-rw-r--r-- | lib/chef/util/powershell/cmdlet.rb | 4 | ||||
-rw-r--r-- | lib/chef/util/threaded_job_queue.rb | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lib/chef/util/backup.rb b/lib/chef/util/backup.rb index 08da52e3b2..5c2201a8f4 100644 --- a/lib/chef/util/backup.rb +++ b/lib/chef/util/backup.rb @@ -81,9 +81,9 @@ class Chef def unsorted_backup_files # If you replace this with Dir[], you will probably break Windows. fn = Regexp.escape(::File.basename(path)) - Dir.entries(::File.dirname(backup_path)).select do |f| + Dir.entries(::File.dirname(backup_path)).select { |f| !!(f =~ /\A#{fn}.chef-[0-9.]*\B/) - end.map { |f| ::File.join(::File.dirname(backup_path), f) } + }.map { |f| ::File.join(::File.dirname(backup_path), f) } end def sorted_backup_files diff --git a/lib/chef/util/dsc/resource_store.rb b/lib/chef/util/dsc/resource_store.rb index d064a397c3..723695f3de 100644 --- a/lib/chef/util/dsc/resource_store.rb +++ b/lib/chef/util/dsc/resource_store.rb @@ -52,9 +52,9 @@ class Chef private def add_resource(new_r) - count = resources.count do |r| + count = resources.count { |r| r["ResourceType"].casecmp(new_r["ResourceType"]) == 0 - end + } if count == 0 resources << new_r end @@ -71,14 +71,14 @@ class Chef end def find_resources(name, module_name, rs) - found = rs.find_all do |r| + found = rs.find_all { |r| name_matches = r["Name"].casecmp(name) == 0 if name_matches module_name.nil? || (r["Module"] && r["Module"]["Name"].casecmp(module_name) == 0) else false end - end + } end # Returns a list of dsc resources diff --git a/lib/chef/util/powershell/cmdlet.rb b/lib/chef/util/powershell/cmdlet.rb index 75cf489e9e..21eea7ca2f 100644 --- a/lib/chef/util/powershell/cmdlet.rb +++ b/lib/chef/util/powershell/cmdlet.rb @@ -115,7 +115,7 @@ class Chef end def command_switches_string(switches) - command_switches = switches.map do |switch_name, switch_value| + command_switches = switches.map { |switch_name, switch_value| if switch_name.class != Symbol raise ArgumentError, "Invalid type `#{switch_name} `for PowerShell switch '#{switch_name}'. The switch must be specified as a Symbol'" end @@ -140,7 +140,7 @@ class Chef end switch_present ? ["-#{switch_name.to_s.downcase}", switch_argument].join(" ").strip : "" - end + } command_switches.join(" ") end diff --git a/lib/chef/util/threaded_job_queue.rb b/lib/chef/util/threaded_job_queue.rb index 6b13bf99a3..ed3cbe4788 100644 --- a/lib/chef/util/threaded_job_queue.rb +++ b/lib/chef/util/threaded_job_queue.rb @@ -45,15 +45,15 @@ class Chef end def process(concurrency = 10) - workers = (1..concurrency).map do + workers = (1..concurrency).map { Thread.new do loop do fn = @queue.pop fn.arity == 1 ? fn.call(@lock) : fn.call end end - end - workers.each { |worker| self << Thread.method(:exit) } + } + workers.each do |worker| self << Thread.method(:exit) end workers.each(&:join) end end |