Enforce consistent whitespaces around blocks, equal signs, and in parameters in Ruby code

Author: kpumuk

lib/rb/.rubocop.yml

@@ -9,15 +9,33 @@ AllCops:
   Exclude:
     - "**/vendor/**/*"
 
+Layout/EmptyLines:
+  Enabled: true
+
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: true
+
+Layout/ExtraSpacing:
+  Enabled: true
+
 Layout/IndentationConsistency:
   Enabled: true
 
-Layout/EmptyLines:
+Layout/LeadingCommentSpace:
   Enabled: true
 
 Layout/LeadingEmptyLines:
   Enabled: true
 
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
 Layout/TrailingEmptyLines:
   Enabled: true
 

lib/rb/Rakefile

@@ -135,5 +135,5 @@ end
 CLEAN.include [
   '.bundle', 'benchmark/gen-rb', 'coverage', 'ext/*.{o,bundle,so,dll}', 'ext/mkmf.log',
   'ext/Makefile', 'ext/conftest.dSYM', 'ext/thrift_native.bundle.dSYM', 'mkmf.log',
-  'pkg',  'spec/gen-rb', 'test/debug_proto/gen-rb', 'thrift-*.gem'
+  'pkg', 'spec/gen-rb', 'test/debug_proto/gen-rb', 'thrift-*.gem'
 ]

lib/rb/benchmark/benchmark.rb

@@ -116,7 +116,7 @@ def socket_class
   def collect_output
     puts "Collecting output..."
     # read from @pool until all sockets are closed
-    @buffers = Hash.new { |h,k| h[k] = '' }
+    @buffers = Hash.new { |h, k| h[k] = '' }
     until @pool.empty?
       rd, = select(@pool)
       next if rd.nil?
@@ -184,9 +184,9 @@ def analyze_output
       end
     end
     @report = {}
-    @report[:total_calls] = call_times.inject(0.0) { |a,t| a += t }
+    @report[:total_calls] = call_times.inject(0.0) { |a, t| a += t }
     @report[:avg_calls] = @report[:total_calls] / call_times.size
-    @report[:total_clients] = client_times.inject(0.0) { |a,t| a += t }
+    @report[:total_clients] = client_times.inject(0.0) { |a, t| a += t }
     @report[:avg_clients] = @report[:total_clients] / client_times.size
     @report[:connection_failures] = connection_failures.size
     @report[:connection_errors] = connection_errors.size
@@ -241,8 +241,8 @@ def report_output
 
   def tabulate(fmt, *labels_and_values)
     labels = labels_and_values.map { |l| Array === l ? l.first : l }
-    label_width = labels.inject(0) { |w,l| l.size > w ? l.size : w }
-    labels_and_values.each do |(l,v)|
+    label_width = labels.inject(0) { |w, l| l.size > w ? l.size : w }
+    labels_and_values.each do |(l, v)|
       f = fmt
       l, f, c = l if Array === l
       fmtstr = "%-#{label_width+1}s #{f}"
@@ -255,7 +255,7 @@ def tabulate(fmt, *labels_and_values)
 end
 
 def resolve_const(const)
-  const and const.split('::').inject(Object) { |k,c| k.const_get(c) }
+  const and const.split('::').inject(Object) { |k, c| k.const_get(c) }
 end
 
 puts "Starting server..."

lib/rb/benchmark/server.rb

@@ -101,7 +101,7 @@ def self.shutdown
 end
 
 def resolve_const(const)
-  const and const.split('::').inject(Object) { |k,c| k.const_get(c) }
+  const and const.split('::').inject(Object) { |k, c| k.const_get(c) }
 end
 
 tls = true if ARGV[0] == '-tls' and ARGV.shift

lib/rb/ext/extconf.rb

@@ -18,7 +18,7 @@
 #
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
-  File.open('Makefile', 'w'){|f| f.puts "all:\n\ninstall:\n" }
+  File.open('Makefile', 'w'){ |f| f.puts "all:\n\ninstall:\n" }
 else
   require 'mkmf'
 

lib/rb/lib/thrift/client.rb

@@ -19,7 +19,7 @@
 
 module Thrift
   module Client
-    def initialize(iprot, oprot=nil)
+    def initialize(iprot, oprot = nil)
       @iprot = iprot
       @oprot = oprot || iprot
       @seqid = 0

lib/rb/lib/thrift/exceptions.rb

@@ -43,7 +43,7 @@ class ApplicationException < Exception
 
     attr_reader :type
 
-    def initialize(type=UNKNOWN, message=nil)
+    def initialize(type = UNKNOWN, message = nil)
       super(message)
       @type = type
     end

lib/rb/lib/thrift/processor.rb

@@ -21,7 +21,7 @@
 
 module Thrift
   module Processor
-    def initialize(handler, logger=nil)
+    def initialize(handler, logger = nil)
       @handler = handler
       if logger.nil?
         @logger = Logger.new(STDERR)
@@ -32,7 +32,7 @@ def initialize(handler, logger=nil)
     end
 
     def process(iprot, oprot)
-      name, type, seqid  = iprot.read_message_begin
+      name, type, seqid = iprot.read_message_begin
       if respond_to?("process_#{name}")
         begin
           send("process_#{name}", seqid, iprot, oprot)

lib/rb/lib/thrift/protocol/base_protocol.rb

@@ -33,7 +33,7 @@ class ProtocolException < Exception
 
     attr_reader :type
 
-    def initialize(type=UNKNOWN, message=nil)
+    def initialize(type = UNKNOWN, message = nil)
       super(message)
       @type = type
     end

lib/rb/lib/thrift/protocol/binary_protocol.rb

@@ -25,7 +25,7 @@ class BinaryProtocol < BaseProtocol
 
     attr_reader :strict_read, :strict_write
 
-    def initialize(trans, strict_read=true, strict_write=true)
+    def initialize(trans, strict_read = true, strict_write = true)
       super(trans)
       @strict_read = strict_read
       @strict_write = strict_write