coveralls 0.6.0 → 0.6.1

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p194

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - rbx-18mode
   - rbx-19mode
-  - jruby-18mode
   - jruby-19mode
-  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head

data/coveralls-ruby.gemspec

@@ -24,9 +24,13 @@ Gem::Specification.new do |gem|
     gem.add_dependency 'simplecov', ">= 0.7"
   end
 
+  unless ENV["CI"]
+    gem.add_development_dependency 'debugger'
+  end
+
   gem.add_runtime_dependency('jruby-openssl') if RUBY_PLATFORM == 'java'
 
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
-
+  gem.add_development_dependency 'webmock'
 end

data/lib/coveralls.rb

@@ -6,14 +6,16 @@ require "coveralls/api"
 require "coveralls/simplecov"
 
 module Coveralls
+  extend self
 
-  def self.wear!(*args)
+  attr_accessor :testing, :noisy, :adapter, :run_locally
+
+  def wear!(simplecov_setting=nil, &block)
     setup!
-    start!(*args)
+    start! simplecov_setting, &block
   end
 
-  def self.setup!
-
+  def setup!
     # Try to load up SimpleCov.
     @@adapter = nil
     if defined?(::SimpleCov)
@@ -36,11 +38,17 @@ module Coveralls
 
   end
 
-  def self.start!(simplecov_setting = 'test_frameworks')
+  def start!(simplecov_setting = 'test_frameworks', &block)
     if @@adapter == :simplecov
       if simplecov_setting
         puts "[Coveralls] Using SimpleCov's '#{simplecov_setting}' settings.".green
-        ::SimpleCov.start(simplecov_setting)
+        if block
+        else
+          ::SimpleCov.start(simplecov_setting)
+        end
+      elsif block
+        puts "[Coveralls] Using SimpleCov settings defined in block.".green
+        ::SimpleCov.start { instance_eval &block }
       else
         puts "[Coveralls] Using SimpleCov's default settings.".green
         ::SimpleCov.start
@@ -48,19 +56,22 @@ module Coveralls
     end
   end
 
-  def self.should_run?
+  def should_run?
 
     # Fail early if we're not on Travis
-    unless ENV["TRAVIS"] || ENV["COVERALLS_RUN_LOCALLY"]
+    unless ENV["CI"] || ENV["COVERALLS_RUN_LOCALLY"] || @testing
       puts "[Coveralls] Outside the Travis environment, not sending data.".yellow
       return false
     end
 
-    if ENV["COVERALLS_RUN_LOCALLY"]
+    if ENV["COVERALLS_RUN_LOCALLY"] || @run_locally
       puts "[Coveralls] Creating a new job on Coveralls from local coverage results.".cyan
     end
 
     true
   end
 
+  def noisy?
+    ENV["COVERALLS_NOISY"] || @noisy
+  end
 end

data/lib/coveralls/api.rb

@@ -30,7 +30,7 @@ module Coveralls
 		private
 
 		def self.disable_net_blockers!
-			if defined?(WebMock)
+			if defined?(WebMock) &&
 			  allow = WebMock::Config.instance.allow || []
 			  WebMock::Config.instance.allow = [*allow].push API_HOST
 			end
@@ -59,7 +59,7 @@ module Coveralls
 
 		def self.apified_hash hash
 			config = Coveralls::Configuration.configuration
-			if ENV['TRAVIS'] || ENV['COVERALLS_DEBUG']
+			if ENV['CI'] || ENV['COVERALLS_DEBUG'] || Coveralls.testing
 				puts "[Coveralls] Submiting with config:".yellow
 				puts MultiJson.dump(config, :pretty => true).
 					gsub(/"repo_token": "(.*?)"/,'"repo_token": "[secure]"').yellow

data/lib/coveralls/configuration.rb

@@ -5,7 +5,7 @@ module Coveralls
 
     def self.configuration
       config = {
-        :environment => self.relevant_env, 
+        :environment => self.relevant_env,
         :git => git
       }
       yml = self.yaml_config
@@ -19,8 +19,10 @@ module Coveralls
       if ENV['TRAVIS']
         config[:service_job_id] = ENV['TRAVIS_JOB_ID']
         config[:service_name]   = (yml ? yml['service_name'] : nil) || 'travis-ci'
-      end
-      if ENV["COVERALLS_RUN_LOCALLY"]
+      elsif ENV['CIRCLECI']
+        config[:service_job_id] = ENV['CIRCLE_BUILD_NUM']
+        config[:service_name]   = 'circleci'
+      elsif ENV["COVERALLS_RUN_LOCALLY"] || Coveralls.testing
         config[:service_job_id] = nil
         config[:service_name]   = 'coveralls-ruby'
         config[:service_event_type] = 'manual'
@@ -60,11 +62,11 @@ module Coveralls
 
     def self.git
       hash = {}
- 
+
       Dir.chdir(root) do
 
         hash[:head] = {
-          :id => `git log -1 --pretty=format:'%H'`, 
+          :id => `git log -1 --pretty=format:'%H'`,
           :author_name => `git log -1 --pretty=format:'%aN'`,
           :author_email => `git log -1 --pretty=format:'%ae'`,
           :committer_name => `git log -1 --pretty=format:'%cN'`,
@@ -98,14 +100,31 @@ module Coveralls
     end
 
     def self.relevant_env
-      {
-        :travis_job_id => ENV['TRAVIS_JOB_ID'], 
-        :travis_pull_request => ENV['TRAVIS_PULL_REQUEST'], 
-        :pwd => self.pwd, 
-        :rails_root => self.rails_root, 
+      hash = {
+        :pwd => self.pwd,
+        :rails_root => self.rails_root,
         :simplecov_root => simplecov_root,
         :gem_version => VERSION
       }
+
+      hash.merge! begin
+        if ENV['TRAVIS']
+          {
+            :travis_job_id => ENV['TRAVIS_JOB_ID'],
+            :travis_pull_request => ENV['TRAVIS_PULL_REQUEST']
+          }
+        elsif ENV['CIRCLECI']
+          {
+            :circleci_build_num => ENV['CIRCLE_BUILD_NUM'],
+            :branch => ENV['CIRCLE_BRANCH'],
+            :commit_sha => ENV['CIRCLE_SHA1']
+          }
+        else
+          {}
+        end
+      end
+
+      hash
     end
 
   end

data/lib/coveralls/simplecov.rb

@@ -2,30 +2,35 @@ module Coveralls
   module SimpleCov
     class Formatter
 
+      def display_result(result)
+        # Log which files would be submitted.
+        if result.files.length > 0
+          puts "[Coveralls] Some handy coverage stats:"
+        else
+          puts "[Coveralls] There are no covered files.".yellow
+        end
+        result.files.each do |f|
+          print "  * "
+          print "#{short_filename(f.filename)}".cyan
+          print " => ".white
+          cov = "#{f.covered_percent.round}%"
+          if f.covered_percent > 90
+            print cov.green
+          elsif f.covered_percent > 80
+            print cov.yellow
+          else
+            print cov.red
+          end
+          puts ""
+        end
+        true
+      end
+
       def format(result)
 
         unless Coveralls.should_run?
-          if ENV["COVERALLS_NOISY"]
-            # Log which files would be submitted.
-            if result.files.length > 0
-              puts "[Coveralls] Some handy coverage stats:"
-            else
-              puts "[Coveralls] There are no covered files.".yellow
-            end
-            result.files.each do |f|
-              print "  * "
-              print "#{short_filename(f.filename)}".cyan
-              print " => ".white
-              cov = "#{f.covered_percent.round}%"
-              if f.covered_percent > 90
-                print cov.green
-              elsif f.covered_percent > 80
-                print cov.yellow
-              else
-                print cov.red
-              end
-              puts ""
-            end
+          if Coveralls.noisy?
+            display_result result
           end
           return
         end
@@ -65,19 +70,25 @@ 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
 
         true
 
       rescue Exception => e
+        display_error e
+      end
+
+      def display_error(e)
         puts "Coveralls encountered an exception:".red
         puts e.class.to_s.red
         puts e.message.red
         e.backtrace.each do |line|
           puts line.red
-        end
+        end if e.backtrace
         if e.respond_to?(:response) && e.response
           puts e.response.to_s.red
         end
+        false
       end
 
       def output_message(result)

data/lib/coveralls/version.rb

@@ -1,3 +1,3 @@
 module Coveralls
- VERSION = "0.6.0"
+ VERSION = "0.6.1"
 end

data/spec/coveralls/coveralls_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Coveralls do
+  before do
+    SimpleCov.stub(:start)
+    stub_api_post
+    Coveralls.testing = true
+  end
+
+  describe "#should_run?" do
+    it "outputs to stdout when running locally" do
+      Coveralls.testing = false
+      Coveralls.run_locally = true
+      silence do
+        Coveralls.should_run?
+      end
+    end
+  end
+
+  describe "#wear!" do
+    it "receives block" do
+      ::SimpleCov.should_receive(:start)
+      silence do
+        subject.wear! do
+          add_filter 's'
+        end
+      end
+    end
+
+    it "uses string" do
+      ::SimpleCov.should_receive(:start).with 'test_frameworks'
+      silence do
+        subject.wear! 'test_frameworks'
+      end
+    end
+
+    it "uses default" do
+      ::SimpleCov.should_receive(:start).with
+      silence do
+        subject.wear!
+      end
+    end
+  end
+
+  describe "#setup!" do
+    it "sets SimpleCov adapter" do
+      SimpleCovTmp = SimpleCov
+      Object.send :remove_const, :SimpleCov
+      silence { subject.setup! }
+      SimpleCov = SimpleCovTmp
+    end
+  end
+
+  after(:all) do
+    setup_formatter
+  end
+end

data/spec/coveralls/fixtures/app/controllers/sample.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+  
+  def bar
+    @foo
+  end
+end

data/spec/coveralls/fixtures/app/models/airplane.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+  
+  def bar
+    @foo
+  end
+end

data/spec/coveralls/fixtures/app/models/dog.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+  
+  def bar
+    @foo
+  end
+end

data/spec/coveralls/fixtures/app/models/house.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+  
+  def bar
+    @foo
+  end
+end

data/spec/coveralls/fixtures/app/models/robot.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+  
+  def bar
+    @foo
+  end
+end

data/spec/coveralls/fixtures/app/models/user.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+  
+  def bar
+    @foo
+  end
+end

data/spec/coveralls/fixtures/sample.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+
+  def bar
+    @foo
+  end
+end

data/spec/coveralls/simplecov_spec.rb

@@ -2,12 +2,71 @@ require 'spec_helper'
 
 describe Coveralls::SimpleCov::Formatter do
 
-	# it "fails unless we are on travis" do
-	# 	Coveralls::SimpleCov::Formatter.new.format(nil).should be_false
-	# end
+  before do
+    stub_api_post
+  end
 
-	it "asserts true" do
-		true.should be_true
-	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],
+      source_fixture( 'app/models/user.rb' )         => [nil, 1, 1, 1, 1, 0, 1, 0, nil, nil],
+      source_fixture( 'app/models/robot.rb' )        => [1, 1, 1, 1, nil, nil, 1, 0, nil, nil],
+      source_fixture( 'app/models/house.rb' )        => [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil],
+      source_fixture( 'app/models/airplane.rb' )     => [0, 0, 0, 0, 0],
+      source_fixture( 'app/models/dog.rb' )          => [1, 1, 1, 1, 1],
+      source_fixture( 'app/controllers/sample.rb' )  => [nil, 1, 1, 1, nil, nil, 0, 0, nil, nil]
+    })
+  }
+
+  describe "#format" do
+    context "should run" do
+      before do
+        Coveralls.testing = true
+        Coveralls.noisy = false
+      end
+
+      it "posts json" do
+        result.files.should_not be_empty
+        silence do
+          Coveralls::SimpleCov::Formatter.new.format(result).should be_true
+        end
+      end
+    end
+
+    context "should not run, noisy" do
+      it "only displays result" do
+        silence do
+          Coveralls::SimpleCov::Formatter.new.display_result(result).should be_true
+        end
+      end
+    end
+
+    context "no files" do
+      let(:result) { SimpleCov::Result.new({}) }
+      it "shows note that no files have been covered" do
+        Coveralls.noisy = true
+        Coveralls.testing = false
+
+        silence do
+          expect do
+            Coveralls::SimpleCov::Formatter.new.format(result)
+          end.not_to raise_error
+        end
+      end
+    end
+
+    context "with api error" do
+      it "rescues" do
+        e = RestClient::ResourceNotFound.new mock('HTTP Response', :code => '502')
+        silence do
+          Coveralls::SimpleCov::Formatter.new.display_error(e).should be_false
+        end
+      end
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'simplecov'
+require 'webmock'
 
 class InceptionFormatter
   def format(result)
@@ -6,8 +7,22 @@ class InceptionFormatter
   end
 end
 
-SimpleCov.formatter = InceptionFormatter
-SimpleCov.start 'test_frameworks'
+def setup_formatter
+  SimpleCov.formatter = if ENV['TRAVIS'] || ENV['COVERALLS_REPO_TOKEN']
+    InceptionFormatter
+  else
+    SimpleCov::Formatter::HTMLFormatter
+  end
+
+  # SimpleCov.start 'test_frameworks'
+  SimpleCov.start do
+    add_filter do |source_file|
+      source_file.filename =~ /spec/ && !(source_file.filename =~ /fixture/)
+    end
+  end
+end
+
+setup_formatter
 
 require 'coveralls'
 
@@ -15,4 +30,41 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.include WebMock::API
+  config.after(:suite) do
+    WebMock.disable!
+  end
+end
+
+def stub_api_post
+  body = "{\"message\":\"\",\"url\":\"\"}"
+  stub_request(:post, Coveralls::API::API_BASE+"/jobs").with(
+    :body => /.+/,
+    :headers => {
+      'Accept'=>'*/*; q=0.5, application/xml',
+      'Accept-Encoding'=>'gzip, deflate',
+      'Content-Length'=>/.+/,
+      'Content-Type'=>/.+/,
+      'User-Agent'=>'Ruby'
+    }
+  ).to_return(:status => 200, :body => body, :headers => {})
 end
+
+def silence
+  return yield if ENV['silence'] == 'false'
+
+  silence_stream(STDOUT) do
+    yield
+  end
+end
+
+module Kernel
+  def silence_stream(stream)
+    old_stream = stream.dup
+    stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
+    stream.sync = true
+    yield
+  ensure
+    stream.reopen(old_stream)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -92,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +140,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby implementation of the Coveralls API.
 email:
 - nick@lemurheavy.com
@@ -133,8 +165,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
 - .gitignore
+- .rbenv-version
 - .rspec
 - .travis.yml
 - Gemfile
@@ -150,6 +182,14 @@ files:
 - lib/coveralls/simplecov.rb
 - lib/coveralls/version.rb
 - spec/coveralls/configuration_spec.rb
+- spec/coveralls/coveralls_spec.rb
+- spec/coveralls/fixtures/app/controllers/sample.rb
+- spec/coveralls/fixtures/app/models/airplane.rb
+- spec/coveralls/fixtures/app/models/dog.rb
+- spec/coveralls/fixtures/app/models/house.rb
+- spec/coveralls/fixtures/app/models/robot.rb
+- spec/coveralls/fixtures/app/models/user.rb
+- spec/coveralls/fixtures/sample.rb
 - spec/coveralls/simplecov_spec.rb
 - spec/spec_helper.rb
 homepage: http://coveralls.io
@@ -178,5 +218,13 @@ specification_version: 3
 summary: A Ruby implementation of the Coveralls API.
 test_files:
 - spec/coveralls/configuration_spec.rb
+- spec/coveralls/coveralls_spec.rb
+- spec/coveralls/fixtures/app/controllers/sample.rb
+- spec/coveralls/fixtures/app/models/airplane.rb
+- spec/coveralls/fixtures/app/models/dog.rb
+- spec/coveralls/fixtures/app/models/house.rb
+- spec/coveralls/fixtures/app/models/robot.rb
+- spec/coveralls/fixtures/app/models/user.rb
+- spec/coveralls/fixtures/sample.rb
 - spec/coveralls/simplecov_spec.rb
 - spec/spec_helper.rb

data/.coveralls.yml

@@ -1 +0,0 @@
-repo_secret_token: 1NlQMLuOhf9NAFElxHAxVKxIWzv3oAYW5