bwoken 1.0.1 → 1.1.0

data/README.md

@@ -1,6 +1,6 @@
 # Bwoken ![build status](https://secure.travis-ci.org/bendyworks/bwoken.png?branch=master)
 
-Runs your UIAutomation tests from the command line for both iPhone and iPad.
+Runs your UIAutomation tests from the command line for both iPhone and iPad, in the simulator or on your device.
 
 Supports coffeescript and javascript.
 
@@ -9,6 +9,12 @@ Supports coffeescript and javascript.
 
 ## Usage
 
+### Simulator or Device?
+
+To run bwoken tests on your device, just plug it in! And if you want to run tests in the simulator, just unplug it!
+
+### Running tests
+
 Make sure bwoken is properly installed via one of the methods below. Then, build your project and run all your tests via:
 
     $ rake
@@ -22,30 +28,31 @@ Or, to run the feature on both iphone and ipad
     $ RUN=focused_test rake
 
 
-## Installation with rvm (recommended)
-
-Ensure Xcode is up-to-date.
+## Basic Installation
 
-Add an .rvmrc file to your project, such as:
+N.B.: This is the simplest way to get started and try out bwoken, but the recommended method is with RVM (see below).
+You can use this method without affecting your ability to later use RVM.
 
-    $ echo 'rvm use 1.9.3@MyProject --create' >> .rvmrc
+Ensure Xcode is up-to-date.
 
 Install bundler and init:
 
-    $ gem install bundler
+    $ sudo gem install bundler
     $ bundle init
 
 Add this line to your application's Gemfile:
 
     gem 'bwoken'
 
-And then execute:
+Ensure your $PATH variable has bundler_bin at the front. This is usually done with .bash_profile:
 
-    $ bundle --binstubs=bundler_bin
+    $ echo 'export PATH=bundler_bin:$PATH' >> ~/.bash_profile
 
-Ensure your after_cd_bundler rvm hook is enabled:
+Restart your terminal.
 
-    $ chmod u+x ~/.rvm/hooks/after_cd_bundler
+And then execute:
+
+    $ bundle --binstubs=bundler_bin
 
 Then, add the following line to your `Rakefile`:
 
@@ -60,11 +67,18 @@ Ensure your project is in a workspace rather than simply a project:
 * In Xcode, select File -> Save as workspace...
 * Save the workspace in the same directory as your .xcodeproj file
 
+We have tried this on a standard lion installation and it works.
+If you have issues please open an [issue](/bendyworks/bwoken/issues) and let us know.
 
-## Installation without rvm (not recommended)
+
+## Installation with rvm (recommended)
 
 Ensure Xcode is up-to-date.
 
+Add an .rvmrc file to your project, such as:
+
+    $ echo 'rvm use 1.9.3@MyProject --create' >> .rvmrc
+
 Install bundler and init:
 
     $ gem install bundler
@@ -78,9 +92,9 @@ And then execute:
 
     $ bundle --binstubs=bundler_bin
 
-Ensure your $PATH variable has bundler_bin at the front. This is usually done with .bash_profile:
+Ensure your after_cd_bundler rvm hook is enabled:
 
-    $ echo 'export PATH=bundler_bin:$PATH' >> ~/.bash_profile
+    $ chmod u+x ~/.rvm/hooks/after_cd_bundler
 
 Then, add the following line to your `Rakefile`:
 

data/lib/bwoken.rb

@@ -5,6 +5,7 @@ require 'bwoken/coffeescript'
 require 'bwoken/formatters/colorful_formatter'
 require 'bwoken/script'
 require 'bwoken/simulator'
+require 'bwoken/device'
 require 'bwoken/version'
 
 module Bwoken
@@ -18,11 +19,7 @@ module Bwoken
     end
 
     def app_name
-      File.basename(project_path)
-    end
-
-    def app_dir
-      File.join(build_path, "#{app_name}.app")
+      File.basename(File.basename(workspace_or_project, '.xcodeproj'), '.xcworkspace')
     end
 
     def formatter
@@ -41,22 +38,21 @@ module Bwoken
       '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/Instruments/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate'
     end
 
-    def build_path
-      File.join(project_path, 'build').tap do |dir_name|
-        FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
+    %w(xcworkspace xcodeproj).each do |xcode_root|
+      define_method xcode_root do
+        paths = Dir["#{project_path}/*.#{xcode_root}"]
+        fail "Error: Found more than one #{xcode_root} file in root" if paths.count > 1
+        paths.first
       end
     end
 
-    def workspace
-      File.join(project_path, "#{app_name}.xcworkspace")
-    end
-
-    def xcodeproj
-      File.join(project_path, "#{app_name}.xcodeproj")
+    def workspace_or_project
+      ws = xcworkspace
+      File.exists?(ws) ? ws : xcodeproj
     end
 
     def workspace_or_project_flag
-      ws = workspace
+      ws = xcworkspace
       if File.exists?(ws)
         "-workspace #{ws}"
       else

data/lib/bwoken/build.rb

@@ -1,8 +1,17 @@
 require 'open3'
+require 'bwoken/device'
 
 module Bwoken
   class Build
 
+    def app_dir
+      File.join(configuration_build_dir, "#{Bwoken.app_name}.app")
+    end
+
+    def build_path
+      File.join(Bwoken.project_path, 'build')
+    end
+
     def scheme
       Bwoken.app_name
     end
@@ -12,13 +21,21 @@ module Bwoken
     end
 
     def sdk
-      'iphonesimulator5.1'
+      if Bwoken::Device.connected?
+        'iphoneos'
+      else
+        'iphonesimulator5.1'
+      end
+    end
+
+    def configuration_build_dir
+      File.join(build_path, sdk)
     end
 
     def env_variables
       {
         'GCC_PREPROCESSOR_DEFINITIONS' => 'TEST_MODE=1',
-        'CONFIGURATION_BUILD_DIR' => Bwoken.build_path
+        'CONFIGURATION_BUILD_DIR' => configuration_build_dir
       }
     end
 
@@ -29,7 +46,7 @@ module Bwoken
     def cmd
       "xcodebuild \
         #{Bwoken.workspace_or_project_flag} \
-        #{"-scheme #{scheme}" if Bwoken.workspace} \
+        #{"-scheme #{scheme}" if Bwoken.xcworkspace} \
         -configuration #{configuration} \
         -sdk #{sdk} \
         #{variables_for_cli} \

data/lib/bwoken/coffeescript.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'coffee_script/source'
-require 'json' if RUBY_VERSION =~ /^1\.8\./
+require 'json'
 require 'execjs'
 
 module Bwoken
@@ -8,7 +8,13 @@ module Bwoken
     class << self
 
       def coffee_script_source
-        IO.read(CoffeeScript::Source.bundled_path)
+        return @coffeescript if @coffeescript
+
+        @coffeescript = ''
+        open(CoffeeScript::Source.bundled_path) do |f|
+          @coffeescript << f.read
+        end
+        @coffeescript
       end
 
       def context

data/lib/bwoken/device.rb

@@ -0,0 +1,13 @@
+module Bwoken
+  class Device
+    def self.connected?
+      self.uuid ? true : false
+    end
+
+    def self.uuid
+      ioreg = `ioreg -w 0 -rc IOUSBDevice -k SupportsIPhoneOS`
+      ioreg[/"USB Serial Number" = "([0-9a-z]+)"/] && $1
+    end
+
+  end
+end

data/lib/bwoken/script.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 require 'open3'
 
+require 'bwoken/build'
+
 module Bwoken
 
   class ScriptFailedError < RuntimeError; end
@@ -54,13 +56,23 @@ module Bwoken
     end
 
     def cmd
+      build = Bwoken::Build.new
       "#{File.expand_path('../../../bin', __FILE__)}/unix_instruments.sh \
+        #{device_flag} \
         -D #{self.class.trace_file_path} \
         -t #{Bwoken.path_to_automation_template} \
-        #{Bwoken.app_dir} \
+        #{build.app_dir} \
         #{env_variables_for_cli}"
     end
 
+    def device_flag
+      if Bwoken::Device.connected?
+        "-w #{Bwoken::Device.uuid}"
+      else
+        ''
+      end
+    end
+
     def make_results_path_dir
       FileUtils.mkdir_p Bwoken.results_path
     end

data/lib/bwoken/simulator.rb

@@ -2,7 +2,7 @@ module Bwoken
   class Simulator
 
     def self.plist_buddy; '/usr/libexec/PlistBuddy'; end
-    def self.plist_file; "#{Bwoken.app_dir}/Info.plist"; end
+    def self.plist_file; "#{Bwoken::Build.new.app_dir}/Info.plist"; end
 
     def self.device_family= device_family
       update_device_family_in_plist :delete_array

data/lib/bwoken/tasks/bwoken.rake

@@ -6,6 +6,7 @@ COMPILED_COFFEE    = COFFEESCRIPTS.pathmap('%{^integration/coffeescript,integrat
 JAVASCRIPTS        = FileList['integration/javascript/**/*.js']
 COPIED_JAVASCRIPTS = JAVASCRIPTS.pathmap('%{^integration/javascript,integration/tmp/javascript}d/%f')
 
+BUILD_DIR          = 'build'
 IPHONE_DIR         = 'integration/coffeescript/iphone'
 IPAD_DIR           = 'integration/coffeescript/ipad'
 VENDOR_JS_DIR      = 'integration/javascript'
@@ -17,6 +18,7 @@ directory IPHONE_DIR
 directory IPAD_DIR
 directory VENDOR_JS_DIR
 directory RESULTS_DIR
+directory BUILD_DIR
 
 file EXAMPLE_COFFEE => IPHONE_DIR do |t|
   open(t.name, 'w') do |io|
@@ -37,12 +39,6 @@ namespace :bwoken do
   task :init => [IPAD_DIR, RESULTS_DIR, EXAMPLE_COFFEE, EXAMPLE_VENDOR_JS]
 end
 
-desc 'Compile the workspace'
-task :build do
-  exit_status = Bwoken::Build.new.compile
-  raise unless exit_status == 0
-end
-
 COMPILED_COFFEE.zip(COFFEESCRIPTS).each do |target, source|
   containing_dir = target.pathmap('%d')
   directory containing_dir
@@ -67,13 +63,19 @@ CLOBBER.include('integration/tmp')
 
 
 
+desc 'Compile the workspace'
+task :build do
+  exit_status = Bwoken::Build.new.compile
+  raise unless exit_status == 0
+end
+
 
 device_families = %w(iphone ipad)
 
 device_families.each do |device_family|
 
   namespace device_family do
-    task :test => :coffeescript do
+    task :test => [RESULTS_DIR, :coffeescript] do
       if ENV['RUN']
         Bwoken::Script.run_one ENV['RUN'], device_family
       else

data/lib/bwoken/version.rb

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

metadata

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