slather 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3fb54ecb063ddb137572a81d78d071c3abe64c
-  data.tar.gz: 7f18e0dce826e19e5929eff17d02368e5d0b27cc
+  metadata.gz: f16b2538dcd029639010c327e4ee5c98ee8c8d5e
+  data.tar.gz: 9f50f7cc111bbdd690d812490673ab71ebcf6d9c
 SHA512:
-  metadata.gz: 47ae378522e002970dea520e193b5de1bed30ed69a259cc1ddc492a54b703a796295faba7535c5749dc5323e18a3f583b1674700ca893a3d6082b0cb2f73b1cd
-  data.tar.gz: b87f45afcafb2d8add2baff4b01eaa21e45ed1ae630c017aff8447b6c9703197019e531420e5507a7013acebec6f73059b4e2ab26feb3ad9e92024d9c23a8d15
+  metadata.gz: 5a31043e931bd04938a32e4c0a78375f764a7bf9275425b2d7c5a9f943382434542eb0c3bb4fe858836b87fba69795f2af87992c0d491a6d9777fd2ad8bf1ace
+  data.tar.gz: 173b017b6e51a8f61506278abc7a44a3acb11d7896aaa779dd18f3c3182346b980f1029ff9fb9a34789a98f72a4ede6bd2e884086021803c5a7f22548be79522

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master
 
+## v2.4.1
+
+* Add `--configuration` option  
+  [thasegaw](https://github.com/thasegaw)
+  [#294](https://github.com/slatherOrg/slather/pull/294)
+
+* Fix misdetection of Xcode version if Spotlight hasn't indexed Xcode yet  
+  [ksuther](https://github.com/ksuther)
+  [#298](https://github.com/slatherOrg/slather/pull/298)
+
+* Better verbose message when no binaries are found  
+  [ksuther](https://github.com/ksuther)
+  [#300](https://github.com/slatherOrg/slather/pull/300)
+
 ## v2.4.0
 
 * Xcode 8.3 support.

data/README.md

@@ -55,6 +55,12 @@ If you use a workspace in Xcode you need to specify it:
 $ slather coverage -s --scheme YourXcodeSchemeName --workspace path/to/workspace.xcworkspace path/to/project.xcodeproj
 ```
 
+If you use a different configuration for your tests: 
+
+```sh
+$ slather coverage -s --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:
@@ -75,6 +81,7 @@ Make a `.slather.yml` file:
 coverage_service: cobertura_xml
 xcodeproj: path/to/project.xcodeproj
 scheme: YourXcodeSchemeName
+configuration: TestedConfiguration
 source_directory: path/to/sources/to/include
 output_directory: path/to/xml_report
 ignore:

data/lib/slather.rb

@@ -10,6 +10,7 @@ require 'slather/coverage_service/hardcover'
 require 'slather/coverage_service/gutter_json_output'
 require 'slather/coverage_service/simple_output'
 require 'slather/coverage_service/html_output'
+require 'cfpropertylist'
 
 module Slather
 
@@ -21,7 +22,8 @@ module Slather
 
   def self.xcode_version
     xcode_path = `xcode-select -p`.strip
-    xcode_version = `mdls -name kMDItemVersion -raw #{xcode_path.shellescape}/../..`.strip
+    plist = CFPropertyList::List.new(:file => File.join(xcode_path, '..', 'Info.plist'))
+    xcode_version = CFPropertyList.native_types(plist.value)["CFBundleShortVersionString"]
     xcode_version.split('.').map(&:to_i)
   end
 

data/lib/slather/command/coverage_command.rb

@@ -24,6 +24,7 @@ class CoverageCommand < Clamp::Command
 
   option ["--input-format"], "INPUT_FORMAT", "Input format (gcov, profdata)"
   option ["--scheme"], "SCHEME", "The scheme for which the coverage was generated"
+  option ["--configuration"], "CONFIGURATION", "The configuration for test that the project was set"
   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
@@ -42,6 +43,7 @@ class CoverageCommand < Clamp::Command
     setup_verbose_mode
     setup_input_format
     setup_scheme
+    setup_configuration
     setup_workspace
     setup_binary_file
     setup_binary_basename
@@ -129,6 +131,10 @@ class CoverageCommand < Clamp::Command
     project.scheme = scheme
   end
 
+  def setup_configuration
+    project.configuration = configuration
+  end
+
   def setup_workspace
     project.workspace = workspace
   end

data/lib/slather/project.rb

@@ -27,19 +27,12 @@ module Xcodeproj
 
       # Patch xcschemes too
       if format == :clang
-        if Gem::Requirement.new('>= 0.28.2') =~ Gem::Version.new(Xcodeproj::VERSION)
-          # @todo This will require to bump the xcodeproj dependency to >= 0.28.2
-          # (which would require to bump cocoapods too)
-          schemes_path = Xcodeproj::XCScheme.shared_data_dir(self.path)
-          Xcodeproj::Project.schemes(self.path).each do |scheme_name|
-            xcscheme_path = "#{schemes_path + scheme_name}.xcscheme"
-            xcscheme = Xcodeproj::XCScheme.new(xcscheme_path)
-            xcscheme.test_action.xml_element.attributes['codeCoverageEnabled'] = 'YES'
-            xcscheme.save_as(self.path, scheme_name)
-          end
-        else
-          # @todo In the meantime, simply inform the user to do it manually
-          puts %Q(Ensure you enabled "Gather coverage data" in each of your scheme's Test action)
+        schemes_path = Xcodeproj::XCScheme.shared_data_dir(self.path)
+        Xcodeproj::Project.schemes(self.path).each do |scheme_name|
+          xcscheme_path = "#{schemes_path + scheme_name}.xcscheme"
+          xcscheme = Xcodeproj::XCScheme.new(xcscheme_path)
+          xcscheme.test_action.xml_element.attributes['codeCoverageEnabled'] = 'YES'
+          xcscheme.save_as(self.path, scheme_name)
         end
       end
     end
@@ -52,7 +45,7 @@ module Slather
 
     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,
-      :decimals, :llvm_version
+      :decimals, :llvm_version, :configuration
 
     alias_method :setup_for_coverage, :slather_setup_for_coverage
 
@@ -230,6 +223,7 @@ module Slather
     def configure
       begin
         configure_scheme
+        configure_configuration
         configure_workspace
         configure_build_directory
         configure_ignore_list
@@ -252,9 +246,13 @@ module Slather
 
       if self.verbose_mode
         puts "\nProcessing coverage file: #{profdata_file}"
-        puts "Against binary files:"
-        self.binary_file.each do |binary_file|
-          puts "\t#{binary_file}"
+        if self.binary_file
+          puts "Against binary files:"
+          self.binary_file.each do |binary_file|
+            puts "\t#{binary_file}"
+          end
+        else
+          puts "No binary files found."
         end
         puts "\n"
       end
@@ -300,6 +298,10 @@ module Slather
       self.scheme ||= self.class.yml["scheme"] if self.class.yml["scheme"]
     end
 
+    def configure_configuration
+      self.configuration ||= self.class.yml["configuration"] if self.class.yml["configuration"]
+    end
+
     def configure_decimals
       return if self.decimals
       self.decimals ||= self.class.yml["decimals"] if self.class.yml["decimals"]
@@ -395,7 +397,11 @@ module Slather
 
         xcscheme = Xcodeproj::XCScheme.new(xcscheme_path)
 
-        configuration = xcscheme.test_action.build_configuration
+        if self.configuration
+          configuration = self.configuration
+        else
+          configuration = xcscheme.test_action.build_configuration
+        end
 
         search_list = binary_basename || find_buildable_names(xcscheme)
 

data/lib/slather/version.rb

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

data/slather.gemspec

@@ -23,13 +23,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "pry", "~> 0.9"
-  spec.add_development_dependency "cocoapods", "~> 1.0"
+  spec.add_development_dependency "cocoapods", "~> 1.2"
   spec.add_development_dependency "json_spec", "~> 1.1.4"
   spec.add_development_dependency "equivalent-xml", "~> 0.5.1"
 
   spec.add_dependency "clamp", "~> 0.6"
-  spec.add_dependency "xcodeproj", "< 2.0.0", ">= 0.20"
+  spec.add_dependency "xcodeproj", "~> 1.4"
   spec.add_dependency "nokogiri", "~> 1.6"
+  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'

data/spec/slather/project_spec.rb

@@ -242,6 +242,7 @@ describe Slather::Project do
       expect(unstubbed_project).to receive(:configure_coverage_service)
       expect(unstubbed_project).to receive(:configure_input_format)
       expect(unstubbed_project).to receive(:configure_scheme)
+      expect(unstubbed_project).to receive(:configure_configuration)
       expect(unstubbed_project).to receive(:configure_workspace)
       unstubbed_project.configure
     end
@@ -325,6 +326,21 @@ describe Slather::Project do
     end
   end
 
+  describe "#configure_configuration" do
+    it "should set the configuration if it has been provided in the yml and has not already been set" do
+      allow(Slather::Project).to receive(:yml).and_return({"configuration" => "Release"})
+      fixtures_project.configure_configuration
+      expect(fixtures_project.configuration).to eq("Release")
+    end
+
+    it "should not set the configuration if it has already been set" do
+      allow(Slather::Project).to receive(:yml).and_return({"configuration" => "Release"})
+      fixtures_project.configuration = "Debug"
+      fixtures_project.configure_configuration
+      expect(fixtures_project.configuration).to eq("Debug")
+    end
+  end
+
   describe "#configure_workspace" do
     it "should set the workspace if it has been provided in the yml and has not already been set" do
       allow(Slather::Project).to receive(:yml).and_return({"workspace" => "fixtures.xcworkspace"})
@@ -503,6 +519,21 @@ describe Slather::Project do
 
       fixtures_project.send(:configure)
     end
+
+    it "should print error when no binaries found" do
+      allow(fixtures_project).to receive(:binary_file).and_return(nil)
+
+      project_root = Pathname("./").realpath
+
+      ["\nProcessing coverage file: #{project_root}/spec/DerivedData/libfixtures/Build/Intermediates/CodeCoverage/Coverage.profdata",
+       "No binary files found.",
+       "\n",
+      ].each do |line|
+        expect(fixtures_project).to receive(:puts).with(line)
+      end
+
+      fixtures_project.send(:configure)
+    end
   end
 
   describe "#source_files" do
@@ -551,4 +582,34 @@ describe Slather::Project do
       expect(decimal_f('50.00000')).to eq('50.0')
     end
   end
+
+  describe '#find_binary_files' 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(:binary_file) { "#{coverage_dir}/Products/#{configuration}-iphonesimulator/fixtures.app/fixtures" }
+
+    before do
+      allow(fixtures_project).to receive(:scheme).and_return("fixtures")
+      allow(fixtures_project).to receive(:workspace).and_return("fixtures.xcworkspace")
+      allow(fixtures_project).to receive(:binary_basename).and_return(["fixtures"])
+      allow(fixtures_project).to receive(:profdata_coverage_dir).and_return(coverage_dir)
+      allow(Dir).to receive(:[]).with(search_dir).and_return([binary_file])
+    end
+
+    context 'load configuration from xcsheme' do
+      it "search binary from 'Products/Debug*'" do
+        expect(fixtures_project.find_binary_files).to eq([binary_file])
+      end
+    end
+
+    context 'load configuration from option' do
+      let(:configuration) { 'Release' }
+      it "search binary from 'Products/Release*'" do
+        fixtures_project.configuration = configuration
+        expect(fixtures_project.find_binary_files).to eq([binary_file])
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slather
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Mark Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -154,22 +154,16 @@ dependencies:
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement