slather 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16b2538dcd029639010c327e4ee5c98ee8c8d5e
-  data.tar.gz: 9f50f7cc111bbdd690d812490673ab71ebcf6d9c
+  metadata.gz: 468a58d0b18f5ae7633a796c72205f80d4db2eb8
+  data.tar.gz: 4f4ee9f3346d2849a29e7a654be2e42354209320
 SHA512:
-  metadata.gz: 5a31043e931bd04938a32e4c0a78375f764a7bf9275425b2d7c5a9f943382434542eb0c3bb4fe858836b87fba69795f2af87992c0d491a6d9777fd2ad8bf1ace
-  data.tar.gz: 173b017b6e51a8f61506278abc7a44a3acb11d7896aaa779dd18f3c3182346b980f1029ff9fb9a34789a98f72a4ede6bd2e884086021803c5a7f22548be79522
+  metadata.gz: 67a07567cfcd9b80606b67b2e40ce3c0f96679f556bf8919bbbbd6d6ccd099d33ad1bab5d624307ee55c4cf3cc80fd9006fef1227998e7d04d9ed593c5b79b90
+  data.tar.gz: 1bd3e902f18d8bee77087615a9806da2359ea235a86fcae23e70c5900ee1ae0ed47ed72789756e9ebd78286589abb5be0f25a26eac1557b083054218799587d8

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master
 
+## v2.4.2
+
+* Restored support for Xcode 7  
+  [ButkiewiczP](https://github.com/ButkiewiczP)
+  [#304](https://github.com/slatherOrg/slather/pull/308)
+
+* Added Jenkins Pipeline support for Coveralls  
+  [daneov](https://github.com/daneov)
+  [#304](https://github.com/slatherOrg/slather/pull/304)
+
 ## v2.4.1
 
 * Add `--configuration` option  

data/lib/slather/coverage_service/coveralls.rb

@@ -37,7 +37,7 @@ module Slather
       private :jenkins_job_id
 
       def jenkins_branch_name
-        branch_name = ENV['GIT_BRANCH']
+        branch_name = ENV['GIT_BRANCH'] || ENV['BRANCH_NAME']
         if branch_name.include? 'origin/'
           branch_name[7...branch_name.length]
         else

data/lib/slather/project.rb

@@ -56,7 +56,7 @@ module Slather
     end
 
     def failure_help_string
-      "\n\tAre you sure your project is generating coverage? Make sure you enable code coverage in the Test section of your Xcode scheme.\n\tDid you specify your Xcode scheme? (--scheme or 'scheme' in .slather.yml)\n\tIf you're using a workspace, did you specify it? (--workspace or 'workspace' in .slather.yml)"
+      "\n\tAre you sure your project is generating coverage? Make sure you enable code coverage in the Test section of your Xcode scheme.\n\tDid you specify your Xcode scheme? (--scheme or 'scheme' in .slather.yml)\n\tIf you're using a workspace, did you specify it? (--workspace or 'workspace' in .slather.yml)\n\tIf you use a different Xcode configuration, did you specify it? (--configuration or 'configuration' in .slather.yml)"
     end
 
     def derived_data_path
@@ -236,7 +236,7 @@ module Slather
         configure_binary_file
         configure_decimals
 
-        self.llvm_version = `xcrun llvm-cov --version`.match(/Apple LLVM version ([\d\.]+)/).captures[0]
+        self.llvm_version = `xcrun llvm-cov --version`.match(/LLVM version ([\d\.]+)/).captures[0]
       rescue => e
         puts e.message
         puts failure_help_string

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = '2.4.1' unless defined?(Slather::VERSION)
+  VERSION = '2.4.2' unless defined?(Slather::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler