slather 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f140d82b4571c441455df1b9eb9c247f8f52e310
-  data.tar.gz: eeaac677b8b341cb92479c16cbdd2bd6254c85de
+SHA256:
+  metadata.gz: 10b576bd7bfd395102e3d01454d5f74fdccb560d58b629b5ce88ac7ebcf1aacc
+  data.tar.gz: 21c39f7fe553b008f08f882c7192721b6c0574ec728c7e9d7e6343ab6e0b80a5
 SHA512:
-  metadata.gz: ebac089dfe9785ab980a86d6f3020a9c700f01edd1d3dcdb170c82faccc553cb5a4d7143a30c6432af7c606de9902fd42737f12233d136240aeb01e0ce415a21
-  data.tar.gz: e3a00efe762b6062a33ef42d30cbdadc4b03444f3f36538bc23b98988659587aace4a6d9fa346ab8a7d5367072fded337dd600efff2e28d5181fd98b366ff10c
+  metadata.gz: 9e8838d258c9570193e9a3d161da02a6ff03f8797c2e85aa3a88c9ff3393d35724da8b66c7a332db543dabec1dd381a6c85821b44e91b4c1796e8c133aed5467
+  data.tar.gz: 96b08ba6c91367fe39efba771caa07cad57208ce8cdb6cce11aa60229a864ca044c4978c9d1d58f3779247476440777898c57acd2bf8b1f31ffddb0bf37d1948

data/.travis.yml

@@ -1,20 +1,10 @@
 language: objective-c
 script: bundle exec rake
-osx_image: xcode8.3
-
-# Sets Travis to run the Ruby specs on OS X machines which are required to
-# build the native extensions of Xcodeproj.
-
-env:
-  - RVM_RUBY_VERSION=system
+osx_image: xcode9.2
 
 before_install:
   - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
-  - source ~/.rvm/scripts/rvm
-  - if [[ $RVM_RUBY_VERSION != 'system' ]]; then rvm install $RVM_RUBY_VERSION; fi
-  - rvm use $RVM_RUBY_VERSION
-  - if [[ $RVM_RUBY_VERSION == 'system' ]]; then export ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future; fi
-  - if [[ $RVM_RUBY_VERSION == 'system' ]]; then sudo gem install bundler --no-ri --no-rdoc; else gem install bundler --no-ri --no-rdoc; fi
+  - gem install bundler --no-ri --no-rdoc
 
 install:
   - bundle install --without=documentation

data/CHANGELOG.md

@@ -1,9 +1,24 @@
 # CHANGELOG
 
