lib/coveralls/configuration.rb in coveralls-0.7.12 vs lib/coveralls/configuration.rb in coveralls-0.8.0

@@ -32,15 +32,15 @@
         set_service_params_for_appveyor(config)
       elsif ENV['TDDIUM']
         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
 
     def self.set_service_params_for_travis(config, service_name)
       config[:service_job_id] = ENV['TRAVIS_JOB_ID']
@@ -87,16 +87,16 @@
       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_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
       if self.configuration_path && File.exist?(self.configuration_path)
         YAML::load_file(self.configuration_path)