Merge 5f0d8ee into ae28043

Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 gem 'rake', Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3') ? '~> 10.3' : '>= 10.3'
 gem 'rspec', '>= 3.2'
-gem 'simplecov', :require => false
+gem 'simplecov', '~> 0.16.1', :require => false
 gem 'truthy', '>= 1'
 
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9')

lib/coveralls/command.rb

@@ -7,7 +7,7 @@ class CommandLine < Thor
     def push
       return unless ensure_can_run_locally!
       ENV["COVERALLS_RUN_LOCALLY"] = "true"
-      cmds = "bundle exec rake"
+      cmds = ["bundle exec rake"]
       if File.exist?('.travis.yml')
         cmds = YAML.load_file('.travis.yml')["script"] || cmds rescue cmds
       end

lib/coveralls/configuration.rb

@@ -98,12 +98,13 @@ def self.set_service_params_for_tddium(config)
     end
 
     def self.set_service_params_for_gitlab(config)
-      config[:service_name]       = 'gitlab-ci'
-      config[:service_number]     = ENV['CI_PIPELINE_ID']
-      config[:service_job_number] = ENV['CI_BUILD_NAME']
-      config[:service_job_id]     = ENV['CI_BUILD_ID']
-      config[:service_branch]     = ENV['CI_BUILD_REF_NAME']
-      config[:commit_sha]         = ENV['CI_BUILD_REF']
+      config[:service_name]         = 'gitlab-ci'
+      config[:service_number]       = ENV['CI_PIPELINE_ID']
+      config[:service_job_number]   = ENV['CI_BUILD_NAME']
+      config[:service_job_id]       = ENV['CI_BUILD_ID']
+      config[:service_branch]       = ENV['CI_BUILD_REF_NAME']
+      config[:service_pull_request] = ENV['CI_MERGE_REQUEST_IID']
+      config[:commit_sha]           = ENV['CI_BUILD_REF']
     end
 
     def self.set_service_params_for_coveralls_local(config)

spec/coveralls/configuration_spec.rb

@@ -238,13 +238,15 @@
     let(:service_job_number) { "spec:one" }
     let(:service_job_id) { 1234 }
     let(:service_branch) { "feature" }
+    let(:service_pull_request) { "1" }
     let(:service_number) { 5678 }
 
     before do
       ENV.stub(:[]).with('CI_BUILD_NAME').and_return(service_job_number)
       ENV.stub(:[]).with('CI_PIPELINE_ID').and_return(service_number)
       ENV.stub(:[]).with('CI_BUILD_ID').and_return(service_job_id)
       ENV.stub(:[]).with('CI_BUILD_REF_NAME').and_return(service_branch)
+      ENV.stub(:[]).with('CI_MERGE_REQUEST_IID').and_return(service_pull_request)
       ENV.stub(:[]).with('CI_BUILD_REF').and_return(commit_sha)
     end
 
@@ -256,6 +258,7 @@
       config[:service_job_number].should eq(service_job_number)
       config[:service_job_id].should eq(service_job_id)
       config[:service_branch].should eq(service_branch)
+      config[:service_pull_request].should eq(service_pull_request)
       config[:commit_sha].should eq(commit_sha)
     end
   end