xcjobs 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c119a3dce6b0ec128d006c306ca9f58fd5937fc0
-  data.tar.gz: 0d76bda17df5c2f0fe063b5e80d803c0c1947924
+  metadata.gz: 1eb63c93a78d7fdc076af6cd7fefa3608e6fe196
+  data.tar.gz: 1dbfcba0c866410ce9c1e0c74ac7c0dc875bb883
 SHA512:
-  metadata.gz: 31180c4018cd1e16c8341c1b072222e6205cee78b48f2ecd087252de469aabd1d593459e26bfcb1bf951ba65aa21687a472720396c017c0074a862c4d9778f96
-  data.tar.gz: 8fd39e7034b671ccb810c183f2b0c94002277a51b9a1a29a7594b661a93cdc304658b9b05dd577a875f332dc8a173a6e89027cf4bbc09618bd0ae8389d094be3
+  metadata.gz: 59da10ad0d509a80a03ddf4cf9ad7c5aa291af7d84935d3d55dfa0a2b1bc61fc15d3398f390308e5ee3469fcf44722b62e24c97280e911a3e09dd18bd7efd9c1
+  data.tar.gz: 57e7e7165061fa0da650bc9dd01166598becefc127e570ca473163bd5c9769c46dcd6615be7db075fb00b7107ecc2a4b5151b414408b748a335e21505b92fba2

data/lib/xcjobs/version.rb

@@ -1,3 +1,3 @@
 module XCJobs
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/lib/xcjobs/xcodebuild.rb

@@ -10,6 +10,7 @@ module XCJobs
     include Rake::DSL if defined?(Rake::DSL)
 
     attr_accessor :name
+    attr_accessor :description
     attr_accessor :project
     attr_accessor :target
     attr_accessor :workspace
@@ -146,6 +147,7 @@ module XCJobs
   class Test < Xcodebuild
     def initialize(name = :test)
       super
+      @description = 'test application'
       yield self if block_given?
       define
     end
@@ -209,25 +211,27 @@ module XCJobs
     def coverage_report(options)
       settings = build_settings(options)
       
+      xcode_version = `xcodebuild -version`.split("\n").first.scan(/\d+/).join('.')
+      
       targetSettings = settings.select { |key, _| settings[key]['PRODUCT_TYPE'] != 'com.apple.product-type.bundle.unit-test' }
       targetSettings.each do |target, settings|
+        objroot = settings['OBJROOT']
+        
         product_type = settings['PRODUCT_TYPE']
         if product_type == 'com.apple.product-type.framework' || product_type == 'com.apple.product-type.application'
           if sdk.start_with?('iphone') && settings['ONLY_ACTIVE_ARCH'] == 'NO'
-            target_dir = settings['OBJECT_FILE_DIR_normal'].gsub('Build/Intermediates', "Build/Intermediates/CodeCoverage/Intermediates")
             executable_name = settings['EXECUTABLE_NAME']
-            target_path = File.join(File.join(target_dir, settings['CURRENT_ARCH']), executable_name)
+            target_path = Dir.glob(File.join(objroot, '/**/' +executable_name)).first
           else
-            target_dir = (product_type == 'com.apple.product-type.application' ? settings['CONFIGURATION_BUILD_DIR'] : settings['CODESIGNING_FOLDER_PATH']).gsub('Build/Products', "Build/Intermediates/CodeCoverage/Products")
             executable_name = product_type == 'com.apple.product-type.application' ? settings['EXECUTABLE_PATH'] : settings['EXECUTABLE_NAME']
-            target_path = File.join(target_dir, executable_name)
+            target_path = Dir.glob(File.join(objroot, '/**/' +executable_name)).select { |f| File.stat(f).file? }.first
           end
         elsif
           raise %[Product type (PRODUCT_TYPE) '#{product_type}' is unsupported.]
         end
         
-        code_coverage_dir = settings['BUILD_DIR'].gsub('Build/Products', "Build/Intermediates/CodeCoverage")
-        profdata_path = File.join(code_coverage_dir, 'Coverage.profdata')
+        puts target_path
+        profdata_path = Dir.glob(File.join(objroot, '/**/Coverage.profdata')).first
         
         show_coverage(profdata_path, target_path)
         generate_gcov_file(profdata_path, target_path)
@@ -255,7 +259,7 @@ module XCJobs
       raise 'test action requires specifying a scheme' unless scheme
       raise 'cannot specify both a scheme and targets' if scheme && target
 
-      desc 'test application'
+      desc @description
       task @name do
         if sdk == 'iphonesimulator'
           add_build_setting('CODE_SIGN_IDENTITY', '""')
@@ -276,6 +280,7 @@ module XCJobs
   class Build < Xcodebuild
     def initialize(name = :build)
       super
+      @description = 'build application'
       yield self if block_given?
       define
     end
@@ -289,7 +294,7 @@ module XCJobs
       CLEAN.include(build_dir) if build_dir
       CLOBBER.include(build_dir) if build_dir
 
-      desc 'build application'
+      desc @description
       task @name do
         add_build_setting('CONFIGURATION_TEMP_DIR', File.join(build_dir, 'temp')) if build_dir
         add_build_setting('CODE_SIGN_IDENTITY', signing_identity) if signing_identity
@@ -305,6 +310,7 @@ module XCJobs
 
     def initialize(name = :archive)
       super
+      @description = 'make xcarchive'
       yield self if block_given?
       define
     end
@@ -320,7 +326,7 @@ module XCJobs
         CLOBBER.include(build_dir)
       end
 
-      desc 'make xcarchive'
+      desc @description
       namespace :build do
         task @name do
           add_build_setting('CONFIGURATION_TEMP_DIR', File.join(build_dir, 'temp')) if build_dir
@@ -363,6 +369,7 @@ module XCJobs
     def initialize(name = :export)
       super
       self.unsetenv_others = true
+      @description = 'export from an archive'
       @export_format = 'IPA'
       yield self if block_given?
       define
@@ -388,7 +395,7 @@ module XCJobs
     private
 
     def define
-      desc 'export from an archive'
+      desc @description
       namespace :build do
         task name do
           run(['xcodebuild', '-exportArchive'] + options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcjobs
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - kishikawa katsumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler