xctasks 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144f3150b16d09a1fea78010ba6035e2dcf7fff9
-  data.tar.gz: b73a4a156f8aebe126ba2abdcdf1e52c7057b899
+  metadata.gz: e5d0e8565d04149c6de73c61d731fb0472c24d37
+  data.tar.gz: 84bff82ae95bdb2b2a2b1f0f67465fd412783aab
 SHA512:
-  metadata.gz: 521a4c5fe8279c39b85813d33791bc8042c4407a6415f65775788a8425c6a4ff3a494191b50ea4971f1156d39d93cc5ea6e884cdeb28c0c839b8497eac9b157e
-  data.tar.gz: 8fc6d66394133b30b593d6357bcb16ce20c4666d6621374888f34e6e28cb7153ef8cdb2a5f3d1b89143bab6e04980748cafd59bc626a3634467b84fea5c54984
+  metadata.gz: 10038f24a8ed42d632c5a72b07a0b57a198aeea624b1f501001eb11aa55f346610d0fc800d0fda550eae13404f3ab058b4a160c5d1a5c750d358744dcb65ef56
+  data.tar.gz: f67207b2a07fc77b22a9f656d1371af67f98e591ab34a28ba65617e09187f92d443084ab071ecb17faec396a8a3bce41ead65f47ab8e934985becee9c6d0945c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # XCTasks Changelog
 
+## v0.4.1
+
+* Reworked output redirection into an optional feature.
+
+## v0.4.0
+
+* Added redirection of stderr to /dev/null
+* Updated dependency on Nokogiri to 1.6
+
 ## v0.3.0
 
 * Added support for writing environment variables into schemes.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xctasks (0.4.0)
+    xctasks (0.4.1)
       nokogiri (~> 1.6, >= 1.6.3.1)
       rake (~> 10.0, >= 10.0.0)
 

data/lib/xctasks/test_task.rb

@@ -100,7 +100,7 @@ module XCTasks
     class Configuration
       SETTINGS = [:workspace, :schemes_dir, :sdk, :runner, :xctool_path,
                   :xcodebuild_path, :settings, :destinations, :actions,
-                  :scheme, :ios_versions, :output_log, :env]
+                  :scheme, :ios_versions, :output_log, :env, :redirect_stderr]
       HELPERS = [:destination, :xctool?, :xcpretty?, :xcodebuild?]
 
       # Configures delegations to pass through configuration accessor when extended
@@ -125,6 +125,7 @@ module XCTasks
         @destinations = []
         @actions = %w{clean build test}
         @env = {}
+        @redirect_stderr = false
       end
 
       def runner=(runner)
@@ -138,6 +139,14 @@ module XCTasks
         @sdk = sdk.to_sym
       end
 
+      def redirect_stderr=(redirect_stderr)
+        if redirect_stderr == true
+          @redirect_stderr = '/dev/null'
+        else
+          @redirect_stderr = redirect_stderr
+        end
+      end
+
       def destination(specifier = {})
         if specifier.kind_of?(String)
           raise ArgumentError, "Cannot configure a destination via a block when a complete String specifier is provided" if block_given?
@@ -226,18 +235,19 @@ module XCTasks
       end
 
       def run_tests(options = {})
-        ios_version = options[:ios_version]
+        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} " : ' '
+        output_log_command = output_log ? "| tee -a #{output_log}" : nil
+        redirect_suffix = redirect_stderr ? "2> #{redirect_stderr}" : nil
         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}#{output_log_command}".strip)
+          Command.run(["#{xctool_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command].grep(String).join(' '))
         elsif xcodebuild?
-          Command.run("#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}#{destination_arg}#{actions_arg}#{settings_arg}#{output_log_command}2>/dev/null".strip)
+          Command.run(["#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command].grep(String).join(' '))
         elsif xcpretty?
           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}2>/dev/null | #{xcpretty_bin} ; exit ${PIPESTATUS[0]}".strip)
+          Command.run(["#{xcodebuild_path} -workspace #{workspace} -scheme '#{scheme}' -sdk #{sdk}#{ios_version}", destination_arg, actions_arg, settings_arg, redirect_suffix, output_log_command, "| #{xcpretty_bin} ; exit ${PIPESTATUS[0]}"].grep(String).join(' '))
         end
 
         XCTasks::TestReport.instance.add_result(self, options, success)
@@ -245,19 +255,19 @@ module XCTasks
 
       def settings_arg
         if settings.any?
-          " " << settings.map { |k,v| "#{k}=#{v}"}.join(' ')
+          settings.map { |k,v| "#{k}=#{v}"}.join(' ')
         else
           nil
         end
       end
 
       def actions_arg
-        " " << actions.join(' ')
+        actions.join(' ')
       end
 
       def destination_arg
         if destinations.any?
-          " " << destinations.map { |d| "-destination #{d}" }.join(' ')
+          destinations.map { |d| "-destination #{d}" }.join(' ')
         else
           nil
         end

data/lib/xctasks/version.rb

@@ -1,3 +1,3 @@
 module XCTasks
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/test_task_spec.rb

@@ -81,6 +81,7 @@ describe XCTasks::TestTask do
         t.workspace = 'LayerKit.xcworkspace'
         t.schemes_dir = 'Tests/Schemes'
         t.runner = :xcpretty
+        t.redirect_stderr = true
         t.subtasks = { unit: 'Unit Tests', functional: 'Functional Tests' }
       end
     end
@@ -115,7 +116,7 @@ describe XCTasks::TestTask do
           @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 2>/dev/null | xcpretty -c ; exit ${PIPESTATUS[0]}"]
+                               "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Unit Tests' -sdk iphonesimulator clean build test 2> /dev/null | xcpretty -c ; exit ${PIPESTATUS[0]}"]
         end
       end
 
@@ -127,7 +128,7 @@ describe XCTasks::TestTask do
           @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 2>/dev/null | xcpretty -c ; exit ${PIPESTATUS[0]}"]
+                               "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Functional Tests' -sdk iphonesimulator clean build test 2> /dev/null | xcpretty -c ; exit ${PIPESTATUS[0]}"]
         end
       end
     end
@@ -153,7 +154,7 @@ describe XCTasks::TestTask do
           @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 2>/dev/null | xcpretty -s ; exit ${PIPESTATUS[0]}"]
+                               "/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
 
@@ -165,7 +166,7 @@ describe XCTasks::TestTask do
           @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 2>/dev/null | xcpretty -s ; exit ${PIPESTATUS[0]}"]
+                               "/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
@@ -247,7 +248,7 @@ describe XCTasks::TestTask do
           subject.invoke
           @commands.should == [
             "killall \"iPhone Simulator\"",
-            "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Functional Tests' -sdk iphonesimulator clean build test 2>/dev/null"
+            "/usr/bin/xcodebuild -workspace LayerKit.xcworkspace -scheme 'Functional Tests' -sdk iphonesimulator clean build test"
           ]
         end
       end
@@ -267,6 +268,7 @@ describe XCTasks::TestTask do
         t.subtask :functional do |s|
           s.runner = :xcodebuild
           s.scheme = 'Functional Tests'
+          s.redirect_stderr = 'stderr.log'
           s.destination do |d|
             d.platform = :iossimulator
             d.name = 'iPad Retina'
@@ -299,7 +301,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 Retina',OS='latest' -destination platform\\=iOS\\ Simulator,OS\\=7.1,name\\=iPhone\\ Retina\\ \\(4-inch\\) -destination platform='iOS',id='437750527b43cff55a46f42ae86dbf870c7591b1' clean build test 2>/dev/null"]
+          "/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 2> stderr.log"]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xctasks
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Blake Watters