coveralls_reborn 0.9.0 → 0.10.0

data/lib/coveralls/configuration.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'securerandom'
 
 module Coveralls
   module Configuration
-
     def self.configuration
       config = {
-        environment: self.relevant_env,
+        environment: relevant_env,
         git: git
       }
-      yml = self.yaml_config
+      yml = yaml_config
       if yml
         config[:configuration] = yml
         config[:repo_token] = yml['repo_token'] || yml['repo_secret_token']
@@ -17,7 +18,7 @@ module Coveralls
       if ENV['COVERALLS_REPO_TOKEN']
         config[:repo_token] = ENV['COVERALLS_REPO_TOKEN']
       end
-      if ENV['COVERALLS_PARALLEL'] && ENV['COVERALLS_PARALLEL'] != "false"
+      if ENV['COVERALLS_PARALLEL'] && ENV['COVERALLS_PARALLEL'] != 'false'
         config[:parallel] = true
       end
       if ENV['TRAVIS']
@@ -41,24 +42,24 @@ module Coveralls
       # standardized env vars
       set_standard_service_params_for_generic_ci(config)
 
-      if service_name = ENV['COVERALLS_SERVICE_NAME']
-        config[:service_name] = service_name
+      if ENV['COVERALLS_SERVICE_NAME']
+        config[:service_name] = ENV['COVERALLS_SERVICE_NAME']
       end
 
       config
     end
 
     def self.set_service_params_for_travis(config, service_name)
-      config[:service_job_id] = ENV['TRAVIS_JOB_ID']
+      config[:service_job_id]       = ENV['TRAVIS_JOB_ID']
       config[:service_pull_request] = ENV['TRAVIS_PULL_REQUEST'] unless ENV['TRAVIS_PULL_REQUEST'] == 'false'
-      config[:service_name]   = service_name || 'travis-ci'
-      config[:service_branch] = ENV['TRAVIS_BRANCH']
+      config[:service_name]         = service_name || 'travis-ci'
+      config[:service_branch]       = ENV['TRAVIS_BRANCH']
     end
 
     def self.set_service_params_for_circleci(config)
       config[:service_name]         = 'circleci'
       config[:service_number]       = ENV['CIRCLE_BUILD_NUM']
-      config[:service_pull_request] = (ENV['CI_PULL_REQUEST'] || "")[/(\d+)$/,1]
+      config[:service_pull_request] = (ENV['CI_PULL_REQUEST'] || '')[/(\d+)$/, 1]
       config[:parallel]             = ENV['CIRCLE_NODE_TOTAL'].to_i > 1
       config[:service_job_number]   = ENV['CIRCLE_NODE_INDEX']
     end
@@ -70,19 +71,19 @@ module Coveralls
     end
 
     def self.set_service_params_for_jenkins(config)
-      config[:service_name]   = 'jenkins'
-      config[:service_number] = ENV['BUILD_NUMBER']
-      config[:service_branch] = ENV['BRANCH_NAME']
+      config[:service_name]         = 'jenkins'
+      config[:service_number]       = ENV['BUILD_NUMBER']
+      config[:service_branch]       = ENV['BRANCH_NAME']
       config[:service_pull_request] = ENV['ghprbPullId']
     end
 
     def self.set_service_params_for_appveyor(config)
-      config[:service_name]   = 'appveyor'
-      config[:service_number] = ENV['APPVEYOR_BUILD_VERSION']
-      config[:service_branch] = ENV['APPVEYOR_REPO_BRANCH']
-      config[:commit_sha] = ENV['APPVEYOR_REPO_COMMIT']
-      repo_name = ENV['APPVEYOR_REPO_NAME']
-      config[:service_build_url]  = 'https://ci.appveyor.com/project/%s/build/%s' % [repo_name, config[:service_number]]
+      config[:service_name]      = 'appveyor'
+      config[:service_number]    = ENV['APPVEYOR_BUILD_VERSION']
+      config[:service_branch]    = ENV['APPVEYOR_REPO_BRANCH']
+      config[:commit_sha]        = ENV['APPVEYOR_REPO_COMMIT']
+      repo_name                  = ENV['APPVEYOR_REPO_NAME']
+      config[:service_build_url] = format('https://ci.appveyor.com/project/%s/build/%s', repo_name, config[:service_number])
     end
 
     def self.set_service_params_for_tddium(config)
@@ -95,11 +96,11 @@ module Coveralls
     end
 
     def self.set_service_params_for_gitlab(config)
-      config[:service_name]         = 'gitlab-ci'
-      config[:service_job_number]   = ENV['CI_BUILD_NAME']
-      config[:service_job_id]       = ENV['CI_BUILD_ID']
-      config[:service_branch]       = ENV['CI_BUILD_REF_NAME']
-      config[:commit_sha]           = ENV['CI_BUILD_REF']
+      config[:service_name]       = 'gitlab-ci'
+      config[:service_job_number] = ENV['CI_BUILD_NAME']
+      config[:service_job_id]     = ENV['CI_BUILD_ID']
+      config[:service_branch]     = ENV['CI_BUILD_REF_NAME']
+      config[:commit_sha]         = ENV['CI_BUILD_REF']
     end
 
     def self.set_service_params_for_coveralls_local(config)
@@ -114,17 +115,16 @@ module Coveralls
       config[:service_job_id]       ||= ENV['CI_JOB_ID']
       config[:service_build_url]    ||= ENV['CI_BUILD_URL']
       config[:service_branch]       ||= ENV['CI_BRANCH']
-      config[:service_pull_request] ||= (ENV['CI_PULL_REQUEST'] || "")[/(\d+)$/,1]
+      config[:service_pull_request] ||= (ENV['CI_PULL_REQUEST'] || '')[/(\d+)$/, 1]
     end
 
     def self.yaml_config
-      if self.configuration_path && File.exist?(self.configuration_path)
-        YAML::load_file(self.configuration_path)
-      end
+      return unless configuration_path && File.exist?(configuration_path)
+      YAML.load_file(configuration_path)
     end
 
     def self.configuration_path
-      File.expand_path(File.join(self.root, ".coveralls.yml")) if self.root
+      File.expand_path(File.join(root, '.coveralls.yml')) if root
     end
 
     def self.root
@@ -136,14 +136,12 @@ module Coveralls
     end
 
     def self.simplecov_root
-      if defined?(::SimpleCov)
-        ::SimpleCov.root
-      end
+      ::SimpleCov.root if defined?(::SimpleCov)
     end
 
     def self.rails_root
       Rails.root.to_s
-    rescue
+    rescue StandardError
       nil
     end
 
@@ -151,44 +149,41 @@ module Coveralls
       hash = {}
 
       Dir.chdir(root) do
-
         hash[:head] = {
-          id: ENV.fetch("GIT_ID", `git log -1 --pretty=format:'%H'`),
-          author_name: ENV.fetch("GIT_AUTHOR_NAME", `git log -1 --pretty=format:'%aN'`),
-          author_email: ENV.fetch("GIT_AUTHOR_EMAIL", `git log -1 --pretty=format:'%ae'`),
-          committer_name: ENV.fetch("GIT_COMMITTER_NAME", `git log -1 --pretty=format:'%cN'`),
-          committer_email: ENV.fetch("GIT_COMMITTER_EMAIL", `git log -1 --pretty=format:'%ce'`),
-          message: ENV.fetch("GIT_MESSAGE", `git log -1 --pretty=format:'%s'`)
+          id: ENV.fetch('GIT_ID', `git log -1 --pretty=format:'%H'`),
+          author_name: ENV.fetch('GIT_AUTHOR_NAME', `git log -1 --pretty=format:'%aN'`),
+          author_email: ENV.fetch('GIT_AUTHOR_EMAIL', `git log -1 --pretty=format:'%ae'`),
+          committer_name: ENV.fetch('GIT_COMMITTER_NAME', `git log -1 --pretty=format:'%cN'`),
+          committer_email: ENV.fetch('GIT_COMMITTER_EMAIL', `git log -1 --pretty=format:'%ce'`),
+          message: ENV.fetch('GIT_MESSAGE', `git log -1 --pretty=format:'%s'`)
         }
 
         # Branch
-        hash[:branch] = ENV.fetch("GIT_BRANCH", `git rev-parse --abbrev-ref HEAD`)
+        hash[:branch] = ENV.fetch('GIT_BRANCH', `git rev-parse --abbrev-ref HEAD`)
 
         # Remotes
         remotes = nil
         begin
           remotes = `git remote -v`.split(/\n/).map do |remote|
-            splits = remote.split(" ").compact
-            {name: splits[0], url: splits[1]}
+            splits = remote.split(' ').compact
+            { name: splits[0], url: splits[1] }
           end.uniq
-        rescue
+        rescue StandardError
         end
         hash[:remotes] = remotes
-
       end
 
       hash
-
-    rescue Exception => e
-      Coveralls::Output.puts "Coveralls git error:", color: "red"
-      Coveralls::Output.puts e.to_s, color: "red"
+    rescue StandardError => e
+      Coveralls::Output.puts 'Coveralls git error:', color: 'red'
+      Coveralls::Output.puts e.to_s, color: 'red'
       nil
     end
 
     def self.relevant_env
       hash = {
-        pwd: self.pwd,
-        rails_root: self.rails_root,
+        pwd: pwd,
+        rails_root: rails_root,
         simplecov_root: simplecov_root,
         gem_version: VERSION
       }
@@ -225,6 +220,5 @@ module Coveralls
 
       hash
     end
-
   end
 end

data/lib/coveralls/output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coveralls
   #
   # Public: Methods for formatting strings with Term::ANSIColor.
@@ -32,16 +34,19 @@ module Coveralls
   #   Coveralls::Output.no_color = true
 
   module Output
-    attr_accessor :silent, :no_color
-    attr_writer :output
-    extend self
+    class << self
+      attr_accessor :silent, :no_color
+      attr_writer :output
+    end
+
+    module_function
 
     def output
       (defined?(@output) && @output) || $stdout
     end
 
     def no_color?
-      (defined?(@no_color)) && @no_color
+      defined?(@no_color) && @no_color
     end
 
     # Public: Formats the given string with the specified color
@@ -87,7 +92,7 @@ module Coveralls
     # Returns nil.
     def puts(string, options = {})
       return if silent?
-      (options[:output] || output).puts self.format(string, options)
+      (options[:output] || output).puts format(string, options)
     end
 
     # Public: Passes .format to Kernel#print
@@ -104,11 +109,11 @@ module Coveralls
     # Returns nil.
     def print(string, options = {})
       return if silent?
-      (options[:output] || output).print self.format(string, options)
+      (options[:output] || output).print format(string, options)
     end
 
     def silent?
-      ENV["COVERALLS_SILENT"] || (defined?(@silent) && @silent)
+      ENV['COVERALLS_SILENT'] || (defined?(@silent) && @silent)
     end
   end
 end

data/lib/coveralls/rake/task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 require 'rake/tasklib'
 
@@ -5,15 +7,14 @@ module Coveralls
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    def initialize(*args, &task_block)
+    def initialize(*_args)
       namespace :coveralls do
-        desc "Push latest coverage results to Coveralls.io"
+        desc 'Push latest coverage results to Coveralls.io'
         task :push do
           require 'coveralls'
           Coveralls.push!
         end
       end
-    end # initialize
-
-  end # class
-end # module
+    end
+  end
+end

data/lib/coveralls/simplecov.rb

@@ -1,27 +1,28 @@
+# frozen_string_literal: true
+
 module Coveralls
   module SimpleCov
     class Formatter
-
       def display_result(result)
         # Log which files would be submitted.
-        if result.files.length > 0
-          Coveralls::Output.puts "[Coveralls] Some handy coverage stats:"
+        if !result.files.empty?
+          Coveralls::Output.puts '[Coveralls] Some handy coverage stats:'
         else
-          Coveralls::Output.puts "[Coveralls] There are no covered files.", color: "yellow"
+          Coveralls::Output.puts '[Coveralls] There are no covered files.', color: 'yellow'
         end
         result.files.each do |f|
-          Coveralls::Output.print "  * "
-          Coveralls::Output.print short_filename(f.filename).to_s, color: "cyan"
-          Coveralls::Output.print " => ", color: "white"
+          Coveralls::Output.print '  * '
+          Coveralls::Output.print short_filename(f.filename).to_s, color: 'cyan'
+          Coveralls::Output.print ' => ', color: 'white'
           cov = "#{f.covered_percent.round}%"
           if f.covered_percent > 90
-            Coveralls::Output.print cov, color: "green"
+            Coveralls::Output.print cov, color: 'green'
           elsif f.covered_percent > 80
-            Coveralls::Output.print cov, color: "yellow"
+            Coveralls::Output.print cov, color: 'yellow'
           else
-            Coveralls::Output.print cov, color: "red"
+            Coveralls::Output.print cov, color: 'red'
           end
-          Coveralls::Output.puts ""
+          Coveralls::Output.puts ''
         end
         true
       end
@@ -33,7 +34,7 @@ module Coveralls
           properties = {}
 
           # Get Source
-          properties[:source] = File.open(file.filename, "rb:utf-8").read
+          properties[:source] = File.open(file.filename, 'rb:utf-8').read
 
           # Get the root-relative filename
           properties[:name] = short_filename(file.filename)
@@ -52,50 +53,51 @@ module Coveralls
       end
 
       def format(result)
-
         unless Coveralls.should_run?
-          if Coveralls.noisy?
-            display_result result
-          end
+          display_result result if Coveralls.noisy?
           return
         end
 
         # Post to Coveralls.
-        API.post_json "jobs", 
-          source_files: get_source_files(result),
-          test_framework: result.command_name.downcase,
-          run_at: result.created_at
+        API.post_json 'jobs',
+                      source_files: get_source_files(result),
+                      test_framework: result.command_name.downcase,
+                      run_at: result.created_at
 
         Coveralls::Output.puts output_message result
 
         true
-
-      rescue Exception => e
+      rescue StandardError => e
         display_error e
       end
 
       def display_error(e)
-        Coveralls::Output.puts "Coveralls encountered an exception:", color: "red"
-        Coveralls::Output.puts e.class.to_s, color: "red"
-        Coveralls::Output.puts e.message, color: "red"
-        e.backtrace.each do |line|
-          Coveralls::Output.puts line, color: "red"
-        end if e.backtrace
+        Coveralls::Output.puts 'Coveralls encountered an exception:', color: 'red'
+        Coveralls::Output.puts e.class.to_s, color: 'red'
+        Coveralls::Output.puts e.message, color: 'red'
+        if e.backtrace
+          e.backtrace.each do |line|
+            Coveralls::Output.puts line, color: 'red'
+          end
+        end
         if e.respond_to?(:response) && e.response
-          Coveralls::Output.puts e.response.to_s, color: "red"
+          Coveralls::Output.puts e.response.to_s, color: 'red'
         end
         false
       end
 
       def output_message(result)
-        "Coverage is at #{result.covered_percent.round(2) rescue result.covered_percent.round}%.\nCoverage report sent to Coveralls."
+        "Coverage is at #{begin
+                            result.covered_percent.round(2)
+                          rescue StandardError
+                            result.covered_percent.round
+                          end}%.\nCoverage report sent to Coveralls."
       end
 
       def short_filename(filename)
-        filename = filename.gsub(::SimpleCov.root, '.').gsub(/^\.\//, '') if ::SimpleCov.root
+        filename = filename.gsub(::SimpleCov.root, '.').gsub(%r{^\./}, '') if ::SimpleCov.root
         filename
       end
-
     end
   end
 end

data/lib/coveralls/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coveralls
- VERSION = "0.9.0"
+  VERSION = '0.10.0'.freeze
 end

data/lib/coveralls.rb

@@ -1,27 +1,30 @@
-require "coveralls/version"
-require "coveralls/configuration"
-require "coveralls/api"
-require "coveralls/output"
-require "coveralls/simplecov"
+# frozen_string_literal: true
+
+require 'coveralls/version'
+require 'coveralls/configuration'
+require 'coveralls/api'
+require 'coveralls/output'
+require 'coveralls/simplecov'
 
 module Coveralls
-  extend self
+  class << self
+    attr_accessor :adapter, :testing, :noisy, :run_locally
+  end
 
   class NilFormatter
-    def format(result)
-    end
+    def format(result); end
   end
 
-  attr_accessor :testing, :noisy, :run_locally
+  module_function
 
-  def wear!(simplecov_setting=nil, &block)
+  def wear!(simplecov_setting = nil, &block)
     setup!
     start! simplecov_setting, &block
   end
 
-  def wear_merged!(simplecov_setting=nil, &block)
+  def wear_merged!(simplecov_setting = nil, &block)
     require 'simplecov'
-    @@adapter = :simplecov
+    @adapter = :simplecov
     ::SimpleCov.formatter = NilFormatter
     start! simplecov_setting, &block
   end
@@ -34,68 +37,67 @@ module Coveralls
 
   def setup!
     # Try to load up SimpleCov.
-    @@adapter = nil
+    @adapter = nil
     if defined?(::SimpleCov)
-      @@adapter = :simplecov
+      @adapter = :simplecov
     else
       begin
         require 'simplecov'
-        @@adapter = :simplecov if defined?(::SimpleCov)
-      rescue
+        @adapter = :simplecov if defined?(::SimpleCov)
+      rescue StandardError
       end
     end
 
     # Load the appropriate adapter.
-    if @@adapter == :simplecov
+    if @adapter == :simplecov
       ::SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-      Coveralls::Output.puts("[Coveralls] Set up the SimpleCov formatter.", color: "green")
+      Coveralls::Output.puts('[Coveralls] Set up the SimpleCov formatter.', color: 'green')
     else
-      Coveralls::Output.puts("[Coveralls] Couldn't find an appropriate adapter.", color: "red")
+      Coveralls::Output.puts("[Coveralls] Couldn't find an appropriate adapter.", color: 'red')
     end
-
   end
 
   def start!(simplecov_setting = 'test_frameworks', &block)
-    if @@adapter == :simplecov
-      ::SimpleCov.add_filter 'vendor'
-
-      if simplecov_setting
-        Coveralls::Output.puts("[Coveralls] Using SimpleCov's '#{simplecov_setting}' settings.", color: "green")
-        if block_given?
-          ::SimpleCov.start(simplecov_setting) { instance_eval(&block)}
-        else
-          ::SimpleCov.start(simplecov_setting)
-        end
-      elsif block
-        Coveralls::Output.puts("[Coveralls] Using SimpleCov settings defined in block.", color: "green")
-        ::SimpleCov.start { instance_eval(&block) }
+    return if @adapter != :simplecov
+
+    ::SimpleCov.add_filter 'vendor'
+
+    if simplecov_setting
+      Coveralls::Output.puts("[Coveralls] Using SimpleCov's '#{simplecov_setting}' settings.", color: 'green')
+      if block_given?
+        ::SimpleCov.start(simplecov_setting) { instance_eval(&block) }
       else
-        Coveralls::Output.puts("[Coveralls] Using SimpleCov's default settings.", color: "green")
-        ::SimpleCov.start
+        ::SimpleCov.start(simplecov_setting)
       end
+    elsif block
+      Coveralls::Output.puts('[Coveralls] Using SimpleCov settings defined in block.', color: 'green')
+      ::SimpleCov.start { instance_eval(&block) }
+    else
+      Coveralls::Output.puts("[Coveralls] Using SimpleCov's default settings.", color: 'green')
+      ::SimpleCov.start
     end
   end
 
   def should_run?
     # Fail early if we're not on a CI
     unless will_run?
-      Coveralls::Output.puts("[Coveralls] Outside the CI environment, not sending data.", color: "yellow")
+      Coveralls::Output.puts('[Coveralls] Outside the CI environment, not sending data.', color: 'yellow')
       return false
     end
 
-    if ENV["COVERALLS_RUN_LOCALLY"] || (defined?(@run_locally) && @run_locally)
-      Coveralls::Output.puts("[Coveralls] Creating a new job on Coveralls from local coverage results.", color: "cyan")
+    if ENV['COVERALLS_RUN_LOCALLY'] || (defined?(@run_locally) && @run_locally)
+      Coveralls::Output.puts('[Coveralls] Creating a new job on Coveralls from local coverage results.', color: 'cyan')
     end
 
     true
   end
 
   def will_run?
-    ENV["CI"] || ENV["JENKINS_URL"] || ENV['TDDIUM'] ||
-      ENV["COVERALLS_RUN_LOCALLY"] || (defined?(@testing) && @testing)
+    ENV['CI'] || ENV['JENKINS_URL'] || ENV['TDDIUM'] ||
+      ENV['COVERALLS_RUN_LOCALLY'] || (defined?(@testing) && @testing)
   end
 
   def noisy?
-    ENV["COVERALLS_NOISY"] || (defined?(@noisy) && @noisy)
+    ENV['COVERALLS_NOISY'] || (defined?(@noisy) && @noisy)
   end
 end