slather 1.5.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2701d4033f375990f4d6eb90a473f3f1fabea04e
-  data.tar.gz: 6b1317d447b3b63b2ad0232ed153810f9bed870e
+  metadata.gz: caeff7a74b6123adedb9180290935d8167a1a86e
+  data.tar.gz: aeccfc1fea76689b142d40649cd5afc28acdef86
 SHA512:
-  metadata.gz: 372f7891468ece01c6f1531d96f75580d1e5674e3efeddc7f4015fec5d4f306efb26d048ce438e3547e32f65895d380a2c4ab41d4664c7bc204323c6529ef8e6
-  data.tar.gz: 42b15f0ad5f3bcd3ae2fbea1caa49527afedd247fa70660783f6323568f12de61170648b96375dd7bd180aff29344058f24b085b9b49cad85e9e3a9f437b20f6
+  metadata.gz: 56d7b2b8bd006e5177094a531944c977d0479c53c63f295b7317526901675483d1d45b776e5f06d9f63f11be79160f7808f6c18d6951a04ed473270fedfa096a
+  data.tar.gz: ecd84dbaa23314124826e78d24446e78d38649cf1bef11101b213f2787ab4a5bc3c546f9cfa412ed3144870fdf9f4dd1ba5d1e30f985d7bd9315b4f80c50a012

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## v1.6.0
+* Add CircleCI support  
+  [Jonathan Hersh](https://github.com/jhersh)
+  [#55](https://github.com/venmo/slather/pull/55)
+
 ## v1.5.4
 
 * Fix calculation of branch coverage when a class has no branches  

data/README.md

@@ -112,9 +112,15 @@ $ slather coverage -x --output-directory path/to/xml_report
 
 ### Coverage for code included via CocoaPods
 
-If you’re trying to compute the coverage of code that has been included via
-CocoaPods, you will need to tell slather where to find the source files for
-your Pod.
+If you're trying to compute the coverage of code that has been included via
+CocoaPods, you will need to tell CocoaPods to use the slather plugin by
+adding the following to your `Podfile`.
+
+```ruby
+plugin 'slather'
+```
+
+You will also need to tell slather where to find the source files for your Pod.
 
 ```yml
 # .slather.yml

data/bin/slather

@@ -12,6 +12,7 @@ Clamp do
     parameter "[xcodeproj]", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
 
     option ["--travis", "-t"], :flag, "Indicate that the builds are running on Travis CI"
+    option ["--circleci"], :flag, "Indicate that the builds are running on CircleCI"
 
     option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
     option ["--simple-output", "-s"], :flag, "Output coverage results to the terminal"
@@ -57,6 +58,8 @@ Clamp do
     def setup_service_name
       if travis?
         project.ci_service = :travis_ci
+      elsif circleci?
+        project.ci_service = :circleci
       end
     end
 

data/lib/cocoapods_plugin.rb

@@ -1,6 +1,6 @@
 require 'slather'
 
-Pod::HooksManager.register(:post_install) do |installer_context|
+Pod::HooksManager.register('slather', :post_install) do |installer_context|
   sandbox_root = installer_context.sandbox_root
   sandbox = Pod::Sandbox.new(sandbox_root)
   project = Xcodeproj::Project.open(sandbox.project_path)

data/lib/slather/coverage_service/coveralls.rb

@@ -11,6 +11,28 @@ module Slather
         ENV['TRAVIS_JOB_ID']
       end
       private :travis_job_id
+      
+      def circleci_job_id
+        ENV['CIRCLE_BUILD_NUM']
+      end
+      private :circleci_job_id
+      
+      def circleci_pull_request
+        ENV['CI_PULL_REQUEST']
+      end
+      private :circleci_pull_request
+      
+      def circleci_git_info
+        {
+          :head => {
+            :id => (ENV['CIRCLE_SHA1'] || ""),
+            :author_name => (ENV['CIRCLE_USERNAME'] || ""),
+            :message => (`git log --format=%B -n 1 HEAD`.chomp || "")
+          },
+          :branch => (ENV['CIRCLE_BRANCH'] || "")
+        }
+      end
+      private :circleci_git_info
 
       def coveralls_coverage_data
         if ci_service == :travis_ci || ci_service == :travis_pro
@@ -32,6 +54,24 @@ module Slather
           else
             raise StandardError, "Environment variable `TRAVIS_JOB_ID` not set. Is this running on a travis build?"
           end
+        elsif ci_service == :circleci
+          if circleci_job_id
+            coveralls_hash = {
+              :service_job_id => circleci_job_id,
+              :service_name => "circleci",
+              :repo_token => ci_access_token,
+              :source_files => coverage_files.map(&:as_json),
+              :git => circleci_git_info
+            }
+            
+            if circleci_pull_request != nil && circleci_pull_request.length > 0
+              coveralls_hash[:service_pull_request] = circleci_pull_request.split("/").last
+            end
+            
+            coveralls_hash.to_json
+          else
+            raise StandardError, "Environment variable `CIRCLE_BUILD_NUM` not set. Is this running on a circleci build?"
+          end
         else
           raise StandardError, "No support for ci named #{ci_service}"
         end

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = "1.5.5"
+  VERSION = "1.6.0"
 end

data/slather.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "pry", "~> 0.9"
-  spec.add_development_dependency "cocoapods", "~> 0.34"
+  spec.add_development_dependency "cocoapods", "~> 0.36.0"
   spec.add_development_dependency "json_spec", "~> 1.1.4"
 
   spec.add_dependency "clamp", "~> 0.6"
-  spec.add_dependency "xcodeproj", "~> 0.20.0"
+  spec.add_dependency "xcodeproj", "~> 0.23.0"
   spec.add_dependency "nokogiri", "~> 1.6.3"
 end

data/spec/slather/cocoapods_plugin_spec.rb

@@ -14,7 +14,7 @@ describe Slather do
       sandbox_root = 'Pods'
       sandbox = Pod::Sandbox.new(sandbox_root)
       context = Pod::Installer::HooksContext.generate(sandbox, [])
-      Pod::HooksManager.run(:post_install, context)
+      Pod::HooksManager.run(:post_install, context, {'slather' => nil})
     end
   end
 end

data/spec/slather/coverage_service/coveralls_spec.rb

@@ -54,6 +54,24 @@ describe Slather::CoverageService::Coveralls do
         expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
       end
     end
+    
+    context "coverage_service is :circleci" do
+      before(:each) { fixtures_project.ci_service = :circleci }
+    
+      it "should return valid json for coveralls coverage data" do
+        fixtures_project.stub(:circleci_job_id).and_return("9182")
+        fixtures_project.stub(:ci_access_token).and_return("abc123")
+        fixtures_project.stub(:circleci_pull_request).and_return("1")
+        fixtures_project.stub(:circleci_git_info).and_return({ :head => { :id => "ababa123", :author_name => "bwayne", :message => "hello" }, :branch => "master" })
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql("{\"service_job_id\":\"9182\",\"service_name\":\"circleci\",\"repo_token\":\"abc123\",\"service_pull_request\":\"1\",\"git\":{\"head\":{\"id\":\"ababa123\",\"author_name\":\"bwayne\",\"message\":\"hello\"},\"branch\":\"master\"}}").excluding("source_files")
+        expect(fixtures_project.send(:coveralls_coverage_data)).to be_json_eql(fixtures_project.send(:coverage_files).map(&:as_json).to_json).at_path("source_files")
+      end
+    
+      it "should raise an error if there is no CIRCLE_BUILD_NUM" do
+        fixtures_project.stub(:circleci_job_id).and_return(nil)
+        expect { fixtures_project.send(:coveralls_coverage_data) }.to raise_error(StandardError)
+      end
+    end
 
     it "should raise an error if it does not recognize the ci_service" do
       fixtures_project.ci_service = :jenkins_ci

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement