coveralls 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751680a4a00bd9050a1fd32c10d1ae1fb16c9575
-  data.tar.gz: e01c5f98d05aadbee38bf723d9b986fed8e4a48a
+  metadata.gz: 37fb125236b8084bb66698ff83b734e7c50019c7
+  data.tar.gz: 5c14c65f7b7a093ab62b7b3219c8a18d9102b84a
 SHA512:
-  metadata.gz: 3ad45611e81128afdc44feec71d0d041d1c12230fd3fb35992163259ac2003ce809778af7cdcd5f2de5e2535d258723c94dee19b9963c5ca3623dffae7dbf8a4
-  data.tar.gz: 1d7456169096246cbcc3f818aedb764305fe840a33c94a03752aa5512e5cd8debaa4175468804cf342859fceda9b44b9a3b5820c6228422f7e344c8d33e60211
+  metadata.gz: d1e17590b229ed02769fc5004ad45ad2469f647913af1259049b7ff59c9f2d6130b450a28472e707306fb143171a7c6f007e047584fcc48cd52a1103325cc755
+  data.tar.gz: 9e3f728924b192cddbb5b608f7f5f596a250a716f27c1acf39fc8b227b7ac4c7164062caf11435271afe6114138167b402fbe0df90f9c5f25bfcb95400eb7091

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 
 .DS_Store
+/vendor/

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.7.0 (September 18, 2013)
+
+[Full Changelog](https://github.com/lemurheavy/coveralls-ruby/compare/v0.6.4...v0.7.0)
+
+Added:
+* output silencing (Thanks @elizabrock)
+* ruby warning fixes (Thanks @steveklabnik and @Nucc)
+
 ## 0.6.4 (April 2, 2013)
 
 [Full Changelog](https://github.com/lemurheavy/coveralls-ruby/compare/v0.6.3...v0.6.4)

data/lib/coveralls.rb

@@ -66,9 +66,9 @@ module Coveralls
         else
           ::SimpleCov.start(simplecov_setting)
         end
-      elsif block_given?
+      elsif block
         Coveralls::Output.puts("[Coveralls] Using SimpleCov settings defined in block.", :color => "green")
-        ::SimpleCov.start { instance_eval(&block)}
+        ::SimpleCov.start { instance_eval(&block) }
       else
         Coveralls::Output.puts("[Coveralls] Using SimpleCov's default settings.", :color => "green")
         ::SimpleCov.start
@@ -78,20 +78,24 @@ module Coveralls
 
   def should_run?
     # Fail early if we're not on a CI
-    unless ENV["CI"] || ENV["JENKINS_URL"] ||
-      ENV["COVERALLS_RUN_LOCALLY"] || testing
+    unless will_run?
       Coveralls::Output.puts("[Coveralls] Outside the Travis environment, not sending data.", :color => "yellow")
       return false
     end
 
-    if ENV["COVERALLS_RUN_LOCALLY"] || run_locally
+    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["COVERALLS_RUN_LOCALLY"] ||
+      (defined?(@testing) && @testing)
+  end
+
   def noisy?
-    ENV["COVERALLS_NOISY"] || noisy
+    ENV["COVERALLS_NOISY"] || (defined?(@noisy) && @noisy)
   end
 end

data/lib/coveralls/api.rb

@@ -14,17 +14,17 @@ module Coveralls
 			url = endpoint_to_url(endpoint)
       Coveralls::Output.puts("#{ MultiJson.dump(hash, :pretty => true) }", :color => "green") if ENV['COVERALLS_DEBUG']
 			hash = apified_hash hash
-      Coveralls::Output.puts "[Coveralls] Submitting to #{API_BASE}", :color => "cyan"
+      Coveralls::Output.puts("[Coveralls] Submitting to #{API_BASE}", :color => "cyan")
 			response = RestClient.post(url, :json_file => hash_to_file(hash))
 			response_hash = MultiJson.load(response.to_str)
-      Coveralls::Output.puts "[Coveralls] #{ response_hash['message'] }", :color => "cyan"
+      Coveralls::Output.puts("[Coveralls] #{ response_hash['message'] }", :color => "cyan")
 			if response_hash['message']
         Coveralls::Output.puts("[Coveralls] #{ Coveralls::Output.format(response_hash['url'], :color => "underline") }", :color => "cyan")
 			end
 		rescue RestClient::ServiceUnavailable
-			Coveralls::Output.puts "[Coveralls] API timeout occured, but data should still be processed", :color => "red"
+			Coveralls::Output.puts("[Coveralls] API timeout occured, but data should still be processed", :color => "red")
 		rescue RestClient::InternalServerError
-      Coveralls::Output.puts "[Coveralls] API internal error occured, we're on it!", :color => "red"
+      Coveralls::Output.puts("[Coveralls] API internal error occured, we're on it!", :color => "red")
 		end
 
 		private
@@ -58,7 +58,7 @@ module Coveralls
 		def self.apified_hash hash
 			config = Coveralls::Configuration.configuration
 			if ENV['CI'] || ENV['COVERALLS_DEBUG'] || Coveralls.testing
-        Coveralls::Output.puts "[Coveralls] Submiting with config:", :color => "yellow"
+        Coveralls::Output.puts "[Coveralls] Submitting with config:", :color => "yellow"
         output = MultiJson.dump(config, :pretty => true).gsub(/"repo_token": "(.*?)"/,'"repo_token": "[secure]"')
         Coveralls::Output.puts output, :color => "yellow"
 			end

data/lib/coveralls/command.rb

@@ -39,7 +39,7 @@ module Coveralls
 
     desc "version", "See version"
     def version
-      puts Coveralls::VERSION
+      Coveralls::Output.puts Coveralls::VERSION
     end
 
     private
@@ -50,7 +50,7 @@ module Coveralls
         url = url.gsub("%@", config[:repo_token])
         `open #{url}`
       else
-        puts "No repo_token configured."
+        Coveralls::Output.puts "No repo_token configured."
       end
     end
 

data/lib/coveralls/output.rb

@@ -18,10 +18,25 @@ module Coveralls
   #   Coveralls::Output.puts("Hello World", :color => "underline")
   #   # Hello World
   #   # => nil
+  #
+  # To silence output completely:
+  #
+  #   Coveralls::Output.silent = true
+  #
+  # or set this environment variable:
+  #
+  #   COVERALLS_SILENT
+
   module Output
     require 'term/ansicolor'
+    attr_accessor :silent
+    attr_writer :output
     extend self
 
+    def output
+      (defined?(@output) && @output) || $stdout
+    end
+
     # Public: Formats the given string with the specified color
     # through Term::ANSIColor
     #
@@ -37,11 +52,14 @@ module Coveralls
     #
     # Returns the formatted string.
     def format(string, options = {})
-      if options[:color] && Term::ANSIColor.respond_to?(options[:color].to_sym)
-        Term::ANSIColor.send(options[:color].to_sym, string)
-      else
-        string
+      if options[:color]
+        options[:color].split(/\s/).reverse_each do |color|
+          if Term::ANSIColor.respond_to?(color.to_sym)
+            string = Term::ANSIColor.send(color.to_sym, string)
+          end
+        end
       end
+      string
     end
 
     # Public: Passes .format to Kernel#puts
@@ -58,7 +76,8 @@ module Coveralls
     #
     # Returns nil.
     def puts(string, options = {})
-      Kernel.puts self.format(string, options)
+      return if silent?
+      (options[:output] || output).puts self.format(string, options)
     end
 
     # Public: Passes .format to Kernel#print
@@ -74,7 +93,12 @@ module Coveralls
     #
     # Returns nil.
     def print(string, options = {})
-      Kernel.print self.format(string, options)
+      return if silent?
+      (options[:output] || output).print self.format(string, options)
+    end
+
+    def silent?
+      ENV["COVERALLS_SILENT"] || (defined?(@silent) && @silent)
     end
   end
 end

data/lib/coveralls/rake/task.rb

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/tasklib'
-require 'json'
 
 module Coveralls
   class RakeTask < ::Rake::TaskLib
@@ -17,4 +16,4 @@ module Coveralls
     end # initialize
 
   end # class
-end # module
+end # module

data/lib/coveralls/simplecov.rb

@@ -5,12 +5,12 @@ module Coveralls
       def display_result(result)
         # Log which files would be submitted.
         if result.files.length > 0
-          puts "[Coveralls] Some handy coverage stats:"
+          Coveralls::Output.puts "[Coveralls] Some handy coverage stats:"
         else
           Coveralls::Output.puts "[Coveralls] There are no covered files.", :color => "yellow"
         end
         result.files.each do |f|
-          print "  * "
+          Coveralls::Output.print "  * "
           Coveralls::Output.print short_filename(f.filename).to_s, :color => "cyan"
           Coveralls::Output.print " => ", :color => "white"
           cov = "#{f.covered_percent.round}%"
@@ -21,7 +21,7 @@ module Coveralls
           else
             Coveralls::Output.print cov, :color => "red"
           end
-          puts ""
+          Coveralls::Output.puts ""
         end
         true
       end
@@ -70,7 +70,7 @@ module Coveralls
 
         # Post to Coveralls.
         API.post_json "jobs", {:source_files => source_files, :test_framework => result.command_name.downcase, :run_at => result.created_at}
-        puts output_message result
+        Coveralls::Output.puts output_message result
 
         true
 

data/lib/coveralls/version.rb

@@ -1,3 +1,3 @@
 module Coveralls
- VERSION = "0.6.9"
+ VERSION = "0.7.0"
 end

data/spec/coveralls/coveralls_spec.rb

@@ -7,6 +7,32 @@ describe Coveralls do
     Coveralls.testing = true
   end
 
+  describe "#will_run?" do
+    it "checks CI environemnt variables" do
+      Coveralls.will_run?.should be_true
+    end
+
+    context "with CI disabled" do
+      before do
+        @ci = ENV['CI']
+        ENV['CI'] = nil
+        @coveralls_run_locally = ENV['COVERALLS_RUN_LOCALLY']
+        ENV['COVERALLS_RUN_LOCALLY'] = nil
+
+        Coveralls.testing = false
+      end
+
+      after do
+        ENV['CI'] = @ci
+        ENV['COVERALLS_RUN_LOCALLY'] = @coveralls_run_locally
+      end
+
+      it "indicates no run" do
+        Coveralls.will_run?.should be_false
+      end
+    end
+  end
+
   describe "#should_run?" do
     it "outputs to stdout when running locally" do
       Coveralls.testing = false

data/spec/coveralls/output_spec.rb

@@ -1,6 +1,60 @@
 require 'spec_helper'
 
 describe Coveralls::Output do
+  it "defaults the IO to $stdout" do
+    old_stdout = $stdout
+    out = StringIO.new
+    $stdout = out
+    Coveralls::Output.puts "this is a test"
+    expect(out.string).to eq "this is a test\n"
+    $stdout = old_stdout
+  end
+
+  it "accepts an IO injection" do
+    out = StringIO.new
+    Coveralls::Output.output = out
+    Coveralls::Output.puts "this is a test"
+    expect(out.string).to eq "this is a test\n"
+  end
+
+  describe ".puts" do
+    it "accepts an IO injection" do
+      out = StringIO.new
+      Coveralls::Output.puts "this is a test", :output => out
+      expect(out.string).to eq "this is a test\n"
+    end
+  end
+
+  describe ".print" do
+    it "accepts an IO injection" do
+      out = StringIO.new
+      Coveralls::Output.print "this is a test", :output => out
+      expect(out.string).to eq "this is a test"
+    end
+  end
+
+  describe 'when silenced' do
+    before do
+      @original_stdout = $stdout
+      @output = StringIO.new
+      Coveralls::Output.silent = true
+      $stdout = @output
+    end
+    it "should not puts" do
+      Coveralls::Output.puts "foo"
+      @output.rewind
+      @output.read.should == ""
+    end
+    it "should not print" do
+      Coveralls::Output.print "foo"
+      @output.rewind
+      @output.read.should == ""
+    end
+    after do
+      $stdout = @original_stdout
+    end
+  end
+
   describe '.format' do
     it "accepts a color argument" do
       string = 'Hello'
@@ -19,8 +73,6 @@ describe Coveralls::Output do
     end
 
     it "accepts more than 1 color argument" do
-      pending "Not implemented"
-
       string = 'Hi dog!'
       multi_formatted_string = Term::ANSIColor.red{ Term::ANSIColor.underline(string) }
       Coveralls::Output.format(string, :color => 'red underline').should eq(multi_formatted_string)

data/spec/coveralls/simplecov_spec.rb

@@ -6,10 +6,11 @@ describe Coveralls::SimpleCov::Formatter do
     stub_api_post
   end
 
+  def source_fixture(filename)
+    File.expand_path( File.join( File.dirname( __FILE__ ), 'fixtures', filename ) )
+  end
+
   let(:result) {
-    def source_fixture(filename)
-      File.expand_path( File.join( File.dirname( __FILE__ ), 'fixtures', filename ) )
-    end
 
     SimpleCov::Result.new({
       source_fixture( 'sample.rb' )                  => [nil, 1, 1, 1, nil, 0, 1, 1, nil, nil],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client