xcjobs 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7464a0a5d68f99a77502c4d293772012113c5743
-  data.tar.gz: 747b110147e42003891b9e14e95e50422eebf107
+  metadata.gz: 694d4c8a53b9a099ff689a38bb163e0d225f7327
+  data.tar.gz: d05a32b42325bc2887be5c5b7319608bfc37220e
 SHA512:
-  metadata.gz: db0f03448c564174b86acbb948a8605872aaca845ccd5ad1891db0e19e50ebf353de9a83825e479e8941cedaec142c18be574150ae5e75e93b2f8c837fc4536d
-  data.tar.gz: 9eaaa2ea808afdbd8d81f00fdd945788dab0f4d7e1af86dc61a01308bb7e518c0e207276ab656354639cb04b71e70c5d06642879d0520627309e83d1b15b5293
+  metadata.gz: ea48a6001664419ebcecb65db4916711f43b781db685fccbfddda5dc1b60b51deeb6759f2b4ccef3d6d1b0d5dfd06c720c3e66315ff67af1cd7a364fa9e69750
+  data.tar.gz: 8f2966ae904065af2080c47771305ca6757e5f71a48c6278016561b12c8bb6be600cc9ed440fa5a6173fd87363ec7f901da9a00f0fd29244d100c4fab069489c

data/lib/xcjobs/version.rb

@@ -1,3 +1,3 @@
 module XCJobs
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/xcjobs/xcodebuild.rb

@@ -31,7 +31,7 @@ module XCJobs
 
     def initialize(name)
       $stdout.sync = $stderr.sync = true
-      
+
       @name = name
       @destinations = []
       @only_testings = []
@@ -39,6 +39,7 @@ module XCJobs
       @build_options = {}
       @build_settings = {}
       @unsetenv_others = false
+      @description = Rake.application.last_description # nil or given from "desc"
     end
 
     def project
@@ -174,7 +175,7 @@ module XCJobs
 
     def initialize(name = :test)
       super
-      @description = 'test application'
+      @description ||= 'test application'
       @without_building = false
       yield self if block_given?
       define
@@ -185,66 +186,30 @@ module XCJobs
     end
 
     private
-    
-    def show_coverage(profdata_path, target_path)
+
+    def show_coverage_report(profdata_path, target_path)
       cmd = ['xcrun', 'llvm-cov', 'report']
       opts = ['-instr-profile', profdata_path, target_path, '-use-color=0']
-      puts (cmd + opts).join(" ")
-      out, status = Open3.capture2(*(cmd + opts))
-      out.lines.each do |line|
-        puts line
-      end
+      sh *(cmd + opts)
     end
-    
-    def generate_gcov_file(profdata_path, target_path)
-      puts 'Generage gcov file...'
+
+    def build_coverage_report(profdata_path, target_path)
       gcov_file = {}
       source_path = ''
-      
+
       cmd = ['xcrun', 'llvm-cov', 'show']
       opts = ['-instr-profile', profdata_path, target_path, '-use-color=0']
-      
-      out, status = Open3.capture2(*(cmd + opts))
-      out.lines.each do |line|
-        match = /^(['"]?(?:\/[^\/]+)*['"]?):$/.match(line)
-        if match.to_a.count > 0
-          source_path = match.to_a[1]
-          gcov_file[source_path] = []
-          next
-        end
-        
-        match = /^[ ]*([0-9]+|[ ]+)\|[ ]*([0-9]+)\|(.*)$/.match(line)
-        next unless match.to_a.count == 4
-        count, number, text = match.to_a[1..3]
-        
-        execution_count = case count.strip
-            when ''
-              '-'.rjust(5)
-            when '0'
-              '#####'
-            else count
-            end
-        gcov_file[source_path] << "#{execution_count.rjust(5)}:#{number.rjust(5)}:#{text}"
-      end
-      
-      gcov_file.each do |key, value|
-        gcon_path = File.join(File.dirname(profdata_path), "#{SecureRandom.urlsafe_base64(6)}-#{File.basename(target_path)}.gcov")
-        file = File::open(gcon_path, "w")
-        file.puts("#{'-'.rjust(5)}:#{'0'.rjust(5)}:Source:#{key}")
-        file.puts(value)
-        file.flush
-      end
+
+      sh *(cmd + opts)
     end
-    
+
     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'
@@ -256,17 +221,17 @@ module XCJobs
         elsif
           raise %[Product type (PRODUCT_TYPE) '#{product_type}' is unsupported.]
         end
-        
+
         profdata_path = Dir.glob(File.join(objroot, '/**/Coverage.profdata')).first
-        
-        show_coverage(profdata_path, target_path)
-        generate_gcov_file(profdata_path, target_path)
+
+        show_coverage_report(profdata_path, target_path)
+        build_coverage_report(profdata_path, target_path)
       end
     end
-    
+
     def build_settings(options)
       out, status = Open3.capture2(*(['xcodebuild', 'test'] + options + ['-showBuildSettings']))
-      
+
       settings, target = {}, nil
       out.lines.each do |line|
         case line
@@ -286,25 +251,26 @@ module XCJobs
       raise 'cannot specify both a scheme and targets' if scheme && target
 
       desc @description
-      task @name do        
+      task @name do
         add_build_setting('GCC_SYMBOLS_PRIVATE_EXTERN', 'NO')
 
-        run(['xcodebuild', without_building ? 'test-without-building' : 'test'] + options)
+        run(['xcodebuild', command] + options)
 
         if coverage_enabled
           coverage_report(options)
         end
       end
     end
+
+    def command
+      'test'
+    end
   end
 
   class Build < Xcodebuild
-    attr_accessor :for_testing
-
     def initialize(name = :build)
       super
-      @description = 'build application'
-      @for_testing = false
+      @description ||= 'build application'
       yield self if block_given?
       define
     end
@@ -324,9 +290,29 @@ module XCJobs
         add_build_setting('CODE_SIGN_IDENTITY', signing_identity) if signing_identity
         add_build_setting('PROVISIONING_PROFILE', provisioning_profile_uuid) if provisioning_profile_uuid
 
-        run(['xcodebuild', for_testing ? 'build-for-testing' : 'build'] + options)
+        run(['xcodebuild', command] + options)
       end
     end
+
+    def command
+      'build'
+    end
+  end
+
+  class TestWithoutBuilding < Build
+    private
+
+    def command
+      'test-without-building'
+    end
+  end
+
+  class BuildForTesting < Build
+    private
+
+    def command
+      'build-for-testing'
+    end
   end
 
   class Archive < Xcodebuild
@@ -334,7 +320,7 @@ module XCJobs
 
     def initialize(name = :archive)
       super
-      @description = 'make xcarchive'
+      @description ||= 'make xcarchive'
       yield self if block_given?
       define
     end
@@ -393,7 +379,7 @@ module XCJobs
     def initialize(name = :export)
       super
       self.unsetenv_others = true
-      @description = 'export from an archive'
+      @description ||= 'export from an archive'
       @export_format = 'IPA'
       yield self if block_given?
       define

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcjobs
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - kishikawa katsumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Support the automation of release process of iOS/OSX apps with CI