bwoken 0.0.1 → 1.0.0

data/README.md

@@ -1,6 +1,6 @@
-# Bwoken
+# 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. ![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.
 
 Supports coffeescript.
 
@@ -13,6 +13,14 @@ Make sure bwoken is properly installed via one of the methods below. Then, build
 
     $ rake
 
+To run a single feature, add a RUN variable with the same name as your feature, ignoring the file extension:
+
+    $ RUN=focused_test rake iphone
+
+Or, to run the feature on both iphone and ipad
+
+    $ RUN=focused_test rake
+
 
 ## Installation with rvm (recommended)
 

data/lib/bwoken.rb

@@ -1,10 +1,11 @@
 require 'fileutils'
 
-require 'bwoken/version'
-require 'bwoken/simulator'
 require 'bwoken/build'
-require 'bwoken/script'
 require 'bwoken/coffeescript'
+require 'bwoken/formatters/colorful_formatter'
+require 'bwoken/script'
+require 'bwoken/simulator'
+require 'bwoken/version'
 
 module Bwoken
   class << self
@@ -24,6 +25,10 @@ module Bwoken
       File.join(build_path, "#{app_name}.app")
     end
 
+    def formatter
+      @formatter ||= Bwoken::ColorfulFormatter.new
+    end
+
     def project_path
       Dir.pwd
     end
@@ -46,6 +51,19 @@ module Bwoken
       File.join(project_path, "#{app_name}.xcworkspace")
     end
 
+    def xcodeproj
+      File.join(project_path, "#{app_name}.xcodeproj")
+    end
+
+    def workspace_or_project_flag
+      ws = workspace
+      if File.exists?(ws)
+        "-workspace #{ws}"
+      else
+        "-project #{xcodeproj}"
+      end
+    end
+
     def results_path
       File.join(tmp_path, 'results').tap do |dir_name|
         FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)

data/lib/bwoken/build.rb

@@ -28,8 +28,8 @@ module Bwoken
 
     def cmd
       "xcodebuild \
-        -workspace #{Bwoken.workspace} \
-        -scheme #{scheme} \
+        #{Bwoken.workspace_or_project_flag} \
+        #{"-scheme #{scheme}" if Bwoken.workspace} \
         -configuration #{configuration} \
         -sdk #{sdk} \
         #{variables_for_cli} \
@@ -37,27 +37,19 @@ module Bwoken
     end
 
     def compile
+      Bwoken.formatter.before_build_start
+
       exit_status = 0
       Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
 
-        print "Building"
-        out_string = ""
-
-        stdout.each_line do |line|
-          out_string << line
-          print "."
-        end
+        out_string = Bwoken.formatter.format_build stdout
 
         exit_status = wait_thr.value if wait_thr
-        puts
 
-        if exit_status == 0
-          puts
-          puts "## Build Successful ##"
-          puts
-        else
-          puts out_string
-          puts 'Build failed'
+        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
       end

data/lib/bwoken/formatter.rb

@@ -6,14 +6,25 @@ module Bwoken
         new.format stdout
       end
 
+      def format_build stdout
+        new.format_build stdout
+      end
+
       def on name, &block
-        define_method "_on_#{name}_callback" do |line|
-          block.call(line)
+        define_method "_on_#{name}_callback" do |*line|
+          block.call(*line)
         end
       end
 
     end
 
+    def method_missing(method_name, *args, &block)
+      callback_method_sig = "_on_#{method_name}_callback"
+      if self.respond_to? callback_method_sig.to_sym
+        send(callback_method_sig, *args, &block)
+      end
+    end
+
     def line_demuxer line, exit_status
       if line =~ /Instruments Trace Error/
         exit_status = 1
@@ -23,12 +34,18 @@ module Bwoken
 
         if tokens[3] =~ /Pass/
           _on_pass_callback(line)
+        elsif tokens[3] =~ /Start/
+          _on_start_callback(line)
         elsif tokens[3] =~ /Fail/ || line =~ /Script threw an uncaught JavaScript error/
           exit_status = 1
           _on_fail_callback(line)
+        elsif tokens[3] =~ /Error/
+          _on_error_callback(line)
         else
           _on_debug_callback(line)
         end
+      elsif line =~ /Instruments Trace Complete/
+        _on_complete_callback(line)
       else
         _on_other_callback(line)
       end
@@ -51,5 +68,38 @@ module Bwoken
       exit_status
     end
 
+    def format_build stdout
+      out_string = ''
+      stdout.each_line do |line|
+        out_string << line
+        if line.length > 1
+          _on_build_line_callback(line)
+        end
+      end
+      out_string
+    end
+
+    on :before_build_start do
+      puts 'Building'
+    end
+
+    on :build_line do |line|
+      print '.'
+    end
+
+    on :build_successful do |build_log|
+      puts
+      puts
+      puts "### Build Successful ###"
+      puts
+    end
+
+    on :build_failed do |build_log, error_log|
+      puts build_log
+      puts "Standard Error:"
+      puts error_log
+      puts '## Build failed ##'
+    end
+
   end
 end

data/lib/bwoken/formatters/colorful_formatter.rb

@@ -5,20 +5,67 @@ require 'bwoken/formatter'
 module Bwoken
   class ColorfulFormatter < Formatter
 
+    on :complete do |line|
+      tokens = line.split(' ')
+      puts %Q( \n#{"Complete".send(@failed ? :red : :green)}\n Duration: #{tokens[5].sub(';','').underline.bold}\n )
+    end
+
     on :debug do |line|
+      filtered_line = line.sub(/(target\.frontMostApp.+)\.tap\(\)/, "#{'tap'.yellow} \\1")
+      filtered_line = filtered_line.gsub(/\[("[^\]]*")\]/, "[" + '\1'.magenta + "]")
+      filtered_line = filtered_line.gsub('()', '')
+      filtered_line = filtered_line.sub(/target.frontMostApp.(?:mainWindow.)?/,'')
+      tokens = filtered_line.split(' ')
+      puts "#{tokens[3].cyan}\t#{tokens[4..-1].join(' ')}"
+    end
+
+    on :error do |line|
+      @failed = true
       tokens = line.split(' ')
-      puts "#{tokens[1]} #{tokens[3].yellow}\t#{tokens[4..-1].join(' ')}"
+      puts "#{tokens[3].bold.red}\t#{tokens[4..-1].join(' ').underline.bold}"
     end
 
     on :fail do |line|
+      @failed = true
       tokens = line.split(' ')
-      puts "#{tokens[1]} #{tokens[3].red}\t#{tokens[4..-1].join(' ')}"
+      puts "#{tokens[3].bold.red}\t#{tokens[4..-1].join(' ').underline.bold}"
+    end
+
+    on :start do |line|
+      tokens = line.split(' ')
+      puts "#{tokens[3].cyan}\t#{tokens[4..-1].join(' ')}"
     end
 
     on :pass do |line|
       tokens = line.split(' ')
-      puts "#{tokens[1]} #{tokens[3].green}\t#{tokens[4..-1].join(' ')}"
+      puts "#{tokens[3].green}\t#{tokens[4..-1].join(' ')}"
     end
 
+    on :before_script_run do |path|
+      @failed = false
+      tokens = path.split('/')
+      puts
+      puts "#{tokens[-2]}\t#{tokens[-1]}".cyan
+    end
+
+    on :before_build_start do
+      print "Building".blue
+    end
+
+    on :build_line do |line|
+      print '.'.blue
+    end
+
+    on :build_successful do |line|
+      puts
+      puts 'Build Successful!'.green
+    end
+
+    on :build_failed do |build_log, error_log|
+      puts build_log
+      puts 'Standard Error:'.yellow
+      puts error_log
+      puts 'Build failed!'.red
+    end
   end
 end

data/lib/bwoken/script.rb

@@ -1,8 +1,6 @@
 require 'fileutils'
 require 'open3'
 
-require 'bwoken/formatters/colorful_formatter'
-
 module Bwoken
 
   class ScriptFailedError < RuntimeError; end
@@ -16,11 +14,16 @@ module Bwoken
       def run_all device_family
         Simulator.device_family = device_family
 
-        Dir["#{Bwoken.test_suite_path}/#{device_family}/**/*.js"].each do |javascript|
+        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
@@ -31,6 +34,12 @@ module Bwoken
         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
+
     end
 
     def env_variables
@@ -52,20 +61,17 @@ module Bwoken
         #{env_variables_for_cli}"
     end
 
-    def formatter
-      Bwoken::ColorfulFormatter
-    end
-
     def make_results_path_dir
       FileUtils.mkdir_p Bwoken.results_path
     end
 
     def run
+      Bwoken.formatter.before_script_run path
       make_results_path_dir
 
       exit_status = 0
       Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-        exit_status = formatter.format stdout
+        exit_status = Bwoken.formatter.format stdout
       end
       raise ScriptFailedError.new('Test Script Failed') unless exit_status == 0
     end

data/lib/bwoken/tasks/bwoken.rake

@@ -28,8 +28,8 @@ end
 
 desc 'Remove result and trace files'
 task :clean do
-  print "Removing #{Bwoken.results_path}/* & #{Bwoken::Script.trace_file_path}/* ... "
-  system "rm -rf #{Bwoken.results_path}/* #{Bwoken::Script.trace_file_path}/*"
+  print "Removing #{Bwoken.tmp_path}/* ... "
+  system "rm -rf #{Bwoken.tmp_path}/*"
   puts 'done.'
 end
 
@@ -40,7 +40,8 @@ end
 
 desc 'Compile the workspace'
 task :build do
-  Bwoken::Build.new.compile
+  exit_status = Bwoken::Build.new.compile
+  raise unless exit_status == 0
 end
 
 task :coffeescript do
@@ -54,7 +55,11 @@ device_families.each do |device_family|
 
   namespace device_family do
     task :test => :coffeescript do
-      Bwoken::Script.run_all device_family
+      if ENV['RUN']
+        Bwoken::Script.run_one ENV['RUN'], device_family
+      else
+        Bwoken::Script.run_all device_family
+      end
     end
   end
 

data/lib/bwoken/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwoken
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
-  requirement: &70256891126900 !ruby/object:Gem::Requirement
+  requirement: &70255276428720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256891126900
+  version_requirements: *70255276428720
 - !ruby/object:Gem::Dependency
   name: colorful
-  requirement: &70256891126240 !ruby/object:Gem::Requirement
+  requirement: &70255276427380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256891126240
+  version_requirements: *70255276427380
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70256891125660 !ruby/object:Gem::Requirement
+  requirement: &70255276426320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256891125660
+  version_requirements: *70255276426320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70256891103760 !ruby/object:Gem::Requirement
+  requirement: &70255276425800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256891103760
+  version_requirements: *70255276425800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70256891101500 !ruby/object:Gem::Requirement
+  requirement: &70255276424840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256891101500
+  version_requirements: *70255276424840
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70256891099820 !ruby/object:Gem::Requirement
+  requirement: &70255276423820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256891099820
+  version_requirements: *70255276423820
 description: iOS UIAutomation Test Runner
 email:
 - brad@bendyworks.com
@@ -87,20 +87,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - bin/unix_instruments.sh
-- lib/bwoken/formatters/colorful_formatter.rb
-- lib/bwoken/tasks/bwoken.rake
 - lib/bwoken/build.rb
 - lib/bwoken/coffeescript.rb
 - lib/bwoken/formatter.rb
+- lib/bwoken/formatters/colorful_formatter.rb
 - lib/bwoken/script.rb
 - lib/bwoken/simulator.rb
+- lib/bwoken/tasks/bwoken.rake
 - lib/bwoken/tasks.rb
 - lib/bwoken/version.rb
 - lib/bwoken.rb
-- LICENSE
-- README.md
-homepage: https://github.com/bendyworks/bwoken
+homepage: https://bendyworks.github.com/bwoken
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2085165610847558799
+      hash: 1868550205244240029
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,10 +123,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2085165610847558799
+      hash: 1868550205244240029
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Runs your UIAutomation tests from the command line for both iPhone and iPad;