+## v2.4.5
+
+* Support for specifying a specific binary architecture
+  [ksuther](https://github.com/ksuther), [nickolas-pohilets](https://github.com/nickolas-pohilets)
+  [#367](https://github.com/SlatherOrg/slather/pull/367)
+
+* Added absolute statement count to simple output (instead of showing just a percentage)
+  [barrault01](https://github.com/barrault01), [ivanbrunel](https://github.com/ivanbruel)
+  [#365](https://github.com/SlatherOrg/slather/pull/365)
+
+* Updated nokogiri dependency version
+  [#363](https://github.com/SlatherOrg/slather/issues/363), [#366](https://github.com/SlatherOrg/slather/pull/366)
+
+* slather now requires ruby 2.1 or later (10.13 ships with 2.3.3)
+
 ## v2.4.4
 
 * Added llvm-cov output format
-  [lampietti](https://github.com/sgtsquiggs) [#354](https://github.com/SlatherOrg/slather/pull/354)
+  [sgtsquiggs](https://github.com/sgtsquiggs) [#354](https://github.com/SlatherOrg/slather/pull/354)
 
 * Exclude swiftmodule from product search
   [lampietti](https://github.com/lampietti) [#352](https://github.com/SlatherOrg/slather/pull/352)

data/README.md

@@ -61,6 +61,12 @@ If you use a different configuration for your tests:
 $ slather coverage -s --scheme YourXcodeSchemeName --configuration YourBuildConfigurationName path/to/project.xcodeproj
 ```
 
+If your configuration produces a universal binary you need to specify a specific architecture to use: 
+
+```sh
+$ slather coverage -s --arch x86_64 --scheme YourXcodeSchemeName --configuration YourBuildConfigurationName path/to/project.xcodeproj
+```
+
 ### Setup for Xcode 5 and 6
 
 Run this command to enable the `Generate Test Coverage` and `Instrument Program Flow` flags for your project:

data/lib/slather/command/coverage_command.rb

@@ -30,6 +30,7 @@ class CoverageCommand < Clamp::Command
   option ["--workspace"], "WORKSPACE", "The workspace that the project was built in"
   option ["--binary-file"], "BINARY_FILE", "The binary file against the which the coverage will be run", :multivalued => true
   option ["--binary-basename"], "BINARY_BASENAME", "Basename of the file against which the coverage will be run", :multivalued => true
+  option ["--arch"], "ARCH", "Architecture to use from universal binaries"
   option ["--source-files"], "SOURCE_FILES", "A Dir.glob compatible pattern used to limit the lookup to specific source files. Ignored in gcov mode.", :multivalued => true
   option ["--decimals"], "DECIMALS", "The amount of decimals to use for % coverage reporting"
 
@@ -49,6 +50,7 @@ class CoverageCommand < Clamp::Command
     setup_workspace
     setup_binary_file
     setup_binary_basename
+    setup_arch
     setup_source_files
     setup_decimals
 
@@ -153,6 +155,10 @@ class CoverageCommand < Clamp::Command
     project.binary_basename = binary_basename_list if !binary_basename_list.empty?
   end
 
+  def setup_arch
+    project.arch = arch
+  end
+
   def setup_source_files
     project.source_files = source_files_list if !source_files_list.empty?
   end

data/lib/slather/coverage_service/simple_output.rb

@@ -43,6 +43,7 @@ module Slather
         end
 
         total_percentage = decimal_f([(total_project_lines_tested / total_project_lines.to_f) * 100.0])
+        puts "Tested #{total_project_lines_tested}/#{total_project_lines} statements"
         puts "Test Coverage: #{total_percentage}%"
       end
 

data/lib/slather/project.rb

@@ -44,7 +44,7 @@ module Slather
   class Project < Xcodeproj::Project
 
     attr_accessor :build_directory, :ignore_list, :ci_service, :coverage_service, :coverage_access_token, :source_directory,
-      :output_directory, :xcodeproj, :show_html, :verbose_mode, :input_format, :scheme, :workspace, :binary_file, :binary_basename, :source_files,
+      :output_directory, :xcodeproj, :show_html, :verbose_mode, :input_format, :scheme, :workspace, :binary_file, :binary_basename, :arch, :source_files,
       :decimals, :llvm_version, :configuration
 
     alias_method :setup_for_coverage, :slather_setup_for_coverage
@@ -212,6 +212,9 @@ module Slather
       end
 
       llvm_cov_args = %W(show -instr-profile #{profdata_file_arg} #{binary_path})
+      if self.arch
+        llvm_cov_args << "--arch" << self.arch
+      end
       `xcrun llvm-cov #{llvm_cov_args.shelljoin} #{source_files.shelljoin}`
     end
     private :unsafe_profdata_llvm_cov_output
@@ -248,6 +251,7 @@ module Slather
         configure_source_directory
         configure_output_directory
         configure_input_format
+        configure_arch
         configure_binary_file
         configure_decimals
 
@@ -370,6 +374,10 @@ module Slather
       end
     end
 
+    def configure_arch
+      self.arch ||= self.class.yml["arch"] if self.class.yml["arch"]
+    end
+
     def decimal_f decimal_arg
       configure_decimals unless decimals
       decimal = "%.#{decimals}f" % decimal_arg
@@ -438,6 +446,12 @@ module Slather
           }.reject { |path|
             path.end_with? ".dSYM"
             path.end_with? ".swiftmodule"
+
+            if path and File.directory? path
+              path = find_binary_file_in_bundle(path)
+            end
+
+            !matches_arch(path)
           }.first
 
           if found_product and File.directory? found_product
@@ -517,6 +531,16 @@ module Slather
       found_buildable_names.uniq
     end
 
+    def matches_arch(binary_path)
+      if self.arch
+        lipo_output = `lipo -info "#{binary_path}"`
+        archs_in_binary = lipo_output.split(':').last.split(' ')
+        archs_in_binary.include? self.arch
+      else
+        true
+      end
+    end
+
     def find_source_files
       source_files = load_option_array("source_files")
       return if source_files.nil?

data/lib/slather/version.rb

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

data/slather.gemspec

@@ -29,9 +29,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'clamp', '~> 0.6'
   spec.add_dependency 'xcodeproj', '~> 1.4'
-  spec.add_dependency 'nokogiri', '>= 1.6', '< 1.7'
+  spec.add_dependency 'nokogiri', '~> 1.8.2'
   spec.add_dependency 'CFPropertyList', '~> 2.2'
 
-  ## Version 5 needs Ruby 2.2, so we specify an upper bound to stay compatible with system ruby
-  spec.add_runtime_dependency 'activesupport', '>= 4.0.2', '< 5'
+  spec.add_runtime_dependency 'activesupport', '>= 4.0.2'
 end

data/spec/slather/coverage_service/simple_output_spec.rb

@@ -25,6 +25,7 @@ describe Slather::CoverageService::SimpleOutput do
       "spec/fixtures/fixturesTests/fixturesTests.m: 17 of 17 lines (100.00%)",
       "spec/fixtures/fixturesTests/peekaviewTests💣.m: 11 of 11 lines (100.00%)",
       "spec/fixtures/fixturesTwo/fixturesTwo.m: 6 of 6 lines (100.00%)",
+      "Tested 66/86 statements",
       "Test Coverage: 76.74%"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
@@ -47,6 +48,7 @@ describe Slather::CoverageService::SimpleOutput do
            "spec/fixtures/fixturesTwo/fixturesTwo.m: 6 of 6 lines (100.00%)",
            "##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='66']",
            "##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='86']",
+           "Tested 66/86 statements",
            "Test Coverage: 76.74%"
           ].each do |line|
             expect(fixtures_project).to receive(:puts).with(line)

data/spec/slather/project_spec.rb

@@ -163,12 +163,19 @@ describe Slather::Project do
 
     it "should find the product path for a scheme with no buildable products" do
       allow(fixtures_project).to receive(:scheme).and_return("fixturesTests")
+      allow(fixtures_project).to receive(:arch).and_return("x86_64")
       fixtures_project.send(:configure_binary_file)
       binary_file_location = fixtures_project.send(:binary_file)
       expect(binary_file_location.count).to eq(1)
       expect(binary_file_location.first).to end_with("Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests")
     end
 
+    it "should not find a product path for an invalid architecture" do
+      allow(fixtures_project).to receive(:scheme).and_return("fixturesTests")
+      allow(fixtures_project).to receive(:arch).and_return("arm64")
+      expect { fixtures_project.send(:configure_binary_file) }.to raise_error.with_message(/No product binary found in (.+)./)
+    end
+
     it "should find multiple unique paths for a scheme with serveral buildable/testable products" do
       allow(fixtures_project).to receive(:scheme).and_return("aggregateFixturesTests")
       fixtures_project.send(:configure_binary_file)
@@ -509,9 +516,9 @@ describe Slather::Project do
     it "should print out environment info when in verbose_mode" do
       project_root = Pathname("./").realpath
 
-      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+      [/\nProcessing coverage file: #{project_root}\/spec\/DerivedData\/libfixtures\/Build\/ProfileData\/[A-Z0-9-]+\/Coverage.profdata/,
        "Against binary files:",
-       "\t#{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests",
+       "\t#{project_root}/spec/DerivedData/libfixtures/Build/Products/Debug/fixturesTests.xctest/Contents/MacOS/fixturesTests",
        "\n"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
@@ -525,7 +532,7 @@ describe Slather::Project do
 
       project_root = Pathname("./").realpath
 
-      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+      [/\nProcessing coverage file: #{project_root}\/spec\/DerivedData\/libfixtures\/Build\/ProfileData\/[A-Z0-9-]+\/Coverage.profdata/,
        "No binary files found.",
        "\n",
       ].each do |line|
@@ -558,6 +565,7 @@ describe Slather::Project do
     it "should print out the coverage for each file, and then total coverage" do
       ["spec/fixtures/fixtures/fixtures.m: 3 of 6 lines (50.00%)",
       "spec/fixtures/fixturesTwo/fixturesTwo.m: 6 of 6 lines (100.00%)",
+      "Tested 9/12 statements",
       "Test Coverage: 75.00%"
       ].each do |line|
         expect(fixtures_project).to receive(:puts).with(line)
@@ -587,7 +595,7 @@ describe Slather::Project do
     let(:configuration) { 'Debug' }
     let(:project_root) { Pathname("./").realpath }
     let(:coverage_dir) { "#{project_root}/spec/DerivedData/DerivedData/Build/Intermediates/CodeCoverage" }
-    let(:search_dir) { "#{coverage_dir}/Products/#{configuration}*/fixtures*" }
+    let(:search_dir) { "#{coverage_dir}/../../Products/#{configuration}*/fixtures*" }
     let(:binary_file) { "#{coverage_dir}/Products/#{configuration}-iphonesimulator/fixtures.app/fixtures" }
 
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2018-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,22 +168,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -205,9 +199,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -215,9 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 description: 
 email:
 - mark@venmo.com
@@ -338,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Test coverage reports for Xcode projects