slather 1.0.1 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzQ1ZmY1MjU4NDI0Njg5M2NkMGI5ZGJjNDhiNWZhMTQ1OTliNWUwNA==
+    Mzk5NGNiYzA1NGVhMzEzYWJhMzdhNjA0YjBhNjhhYWY2ZmQ3NDNlZQ==
   data.tar.gz: !binary |-
-    YWY4ZTg1MDdjYTRhMDg4MDQyNGU2YzQzOWJhZGU0ODQ4NTE0ZjNiMA==
+    YTY0ZjBiNDcwZGFlMmM5YzQyNjU0YjdkYjQyNDcyYThhMDAyYzM3Zg==
 SHA512:
   metadata.gz: !binary |-
-    ODU0OTQ5OGE0ZjYxMDI3OGVlYTcwMzE5ZjIwNWUyOGYzMGUxNDAxY2U3Yjll
-    MWI5ZjU1NzZhZTQ2MjYzNzA0MjNkNmE0MWY3MDAwNGQ4ZmU1NTI0Y2Q4NmUw
-    ODAxZGEwYWY4MDU2MDY2MDVhOTBkMmZhNjBlN2Y4YWRmMGY0ZTY=
+    YmNkNjVhOGYxNWM4NzFjMTBiYTY3NGMwZjM2Y2Y5NDU5MDMzNjEwYWQyYjJj
+    MjcwNDkxNTEzNmQwNGE5NjVhODI4NTM5OTA5OTRlYjEwMTc2YWYxMWMzMGM1
+    ZDEwODRiMjdjYmZjNTUxZjZlMDJmMTJjNDQyZWU1YmM3OGEyNzE=
   data.tar.gz: !binary |-
-    MTVhMGExOTViY2VkNDA4ZTJhMTA3ZjA1NGZhM2YxMmZjNjBiZDZkNTk2ZjA2
-    Mjk4MzAxNTIxNzFlNTFiMDVmYjMyN2ViZjJiYzBkZjg0N2FjNTMxYWIxN2Q3
-    MjYwYTlkOTNhZDFmMTEyZDA3NTIwNTNjZDQxOGU1MWY2NmQ4NGQ=
+    M2E4N2ZmNzZkYTViMjAzYzA0N2MyZDQxMmI0NjQyOGY0YjExNjhkYTIwYjky
+    N2Y3M2IzZGE3NmU0NmUwZWRiZDhiNzUwZjhlYjc3NWNlOGYyOGFmMGFlYmI1
+    YWE3ODA0NDA0NGI2YWZhNGI1MzdlNmU0NTc1NWUwYzJlN2I5NjA=

data/bin/slather

@@ -17,6 +17,7 @@ Clamp do
     option ["--simple-output", "-s"], :flag, "Post coverage results to coveralls"
 
     option ["--build-directory", "-b"], "BUILD_DIRECTORY", "The directory where gcno files will be written to. Defaults to derived data."
+    option ["--source-directory"], "SOURCE_DIRECTORY", "The directory where your source files are located."
     option ["--ignore", "-i"], "IGNORE", "ignore files conforming to a path", :multivalued => true
 
     def execute
@@ -25,6 +26,7 @@ Clamp do
       setup_service_name
       setup_ignore_list
       setup_build_directory
+      setup_source_directory
       setup_coverage_service
 
       post
@@ -36,6 +38,10 @@ Clamp do
       project.build_directory = build_directory if build_directory
     end
 
+    def setup_source_directory
+      project.source_directory = source_directory if source_directory
+    end
+
     def setup_ignore_list
       project.ignore_list = ignore_list if !ignore_list.empty?
     end

data/lib/slather.rb

@@ -9,4 +9,10 @@ module Slather
 
   Encoding.default_external = "utf-8"
 
+  def self.prepare_pods(pods)
+    pods.post_install do |installer|
+      installer.project.slather_setup_for_coverage
+    end
+  end
+
 end

data/lib/slather/coverage_file.rb

@@ -12,8 +12,15 @@ module Slather
       @source_file_pathname ||= begin
         base_filename = gcno_file_pathname.basename.sub_ext("")
         # TODO: Handle Swift
-        path = Dir["./**/#{base_filename}.m"].first
-        path && Pathname(path)
+        path = nil
+        if project.source_directory
+          path = Dir["#{project.source_directory}/**/#{base_filename}.m"].first
+          path &&= Pathname(path)
+        else
+          pbx_file = project.files.detect { |pbx_file| pbx_file.real_path.basename.to_s == "#{base_filename}.m" }
+          path = pbx_file && pbx_file.real_path
+        end
+        path
       end
     end
 
@@ -26,7 +33,6 @@ module Slather
     end
 
     def source_file_pathname_relative_to_repo_root
-      puts "pathhh: #{source_file_pathname.cleanpath}"
       source_file_pathname.realpath.relative_path_from(Pathname("./").realpath)
     end
 

data/lib/slather/project.rb

@@ -3,10 +3,25 @@ require 'xcodeproj'
 require 'json'
 require 'yaml'
 
+module Xcodeproj
+  class Project
+
+    def slather_setup_for_coverage
+      build_configurations.each do |build_configuration|
+        build_configuration.build_settings["GCC_INSTRUMENT_PROGRAM_FLOW_ARCS"] = "YES"
+        build_configuration.build_settings["GCC_GENERATE_TEST_COVERAGE_FILES"] = "YES"
+      end
+    end
+
+  end
+end
+
 module Slather
   class Project < Xcodeproj::Project
 
-    attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service
+    attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service, :source_directory
+
+    alias_method :setup_for_coverage, :slather_setup_for_coverage
 
     def self.open(xcodeproj)
       proj = super
@@ -51,12 +66,17 @@ module Slather
       configure_ignore_list_from_yml
       configure_ci_service_from_yml
       configure_coverage_service_from_yml
+      configure_source_directory_from_yml
     end
 
     def configure_build_directory_from_yml
       self.build_directory = self.class.yml["build_directory"] if self.class.yml["build_directory"] && !@build_directory
     end
 
+    def configure_source_directory_from_yml
+      self.source_directory ||= self.class.yml["source_directory"] if self.class.yml["source_directory"]
+    end
+
     def configure_ignore_list_from_yml
       self.ignore_list ||= [(self.class.yml["ignore"] || [])].flatten
     end
@@ -85,13 +105,6 @@ module Slather
       @coverage_service = service
     end
 
-    def setup_for_coverage
-      build_configurations.each do |build_configuration|
-        build_configuration.build_settings["GCC_INSTRUMENT_PROGRAM_FLOW_ARCS"] = "YES"
-        build_configuration.build_settings["GCC_GENERATE_TEST_COVERAGE_FILES"] = "YES"
-      end
-    end
-
   end
 end
 

data/lib/slather/version.rb

@@ -1,3 +1,3 @@
 module Slather
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Larsen