guard-ocunit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e3e4a66b277e0f15f809a0b545d34fdda13f57
-  data.tar.gz: 787243eec56230d7b9375f828bfe29583dacb774
+  metadata.gz: f3693467e7c421fa2ae3e31ce689a2cb057e6ca5
+  data.tar.gz: 31d888a945ff841994b01a31ec27f760636532b3
 SHA512:
-  metadata.gz: 28d7add451ce1979eb0473c9d1c4ae90da4cffce046c987747f5f202b26af89930477a50d2072e6c7eea2cfb9d3e0b4f706feb66462692bc56e5dd8939fcf5c3
-  data.tar.gz: 45e13926518e42ece3652047ec416ec7fd8025e69d1ebfc722e2ecbf07ad13907574eef8cc8324e83b093dd17c2eab5e57c034218b9cb16971d8015b9db89dff
+  metadata.gz: 8d66ef2adb5f7d5d0996b6d9d84bcfbea4b1dbd0cd1e2648819f3b2be240bfb9d955ae7e854e967540fa617cdc662c1cc1ac477f877050633e233fe7935f81e0
+  data.tar.gz: 110c8ac5ff41a4ab3885fef1b0655cce6320d6b601d7f688e4ae8974b87325116a96ea270a2999da974431a87fc2f83ba1fa322413b49128c142d7cc36909146

data/README.md

@@ -9,18 +9,20 @@ OCUnit guard allows to automatically launch tests when files are modified.
 
 Please be sure to have [Guard](https://github.com/guard/guard) and [ios-sim](https://github.com/phonegap/ios-sim) installed before continue. `guard-ocunit` uses `ios-sim` for running `application` tests from command line, for more info refer to the [SO](http://stackoverflow.com/questions/12557935/xcode-4-5-command-line-unit-testing) question.
 
-Install the gem:
+* Install the gem:
 
-```
+```bash
 $ gem install guard-ocunit
 ```
 
-Add guard definition to your Guardfile by running this command:
+* Add guard definition to your Guardfile by running this command:
 
-```
+```bash
 $ guard init ocunit
 ```
 
+* Enable `Run` in the `Build` section of your test bundle’s scheme.
+
 ## Usage
 
 Please read [Guard usage doc](https://github.com/guard/guard#readme)

data/lib/guard/ocunit/formatter.rb

@@ -28,10 +28,10 @@ class Guard::OCUnit::Formatter < Array
     when /(started|Executed|finished)/
       @verbose ? line : ''
     when /^#{Date.today}/
-      @verbose ? line.yellow : ''
+      line
     else
       @current_failure << line unless line.strip.empty?
-      @verbose ? line : ''
+      @verbose ? line.yellow : ''
     end
     self
   end
@@ -48,9 +48,10 @@ class Guard::OCUnit::Formatter < Array
   end
 
   def dump_error_messages
+    puts "\n\n"
     return if @error_messages.empty?
 
-    puts "\n\nFailures:\n"
+    puts "Failures:\n"
     puts @error_messages.join + "\n"
   end
 
@@ -119,7 +120,7 @@ private
 
   def failure_case(failure)
     components = failure.split(':')
-    case_name = "\n#{@error_messages.size + 1}."
+    case_name = "\n  #{@error_messages.size + 1}."
     case_name << components[3]
   end
 

data/lib/guard/ocunit/runner.rb

@@ -17,7 +17,7 @@ module Guard
       def initialize(options = {})
         @options = {
           :test_bundle      => nil,
-          :derived_data     => '/tmp/tests/',
+          :derived_data     => nil,
           :workspace        => nil,
           :scheme           => nil,
           :project          => nil,
@@ -42,11 +42,13 @@ module Guard
 
       def xcodebuild(options = {})
         options = @options.merge(options)
-        path_variables(options)
+        update_build_path(nil, options)
 
         formatter     = XcodeBuild::Formatters::ProgressFormatter.new
         reporter      = XcodeBuild::Reporter.new(formatter)
         output_buffer = XcodeBuild::OutputTranslator.new(reporter)
+        path_handler  = BuildPathHandler.new
+        reporter.direct_raw_output_to = path_handler
 
         arguments = []
         arguments << "-workspace #{options[:workspace]}" unless options[:workspace].to_s.empty?
@@ -57,18 +59,21 @@ module Guard
         arguments << "-alltargets" if options[:workspace].to_s.empty?
         arguments << "clean" if options[:clean]
         arguments << "build"
-        arguments << "CONFIGURATION_BUILD_DIR=#{@built_products_dir}"
+        arguments << "CONFIGURATION_BUILD_DIR=#{@built_products_dir}" if @derived_data
         arguments << options[:build_variables] unless options[:build_variables].to_s.empty?
 
-        XcodeBuild.run(arguments.compact.join(' '), output_buffer)
+        build_result = XcodeBuild.run(arguments.compact.join(' '), output_buffer)
+        update_build_path(path_handler.build_path, options)
+        build_result
       end
 
     private
 
-      def path_variables(options)
+      def update_build_path(build_path, options)
         project_folder      = options[:project] && File.dirname(options[:project])
         @derived_data       = project_folder || options[:derived_data]
-        @built_products_dir = File.join(@derived_data, 'build/')
+        joined_path         = File.join(@derived_data, 'build/') if @derived_data
+        @built_products_dir = build_path || joined_path || '/tmp/tests/build/'
 
         scheme_name         = options[:scheme]
         @test_bundle_path   = File.join(@built_products_dir, "#{options[:test_bundle]}.octest")
@@ -126,5 +131,16 @@ module Guard
         command.compact.join(' ')
       end
     end
+
+    class BuildPathHandler
+
+        attr_reader :build_path
+
+        def <<(line)
+            match = line.match(/setenv BUILT_PRODUCTS_DIR (?<build_path>.*)/)
+            @build_path = match['build_path'] if match
+        end
+    end
+
   end
 end

data/lib/guard/ocunit/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module OCUnitVersion
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-ocunit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Arthur Evstifeev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard