Clean up Code Climate rubocop style issues

ABaldwinHunter · ABaldwinHunter · commit 74816a246c96 · 2016-08-17T18:18:05.000-04:00
diff --git a/bin/cc-tddium-post-worker b/bin/cc-tddium-post-worker
@@ -7,7 +7,7 @@ if ENV["CODECLIMATE_REPO_TOKEN"]
   tmpdir = Dir.tmpdir
   puts "Searching #{tmpdir} for files to POST."
   coverage_report_files = Dir.glob("#{tmpdir}/codeclimate-test-coverage-*")
-  if coverage_report_files.size > 0
+  if coverage_report_files.any?
     puts "Found: "
     puts coverage_report_files.join("\n")
     client = CodeClimate::TestReporter::Client.new
diff --git a/lib/code_climate/test_reporter/calculate_blob.rb b/lib/code_climate/test_reporter/calculate_blob.rb
@@ -1,7 +1,6 @@
 module CodeClimate
   module TestReporter
     class CalculateBlob
-
       def initialize(file_path)
         @file_path = file_path
       end
@@ -10,7 +9,7 @@ def blob_id
         calculate_with_file or calculate_with_git
       end
 
-    private
+      private
 
       def calculate_with_file
         File.open(@file_path, "rb") do |file|
@@ -31,7 +30,6 @@ def calculate_with_git
 
         output
       end
-
     end
   end
 end
diff --git a/lib/code_climate/test_reporter/client.rb b/lib/code_climate/test_reporter/client.rb
@@ -5,9 +5,8 @@
 module CodeClimate
   module TestReporter
     class Client
-
       DEFAULT_TIMEOUT = 5 # in seconds
-      USER_AGENT = "Code Climate (Ruby Test Reporter v#{VERSION})"
+      USER_AGENT = "Code Climate (Ruby Test Reporter v#{VERSION})".freeze
 
       def host
         ENV["CODECLIMATE_API_HOST"] ||
@@ -72,7 +71,7 @@ def post_results(result)
         end
       end
 
-    private
+      private
 
       def http_client(uri)
         Net::HTTP.new(uri.host, uri.port).tap do |http|
diff --git a/lib/code_climate/test_reporter/exception_message.rb b/lib/code_climate/test_reporter/exception_message.rb
@@ -6,9 +6,9 @@ def library_name
       end
 
       def instructions
-      <<-STR
+        <<-STR
   WebMock.disable_net_connect!(:allow => "codeclimate.com")
-STR
+        STR
       end
     end
 
@@ -18,21 +18,20 @@ def library_name
       end
 
       def instructions
-      <<-STR
+        <<-STR
   VCR.configure do |config|
     # your existing configuration
     config.ignore_hosts 'codeclimate.com'
   end
-STR
+        STR
       end
     end
 
     class ExceptionMessage
-
       HTTP_STUBBING_MESSAGES = {
-        "VCR::Errors::UnhandledHTTPRequestError" => VCRMessage,
-        "WebMock::NetConnectNotAllowedError"     => WebMockMessage
-      }
+        "VCR::Errors::UnhandledHTTPRequestError".freeze => VCRMessage,
+        "WebMock::NetConnectNotAllowedError".freeze => WebMockMessage,
+      }.freeze
 
       def initialize(exception)
         @exception = exception
@@ -59,7 +58,7 @@ def message
         parts.join("\n")
       end
 
-    private
+      private
 
       def exception_class
         @exception.class.to_s
diff --git a/lib/code_climate/test_reporter/formatter.rb b/lib/code_climate/test_reporter/formatter.rb
@@ -39,11 +39,11 @@ def format(result)
       # actually private ...
       def short_filename(filename)
         return filename unless ::SimpleCov.root
-        filename = filename.gsub(/^#{::SimpleCov.root}/, ".").gsub(/^\.\//, "")
+        filename = filename.gsub(/^#{::SimpleCov.root}/, ".").gsub(%r{^\./}, "")
         apply_prefix filename
       end
 
-    private
+      private
 
       def partial?
         tddium?
@@ -70,8 +70,8 @@ def to_payload(result)
             line_counts: {
               total:    file.lines.count,
               covered:  file.covered_lines.count,
-              missed:   file.missed_lines.count
-            }
+              missed:   file.missed_lines.count,
+            },
           }
         end
 
@@ -89,9 +89,9 @@ def to_payload(result)
             pwd:            Dir.pwd,
             rails_root:     (Rails.root.to_s rescue nil),
             simplecov_root: ::SimpleCov.root,
-            gem_version:    VERSION
+            gem_version:    VERSION,
           },
-          ci_service: ci_service_data
+          ci_service: ci_service_data,
         }
       end
 
@@ -110,7 +110,7 @@ def write_to_file?
         tddium? || ENV["CODECLIMATE_TO_FILE"] || ENV["TO_FILE"]
       end
 
-      def apply_prefix filename
+      def apply_prefix(filename)
         prefix = CodeClimate::TestReporter.configuration.path_prefix
         return filename if prefix.nil?
         "#{prefix}/#{filename}"
diff --git a/lib/code_climate/test_reporter/git.rb b/lib/code_climate/test_reporter/git.rb
@@ -1,7 +1,6 @@
 module CodeClimate
   module TestReporter
     class Git
-
       class << self
         def info
           {
@@ -17,16 +16,16 @@ def branch_from_git_or_ci
 
         def clean_service_branch
           ci_branch = String(Ci.service_data[:branch])
-          clean = ci_branch.strip.sub(/^origin\//, "")
+          clean = ci_branch.strip.sub(%r{^origin/}, "")
 
-          clean.size > 0 ? clean : nil
+          !clean.empty? ? clean : nil
         end
 
         def clean_git_branch
           git_branch = String(branch_from_git)
-          clean = git_branch.sub(/^origin\//, "") unless git_branch.start_with?("(")
+          clean = git_branch.sub(%r{^origin/}, "") unless git_branch.start_with?("(")
 
-          clean.size > 0 ? clean : nil
+          !clean.empty? ? clean : nil
         end
 
         private
@@ -65,4 +64,3 @@ def rails_git_dir_present?
     end
   end
 end
-
diff --git a/lib/code_climate/test_reporter/payload_validator.rb b/lib/code_climate/test_reporter/payload_validator.rb
@@ -20,7 +20,7 @@ def validate
         true
       end
 
-    private
+      private
 
       def commit_sha
         commit_sha_from_git || commit_sha_from_ci_service
