bwoken 1.3.0 → 2.0.0.beta.1

data/README.md

@@ -7,38 +7,38 @@ Supports coffeescript and javascript.
 ![screenshot](https://raw.github.com/bendyworks/bwoken/master/doc/screenshot.png)
 
 
-## Usage
+## On the Command Line
 
 ### Running tests
 
 Make sure bwoken is <a href="#installation">properly installed</a>. Then, build your project and run all your tests via:
 
 <pre><code># will build and run all of your tests
-$ rake
+$ bwoken test
 
-# will run one file, relative to integration/coffeescript (note: no file extension)
-$ RUN=iphone/focused_test rake
+# will run one file, relative to integration/coffeescript/{iphone,ipad}/
+#  (note: no file extension)
+$ bwoken test --focus some_test # runs this test on (iphone and ipad) OR (connected iDevice)
+$ bwoken test --focus some_test --family iphone
 </code></pre>
 
 ### 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!
 
-As of bwoken 1.2.0, you can pass <code>SIMULATOR=true</code> as an environment variable to force simulator use even if your device is plugged in:
-
 <pre><code># without a device connected, will run on the simulator:
-$ rake
+$ bwoken test
 
 # with a device connected, will run on the device:
-$ rake
+$ bwoken test
 
 # with a device connected, will run on the simulator:
-$ SIMULATOR=true rake
+$ bwoken test --simulator
 </code></pre>
 
 Your tests will look something like this:
 
-<pre><code>$ rake
+<pre><code>$ bwoken test
 Building.............................................................................
 .....................................................................................
 .....................................................................................
@@ -73,21 +73,42 @@ Complete
  Duration: 23.419741s
 </code></pre>
 
-### Bring in Libraries!
-
-Wanna bring in [tuneup.js](https://github.com/alexvollmer/tuneup_js) or [mechanic](https://github.com/jaykz52/mechanic)? Just use `#github` instead of `#import`:
-
-<pre><code>#github "alexvollmer/tuneup_js/tuneup.js"
-#github "jaykz52/mechanic/src/mechanic-core.js"
+### All the switches
+
+Here's a list of all the switches that bwoken takes for the `test` command:
+
+<pre><code>
+$ bwoken test -h
+[...]
+        --simulator       Use simulator, even when an iDevice is connected
+        --family          Test only one device type, either ipad or iphone. Default is to test on both
+        --scheme          Specify a custom scheme
+        --formatter       Specify a custom formatter (e.g., --formatter=passthru)
+        --focus           Specify particular tests to run
+        --clobber         Remove any generated file
+        --skip-build      Do not build the iOS binary
+        --verbose         Be verbose
+    -h, --help            Display this help message.
 </code></pre>
 
+## In Your Code
+
 ### Like Javascript?
 
-Sometimes we'd like to have some javascript help us out. For example, what if you'd like <a href="http://underscorejs.org">Underscore.js</a> in your test suite? Simple! Just put it in <code>integration/javascript</code> and import it in your test:
+Sometimes we'd like to have some javascript help us out. For example, what if you'd like [Underscore.js](http://underscorejs.org) in your test suite? Simple! Just put it in <code>integration/javascript</code> and import it in your test:
 
 <pre><code>#import "../underscore.js"
 </code></pre>
 
+### Bring in Libraries!
+
+Wanna bring in [tuneup.js](https://github.com/alexvollmer/tuneup_js), [mechanic](https://github.com/jaykz52/mechanic), or [underscore](http://underscorejs.org) without manually downloading them first? Just use `#github` instead of `#import`:
+
+<pre><code>#github "jashkenas/underscore/underscore.js"
+#github "alexvollmer/tuneup_js/tuneup.js"
+#github "jaykz52/mechanic/src/mechanic-core.js"
+</code></pre>
+
 
 ## Installation
 
@@ -100,7 +121,7 @@ Ensure your project is in a workspace rather than simply a project:
 * In Xcode, select File -&gt; Save as workspace...
 * Save the workspace in the same directory as your .xcodeproj file
 
-Note: This is done automatically if you use <a href="http://cocoapods.org/">CocoaPods</a>. I highly suggest you do!
+Note: This is done automatically if you use [CocoaPods](http://cocoapods.org/). I highly suggest you do!
 
 ### Prerequisites
 
@@ -111,18 +132,18 @@ Install rvm via <a href="https://rvm.io/rvm/install/">the instructions</a>. Ensu
 <pre><code>$ chmod u+x ~/.rvm/hooks/after_cd_bundler
 </code></pre>
 
-### Installation
+### Install
 
 In the terminal, inside the directory of your project (e.g., you should see a <code>ProjectName.xcodeproj</code> file), create an <code>.rvmrc</code> file and trigger its use:
 
-<pre><code>$ echo 'rvm use 1.9.3@my_project' &gt; .rvmrc
-$ rvm rvmrc trust .rvmrc
-$ . .rvmrc
+<pre><code>$ echo '2.0.0' &gt; .ruby-version
+$ echo 'my_project' &gt; .ruby-gemset
+$ cd .
 </code></pre>
 
 Install bundler (a ruby library dependency manager) and init:
 
-<pre><code>$ gem install bundler
+<pre><code>$ gem install bundler # idempotent; might already be installed and that's ok
 $ bundle init
 </code></pre>
 
@@ -132,14 +153,17 @@ This will create a <code>Gemfile</code>. Add bwoken to it and bundle:
 $ bundle
 </code></pre>
 
-Then, create a simple <code>Rakefile</code> and initialize your bwoken file structure:
+The last installation step is to initialize the bwoken file structure:
 
-<pre><code>$ echo "require 'bwoken/tasks'" &gt; Rakefile
-$ rake bwoken:init
+<pre><code>$ bwoken init
 </code></pre>
 
 Now, you can start <a href="#usage">using it!</a>
 
+#### The Dirty Little Installation Method
+
+Technically, you can skip this entire Installation section and just run `sudo gem install bwoken && bwoken init`. This is listed here for completeness, but you really shouldn't install gems this way.
+
 ## Contributing
 
 1. Fork it

data/bin/bwoken

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+require 'bwoken/cli'

data/lib/bwoken/build.rb

@@ -1,44 +1,56 @@
 require 'open3'
+require 'bwoken'
 require 'bwoken/device'
 
 module Bwoken
+  class BuildFailedError < RuntimeError; end
+
   class Build
 
-    def app_dir
-      File.join(configuration_build_dir, "#{Bwoken.app_name}.app")
-    end
+    class << self
+      def build_path
+        File.join(Bwoken.project_path, 'build')
+      end
 
-    def build_path
-      File.join(Bwoken.project_path, 'build')
-    end
+      def xcconfig
+        File.join(File.dirname(__FILE__), 'configs', 'bwoken.xcconfig')
+      end
 
-    def scheme
-      Bwoken.app_name
-    end
+      def sdk simulator
+        simulator ? 'iphonesimulator' : 'iphoneos'
+      end
 
-    def configuration
-      'Debug'
-    end
+      def configuration_build_dir simulator
+        File.join(build_path, sdk(simulator))
+      end
 
-    def sdk
-      if Bwoken::Device.should_use_simulator?
-        'iphonesimulator'
-      else
-        'iphoneos'
+      def app_dir simulator
+        File.join(configuration_build_dir(simulator), "#{Bwoken.app_name}.app")
       end
     end
 
-    def configuration_build_dir
-      File.join(build_path, sdk)
+    #attr_accessor :flags #TODO: implement
+    attr_accessor :formatter
+    attr_accessor :scheme
+    attr_accessor :simulator
+    attr_accessor :configuration
+    attr_accessor :verbose
+
+    def initialize
+      #self.flags = [] #TODO: implement
+      self.scheme = Bwoken.app_name
+      self.configuration = 'Debug'
+
+      yield self if block_given?
     end
 
-    def xcconfig
-      File.join(File.dirname(__FILE__), 'configs', 'bwoken.xcconfig')
+    def sdk
+      self.class.sdk(simulator)
     end
 
     def env_variables
       {
-        'BWOKEN_CONFIGURATION_BUILD_DIR' => configuration_build_dir
+        'BWOKEN_CONFIGURATION_BUILD_DIR' => self.class.configuration_build_dir(simulator)
       }
     end
 
@@ -46,35 +58,55 @@ module Bwoken
       env_variables.map{|key,val| "#{key}=#{val}"}.join(' ')
     end
 
+    def scheme_string
+      Bwoken.xcworkspace ? "-scheme #{scheme}" : ''
+    end
+
     def cmd
       "xcodebuild \
         #{Bwoken.workspace_or_project_flag} \
-        #{"-scheme #{scheme}" if Bwoken.xcworkspace} \
+        #{scheme_string} \
         -configuration #{configuration} \
         -sdk #{sdk} \
-        -xcconfig #{xcconfig} \
+        -xcconfig #{self.class.xcconfig} \
         #{variables_for_cli} \
         clean build"
     end
 
     def compile
-      Bwoken.formatter.before_build_start
+      formatter.before_build_start
 
-      exit_status = 0
-      Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+      succeeded, out_string, err_string = RUBY_VERSION == '1.8.7' ? compile_18 : compile_19_plus
 
-        out_string = Bwoken.formatter.format_build stdout
+      if succeeded
+        formatter.build_successful out_string
+      else
+        formatter.build_failed out_string, err_string
+        fail BuildFailedError.new
+      end
+    end
+
+    def compile_18
+      out_string, err_string = '', ''
+      a, b, c = Open3.popen3(cmd) do |stdin, stdout, stderr|
+        out_string = formatter.format_build stdout
+        err_string = stderr.read
+      end
+
+      [a.to_s !~ /BUILD FAILED/, out_string, err_string]
+    end
+
+    def compile_19_plus
+      ret = nil
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
 
+        out_string = formatter.format_build stdout
+        err_string = stderr.read
         exit_status = wait_thr.value if wait_thr
 
-        if exit_status == 0 # Build Successful
-          Bwoken.formatter.build_successful out_string
-        else # Build Failed
-          Bwoken.formatter.build_failed out_string, stderr.read
-          return exit_status
-        end
+        ret = [exit_status == 0, out_string, err_string]
       end
-      exit_status
+      ret
     end
   end
 end

data/lib/bwoken/cli/init.rb

@@ -0,0 +1,48 @@
+require 'fileutils'
+require 'slop'
+
+module Bwoken
+  module CLI
+    class Init
+
+      class << self
+
+        def help_banner
+          <<BANNER
+Initialize your UIAutomation project.
+
+
+== Options ==
+BANNER
+        end
+      end
+
+      # opts - A slop command object (acts like super-hash)
+      #        There are currently no options available
+      def initialize opts
+        # opts = opts.to_hash if opts.is_a?(Slop)
+      end
+
+      def run
+        directory 'integration/coffeescript/iphone'
+        directory 'integration/coffeescript/ipad'
+        directory 'integration/javascript'
+        directory 'integration/tmp/results'
+        template 'integration/coffeescript/iphone/example.coffee'
+        template 'integration/coffeescript/ipad/example.coffee'
+        template 'integration/javascript/example_vendor.js'
+      end
+
+      def directory dirname
+        FileUtils.mkdir_p dirname
+      end
+
+      def template filename
+        FileUtils.cp \
+          File.expand_path("../templates/#{filename}", __FILE__),
+          filename
+      end
+
+    end
+  end
+end

data/lib/bwoken/cli/templates/integration/coffeescript/ipad/example.coffee

@@ -0,0 +1,5 @@
+# iPad example test file
+#import ../example_vendor.js
+
+target = UIATarget.localTarget()
+window = target.frontMostApp().mainWindow()

data/lib/bwoken/cli/templates/integration/coffeescript/iphone/example.coffee

@@ -0,0 +1,5 @@
+# iPhone example test file
+#import ../example_vendor.js
+
+target = UIATarget.localTarget()
+window = target.frontMostApp().mainWindow()

data/lib/bwoken/cli/test.rb

@@ -0,0 +1,133 @@
+require 'slop'
+require 'rake/file_list'
+require 'fileutils'
+
+require 'bwoken'
+require 'bwoken/build'
+require 'bwoken/coffeescript'
+require 'bwoken/device'
+#TODO: make formatters dynamically loadable during runtime
+require 'bwoken/formatter'
+require 'bwoken/formatters/passthru_formatter'
+require 'bwoken/formatters/colorful_formatter'
+require 'bwoken/script_runner'
+
+module Bwoken
+  module CLI
+    class Test
+
+      def self.help_banner
+        <<BANNER
+Run your tests. If you don't specify which tests, bwoken will run them all
+
+  bwoken test --simulator # runs all tests in the simulator
+
+You can specify a device family if you only want to run, say, iPad tests:
+
+  bwoken test --family ipad
+
+If you only want to run a specific test, you can focus on it:
+
+  bwoken test --focus login # runs iPhone and iPad tests named "login"
+
+
+== Options ==
+BANNER
+      end
+
+      attr_accessor :options
+
+      # opts - A slop command object (acts like super-hash)
+      #       :clobber    - remove all generated files, including iOS build
+      #       :family     - enum of [nil, 'iphone', 'ipad'] (case-insensitive)
+      #       :flags      - custom build flag array (default: []) TODO: not yet implmented
+      #       :focus      - which tests to run (default: [], meaning "all")
+      #       :formatter  - custom formatter (default: 'colorful')
+      #       :scheme     - custom scheme (default: nil)
+      #       :simulator  - should force simulator use (default: nil)
+      #       :skip-build - do not build the iOS binary
+      #       :verbose    - be verbose
+      def initialize opts
+        opts = opts.to_hash if opts.is_a?(Slop)
+        self.options = opts.to_hash.tap do |o|
+          o[:formatter] = 'passthru' if o[:verbose]
+          o[:formatter] = select_formatter(o[:formatter])
+          o[:simulator] = use_simulator?(o[:simulator])
+          o[:family] = o[:family]
+        end
+      end
+
+      def run
+        clobber if options[:clobber]
+        compile unless options[:'skip-build']
+        clean
+        transpile
+        test
+      end
+
+      def compile
+        Build.new do |b|
+          #b.flags = opts.flags #TODO: implement
+          b.formatter = options[:formatter]
+          b.scheme = options[:scheme] if options[:scheme]
+          b.simulator = options[:simulator]
+        end.compile
+      end
+
+      def transpile
+        coffeescripts      = Rake::FileList['integration/coffeescript/**/*.coffee']
+        compiled_coffee    = coffeescripts.pathmap('%{^integration/coffeescript,integration/tmp/javascript}d/%n.js')
+        javascripts        = Rake::FileList['integration/javascript/**/*.js']
+        copied_javascripts = javascripts.pathmap('%{^integration/javascript,integration/tmp/javascript}d/%f')
+
+        compiled_coffee.zip(coffeescripts).each do |target, source|
+          containing_dir = target.pathmap('%d')
+          ensure_directory containing_dir
+          Bwoken::Coffeescript.compile source, target
+        end
+
+        copied_javascripts.zip(javascripts).each do |target, source|
+          containing_dir = target.pathmap('%d')
+          ensure_directory containing_dir
+          FileUtils.cp source, target
+        end
+      end
+
+      def test
+        ScriptRunner.new do |s|
+          s.app_dir = Build.app_dir(options[:simulator])
+          s.family = options[:family]
+          s.focus = options[:focus]
+          s.formatter = options[:formatter]
+          s.simulator = options[:simulator]
+        end.execute
+      end
+
+      def clobber
+        FileUtils.rm_rf Bwoken.tmp_path
+        FileUtils.rm_rf Bwoken::Build.build_path
+      end
+
+      def clean
+        FileUtils.rm_rf Bwoken.test_suite_path
+      end
+
+      def select_formatter formatter_name
+        case formatter_name
+        when 'passthru' then Bwoken::PassthruFormatter.new
+        else Bwoken::ColorfulFormatter.new
+        end
+      end
+
+      def use_simulator? want_forced_simulator
+        want_forced_simulator || ! Bwoken::Device.connected?
+      end
+
+      def ensure_directory dir
+        FileUtils.mkdir_p dir
+      end
+
+    end
+
+  end
+end

data/lib/bwoken/cli.rb

@@ -0,0 +1,54 @@
+require 'slop'
+
+%w(version cli/init cli/test).each do |f|
+  require File.expand_path("../#{f}", __FILE__)
+end
+
+ran_command = nil
+
+opts = Slop.parse :help => true do
+  on :v, :version, 'Print the version' do
+    puts Bwoken::VERSION
+    exit 0
+  end
+
+  command 'init' do
+    banner Bwoken::CLI::Init.help_banner
+
+    run { ran_command = 'init' }
+  end
+
+  command 'test' do
+    banner Bwoken::CLI::Test.help_banner
+
+    on :simulator, 'Use simulator, even when an iDevice is connected', :default => false
+
+    on :family=, 'Test only one device type, either ipad or iphone. Default is to test on both',
+      :match => /\A(?:ipad|iphone|all)\Z/i, :default => 'all'
+    on :scheme=, 'Specify a custom scheme'
+    #on :flags=, 'Specify custom build flags (e.g., --flags="-arch=i386,foo=bar")', :as => Array, :default => [] # TODO: implement
+    on :formatter=, 'Specify a custom formatter (e.g., --formatter=passthru)', :default => 'colorful'
+    on :focus=, 'Specify particular tests to run', :as => Array, :default => []
+    on :clobber, 'Remove any generated file'
+    on :'skip-build', 'Do not build the iOS binary'
+    on :verbose, 'Be verbose'
+
+    run { ran_command = 'test' }
+  end
+
+end
+
+if File.exists?('Rakefile')
+  contents = open('Rakefile').read.strip
+  if contents =~ /\Arequire ["']bwoken\/tasks["']\Z/
+    STDERR.puts 'You may safely delete Rakefile'
+  elsif contents =~ /require ["']bwoken\/tasks["']/
+    STDERR.puts %Q|You may safely remove the "require 'bwoken/tasks'" line from Rakefile|
+  end
+end
+
+case ran_command
+when 'init' then Bwoken::CLI::Init.new(opts.commands['init']).run
+when 'test' then Bwoken::CLI::Test.new(opts.commands['test']).run
+else puts opts
+end

data/lib/bwoken/device.rb

@@ -2,10 +2,12 @@ module Bwoken
   class Device
     class << self
 
+      # deprecated. Remove when Rakefile support removed
       def should_use_simulator?
         want_simulator? || ! connected?
       end
 
+      # deprecated. Remove when Rakefile support removed
       def want_simulator?
         ENV['SIMULATOR'] && ENV['SIMULATOR'].downcase == 'true'
       end
@@ -15,10 +17,17 @@ module Bwoken
       end
 
       def uuid
-        ioreg = `ioreg -w 0 -rc IOUSBDevice -k SupportsIPhoneOS`
         ioreg[/"USB Serial Number" = "([0-9a-z]+)"/] && $1
       end
 
+      def device_type
+        ioreg[/"USB Product Name" = "(.*)"/] && $1.downcase
+      end
+
+      def ioreg
+        @ioreg ||= `ioreg -w 0 -rc IOUSBDevice -k SupportsIPhoneOS`
+      end
+
     end
 
   end

data/lib/bwoken/device_runner.rb

@@ -0,0 +1,62 @@
+require 'bwoken'
+require 'bwoken/script'
+
+module Bwoken
+  class DeviceRunner
+    attr_accessor :focus
+    attr_accessor :formatter
+    attr_accessor :app_dir
+
+    alias_method :feature_names, :focus
+
+    def initialize
+      yield self if block_given?
+    end
+
+    def execute
+      scripts.each(&:run)
+    end
+
+    def device_family
+      Device.device_type
+    end
+
+    def scripts
+      script_filenames.map do |filename|
+        Script.new do |s|
+          s.path = filename
+          s.device_family = device_family
+          s.formatter = formatter
+          s.app_dir = app_dir
+        end
+      end
+    end
+
+    def script_filenames
+      if focus.respond_to?(:length) && focus.length > 0
+        test_files_from_feature_names
+      else
+        all_test_files
+      end
+    end
+
+    def test_files_from_feature_names
+      feature_names.map do |feature_name|
+        File.join(Bwoken.test_suite_path, device_family, "#{feature_name}.js")
+      end
+    end
+
+    def all_test_files
+      all_files_in_test_dir - helper_files
+    end
+
+    def all_files_in_test_dir
+      Dir["#{Bwoken.test_suite_path}/#{device_family}/**/*.js"]
+    end
+
+    def helper_files
+      Dir["#{Bwoken.test_suite_path}/#{device_family}/**/helpers/**/*.js"]
+    end
+
+  end
+end

data/lib/bwoken/formatters/passthru_formatter.rb

@@ -0,0 +1,12 @@
+require 'bwoken/formatter'
+
+module Bwoken
+  class PassthruFormatter < Formatter
+    [:before_build_start, :build_line, :build_successful, :build_failed,
+     :complete, :debug, :error, :fail, :other, :pass, :start].each do |cb|
+      on cb do |line|
+        puts line
+      end
+    end
+  end
+end

data/lib/bwoken/script.rb

@@ -1,47 +1,26 @@
 require 'fileutils'
 require 'open3'
 
-require 'bwoken/build'
+require 'bwoken'
+require 'bwoken/device'
 
 module Bwoken
-
   class ScriptFailedError < RuntimeError; end
 
   class Script
 
-    attr_accessor :path
-
-    class << self
-
-      def run_all device_family
-        Simulator.device_family = device_family
-
-        test_files(device_family).each do |javascript|
-          run(javascript)
-        end
-      end
-
-      def run_one feature_name, device_family
-        Simulator.device_family = device_family
-        run File.join(Bwoken.test_suite_path, device_family, "#{feature_name}.js")
-      end
-
-      def run javascript_path
-        script = new
-        script.path = javascript_path
-        script.run
-      end
-
-      def trace_file_path
-        File.join(Bwoken.tmp_path, 'trace')
-      end
+    def self.trace_file_path
+      File.join(Bwoken.tmp_path, 'trace')
+    end
 
-      def test_files device_family
-        all_files_in_test_dir = Dir["#{Bwoken.test_suite_path}/#{device_family}/**/*.js"]
-        helper_files = Dir["#{Bwoken.test_suite_path}/#{device_family}/**/helpers/**/*.js"]
-        all_files_in_test_dir - helper_files
-      end
+    attr_accessor :path
+    attr_accessor :device_family
+    attr_accessor :formatter
+    attr_accessor :simulator
+    attr_accessor :app_dir
 
+    def initialize
+      yield self if block_given?
     end
 
     def env_variables
@@ -56,36 +35,25 @@ 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} \
-        #{build.app_dir} \
+        #{app_dir} \
         #{env_variables_for_cli}"
     end
 
     def device_flag
-      if Bwoken::Device.should_use_simulator?
-        ''
-      else
-        "-w #{Bwoken::Device.uuid}"
-      end
-    end
-
-    def make_results_path_dir
-      FileUtils.mkdir_p Bwoken.results_path
+      simulator ? '' : "-w #{Bwoken::Device.uuid}"
     end
 
     def run
-      Bwoken.formatter.before_script_run path
-      make_results_path_dir
+      formatter.before_script_run path
 
-      exit_status = 0
       Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-        exit_status = Bwoken.formatter.format stdout
+        exit_status = formatter.format stdout
+        raise ScriptFailedError.new('Test Script Failed') unless exit_status == 0
       end
-      raise ScriptFailedError.new('Test Script Failed') unless exit_status == 0
     end
 
   end

data/lib/bwoken/script_runner.rb

@@ -0,0 +1,67 @@
+require 'bwoken/simulator_runner'
+require 'bwoken/device_runner'
+
+module Bwoken
+  class ScriptRunner
+    attr_accessor :family
+    attr_accessor :focus
+    attr_accessor :formatter
+    attr_accessor :simulator
+    attr_accessor :app_dir
+
+    alias_method :feature_names, :focus
+
+    def initialize
+      yield self if block_given?
+    end
+
+    def execute
+      if simulator
+        execute_in_simulator
+      else
+        execute_on_device
+      end
+    end
+
+    def execute_in_simulator
+      chosen_families.each do |device_family|
+        execute_for_family device_family
+      end
+    end
+
+    def execute_for_family device_family
+      runner_for_family(device_family).execute
+    end
+
+    def runner_for_family device_family
+      SimulatorRunner.new do |sr|
+        sr.device_family = device_family
+        sr.focus = focus
+        sr.formatter = formatter
+        sr.simulator = simulator
+        sr.app_dir = app_dir
+      end
+    end
+
+    def chosen_families
+      if family == 'all' || family == [] || family.nil?
+        %w(iphone ipad)
+      else
+        Array(family)
+      end
+    end
+
+    def execute_on_device
+      runner_for_device.execute
+    end
+
+    def runner_for_device
+      DeviceRunner.new do |dr|
+        dr.focus = focus
+        dr.formatter = formatter
+        dr.app_dir = app_dir
+      end
+    end
+
+  end
+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::Build.new.app_dir}/Info.plist"; end
+    def self.plist_file; "#{Bwoken::Build.app_dir(true)}/Info.plist"; end
 
     def self.device_family= device_family
       update_device_family_in_plist :delete_array

data/lib/bwoken/simulator_runner.rb

@@ -0,0 +1,63 @@
+require 'bwoken'
+require 'bwoken/script'
+require 'bwoken/simulator'
+
+module Bwoken
+  class SimulatorRunner
+    attr_accessor :focus
+    attr_accessor :formatter
+    attr_accessor :simulator
+    attr_accessor :app_dir
+    attr_accessor :device_family
+
+    alias_method :feature_names, :focus
+
+    def initialize
+      yield self if block_given?
+    end
+
+    def execute
+      Simulator.device_family = device_family
+      scripts.each(&:run)
+    end
+
+    def scripts
+      script_filenames.map do |filename|
+        Script.new do |s|
+          s.path = filename
+          s.device_family = device_family
+          s.formatter = formatter
+          s.simulator = simulator
+          s.app_dir = app_dir
+        end
+      end
+    end
+
+    def script_filenames
+      if focus.respond_to?(:length) && focus.length > 0
+        test_files_from_feature_names
+      else
+        all_test_files
+      end
+    end
+
+    def test_files_from_feature_names
+      feature_names.map do |feature_name|
+        File.join(Bwoken.test_suite_path, device_family, "#{feature_name}.js")
+      end
+    end
+
+    def all_test_files
+      all_files_in_test_dir - helper_files
+    end
+
+    def all_files_in_test_dir
+      Dir["#{Bwoken.test_suite_path}/#{device_family}/**/*.js"]
+    end
+
+    def helper_files
+      Dir["#{Bwoken.test_suite_path}/#{device_family}/**/helpers/**/*.js"]
+    end
+
+  end
+end

data/lib/bwoken/tasks/bwoken.rake

@@ -1,72 +1,53 @@
 require 'bwoken'
 require 'rake/clean'
 
-COFFEESCRIPTS      = FileList['integration/coffeescript/**/*.coffee']
-COMPILED_COFFEE    = COFFEESCRIPTS.pathmap('%{^integration/coffeescript,integration/tmp/javascript}d/%n.js')
-JAVASCRIPTS        = FileList['integration/javascript/**/*.js']
-COPIED_JAVASCRIPTS = JAVASCRIPTS.pathmap('%{^integration/javascript,integration/tmp/javascript}d/%f')
+require 'slop'
+require 'bwoken/cli/init'
+require 'bwoken/cli/test'
 
 BUILD_DIR          = 'build'
 IPHONE_DIR         = 'integration/coffeescript/iphone'
-IPAD_DIR           = 'integration/coffeescript/ipad'
 VENDOR_JS_DIR      = 'integration/javascript'
 RESULTS_DIR        = 'integration/tmp/results'
-EXAMPLE_COFFEE     = 'integration/coffeescript/iphone/example.coffee'
-EXAMPLE_VENDOR_JS  = 'integration/javascript/example_js.js'
 
 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|
-    io.puts '#import ../example_js.js'
-    io.puts 'target = UIATarget.localTarget()'
-    io.puts 'window = target.frontMostApp().mainWindow()'
-  end
-end
-
-file EXAMPLE_VENDOR_JS => VENDOR_JS_DIR do |t|
-  open(t.name, 'w') do |io|
-    io.puts '/* Place your javascript here */'
-  end
+task :rake_deprecated do
+  STDERR.puts 'WARNING: Invoking bwoken with rake is deprecated. Please use the `bwoken` executable now.'
+  STDERR.puts 'Please see https://github.com/bendyworks/bwoken/wiki/Upgrading-from-v1-to-v2'
+  STDERR.puts ''
 end
 
 namespace :bwoken do
   desc 'Create bwoken skeleton folders'
-  task :init => [IPAD_DIR, RESULTS_DIR, EXAMPLE_COFFEE, EXAMPLE_VENDOR_JS]
-end
-
-COMPILED_COFFEE.zip(COFFEESCRIPTS).each do |target, source|
-  containing_dir = target.pathmap('%d')
-  directory containing_dir
-  file target => [containing_dir, source] do
-    Bwoken::Coffeescript.compile source, target
-  end
-end
-
-COPIED_JAVASCRIPTS.zip(JAVASCRIPTS).each do |target, source|
-  containing_dir = target.pathmap('%d')
-  directory containing_dir
-  file target => [containing_dir, source] do
-    sh "cp #{source} #{target}"
+  task :init => :rake_deprecated do
+    Bwoken::CLI::Init.new({}).run
   end
 end
 
 desc 'Compile coffeescript to javascript and copy vendor javascript'
-task :coffeescript => (COMPILED_COFFEE + COPIED_JAVASCRIPTS)
+task :coffeescript => :rake_deprecated do
+  Bwoken::CLI::Test.new({}).transpile
+end
 
-CLEAN.include('integration/tmp/javascript')
-CLOBBER.include('integration/tmp')
+desc 'remove any temporary products'
+task :clean => :rake_deprecated do
+  Bwoken::CLI::Test.new({}).clean
+end
 
+desc 'remove any generated file'
+task :clobber => :rake_deprecated do
+  Bwoken::CLI::Test.new({}).clobber
+end
 
 
 desc 'Compile the workspace'
-task :compile do
-  exit_status = Bwoken::Build.new.compile
-  raise unless exit_status == 0
+task :compile => :rake_deprecated do
+  opts = {:simulator => Bwoken::Device.should_use_simulator?}
+  Bwoken::CLI::Test.new(opts).compile
 end
 
 
@@ -75,29 +56,31 @@ device_families = %w(iphone ipad)
 device_families.each do |device_family|
 
   namespace device_family do
-    task :test => [RESULTS_DIR, :coffeescript] do
-      if ENV['RUN']
-        Bwoken::Script.run_one ENV['RUN'], device_family
-      else
-        Bwoken::Script.run_all device_family
-      end
+    task :test => [:rake_deprecated, RESULTS_DIR, :coffeescript] do
+      opts = {
+        :simulator => Bwoken::Device.should_use_simulator?,
+        :family => device_family
+      }
+      opts[:focus] = [ENV['RUN']] if ENV['RUN']
+
+      Bwoken::CLI::Test.new(opts).test
     end
   end
 
   desc "Run tests for #{device_family}"
-  task device_family => "#{device_family}:test"
+  task device_family => [:rake_deprecated, "#{device_family}:test"]
 
 end
 
 desc 'Run all tests without compiling first'
-task :test do
-  if ENV['FAMILY']
-    Rake::Task[ENV['FAMILY']].invoke
-  else
-    device_families.each do |device_family|
-      Rake::Task[device_family].invoke
-    end
-  end
+task :test => :rake_deprecated do
+  opts = {
+    :simulator => Bwoken::Device.should_use_simulator?
+  }
+  opts[:focus] = [ENV['RUN']] if ENV['RUN']
+  opts[:family] = ENV['FAMILY'] if ENV['FAMILY']
+
+  Bwoken::CLI::Test.new(opts).test
 end
 
-task :default => [:compile, :test]
+task :default => [:rake_deprecated, :compile, :test]

data/lib/bwoken/version.rb

@@ -1,3 +1,3 @@
 module Bwoken
-  VERSION = "1.3.0" unless defined?(::Bwoken::VERSION)
+  VERSION = "2.0.0.beta.1" unless defined?(::Bwoken::VERSION)
 end

data/lib/bwoken.rb

@@ -1,15 +1,9 @@
 require 'fileutils'
 
-require 'bwoken/build'
-require 'bwoken/coffeescript'
-require 'bwoken/formatters/colorful_formatter'
-require 'bwoken/script'
-require 'bwoken/simulator'
-require 'bwoken/device'
-require 'bwoken/version'
-
 module Bwoken
   class << self
+    DEVICE_FAMILIES = %w(iphone ipad)
+
     def path
       File.join(project_path, 'integration')
     end
@@ -22,10 +16,6 @@ module Bwoken
       File.basename(File.basename(workspace_or_project, '.xcodeproj'), '.xcworkspace')
     end
 
-    def formatter
-      @formatter ||= Bwoken::ColorfulFormatter.new
-    end
-
     def project_path
       Dir.pwd
     end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: bwoken
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 2.0.0.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Brad Grzesiak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
@@ -60,6 +60,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,22 +146,34 @@ email:
 - jaymes@bendyworks.com
 executables:
 - unix_instruments.sh
+- bwoken
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/bwoken
 - bin/unix_instruments.sh
 - lib/bwoken/build.rb
+- lib/bwoken/cli/init.rb
+- lib/bwoken/cli/templates/integration/coffeescript/ipad/example.coffee
+- lib/bwoken/cli/templates/integration/coffeescript/iphone/example.coffee
+- lib/bwoken/cli/templates/integration/javascript/example_vendor.js
+- lib/bwoken/cli/test.rb
+- lib/bwoken/cli.rb
 - lib/bwoken/coffeescript/github_import_string.rb
 - lib/bwoken/coffeescript/import_string.rb
 - lib/bwoken/coffeescript.rb
 - lib/bwoken/configs/bwoken.xcconfig
 - lib/bwoken/device.rb
+- lib/bwoken/device_runner.rb
 - lib/bwoken/formatter.rb
 - lib/bwoken/formatters/colorful_formatter.rb
+- lib/bwoken/formatters/passthru_formatter.rb
 - lib/bwoken/script.rb
+- lib/bwoken/script_runner.rb
 - lib/bwoken/simulator.rb
+- lib/bwoken/simulator_runner.rb
 - lib/bwoken/tasks/bwoken.rake
 - lib/bwoken/tasks.rb
 - lib/bwoken/version.rb
@@ -148,16 +192,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -192482595553482221
+      hash: -2275845528582836031
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -192482595553482221
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25