xcjobs 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77fa2599099b33acbf2d9810c44d794383bb6704
-  data.tar.gz: 66592101cff663dd0ad07d5adf8b0780b6da2b35
+  metadata.gz: f32da1984b26234e750171374e06b8f80d4239e5
+  data.tar.gz: 58446dc2854f728e56bee1e98d3e4a465f6cfe62
 SHA512:
-  metadata.gz: 9cbc57bd73906258ce007277f0cf9db4656172ce261240ddab7dddb913e19b88874652d7a22ee1a55bba51c6f842e6350584ffe2c8260ce87aaeac3252f72ca8
-  data.tar.gz: 76debdf38cdadc9f6a9c72be8672797316e0d7bb5ba9bcfab51f15e4206ababdc7bfbad26220d658d7b922484c44d32a3706fe89b0473565d6991d9c5e9f531f
+  metadata.gz: ccbb36c27d38e9128c63db56530007f3c06f0ba82b786e28cd8a14f0d0f2f0da4317a95f38adfe2240df30d67c4877254f99c1f80880b3da0a381b4bd6967cd7
+  data.tar.gz: 512b672869af92b52bb38072479340a838068f56f8f8e476c2983b9f02c2ab9295f3427bcff31c6bd9a5d93e790f71efa64a119e15b8ae62d7997bab53389c30

data/README.md

@@ -1,5 +1,10 @@
 # XCJobs
-[![Gem Version](https://badge.fury.io/rb/xcjobs.svg)](http://badge.fury.io/rb/xcjobs) [![Build Status](https://travis-ci.org/kishikawakatsumi/xcjobs.svg?branch=master)](https://travis-ci.org/kishikawakatsumi/xcjobs) [![Coverage Status](https://img.shields.io/coveralls/kishikawakatsumi/xcjobs.svg)](https://coveralls.io/r/kishikawakatsumi/xcjobs?branch=master) [![Code Climate](https://codeclimate.com/github/kishikawakatsumi/xcjobs/badges/gpa.svg)](https://codeclimate.com/github/kishikawakatsumi/xcjobs) [![Dependency Status](https://gemnasium.com/kishikawakatsumi/xcjobs.svg)](https://gemnasium.com/kishikawakatsumi/xcjobs)
+[![Gem Version](https://badge.fury.io/rb/xcjobs.svg)](http://badge.fury.io/rb/xcjobs)
+[![Circle CI](https://circleci.com/gh/kishikawakatsumi/xcjobs.svg?style=svg)](https://circleci.com/gh/kishikawakatsumi/xcjobs)
+[![Build Status](https://travis-ci.org/kishikawakatsumi/xcjobs.svg?branch=master)](https://travis-ci.org/kishikawakatsumi/xcjobs)
+[![Coverage Status](https://img.shields.io/coveralls/kishikawakatsumi/xcjobs.svg)](https://coveralls.io/r/kishikawakatsumi/xcjobs?branch=master)
+[![Code Climate](https://codeclimate.com/github/kishikawakatsumi/xcjobs/badges/gpa.svg)](https://codeclimate.com/github/kishikawakatsumi/xcjobs)
+[![Dependency Status](https://gemnasium.com/kishikawakatsumi/xcjobs.svg)](https://gemnasium.com/kishikawakatsumi/xcjobs)
 
 Support the automation of release process of iOS/OSX apps with CI
 

data/circle.yml

@@ -0,0 +1,6 @@
+dependencies:
+  pre:
+    - case $CIRCLE_NODE_INDEX in 0) rvm use 1.9.3 --default ;; 1) rvm use 2.0.0 --default ;; 2) rvm use 2.1 --default ;; 3) rvm use 2.2 --default ;; esac
+test:
+  override:
+    - ruby -v ; bundle exec rspec --format documentation --color spec: {parallel: true}

data/lib/xcjobs/coverage.rb

@@ -8,12 +8,6 @@ require 'digest/md5'
 module XCJobs
   module Coverage
 
-    def self.run_gcov(configuration_temp_dir)
-      Dir.glob("#{configuration_temp_dir}/**/*.gcda").each do |file|
-        system %[(cd "#{File.dirname(file)}" && gcov -l "#{file}")]
-      end
-    end
-
     class Coveralls < Rake::TaskLib
       include Rake::DSL if defined?(Rake::DSL)
 
@@ -109,9 +103,9 @@ module XCJobs
                 end
               else
                 coverage[number.to_i - 1] = case count.strip
-                  when "-"
+                  when '-'
                     nil
-                  when "#####"
+                  when '#####'
                     if text.strip == '}'
                       nil
                     else

data/lib/xcjobs/version.rb

@@ -1,3 +1,3 @@
 module XCJobs
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/xcjobs/xcodebuild.rb

@@ -43,17 +43,6 @@ module XCJobs
       end
     end
 
-    def coverage=(coverage)
-      @coverage = coverage
-      if coverage
-        add_build_setting('GCC_INSTRUMENT_PROGRAM_FLOW_ARCS', 'YES')
-        add_build_setting('GCC_GENERATE_TEST_COVERAGE_FILES', 'YES')
-      else
-        @build_settings.delete('GCC_INSTRUMENT_PROGRAM_FLOW_ARCS')
-        @build_settings.delete('GCC_GENERATE_TEST_COVERAGE_FILES')
-      end
-    end
-
     def coverage_enabled
       @coverage
     end
@@ -84,11 +73,6 @@ module XCJobs
     def run(cmd)
       @before_action.call if @before_action
 
-      if coverage_enabled
-        out, status = Open3.capture2(*(cmd + ['-showBuildSettings']))
-        configuration_temp_dir = out.lines.grep(/\bCONFIGURATION_TEMP_DIR\b/).first.split('=').last.strip
-      end
-
       if @formatter
         puts (cmd + ['|', @formatter]).join(" ")
       else
@@ -105,10 +89,6 @@ module XCJobs
 
           status = wait_thrs.first.value
           if status.success?
-            if coverage_enabled
-              XCJobs::Coverage.run_gcov(configuration_temp_dir)
-            end
-
             @after_action.call(output, status) if @after_action
           else
             fail "xcodebuild failed (exited with status: #{status.exitstatus})"
@@ -124,10 +104,6 @@ module XCJobs
 
           status = wait_thr.value
           if status.success?
-            if coverage_enabled
-              XCJobs::Coverage.run_gcov(configuration_temp_dir)
-            end
-
             @after_action.call(output, status) if @after_action
           else
             fail "xcodebuild failed (exited with status: #{status.exitstatus})"
@@ -144,6 +120,7 @@ module XCJobs
         opts.concat(['-scheme', scheme]) if scheme
         opts.concat(['-sdk', sdk]) if sdk
         opts.concat(['-configuration', configuration]) if configuration
+        opts.concat(['-enableCodeCoverage', 'YES']) if coverage_enabled
         opts.concat(['-derivedDataPath', build_dir]) if build_dir
 
         @destinations.each do |destination|
@@ -180,10 +157,78 @@ 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
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcjobs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - kishikawa katsumi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- circle.yml
 - lib/xcjobs.rb
 - lib/xcjobs/certificate.rb
 - lib/xcjobs/coverage.rb
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Support the automation of release process of iOS/OSX apps with CI