bwoken 1.1.0 → 1.1.1

data/lib/bwoken/build.rb

@@ -24,18 +24,21 @@ module Bwoken
       if Bwoken::Device.connected?
         'iphoneos'
       else
-        'iphonesimulator5.1'
+        'iphonesimulator'
       end
     end
 
     def configuration_build_dir
       File.join(build_path, sdk)
     end
+    
+    def xcconfig
+      File.join(File.dirname(__FILE__), 'configs', 'bwoken.xcconfig')
+    end
 
     def env_variables
       {
-        'GCC_PREPROCESSOR_DEFINITIONS' => 'TEST_MODE=1',
-        'CONFIGURATION_BUILD_DIR' => configuration_build_dir
+        'BWOKEN_CONFIGURATION_BUILD_DIR' => configuration_build_dir
       }
     end
 
@@ -49,6 +52,7 @@ module Bwoken
         #{"-scheme #{scheme}" if Bwoken.xcworkspace} \
         -configuration #{configuration} \
         -sdk #{sdk} \
+        -xcconfig #{xcconfig} \
         #{variables_for_cli} \
         clean build"
     end

data/lib/bwoken/configs/bwoken.xcconfig

@@ -0,0 +1,2 @@
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) TEST_MODE=1
+CONFIGURATION_BUILD_DIR = $(BWOKEN_CONFIGURATION_BUILD_DIR)

data/lib/bwoken/formatters/colorful_formatter.rb

@@ -67,5 +67,9 @@ module Bwoken
       puts error_log
       puts 'Build failed!'.red
     end
+
+    on :other do |line|
+      nil
+    end
   end
 end

data/lib/bwoken/tasks/bwoken.rake

@@ -64,7 +64,7 @@ CLOBBER.include('integration/tmp')
 
 
 desc 'Compile the workspace'
-task :build do
+task :compile do
   exit_status = Bwoken::Build.new.compile
   raise unless exit_status == 0
 end
@@ -100,4 +100,4 @@ task :test do
   end
 end
 
-task :default => [:build, :test]
+task :default => [:compile, :test]

data/lib/bwoken/version.rb

@@ -1,3 +1,3 @@
 module Bwoken
-  VERSION = "1.1.0" unless defined?(::Bwoken::VERSION)
+  VERSION = "1.1.1" unless defined?(::Bwoken::VERSION)
 end

data/lib/bwoken.rb

@@ -33,9 +33,19 @@ module Bwoken
     def test_suite_path
       File.join(tmp_path, 'javascript')
     end
+    
+    def path_to_developer_dir
+      `xcode-select -print-path`.strip
+    end
 
     def path_to_automation_template
-      '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Instruments/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate'
+      template = nil
+      `xcrun instruments -s 2>&1 | grep Automation.tracetemplate`.split("\n").each do |path|
+        path = path.gsub(/^\s*"|",\s*$/, "")
+        template = path if File.exists?(path)
+        break if template
+      end
+      template
     end
 
     %w(xcworkspace xcodeproj).each do |xcode_root|
@@ -48,12 +58,12 @@ module Bwoken
 
     def workspace_or_project
       ws = xcworkspace
-      File.exists?(ws) ? ws : xcodeproj
+      ws && File.exists?(ws) ? ws : xcodeproj
     end
 
     def workspace_or_project_flag
       ws = xcworkspace
-      if File.exists?(ws)
+      if ws && File.exists?(ws)
         "-workspace #{ws}"
       else
         "-project #{xcodeproj}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwoken
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
-  requirement: &70362206841360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362206841360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorful
-  requirement: &70362206840320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362206840320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70362206839820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362206839820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70362206839180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362206839180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70362206838380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362206838380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70362206837680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +102,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362206837680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: iOS UIAutomation Test Runner
 email:
 - brad@bendyworks.com
@@ -92,6 +122,7 @@ files:
 - bin/unix_instruments.sh
 - lib/bwoken/build.rb
 - lib/bwoken/coffeescript.rb
+- lib/bwoken/configs/bwoken.xcconfig
 - lib/bwoken/device.rb
 - lib/bwoken/formatter.rb
 - lib/bwoken/formatters/colorful_formatter.rb
@@ -115,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3024521227927811859
+      hash: -4146561164984030990
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,10 +155,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3024521227927811859
+      hash: -4146561164984030990
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Runs your UIAutomation tests from the command line for both iPhone and iPad;