Merge pull request #238 from winebarrel/enable_Naming/Uncommunicative…

…MethodParamName

Enable Naming/UncommunicativeMethodParamName

.rubocop.yml

@@ -25,8 +25,6 @@ Metrics/ParameterLists:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
 Performance/StringReplacement:
   Enabled: false
 Style/ClassAndModuleChildren:

lib/ridgepole/delta.rb

@@ -205,9 +205,9 @@ def raise_exception(script, org)
     raise e
   end
 
-  def detect_error_line(e)
+  def detect_error_line(exception)
     rgx = /\A#{Regexp.escape(SCRIPT_NAME)}:(\d+):/
-    line = e.backtrace.find { |i| i =~ rgx }
+    line = exception.backtrace.find { |i| i =~ rgx }
 
     if line && (m = rgx.match(line))
       m[1].to_i

lib/ridgepole/ext/pp_sort_hash.rb

@@ -1,17 +1,17 @@
 module Ridgepole
   module Ext
     module PpSortHash
-      def pretty_print(q)
-        q.group(1, '{', '}') do
-          q.seplist(sort_by { |k, _| k.to_s }, nil, :each) do |k, v|
+      def pretty_print(pp_obj)
+        pp_obj.group(1, '{', '}') do
+          pp_obj.seplist(sort_by { |k, _| k.to_s }, nil, :each) do |k, v|
             v = PpSortHash.extend_if_hash(v)
 
-            q.group do
-              q.pp k
-              q.text '=>'
-              q.group(1) do
-                q.breakable ''
-                q.pp v
+            pp_obj.group do
+              pp_obj.pp k
+              pp_obj.text '=>'
+              pp_obj.group(1) do
+                pp_obj.breakable ''
+                pp_obj.pp v
               end
             end
           end