xctasks 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b26a1a32a4e137483845cb383e346ccee81628d2
-  data.tar.gz: cd8f55173880471e1b16c6614f3e883fb1e5a1cc
+  metadata.gz: 6b5e17c017baddd3b1950ae2fc75dec14dcbaf16
+  data.tar.gz: bf2a96d113244d0e97cd637df8dcc01d361d27fe
 SHA512:
-  metadata.gz: 251b519b886dde9cc1050db9c2d50ad097f87d7b081d6cc8714ad5d4d03da357a2310532114cfdb2b53b6c5ad9aca374574554612d487fe274be439e7897e8f4
-  data.tar.gz: b02d1353020d477aebd2ae8fa07d1470c155740eba2452a9f72e8d1bc35d74bc7dd3fd07b189c232394b2afd4cb14c5522e06c77f03680ce357d6df92911140b
+  metadata.gz: ab29b2b90d38db843938ea0a153ef5be79392f9c38a4a8aa5ff3d135b4acf3d82db79b4be306035cac4f8553df918b06aed653c7cfdad2a5ea38490a4429702e
+  data.tar.gz: 0fea3e3734f8258131ac3901a11a39d139cd3a9e2ecdb4243aef946a10c17a5805305b9d702e9fe480e916a65e0e346887dee9c3ea52f21cbf825e456971abf3

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# XCTasks Changelog
+
+## v0.2.0
+
+* Further refinements to shell escaping [@tayhalla]
+* Added `output_log` option.
+* Added support for passing options to runner commands.
+
+## v0.1.1
+
+* Add explicit require of forwardable to fix load error under certain Ruby environments.
+
+## v0.1.0
+
+* Internal refactoring and cleanups.
+
+## v0.0.2
+
+* Expanded SDK configuration support.
+* Improved issues with shell escaping.
+
+## v0.0.1
+
+* Initial public release.
+* Supports execution of test suites.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xctasks (0.1.1)
+    xctasks (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -19,7 +19,8 @@ require 'xctasks/test_task'
 XCTasks::TestTask.new(test: 'server:autostart') do |t|
   t.workspace = 'LayerKit.xcworkspace'  
   t.schemes_dir = 'Tests/Schemes' # Location where you store your shared schemes, will copy into workspace
-  t.runner = :xctool # or :xcodebuild/:xcpretty
+  t.runner = :xctool # or :xcodebuild/:xcpretty. Can also pass options as string, i.e. 'xcpretty -s'
+  t.output_log = 'output.log' # Save the build log to a file. Export as Jenkins build artifact for CI build auditing
   
   t.subtask(unit: 'LayerKit Tests') do |s|
     s.ios_versions = %w{7.0 7.1}

data/lib/xctasks/test_task.rb

@@ -85,8 +85,8 @@ module XCTasks
       end            
       
       def to_s
-        keys = [:platform, :name, :arch, :id, :os].reject { |k| self[k].nil? }
-        keys.map { |k| "#{key_name(k)}='#{self[k].to_s.shellescape}'" }.join(',')
+        keys = [:platform, :name, :arch, :id, :os].reject { |k| self[k].nil? }        
+        keys.map { |k| "#{key_name(k)}='#{self[k].to_s}'" }.join(',')
       end
       
       private
@@ -99,7 +99,7 @@ module XCTasks
     class Configuration
       SETTINGS = [:workspace, :schemes_dir, :sdk, :runner, :xctool_path, 
                   :xcodebuild_path, :settings, :destinations, :actions,
-                  :scheme, :ios_versions]
+                  :scheme, :ios_versions, :output_log]
       HELPERS = [:destination, :xctool?, :xcpretty?, :xcodebuild?]
       
       # Configures delegations to pass through configuration accessor when extended
@@ -126,8 +126,9 @@ module XCTasks
       end
       
       def runner=(runner)
-        raise ConfigurationError, "Must be :xcodebuild, :xctool or :xcpretty" unless %w{xctool xcodebuild xcpretty}.include?(runner.to_s)
-        @runner = runner.to_sym
+        runner_bin = runner.to_s.split(' ')[0]
+        raise ConfigurationError, "Must be :xcodebuild, :xctool or :xcpretty" unless %w{xctool xcodebuild xcpretty}.include?(runner_bin)
+        @runner = runner
       end
       
       def sdk=(sdk)
@@ -153,15 +154,15 @@ module XCTasks
       end
       
       def xctool?
-        runner == :xctool
+        runner =~ /^xctool/
       end
 
       def xcodebuild?
-        runner == :xcodebuild
+        runner =~ /^xcodebuild/
       end
     
       def xcpretty?
-        runner == :xcpretty
+        runner =~ /^xcpretty/
       end
       
       # Deep copy any nested structures
@@ -221,14 +222,16 @@ module XCTasks
       def run_tests(options = {})        
         ios_version = options[:ios_version]
         XCTasks::Command.run(%q{killall "iPhone Simulator"}, false) if sdk == :iphonesimulator
-      
+        
+        output_log_command = output_log ? " | tee -a #{output_log} " : ' '
         success = if xctool?
           actions_arg << " -freshSimulator" if ios_version
-          Command.run("#{xctool_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}#{destination_arg}#{actions_arg}#{settings_arg}".strip)
+          Command.run("#{xctool_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}#{destination_arg}#{actions_arg}#{settings_arg}#{output_log_command}".strip)
         elsif xcodebuild?
-          Command.run("#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}#{destination_arg}#{actions_arg}#{settings_arg}".strip)
+          Command.run("#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}#{destination_arg}#{actions_arg}#{settings_arg}#{output_log_command}".strip)
         elsif xcpretty?
-          Command.run("#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}#{destination_arg}#{actions_arg}#{settings_arg} | xcpretty -c ; exit ${PIPESTATUS[0]}".strip)
+          xcpretty_bin = runner.is_a?(String) ? runner : "xcpretty -c"
+          Command.run("#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}#{destination_arg}#{actions_arg}#{settings_arg}#{output_log_command}| #{xcpretty_bin} ; exit ${PIPESTATUS[0]}".strip)
         end
         
         XCTasks::TestReport.instance.add_result(self, options, success)
@@ -290,6 +293,7 @@ module XCTasks
     def define_rake_tasks
       namespace self.namespace_name do
         task (prepare_dependency ? { prepare: prepare_dependency} : :prepare ) do
+          File.truncate(output_log, 0) if output_log && File.exists?(output_log)
           if schemes_dir
             FileUtils::Verbose.mkdir_p "#{workspace}/xcshareddata/xcschemes"
             FileUtils::Verbose.cp Dir.glob("#{schemes_dir}/*.xcscheme"), "#{workspace}/xcshareddata/xcschemes"

data/lib/xctasks/version.rb

@@ -1,3 +1,3 @@
 module XCTasks
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/test_task_spec.rb

@@ -77,6 +77,44 @@ describe XCTasks::TestTask do
     end
   end
   
+  describe 'task with log' do
+    let!(:task) do
+      XCTasks::TestTask.new do |t|
+        t.workspace = 'LayerKit.xcworkspace'    
+        t.schemes_dir = 'Tests/Schemes'    
+        t.runner = 'xcpretty -s'
+        t.output_log = 'output.log'
+        t.subtasks = { unit: 'Unit Tests', functional: 'Functional Tests' }
+      end
+    end
+    
+    describe 'tasks' do
+      describe 'spec:unit' do
+        subject { Rake.application['test:unit'] }
+        
+        it "executes the appropriate commands" do
+          subject.invoke
+          @commands.should == ["mkdir -p LayerKit.xcworkspace/xcshareddata/xcschemes", 
+                               "cp [] LayerKit.xcworkspace/xcshareddata/xcschemes", 
+                               "killall \"iPhone Simulator\"", 
+                               "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Unit Tests' -sdk iphonesimulator clean build test | tee -a output.log | xcpretty -s ; exit ${PIPESTATUS[0]}"]
+        end
+      end
+      
+      describe 'spec:functional' do
+        subject { Rake.application['test:functional'] }
+        
+        it "executes the appropriate commands" do
+          subject.invoke
+          @commands.should == ["mkdir -p LayerKit.xcworkspace/xcshareddata/xcschemes", 
+                               "cp [] LayerKit.xcworkspace/xcshareddata/xcschemes", 
+                               "killall \"iPhone Simulator\"",
+                               "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Functional Tests' -sdk iphonesimulator clean build test | tee -a output.log | xcpretty -s ; exit ${PIPESTATUS[0]}"]
+        end
+      end
+    end
+  end
+  
   describe 'advanced task' do
     let!(:task) do
       XCTasks::TestTask.new do |t|
@@ -150,7 +188,7 @@ describe XCTasks::TestTask do
           s.scheme = 'Functional Tests'
           s.destination do |d|
             d.platform = :iossimulator
-            d.name = 'iPad'
+            d.name = 'iPad Retina'
             d.os = :latest
           end
           s.destination('platform=iOS Simulator,OS=7.1,name=iPhone Retina (4-inch)')
@@ -180,7 +218,7 @@ describe XCTasks::TestTask do
         subject.invoke
         @commands.should == [
           "killall \"iPhone Simulator\"", 
-          "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Functional Tests' -sdk iphonesimulator -destination platform='iOS\\ Simulator',name='iPad',OS='latest' -destination platform\\=iOS\\ Simulator,OS\\=7.1,name\\=iPhone\\ Retina\\ \\(4-inch\\) -destination platform='iOS',id='437750527b43cff55a46f42ae86dbf870c7591b1' clean build test"]
+          "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Functional Tests' -sdk iphonesimulator -destination platform='iOS Simulator',name='iPad Retina',OS='latest' -destination platform\\=iOS\\ Simulator,OS\\=7.1,name\\=iPhone\\ Retina\\ \\(4-inch\\) -destination platform='iOS',id='437750527b43cff55a46f42ae86dbf870c7591b1' clean build test"]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xctasks
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Blake Watters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-version
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE