xcjobs 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 948f6e3c8ee8b50dad1e1f24d955bc59d9e9884f
-  data.tar.gz: 196cd3e5c69c34090b4cfe1cd08b8a528d603e9a
+  metadata.gz: e4c4306b452320be5d2c072f1698f3c7d8f7a4fb
+  data.tar.gz: d6a07bf56db736e8930823b9ab9ac2b9bcada113
 SHA512:
-  metadata.gz: d9c8139fa4f033a24ce4a0d98c7da1894ca272675c6d469c1bc9dcc0fadf9e5863ea54cd25a75a5f5a715f8de068e741c37e25528d02c2d2b716de81e6231436
-  data.tar.gz: c129ea3a349370964038ac642b94a3bcf6b85ce5aac7c002253ed1b4c6ee90e524a7b91ea8832b13c6ac27dcdea27f75dd6b28609c0ff96537b011bd8b8bd554
+  metadata.gz: 09b03987ce8067398f09a528f910b0312af2f9fd6b6e94d9d84d66e135795da91da749453159645e78d2a73e415024c3b9fae2b0b16db79e3bb590303f73554a
+  data.tar.gz: 1e14499775964041a9d4ddad1a25fbc224228953c8118df02bb4ec4478437e71e68ec112b41b776de91fca999f347a5800588e2fecb7b2f9d068b3acc3e6a90f

data/lib/xcjobs/version.rb

@@ -1,3 +1,3 @@
 module XCJobs
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/lib/xcjobs/xcodebuild.rb

@@ -26,12 +26,15 @@ module XCJobs
     attr_reader :provisioning_profile_name
     attr_reader :provisioning_profile_uuid
 
+    attr_accessor :unsetenv_others
+
     def initialize(name)
       $stdout.sync = $stderr.sync = true
       
       @name = name
       @destinations = []
       @build_settings = {}
+      @unsetenv_others = false
     end
 
     def project
@@ -82,8 +85,11 @@ module XCJobs
         puts cmd.join(" ")
       end
 
+      env = {}
+      options = { unsetenv_others: unsetenv_others }
+
       if @formatter
-        Open3.pipeline_r(cmd, [@formatter]) do |stdout, wait_thrs|
+        Open3.pipeline_r([env] + cmd + [options], [@formatter]) do |stdout, wait_thrs|
           output = []
           while line = stdout.gets
             puts line
@@ -98,7 +104,7 @@ module XCJobs
           end
         end
       else
-        Open3.popen2e(*cmd) do |stdin, stdout_err, wait_thr|
+        Open3.popen2e(env, *cmd, options) do |stdin, stdout_err, wait_thr|
           output = []
           while line = stdout_err.gets
             puts line
@@ -207,7 +213,7 @@ module XCJobs
       targetSettings.each do |target, settings|
         if settings['PRODUCT_TYPE'] == 'com.apple.product-type.framework'
           if sdk.start_with?('iphone') && settings['ONLY_ACTIVE_ARCH'] == 'NO'
-            target_dir = settings['OBJECT_FILE_DIR_normal'].gsub('Build/Intermediates', "Build/Intermediates/CodeCoverage/#{target}/Intermediates")
+            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)
           else
@@ -219,7 +225,7 @@ module XCJobs
           
         end
         
-        code_coverage_dir = settings['BUILD_DIR'].gsub('Build/Products', "Build/Intermediates/CodeCoverage/#{target}/")
+        code_coverage_dir = settings['BUILD_DIR'].gsub('Build/Products', "/Build/Intermediates/CodeCoverage/")
         profdata_path = File.join(code_coverage_dir, 'Coverage.profdata')
         
         show_coverage(profdata_path, target_path)
@@ -351,9 +357,12 @@ module XCJobs
     attr_accessor :export_signing_identity
     attr_accessor :export_installer_identity
     attr_accessor :export_with_original_signing_identity
+    attr_accessor :options_plist
 
     def initialize(name = :export)
       super
+      self.unsetenv_others = true
+      @export_format = 'IPA'
       yield self if block_given?
       define
     end
@@ -363,7 +372,7 @@ module XCJobs
     end
 
     def export_format
-      @export_format || 'IPA'
+      @export_format
     end
 
     def export_provisioning_profile=(provisioning_profile)
@@ -388,6 +397,7 @@ module XCJobs
 
     def options
       [].tap do |opts|
+        opts.concat(['-exportOptionsPlist', options_plist]) if options_plist
         opts.concat(['-archivePath', archive_path]) if archive_path
         opts.concat(['-exportFormat', export_format])  if export_format
         opts.concat(['-exportPath', export_path]) if export_path

data/spec/xcodebuild_spec.rb

@@ -334,6 +334,29 @@ describe XCJobs::Xcodebuild do
         end
       end
     end
+
+    describe 'unsetenv_others' do
+      it 'defaults to false' do
+        task = XCJobs::Build.new do |t|
+          t.project = 'Example.xcodeproj'
+          t.target = 'Example'
+          t.configuration = 'Release'
+        end
+
+        expect(task.unsetenv_others).to eq false
+      end
+
+      it 'can be configured' do
+        task = XCJobs::Build.new do |t|
+          t.project = 'Example.xcodeproj'
+          t.target = 'Example'
+          t.configuration = 'Release'
+          t.unsetenv_others = true
+        end
+
+        expect(task.unsetenv_others).to eq true
+      end
+    end
   end
 
   describe XCJobs::Archive do
@@ -512,6 +535,10 @@ describe XCJobs::Xcodebuild do
         expect(task.export_signing_identity).to eq 'iPhone Distribution: kishikawa katsumi'
       end
 
+      it 'configures unsetenv_others to true by default' do
+        expect(task.unsetenv_others).to be_truthy
+      end
+
       describe 'tasks' do
         describe 'export' do
           subject { Rake.application['build:export'] }
@@ -567,6 +594,81 @@ describe XCJobs::Xcodebuild do
       end
     end
 
+    describe 'export task for IPA' do
+      let!(:task) do
+        XCJobs::Export.new do |t|
+          t.archive_path = 'build/Example'
+          t.export_format = nil
+          t.export_path = 'build'
+        end
+      end
+
+      it 'configures the export_format to be nil' do
+        expect(task.export_format).to be_nil
+      end
+
+      describe 'tasks' do
+        describe 'export' do
+          subject { Rake.application['build:export'] }
+
+          it 'executes the appropriate commands' do
+            subject.invoke
+            expect(@commands).to eq ['xcodebuild -exportArchive -archivePath build/Example -exportPath build']
+          end
+        end
+      end
+    end
+
+    describe 'export task for IPA' do
+      let!(:task) do
+        XCJobs::Export.new do |t|
+          t.archive_path = 'build/Example'
+          t.export_path = 'build'
+        end
+      end
+
+      it 'has default export_format default to be IPA' do
+        expect(task.export_format).to eq 'IPA'
+      end
+
+      describe 'tasks' do
+        describe 'export' do
+          subject { Rake.application['build:export'] }
+
+          it 'executes the appropriate commands' do
+            subject.invoke
+            expect(@commands).to eq ['xcodebuild -exportArchive -archivePath build/Example -exportFormat IPA -exportPath build']
+          end
+        end
+      end
+    end
+
+    describe 'export task for IPA' do
+      let!(:task) do
+        XCJobs::Export.new do |t|
+          t.archive_path = 'build/Example'
+          t.export_format = nil
+          t.export_path = 'build'
+          t.options_plist = 'options.plist'
+        end
+      end
+
+      it 'configures the export options plist' do
+        expect(task.options_plist).to eq 'options.plist'
+      end
+
+      describe 'tasks' do
+        describe 'export' do
+          subject { Rake.application['build:export'] }
+
+          it 'executes the appropriate commands' do
+            subject.invoke
+            expect(@commands).to eq ['xcodebuild -exportArchive -exportOptionsPlist options.plist -archivePath build/Example -exportPath build']
+          end
+        end
+      end
+    end
+
     describe 'export task for PKG' do
       let!(:task) do
         XCJobs::Export.new do |t|

metadata

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