coveralls 0.6.5 → 0.6.6

data/lib/coveralls.rb

@@ -8,6 +8,11 @@ require "coveralls/simplecov"
 module Coveralls
   extend self
 
+  class NilFormatter
+    def format( result )
+    end
+  end
+
   attr_accessor :testing, :noisy, :adapter, :run_locally
 
   def wear!(simplecov_setting=nil, &block)
@@ -18,7 +23,7 @@ module Coveralls
   def wear_merged!(simplecov_setting=nil, &block)
     require 'simplecov'
     @@adapter = :simplecov
-    ::SimpleCov.formatter = nil
+    ::SimpleCov.formatter = NilFormatter
     start! simplecov_setting, &block
   end
 
@@ -57,11 +62,12 @@ module Coveralls
 
       if simplecov_setting
         puts "[Coveralls] Using SimpleCov's '#{simplecov_setting}' settings.".green
-        if block
+        if block_given?
+          ::SimpleCov.start(simplecov_setting) { instance_eval &block }
         else
           ::SimpleCov.start(simplecov_setting)
         end
-      elsif block
+      elsif block_given?
         puts "[Coveralls] Using SimpleCov settings defined in block.".green
         ::SimpleCov.start { instance_eval &block }
       else
@@ -89,4 +95,4 @@ module Coveralls
   def noisy?
     ENV["COVERALLS_NOISY"] || @noisy
   end
-end
+end

data/lib/coveralls/configuration.rb

@@ -28,6 +28,8 @@ module Coveralls
       elsif ENV['JENKINS_URL']
         config[:service_name]   = 'jenkins'
         config[:service_number] = ENV['BUILD_NUMBER']
+      elsif ENV['CODESHIP']
+        config[:service_name]   = 'codeship'
       elsif ENV["COVERALLS_RUN_LOCALLY"] || Coveralls.testing
         config[:service_job_id] = nil
         config[:service_name]   = 'coveralls-ruby'

data/lib/coveralls/version.rb

@@ -1,3 +1,3 @@
 module Coveralls
- VERSION = "0.6.5"
+ VERSION = "0.6.6"
 end

data/spec/coveralls/coveralls_spec.rb

@@ -44,12 +44,14 @@ describe Coveralls do
   end
 
   describe "#wear_merged!" do
-    it "sets formatter to nil" do
-      ::SimpleCov.should_receive(:start).with
+    it "sets formatter to NilFormatter" do
+      ::SimpleCov.should_receive(:start).with 'rails'
       silence do
-        subject.wear_merged!
+        subject.wear_merged! 'rails' do
+          add_filter "/spec/"
+        end
       end
-      ::SimpleCov.formatter.should be_nil
+      ::SimpleCov.formatter.should be Coveralls::NilFormatter
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client