coveralls 0.7.12 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e0bd0063aa8ae76c60cecafc2d08742206ae0d9
-  data.tar.gz: 5580074308250e46d55621c9ba08d563eb081f15
+  metadata.gz: 219c86793eeb9500314dd5e3d82c1005156b902d
+  data.tar.gz: ef35f8c0ea3dc55934d8dc5adbf2ab928cbc374b
 SHA512:
-  metadata.gz: 838521b4b4096571dc61fc25d581b133243b1d455296d7f341d42e0ac7222a2c1a5ee8eb0c13574d4072c995b64ec6df8260e74acae3ac11598eb6e9f05b35dc
-  data.tar.gz: e02194eb03ab2f201c8bfed5c231bedd6c9d77f6ba06f62ad4e8021a14f60423882b861c568a58d6e28f05772ed7f140f0bd4e3c96b5f5d1d391d2a54011ab52
+  metadata.gz: 7a1095dff575e95b96e1a8632eb71cb32d9a0e18929455e26d7a36f50ab0987b0680d440bf1c0be39f46f80fe87727fbcbd92c4d3306a2475b8d82345c6f0853
+  data.tar.gz: 6c45df07a7d00c16b05887357538f0bb8b352a48b21847787b5420732acce04e06e3cc8102a72a5517c3776b4158d59e6754be1d0f991e5470214a63faede217

data/lib/coveralls/configuration.rb

@@ -34,11 +34,11 @@ module Coveralls
         set_service_params_for_tddium(config)
       elsif ENV['COVERALLS_RUN_LOCALLY'] || Coveralls.testing
         set_service_params_for_coveralls_local(config)
-      # standardized env vars
-      elsif ENV['CI_NAME']
-        set_service_params_for_generic_ci(config)
       end
 
+      # standardized env vars
+      set_standard_service_params_for_generic_ci(config)
+
       config
     end
 
@@ -89,13 +89,13 @@ module Coveralls
       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_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]
+    def self.set_standard_service_params_for_generic_ci(config)
+      config[:service_name]         ||= ENV['CI_NAME']
+      config[:service_number]       ||= ENV['CI_BUILD_NUMBER']
+      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]
     end
 
     def self.yaml_config

data/lib/coveralls/version.rb

@@ -1,3 +1,3 @@
 module Coveralls
- VERSION = "0.7.12"
+ VERSION = "0.8.0"
 end

data/spec/coveralls/configuration_spec.rb

@@ -66,7 +66,7 @@ describe Coveralls::Configuration do
           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.should_receive(:set_standard_service_params_for_generic_ci)
           Coveralls::Configuration.configuration
         end
       end
@@ -82,7 +82,7 @@ describe Coveralls::Configuration do
           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.should_receive(:set_standard_service_params_for_generic_ci)
           Coveralls::Configuration.configuration
         end
       end
@@ -98,7 +98,7 @@ describe Coveralls::Configuration do
           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.should_receive(:set_standard_service_params_for_generic_ci)
           Coveralls::Configuration.configuration
         end
       end
@@ -114,7 +114,7 @@ describe Coveralls::Configuration do
           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.should_receive(:set_standard_service_params_for_generic_ci)
           Coveralls::Configuration.configuration
         end
       end
@@ -130,7 +130,7 @@ describe Coveralls::Configuration do
           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.should_receive(:set_standard_service_params_for_generic_ci)
           Coveralls::Configuration.configuration
         end
       end
@@ -146,7 +146,7 @@ describe Coveralls::Configuration do
           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.should_receive(:set_standard_service_params_for_generic_ci).with(anything)
           Coveralls::Configuration.configuration
         end
       end
@@ -208,16 +208,20 @@ describe Coveralls::Configuration do
   end
 
   describe '.set_service_params_for_jenkins' do
+    let(:service_pull_request) { '1234' }
     let(:build_num) { SecureRandom.hex(4) }
     before do
+      ENV.stub(:[]).with('CI_PULL_REQUEST').and_return(service_pull_request)
       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)
+      Coveralls::Configuration.set_standard_service_params_for_generic_ci(config)
       config[:service_name].should eq('jenkins')
       config[:service_number].should eq(build_num)
+      config[:service_pull_request].should eq(service_pull_request)
     end
   end
 
@@ -248,7 +252,7 @@ describe Coveralls::Configuration do
 
     it 'should set the expected parameters' do
       config = {}
-      Coveralls::Configuration.set_service_params_for_generic_ci(config)
+      Coveralls::Configuration.set_standard_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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coveralls
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.8.0
 platform: ruby
 authors:
 - Nick Merwin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json