slather 0.0.233 → 0.0.234

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dde61485c0ba365e1030ab355fceb8a83f54822
-  data.tar.gz: 5f52fc6736730b6c04d0fec21284d2972fa098a8
+  metadata.gz: 0c5ba01f7c2a9589c8c8e6bf2bf964d5e073faa5
+  data.tar.gz: 0018264bf4c9a9ec2744b1e8ca670c0fc5fa7862
 SHA512:
-  metadata.gz: 68313dc2637e7b9e59cabd5961a092bd6546ae958624877311eaf1823b86fb2d4bcab0ab71728c0b31c304c57c572907b53ae8eab0eeadabec4ec55853ec50df
-  data.tar.gz: 8551d85897124c58a9895a8a0448a4fd2152af1c90f118263e92da4f8ecbd8fcb8e80644fb9cf21e8b6ee672430d6a5338b26a8defc5f89d7e96860e725c3eac
+  metadata.gz: 0f811984af1548b8068ca126419bd91f12306fec511a11539cb99e5f3bee18074d37fb4d78bbc2d1fee05352109b134079c78265bd7987d2b04121c40a8a1f08
+  data.tar.gz: 2a9d1b94116d9426317e8bcd2ce483acb3d1af6adbaf433ba0efdcb83f9c23d90de376b8b500413979fb2b0d16097906cf17ecfe219fbc455997b1f5ea232f33

data/bin/slather

@@ -12,6 +12,8 @@ Clamp do
 
     option "--project, -p", "PROJECT", "Path to the xcodeproj", :attribute_name => :xcodeproj_path
 
+    option ["--travis", "-t"], :flag, "Indicate that the builds are running on Travis CI"
+
     option ["--coveralls", "-c"], :flag, "Post coverage results to coveralls"
     option ["--simple-output", "-s"], :flag, "Post coverage results to coveralls"
 
@@ -20,22 +22,48 @@ Clamp do
 
     def execute
       puts "Slathering..."
+          
+      setup_service_name
+      setup_ignore_list
+      setup_build_directory
+      setup_coverage_service
 
-      xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml_file["xcodeproj"]
+      post
 
-      project = Slather::Project.open(xcodeproj_path_to_open)
+      puts "Done slathering!"
+    end
+
+    def setup_build_directory
+      project.build_directory = build_directory if build_directory
+    end
+
+    def setup_ignore_list
+      project.ignore_list = ignore_list if !ignore_list.empty?
+    end
+
+    def setup_service_name
+      if travis?
+        project.ci_service = :travis_ci
+      end
+    end
 
+    def post
+      project.post
+    end
+
+    def project
+      @project ||= begin
+        xcodeproj_path_to_open = xcodeproj_path || Slather::Project.yml_file["xcodeproj"]
+        project = Slather::Project.open(xcodeproj_path_to_open)
+      end
+    end
+
+    def setup_coverage_service
       if coveralls?
         project.extend(Slather::CoverageService::Coveralls)
       elsif simple_output?
         project.extend(Slather::CoverageService::SimpleOutput)
       end
-          
-      project.ignore_list = ignore_list if !ignore_list.empty?
-      project.build_directory = build_directory if build_directory
-      project.post
-
-      puts "Done slathering!"
     end
 
   end

data/lib/slather/coverage_file.rb

@@ -57,5 +57,11 @@ module Slather
       end
     end
 
+    def ignored?
+      project.ignore_list.any? do |ignore|
+        File.fnmatch(ignore, source_file_pathname_relative_to_project_root)
+      end
+    end
+
   end
 end

data/lib/slather/coverage_service/coveralls.rb

@@ -6,22 +6,38 @@ module Slather
         Slather::CoverallsCoverageFile
       end
 
+      def travis_job_id
+        ENV['TRAVIS_JOB_ID']
+      end
+
       def coveralls_coverage_data
-        {
-          :service_job_id => ENV['TRAVIS_JOB_ID'],
-          :service_name => "travis-ci",
-          :source_files => coverage_files.map(&:as_json)
-        }.to_json
+        if ci_service == :travis_ci
+          if travis_job_id
+            {
+              :service_job_id => travis_job_id,
+              :service_name => "travis-ci",
+              :source_files => coverage_files.map(&:as_json)
+            }.to_json
+          else
+            raise StandardError, "Environment variable `TRAVIS_JOB_ID` not set. Is this running on a travis build?"
+          end
+        else
+          raise StandardError, "No support for ci named #{ci_service}"
+        end
       end
       private :coveralls_coverage_data
 
       def post
         f = File.open('coveralls_json_file', 'w+')
         f.write(coveralls_coverage_data)
-        `curl -s --form json_file=@#{f.path} https://coveralls.io/api/v1/jobs`
+        `curl -s --form json_file=@#{f.path} #{coveralls_api_jobs_path}`
         FileUtils.rm(f)
       end
 
+      def coveralls_api_jobs_path
+        "https://coveralls.io/api/v1/jobs"
+      end
+
     end
   end
 end

data/lib/slather/project.rb

@@ -6,7 +6,7 @@ require 'yaml'
 module Slather
   class Project < Xcodeproj::Project
 
-    attr_accessor :build_directory, :ignore_list
+    attr_accessor :build_directory, :ignore_list, :ci_service
 
     def self.open(xcodeproj)
       proj = super
@@ -29,7 +29,7 @@ module Slather
         coverage_file = coverage_file_class.new(file)
         coverage_file.project = self
         # If there's no source file for this gcno, it probably belongs to another project.
-        if coverage_file.source_file_pathname && !(coverage_file.source_file_pathname_relative_to_project_root.to_s =~ /^(#{ignore_list.join("|")})$/)
+        if coverage_file.source_file_pathname && !coverage_file.ignored?
           coverage_file
         else
           nil
@@ -58,6 +58,7 @@ module Slather
     def configure_from_yml
       self.build_directory = self.class.yml_file["build_directory"] if self.class.yml_file["build_directory"]
       self.ignore_list = self.class.yml_file["ignore"] || []
+      self.ci_service = (self.class.yml_file["ci_service"] || :travis_ci).to_sym
 
       coverage_service = self.class.yml_file["coverage_service"]
       if coverage_service == "coveralls"

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = "0.0.233"
+  VERSION = "0.0.234"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 0.0.233
+  version: 0.0.234
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler