coveralls 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37fb125236b8084bb66698ff83b734e7c50019c7
-  data.tar.gz: 5c14c65f7b7a093ab62b7b3219c8a18d9102b84a
+  metadata.gz: 2b4b79d112b23fa2383f40994e33d8c197566ded
+  data.tar.gz: e10986ebd08afe821cf47dcaecd79e72b9b735af
 SHA512:
-  metadata.gz: d1e17590b229ed02769fc5004ad45ad2469f647913af1259049b7ff59c9f2d6130b450a28472e707306fb143171a7c6f007e047584fcc48cd52a1103325cc755
-  data.tar.gz: 9e3f728924b192cddbb5b608f7f5f596a250a716f27c1acf39fc8b227b7ac4c7164062caf11435271afe6114138167b402fbe0df90f9c5f25bfcb95400eb7091
+  metadata.gz: 8b3108e79e523aa7893b0854737adf155ed77ff1e91387583227027e851307f45d2f6a8922231c5178f7425946772660fabb1cab0409813bdcda09b47f0b5637
+  data.tar.gz: cb485eec58a0e30d51c411738a5762a267c86668c0d357d107dc1500608515d2bc1c47c4e0dc61bac8c97e6e6675e44943f1387af69adbe9c67228c5c7f2d365

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - rbx-19mode
+  - rbx
   - jruby-19mode
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - ruby-head
 matrix:
   allow_failures:

data/Gemfile

@@ -3,4 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in coveralls-ruby.gemspec
 gemspec
 
-gem 'simplecov', :require => false
+gem 'simplecov', :require => false
+
+platform :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'json'
+  gem 'rubinius-developer_tools'
+end

data/lib/coveralls/api.rb

@@ -4,9 +4,15 @@ module Coveralls
 		require 'multi_json'
 		require 'rest_client'
 
-		API_HOST = ENV['COVERALLS_DEVELOPMENT'] ? "localhost:3000" : "coveralls.io"
-		API_PROTOCOL = ENV['COVERALLS_DEVELOPMENT'] ? "http" : "https"
-		API_DOMAIN = "#{API_PROTOCOL}://#{API_HOST}"
+		if ENV['COVERALLS_ENDPOINT']
+			API_HOST = ENV['COVERALLS_ENDPOINT']
+			API_DOMAIN = ENV['COVERALLS_ENDPOINT']
+		else
+			API_HOST = ENV['COVERALLS_DEVELOPMENT'] ? "localhost:3000" : "coveralls.io"
+			API_PROTOCOL = ENV['COVERALLS_DEVELOPMENT'] ? "http" : "https"
+			API_DOMAIN = "#{API_PROTOCOL}://#{API_HOST}"
+		end
+
 		API_BASE = "#{API_DOMAIN}/api/v1"
 
 		def self.post_json(endpoint, hash)

data/lib/coveralls/configuration.rb

@@ -17,34 +17,57 @@ module Coveralls
         config[:repo_token] = ENV['COVERALLS_REPO_TOKEN']
       end
       if ENV['TRAVIS']
-        config[:service_job_id] = ENV['TRAVIS_JOB_ID']
-        config[:service_name]   = (yml ? yml['service_name'] : nil) || 'travis-ci'
+        set_service_params_for_travis(config, yml ? yml['service_name'] : nil)
       elsif ENV['CIRCLECI']
-        config[:service_name]   = 'circleci'
-        config[:service_number] = ENV['CIRCLE_BUILD_NUM']
+        set_service_params_for_circleci(config)
       elsif ENV['SEMAPHORE']
-        config[:service_name]   = 'semaphore'
-        config[:service_number] = ENV['SEMAPHORE_BUILD_NUMBER']
+        set_service_params_for_semaphore(config)
       elsif ENV['JENKINS_URL']
-        config[:service_name]   = 'jenkins'
-        config[:service_number] = ENV['BUILD_NUMBER']
-      elsif ENV["COVERALLS_RUN_LOCALLY"] || Coveralls.testing
-        config[:service_job_id] = nil
-        config[:service_name]   = 'coveralls-ruby'
-        config[:service_event_type] = 'manual'
-
+        set_service_params_for_jenkins(config)
+      elsif ENV['COVERALLS_RUN_LOCALLY'] || Coveralls.testing
+        set_service_params_for_coveralls_local(config)
       # standardized env vars
       elsif ENV['CI_NAME']
-        config[:service_name]         = ENV['CI_NAME']
-        config[:service_number]       = ENV['CI_BUILD_NUMBER']
-        config[:service_build_url]    = ENV['CI_BUILD_URL']
-        config[:service_branch]       = ENV['CI_BRANCH']
-        config[:service_pull_request] = ENV['CI_PULL_REQUEST']
+        set_service_params_for_generic_ci(config)
       end
 
       config
     end
 
+    def self.set_service_params_for_travis(config, service_name)
+      config[:service_job_id] = ENV['TRAVIS_JOB_ID']
+      config[:service_name]   = service_name || 'travis-ci'
+    end
+
+    def self.set_service_params_for_circleci(config)
+      config[:service_name]   = 'circleci'
+      config[:service_number] = ENV['CIRCLE_BUILD_NUM']
+    end
+
+    def self.set_service_params_for_semaphore(config)
+      config[:service_name]   = 'semaphore'
+      config[:service_number] = ENV['SEMAPHORE_BUILD_NUMBER']
+    end
+
+    def self.set_service_params_for_jenkins(config)
+      config[:service_name]   = 'jenkins'
+      config[:service_number] = ENV['BUILD_NUMBER']
+    end
+
+    def self.set_service_params_for_coveralls_local(config)
+      config[:service_job_id] = nil
+      config[:service_name]   = 'coveralls-ruby'
+      config[:service_event_type] = 'manual'
+    end
+
+    def self.set_service_params_for_generic_ci(config)
+      config[:service_name]         = ENV['CI_NAME']
+      config[:service_number]       = ENV['CI_BUILD_NUMBER']
+      config[:service_build_url]    = ENV['CI_BUILD_URL']
+      config[:service_branch]       = ENV['CI_BRANCH']
+      config[:service_pull_request] = ENV['CI_PULL_REQUEST']
+    end
+
     def self.yaml_config
       if self.configuration_path && File.exists?(self.configuration_path)
         YAML::load_file(self.configuration_path)

data/lib/coveralls/output.rb

@@ -26,10 +26,13 @@ module Coveralls
   # or set this environment variable:
   #
   #   COVERALLS_SILENT
+  #
+  # To disable color completely:
+  #
+  #   Coveralls::Output.no_color = true
 
   module Output
-    require 'term/ansicolor'
-    attr_accessor :silent
+    attr_accessor :silent, :no_color
     attr_writer :output
     extend self
 
@@ -37,6 +40,10 @@ module Coveralls
       (defined?(@output) && @output) || $stdout
     end
 
+    def no_color?
+      (defined?(@no_color)) && @no_color
+    end
+
     # Public: Formats the given string with the specified color
     # through Term::ANSIColor
     #
@@ -52,10 +59,13 @@ module Coveralls
     #
     # Returns the formatted string.
     def format(string, options = {})
-      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)
+      unless no_color?
+        require 'term/ansicolor'
+        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
       end

data/lib/coveralls/version.rb

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

data/spec/coveralls/configuration_spec.rb

@@ -1,10 +1,259 @@
 require 'spec_helper'
 
 describe Coveralls::Configuration do
+  before do
+    ENV.stub(:[]).and_return(nil)
+  end
+
+  describe '.configuration' do
+    it "returns a hash with the default keys" do
+      config = Coveralls::Configuration.configuration
+      config.should be_a(Hash)
+      config.keys.should include(:environment)
+      config.keys.should include(:git)
+    end
+
+    context 'yaml_config' do
+      let(:repo_token) { SecureRandom.hex(4) }
+      let(:repo_secret_token) { SecureRandom.hex(4) }
+      let(:yaml_config) {
+        {
+          'repo_token' => repo_token,
+          'repo_secret_token' => repo_secret_token
+        }
+      }
+
+      before do
+        Coveralls::Configuration.stub(:yaml_config).and_return(yaml_config)
+      end
+
+      it 'sets the Yaml config and associated variables if present' do
+        config = Coveralls::Configuration.configuration
+        config[:configuration].should eq(yaml_config)
+        config[:repo_token].should eq(repo_token)
+      end
+
+      it 'uses the repo_secret_token if the repo_token is not set' do
+        yaml_config.delete('repo_token')
+        config = Coveralls::Configuration.configuration
+        config[:configuration].should eq(yaml_config)
+        config[:repo_token].should eq(repo_secret_token)
+      end
+    end
+
+    context 'repo_token in environment' do
+      let(:repo_token) { SecureRandom.hex(4) }
+
+      before do
+        ENV.stub(:[]).with('COVERALLS_REPO_TOKEN').and_return(repo_token)
+      end
+
+      it 'pulls the repo token from the environment if set' do
+        config = Coveralls::Configuration.configuration
+        config[:repo_token].should eq(repo_token)
+      end
+    end
+
+    context 'Services' do
+      context 'on Travis' do
+        before do
+          ENV.stub(:[]).with('TRAVIS').and_return('1')
+        end
+
+        it 'should set service parameters for this service and no other' do
+          Coveralls::Configuration.should_receive(:set_service_params_for_travis).with(anything, anything)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_circleci)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_semaphore)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_jenkins)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_coveralls_local)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_generic_ci)
+          Coveralls::Configuration.configuration
+        end
+      end
+
+      context 'on CircleCI' do
+        before do
+          ENV.stub(:[]).with('CIRCLECI').and_return('1')
+        end
+
+        it 'should set service parameters for this service and no other' do
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_travis)
+          Coveralls::Configuration.should_receive(:set_service_params_for_circleci)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_semaphore)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_jenkins)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_coveralls_local)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_generic_ci)
+          Coveralls::Configuration.configuration
+        end
+      end
+
+      context 'on Semaphore' do
+        before do
+          ENV.stub(:[]).with('SEMAPHORE').and_return('1')
+        end
+
+        it 'should set service parameters for this service and no other' do
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_travis)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_circleci)
+          Coveralls::Configuration.should_receive(:set_service_params_for_semaphore)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_jenkins)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_coveralls_local)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_generic_ci)
+          Coveralls::Configuration.configuration
+        end
+      end
+
+      context 'when using Jenkins' do
+        before do
+          ENV.stub(:[]).with('JENKINS_URL').and_return('1')
+        end
+
+        it 'should set service parameters for this service and no other' do
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_travis)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_circleci)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_semaphore)
+          Coveralls::Configuration.should_receive(:set_service_params_for_jenkins)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_coveralls_local)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_generic_ci)
+          Coveralls::Configuration.configuration
+        end
+      end
+
+      context 'when running Coveralls locally' do
+        before do
+          ENV.stub(:[]).with('COVERALLS_RUN_LOCALLY').and_return('1')
+        end
+
+        it 'should set service parameters for this service and no other' do
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_travis)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_circleci)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_semaphore)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_jenkins)
+          Coveralls::Configuration.should_receive(:set_service_params_for_coveralls_local)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_generic_ci)
+          Coveralls::Configuration.configuration
+        end
+      end
+
+      context 'for generic CI' do
+        before do
+          ENV.stub(:[]).with('CI_NAME').and_return('1')
+        end
 
-  it "asserts true" do
-    config = Coveralls::Configuration.configuration
-    config.should_not be_nil
+        it 'should set service parameters for this service and no other' do
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_travis)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_circleci)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_semaphore)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_jenkins)
+          Coveralls::Configuration.should_not_receive(:set_service_params_for_coveralls_local)
+          Coveralls::Configuration.should_receive(:set_service_params_for_generic_ci)
+          Coveralls::Configuration.configuration
+        end
+      end
+    end
   end
 
+  describe '.set_service_params_for_travis' do
+    let(:travis_job_id) { SecureRandom.hex(4) }
+    before do
+      ENV.stub(:[]).with('TRAVIS_JOB_ID').and_return(travis_job_id)
+    end
+
+    it 'should set the service_job_id' do
+      config = {}
+      Coveralls::Configuration.set_service_params_for_travis(config, nil)
+      config[:service_job_id].should eq(travis_job_id)
+    end
+
+    it 'should set the service_name to travis-ci by default' do
+      config = {}
+      Coveralls::Configuration.set_service_params_for_travis(config, nil)
+      config[:service_name].should eq('travis-ci')
+    end
+
+    it 'should set the service_name to a value if one is passed in' do
+      config = {}
+      service_name = SecureRandom.hex(4)
+      Coveralls::Configuration.set_service_params_for_travis(config, service_name)
+      config[:service_name].should eq(service_name)
+    end
+  end
+
+  describe '.set_service_params_for_circleci' do
+    let(:circle_build_num) { SecureRandom.hex(4) }
+    before do
+      ENV.stub(:[]).with('CIRCLE_BUILD_NUM').and_return(circle_build_num)
+    end
+
+    it 'should set the expected parameters' do
+      config = {}
+      Coveralls::Configuration.set_service_params_for_circleci(config)
+      config[:service_name].should eq('circleci')
+      config[:service_number].should eq(circle_build_num)
+    end
+  end
+
+  describe '.set_service_params_for_semaphore' do
+    let(:semaphore_build_num) { SecureRandom.hex(4) }
+    before do
+      ENV.stub(:[]).with('SEMAPHORE_BUILD_NUMBER').and_return(semaphore_build_num)
+    end
+
+    it 'should set the expected parameters' do
+      config = {}
+      Coveralls::Configuration.set_service_params_for_semaphore(config)
+      config[:service_name].should eq('semaphore')
+      config[:service_number].should eq(semaphore_build_num)
+    end
+  end
+
+  describe '.set_service_params_for_jenkins' do
+    let(:build_num) { SecureRandom.hex(4) }
+    before do
+      ENV.stub(:[]).with('BUILD_NUMBER').and_return(build_num)
+    end
+
+    it 'should set the expected parameters' do
+      config = {}
+      Coveralls::Configuration.set_service_params_for_jenkins(config)
+      config[:service_name].should eq('jenkins')
+      config[:service_number].should eq(build_num)
+    end
+  end
+
+  describe '.set_service_params_for_coveralls_local' do
+    it 'should set the expected parameters' do
+      config = {}
+      Coveralls::Configuration.set_service_params_for_coveralls_local(config)
+      config[:service_name].should eq('coveralls-ruby')
+      config[:service_job_id].should be_nil
+      config[:service_event_type].should eq('manual')
+    end
+  end
+
+  describe '.set_service_params_for_generic_ci' do
+    let(:service_name) { SecureRandom.hex(4) }
+    let(:service_number) { SecureRandom.hex(4) }
+    let(:service_build_url) { SecureRandom.hex(4) }
+    let(:service_branch) { SecureRandom.hex(4) }
+    let(:service_pull_request) { SecureRandom.hex(4) }
+
+    before do
+      ENV.stub(:[]).with('CI_NAME').and_return(service_name)
+      ENV.stub(:[]).with('CI_BUILD_NUMBER').and_return(service_number)
+      ENV.stub(:[]).with('CI_BUILD_URL').and_return(service_build_url)
+      ENV.stub(:[]).with('CI_BRANCH').and_return(service_branch)
+      ENV.stub(:[]).with('CI_PULL_REQUEST').and_return(service_pull_request)
+    end
+
+    it 'should set the expected parameters' do
+      config = {}
+      Coveralls::Configuration.set_service_params_for_generic_ci(config)
+      config[:service_name].should eq(service_name)
+      config[:service_number].should eq(service_number)
+      config[:service_build_url].should eq(service_build_url)
+      config[:service_branch].should eq(service_branch)
+      config[:service_pull_request].should eq(service_pull_request)
+    end
+  end
 end

data/spec/coveralls/output_spec.rb

@@ -57,6 +57,7 @@ describe Coveralls::Output do
 
   describe '.format' do
     it "accepts a color argument" do
+      require 'term/ansicolor'
       string = 'Hello'
       ansi_color_string =  Term::ANSIColor.red(string)
       Coveralls::Output.format(string, :color => 'red').should eq(ansi_color_string)
@@ -77,5 +78,15 @@ describe Coveralls::Output do
       multi_formatted_string = Term::ANSIColor.red{ Term::ANSIColor.underline(string) }
       Coveralls::Output.format(string, :color => 'red underline').should eq(multi_formatted_string)
     end
+
+    context "no color" do
+      before { Coveralls::Output.no_color = true }
+
+      it "does not add color to string" do
+        unformatted_string = "Hi Doggie!"
+        Coveralls::Output.format(unformatted_string, :color => 'red').
+          should eq(unformatted_string)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -73,4 +73,4 @@ module Kernel
   ensure
     stream.reopen(old_stream)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nick Merwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: A Ruby implementation of the Coveralls API.