xcjobs 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63dcf92b35885eb60c2b55a65af78496bd9cdbcb
-  data.tar.gz: f90022d38f0019958a485fe58b7bdbfcd916ecdf
+  metadata.gz: cfed7f6abb2a79dd85f2b689a1a6c9bbaa82f605
+  data.tar.gz: 44e38c2a7d513135212861088c14b77d4b37bfbc
 SHA512:
-  metadata.gz: 37295d7f0acc2425d22482becf983d6206c806f22d4638ad4e2ca9623eed3ceecc2b4e2c9b45842f542e82f9091ca32a626f2a0166d4abfa6b667a365ff3a2b3
-  data.tar.gz: 42acf9fe3cc9a4a9b7bb9754e0ab79237d86d1b4400ce9cb91e1a5554923a54c0195393afcc4b2d918aa09e14864735fe34357e33a5df845c256805e4ee9dacc
+  metadata.gz: c4c9a23d70fab95c73ccce1e6bcb03251b64330fb7c7b9de039960b7c9c7b9cb101285c47fa31bbf8857fd938d81c14671bfe33e918b6847869e1ec6814fa22f
+  data.tar.gz: 00861da56737697a84b98d09b3e602afd3a715dce913fdfa4befe9c8176f1b3a84201ebeb105fea34bc147813b07a0b9036600dea7aa33ab9437588c2bf1ec8e

data/lib/xcjobs/version.rb

@@ -1,3 +1,3 @@
 module XCJobs
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/xcjobs/xcodebuild.rb

@@ -146,6 +146,100 @@ module XCJobs
     end
 
     private
+    
+    def show_coverage(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
+    end
+    
+    def generate_gcov_file(profdata_path, target_path)
+      puts 'Generage gcov file...'
+      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), "#{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
+    end
+    
+    def coverage_report(options)
+      settings = build_settings(options)
+      
+      targetSettings = settings.select { |key, _| settings[key]['PRODUCT_TYPE'] != 'com.apple.product-type.bundle.unit-test' }
+      targetSettings.each do |target, settings|
+        if settings['PRODUCT_TYPE'] == 'com.apple.product-type.framework'
+          if sdk.start_with? 'iphone'
+            target_dir = settings['OBJECT_FILE_DIR_normal'].gsub('Build/Intermediates', "Build/Intermediates/CodeCoverage/#{target}/Intermediates")
+            executable_name = settings['EXECUTABLE_NAME']
+            target_path = File.join(File.join(target_dir, settings['CURRENT_ARCH']), executable_name)
+          else
+            target_dir = settings['CODESIGNING_FOLDER_PATH'].gsub('Build/Products', "Build/Intermediates/CodeCoverage/#{target}/Products")
+            executable_name = settings['EXECUTABLE_NAME']
+            target_path = File.join(target_dir, executable_name)
+          end
+        else
+          
+        end
+        
+        code_coverage_dir = settings['BUILD_DIR'].gsub('Build/Products', "Build/Intermediates/CodeCoverage/#{target}/")
+        profdata_path = File.join(code_coverage_dir, 'Coverage.profdata')
+        
+        show_coverage(profdata_path, target_path)
+        generate_gcov_file(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
+        when /Build settings for action test and target (.+):/
+          target = $1
+          settings[target] = {}
+        else
+          key, value = line.split(/\=/).collect(&:strip)
+          settings[target][key] = value if target
+        end
+      end
+      return settings
+    end
 
     def define
       raise 'test action requires specifying a scheme' unless scheme
@@ -157,77 +251,13 @@ module XCJobs
           add_build_setting('CODE_SIGN_IDENTITY', '""')
           add_build_setting('CODE_SIGNING_REQUIRED', 'NO')
         end
-        if sdk == 'macosx'
-          add_build_setting('CONFIGURATION_BUILD_DIR', File.expand_path(build_dir)) if build_dir
-        end
-        add_build_setting('CONFIGURATION_TEMP_DIR', File.join(build_dir, 'temp')) if build_dir
+        
         add_build_setting('GCC_SYMBOLS_PRIVATE_EXTERN', 'NO')
 
         run(['xcodebuild', 'test'] + options)
         
         if coverage_enabled
-          out, status = Open3.capture2(*(['xcodebuild', 'test'] + options + ['-showBuildSettings']))
-          
-          configuration_build_dir = out.lines.grep(/\bCONFIGURATION_BUILD_DIR\b/).first.split('=').last.strip
-          project_temp_root = out.lines.grep(/\bPROJECT_TEMP_ROOT\b/).first.split('=').last.strip
-          object_file_dir_normal = out.lines.grep(/\bOBJECT_FILE_DIR_normal\b/).first.split('=').last.strip
-          current_arch = out.lines.grep(/\bCURRENT_ARCH\b/).first.split('=').last.strip
-          executable_name = out.lines.grep(/\bEXECUTABLE_NAME\b/).first.split('=').last.strip
-          executable_path = out.lines.grep(/\bEXECUTABLE_PATH\b/).first.split('=').last.strip
-          
-          if sdk.start_with? 'iphone'
-            target_path = File.join(File.join(object_file_dir_normal, current_arch), executable_name)
-          elsif sdk == 'macosx'
-            target_path = File.join(configuration_build_dir, executable_path)
-          end
-          
-          code_coverage_dir = File.join(project_temp_root, 'CodeCoverage')
-          profdata_dir = File.join(code_coverage_dir, scheme)
-          profdata_path = File.join(profdata_dir, 'Coverage.profdata')
-          
-          gcov_file = {}
-          source_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
-          
-          cmd = ['xcrun', 'llvm-cov', 'show']
-          puts (cmd + opts).join(" ")
-          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(target_path), "#{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
+          coverage_report(options)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcjobs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - kishikawa katsumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler