flip multiline function arguments around

no enforced trailing comma on arguments...
cgerke · Feb 19, 2016 · 92bec4b · 92bec4b
1 parent 6077b99
commit 92bec4b
Show file tree

Hide file tree

Showing 139 changed files with 588 additions and 588 deletions.
diff --git a/ext/win32-eventlog/Rakefile b/ext/win32-eventlog/Rakefile
@@ -45,7 +45,7 @@ task :register => EVT_SHARED_OBJECT do
       :source => "Application",
       :key_name => "Chef",
       :event_message_file => dll_file,
-      :category_message_file => dll_file,
+      :category_message_file => dll_file
     )
   rescue Errno::EIO => e
     puts "Skipping event log registration due to missing privileges: #{e}"

diff --git a/lib/chef/api_client.rb b/lib/chef/api_client.rb
@@ -53,7 +53,7 @@ def name(arg = nil)
       set_or_return(
         :name,
         arg,
-        :regex => /^[\-[:alnum:]_\.]+$/,
+        :regex => /^[\-[:alnum:]_\.]+$/
       )
     end
 
@@ -65,7 +65,7 @@ def admin(arg = nil)
       set_or_return(
         :admin,
         arg,
-        :kind_of => [ TrueClass, FalseClass ],
+        :kind_of => [ TrueClass, FalseClass ]
       )
     end
 
@@ -77,7 +77,7 @@ def public_key(arg = nil)
       set_or_return(
         :public_key,
         arg,
-        :kind_of => String,
+        :kind_of => String
       )
     end
 
@@ -90,7 +90,7 @@ def validator(arg = nil)
       set_or_return(
         :validator,
         arg,
-        :kind_of => [TrueClass, FalseClass],
+        :kind_of => [TrueClass, FalseClass]
       )
     end
 
@@ -102,7 +102,7 @@ def private_key(arg = nil)
       set_or_return(
         :private_key,
         arg,
-        :kind_of => [String, FalseClass],
+        :kind_of => [String, FalseClass]
       )
     end
 

diff --git a/lib/chef/api_client/registration.rb b/lib/chef/api_client/registration.rb
@@ -152,7 +152,7 @@ def http_api
                                             :api_version => "0",
                                             :client_name => Chef::Config[:validation_client_name],
                                             :signing_key_filename => Chef::Config[:validation_key],
-                                          },
+                                          }
                                          )
       end
 

diff --git a/lib/chef/api_client_v1.rb b/lib/chef/api_client_v1.rb
@@ -76,7 +76,7 @@ def name(arg = nil)
       set_or_return(
         :name,
         arg,
-        :regex => /^[\-[:alnum:]_\.]+$/,
+        :regex => /^[\-[:alnum:]_\.]+$/
       )
     end
 
@@ -88,7 +88,7 @@ def admin(arg = nil)
       set_or_return(
         :admin,
         arg,
-        :kind_of => [ TrueClass, FalseClass ],
+        :kind_of => [ TrueClass, FalseClass ]
       )
     end
 
@@ -100,7 +100,7 @@ def public_key(arg = nil)
       set_or_return(
         :public_key,
         arg,
-        :kind_of => String,
+        :kind_of => String
       )
     end
 
@@ -113,7 +113,7 @@ def validator(arg = nil)
       set_or_return(
         :validator,
         arg,
-        :kind_of => [TrueClass, FalseClass],
+        :kind_of => [TrueClass, FalseClass]
       )
     end
 
@@ -126,7 +126,7 @@ def private_key(arg = nil)
       set_or_return(
         :private_key,
         arg,
-        :kind_of => [String, TrueClass, FalseClass],
+        :kind_of => [String, TrueClass, FalseClass]
       )
     end
 
@@ -138,7 +138,7 @@ def create_key(arg = nil)
       set_or_return(
         :create_key,
         arg,
-        :kind_of => [ TrueClass, FalseClass ],
+        :kind_of => [ TrueClass, FalseClass ]
       )
     end
 

diff --git a/lib/chef/application.rb b/lib/chef/application.rb
@@ -215,7 +215,7 @@ def run_chef_client(specific_recipes = [])
           @chef_client_json,
           override_runlist: override_runlist,
           specific_recipes: specific_recipes,
-          runlist: config[:runlist],
+          runlist: config[:runlist]
         )
         @chef_client_json = nil
 

diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
@@ -198,7 +198,7 @@ def run_chef_client
           result = shell_out(
             "chef-client.bat #{config_params}",
             :timeout => Chef::Config[:windows_service][:watchdog_timeout],
-            :logger => Chef::Log,
+            :logger => Chef::Log
           )
           Chef::Log.debug "#{result.stdout}"
           Chef::Log.debug "#{result.stderr}"

diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb
@@ -124,11 +124,11 @@ def run(params = ARGV)
               :binary_path_name   => cmd,
               :service_start_name => @service_start_name,
               :password           => @password,
-              :dependencies       => @dependencies,
+              :dependencies       => @dependencies
             )
             ::Win32::Service.configure(
               :service_name     => @service_name,
-              :delayed_start    => @delayed_start,
+              :delayed_start    => @delayed_start
             ) unless @delayed_start.nil?
             puts "Service '#{@service_name}' has successfully been installed."
           end

diff --git a/lib/chef/chef_fs/data_handler/acl_data_handler.rb b/lib/chef/chef_fs/data_handler/acl_data_handler.rb
@@ -12,7 +12,7 @@ def normalize(acl, entry)
             "update" => {},
             "delete" => {},
             "grant" => {},
-            },)
+            })
           result.keys.each do |key|
             result[key] = normalize_hash(result[key], { "actors" => [], "groups" => [] })
             result[key]["actors"] = result[key]["actors"].sort

diff --git a/lib/chef/chef_fs/data_handler/container_data_handler.rb b/lib/chef/chef_fs/data_handler/container_data_handler.rb
@@ -8,7 +8,7 @@ def normalize(container, entry)
           normalize_hash(container, {
             "containername" => remove_dot_json(entry.name),
             "containerpath" => remove_dot_json(entry.name),
-          },)
+          })
         end
 
         def preserve_key?(key)

diff --git a/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb b/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb
@@ -16,11 +16,11 @@ def normalize(cookbook, entry)
             "chef_type" => "cookbook_version",
             "frozen?" => false,
             "metadata" => {},
-          },)
+          })
           result["metadata"] = normalize_hash(result["metadata"], {
             "version" => version,
             "name" => name,
-          },)
+          })
         end
 
         def preserve_key?(key)

diff --git a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb
@@ -14,7 +14,7 @@ def normalize(data_bag_item, entry)
           # use those in knife-essentials.
           normalize_hash(data_bag_item, {
             "id" => remove_dot_json(entry.name),
-          },)
+          })
         end
 
         def normalize_for_post(data_bag_item, entry)

diff --git a/lib/chef/chef_fs/data_handler/environment_data_handler.rb b/lib/chef/chef_fs/data_handler/environment_data_handler.rb
@@ -14,7 +14,7 @@ def normalize(environment, entry)
             "override_attributes" => {},
             "json_class" => "Chef::Environment",
             "chef_type" => "environment",
-          },)
+          })
         end
 
         def preserve_key?(key)

diff --git a/lib/chef/chef_fs/data_handler/node_data_handler.rb b/lib/chef/chef_fs/data_handler/node_data_handler.rb
@@ -16,7 +16,7 @@ def normalize(node, entry)
             "default" => {},
             "automatic" => {},
             "run_list" => [],
-          },)
+          })
           result["run_list"] = normalize_run_list(result["run_list"])
           result
         end

diff --git a/lib/chef/chef_fs/data_handler/organization_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_data_handler.rb
@@ -11,7 +11,7 @@ def normalize(organization, entry)
             "org_type" => "Business",
             "clientname" => "#{entry.org}-validator",
             "billing_plan" => "platform-free",
-          },)
+          })
           result
         end
 

diff --git a/lib/chef/chef_fs/data_handler/role_data_handler.rb b/lib/chef/chef_fs/data_handler/role_data_handler.rb
@@ -15,7 +15,7 @@ def normalize(role, entry)
             "override_attributes" => {},
             "run_list" => [],
             "env_run_lists" => {},
-          },)
+          })
           result["run_list"] = normalize_run_list(result["run_list"])
           result["env_run_lists"].each_pair do |env, run_list|
             result["env_run_lists"][env] = normalize_run_list(run_list)

diff --git a/lib/chef/chef_fs/data_handler/user_data_handler.rb b/lib/chef/chef_fs/data_handler/user_data_handler.rb
@@ -15,7 +15,7 @@ def normalize(user, entry)
             "salt" => nil,
             "password" => nil,
             "openid" => nil,
-          },)
+          })
         end
 
         def preserve_key?(key)

diff --git a/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb
@@ -177,7 +177,7 @@ def maintainer(arg = nil)
         set_or_return(
           :maintainer,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -192,7 +192,7 @@ def maintainer_email(arg = nil)
         set_or_return(
           :maintainer_email,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -207,7 +207,7 @@ def license(arg = nil)
         set_or_return(
           :license,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -222,7 +222,7 @@ def description(arg = nil)
         set_or_return(
           :description,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -237,7 +237,7 @@ def long_description(arg = nil)
         set_or_return(
           :long_description,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -268,7 +268,7 @@ def name(arg = nil)
         set_or_return(
           :name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -492,7 +492,7 @@ def attribute(name, options)
             :source_url => { :kind_of => String },
             :issues_url => { :kind_of => String },
             :privacy => { :kind_of => [ TrueClass, FalseClass ] },
-          },
+          }
         )
         options[:required] = remap_required_attribute(options[:required]) unless options[:required].nil?
         validate_choice_array(options)
@@ -509,7 +509,7 @@ def grouping(name, options)
           {
             :title => { :kind_of => String },
             :description => { :kind_of => String },
-          },
+          }
         )
         @groupings[name] = options
         @groupings[name]
@@ -648,7 +648,7 @@ def source_url(arg = nil)
         set_or_return(
           :source_url,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -663,7 +663,7 @@ def issues_url(arg = nil)
         set_or_return(
           :issues_url,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -680,7 +680,7 @@ def privacy(arg = nil)
         set_or_return(
           :privacy,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 

diff --git a/lib/chef/cookbook_manifest.rb b/lib/chef/cookbook_manifest.rb
@@ -195,7 +195,7 @@ def generate_manifest
         :resources => Array.new,
         :providers => Array.new,
         :root_files => Array.new,
-      },)
+      })
       @checksums = {}
 
       if !root_paths || root_paths.size == 0
@@ -217,7 +217,7 @@ def generate_manifest
             :path => path,
             :checksum => csum,
             :specificity => specificity,
-          },)
+          })
 
           manifest[segment] << rs
         end

diff --git a/lib/chef/data_bag.rb b/lib/chef/data_bag.rb
@@ -52,7 +52,7 @@ def name(arg = nil)
       set_or_return(
         :name,
         arg,
-        :regex => VALID_NAME,
+        :regex => VALID_NAME
       )
     end
 

diff --git a/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb
@@ -86,7 +86,7 @@ def data_bag(arg = nil)
       set_or_return(
         :data_bag,
         arg,
-        :regex => /^[\-[:alnum:]_]+$/,
+        :regex => /^[\-[:alnum:]_]+$/
       )
     end
 

diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb
@@ -100,7 +100,7 @@ def build_resource(type, name, created_at = nil, run_context: self.run_context,
           run_context:         run_context,
           cookbook_name:       cookbook_name,
           recipe_name:         recipe_name,
-          enclosing_provider:  self.is_a?(Chef::Provider) ? self : nil,
+          enclosing_provider:  self.is_a?(Chef::Provider) ? self : nil
         ).build(&resource_attrs_block)
       end
     end
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,7 +152,7 @@ def http_api @@
                                                 :api_version => "0",
                                                 :client_name => Chef::Config[:validation_client_name],
                                                 :signing_key_filename => Chef::Config[:validation_key],
-                                              },
+                                              }
                                              )
           end
@@ Expand Down @@