bwoken 1.0.0 → 1.0.1

data/README.md

@@ -2,7 +2,7 @@
 
 Runs your UIAutomation tests from the command line for both iPhone and iPad.
 
-Supports coffeescript.
+Supports coffeescript and javascript.
 
 ![screenshot](https://raw.github.com/bendyworks/bwoken/master/doc/screenshot.png)
 

data/bin/unix_instruments.sh

@@ -1,5 +1,27 @@
 #!/usr/bin/env bash
 #
+# Copyright (c) 2012 Jonathan Penn (http://cocoamanifest.net)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+
 # unix_instruments
 #
 # A wrapper around `instruments` that returns a proper unix status code
@@ -41,9 +63,12 @@ run_instruments() {
 }
 
 get_error_status() {
-  # Catch "00-00-00 00:00:00 +000 Fail:"
   # Catch "Instruments Trace Error"
-  ruby -e 'exit 1 if STDIN.read =~ /Instruments Trace Error|^\d+-\d+-\d+ \d+:\d+:\d+ [-+]\d+ Fail:/'
+  # Catch "Instruments Usage Error"
+  # Catch "00-00-00 00:00:00 +000 Fail:"
+  # Catch "00-00-00 00:00:00 +000 Error:"
+  # Catch "00-00-00 00:00:00 +000 None: Script threw an uncaught JavaScript error"
+  ruby -e 'exit 1 if STDIN.read =~ /Instruments Usage Error|Instruments Trace Error|^\d+-\d+-\d+ \d+:\d+:\d+ [-+]\d+ (Fail:|Error:|None: Script threw an uncaught JavaScript error)/'
 }
 
 trap cleanup_instruments EXIT
@@ -51,10 +76,14 @@ function cleanup_instruments() {
   # Because we fork instruments in this script, we need to clean up if it's
   # still running because of an error or the user pressed Ctrl-C
   if [[ $pid_instruments -gt 0 ]]; then
-    kill $pid_instruments
+    echo "Cleaning up instruments..."
+    kill -9 $pid_instruments
   fi
 }
 
+# Running this file with "----test" will try to parse an error out of whatever
+# is handed in to it from stdin. Use this method to double check your work if
+# you need a custom "get_error_status" function above.
 if [[ $1 == "----test" ]]; then
   get_error_status
 else

data/lib/bwoken/coffeescript.rb

@@ -7,14 +7,6 @@ module Bwoken
   class Coffeescript
     class << self
 
-      def source_folder
-        File.join(Bwoken.path, 'coffeescript')
-      end
-
-      def test_files
-        "#{source_folder}/**/*.coffee"
-      end
-
       def coffee_script_source
         IO.read(CoffeeScript::Source.bundled_path)
       end
@@ -23,75 +15,29 @@ module Bwoken
         @context ||= ExecJS.compile(coffee_script_source)
       end
 
-      def compile_all
-
-        Dir[test_files].each do |filename|
-          new(filename).make
-        end
-      end
-
-      def clean
-        FileUtils.rm_rf compiled_javascript_path
+      def precompile coffeescript
+        coffeescript.lines.partition {|line| line =~ /^#import .*$/}.map(&:join)
       end
 
-      def compiled_javascript_path
-        File.join(Bwoken.tmp_path, 'javascript')
-      end
-
-    end
-
-    attr_accessor :import_strings
+      def compile source, target
+        import_strings, sans_imports = precompile(IO.read source)
 
-    def initialize path
-      @source_file = path
-    end
-
-    def destination_folder
-      subpath = File.dirname(@source_file.sub(Regexp.new(self.class.source_folder + '/'), '')).sub('.','')
-      File.join(self.class.compiled_javascript_path, subpath)
-    end
+        javascript = self.context.call 'CoffeeScript.compile', sans_imports, :bare => true
 
-    def destination_file
-      basename = File.basename(@source_file, '.coffee')
-      "#{self.destination_folder}/#{basename}.js"
-    end
-
-    def make
-      FileUtils.mkdir_p(destination_folder)
-      javascript = compile
-      save javascript
-    end
-
-    def source_contents
-      IO.read(@source_file)
-    end
-
-    def compile
-      source = precompile(source_contents)
-      self.class.context.call('CoffeeScript.compile', source, :bare => true)
-    end
-
-    def precompile coffeescript
-      capture_imports coffeescript
-      remove_imports coffeescript
-    end
-
-    def capture_imports raw_coffeescript
-      self.import_strings = raw_coffeescript.scan(/#import .*$/)
-    end
+        write import_strings, javascript, :to => target
+      end
 
-    def remove_imports raw_coffeescript
-      raw_coffeescript.gsub(/#import .*$/,'')
-    end
+      def write *args
+        to_hash = args.last
+        chunks = args[0..-2]
 
-    def save javascript
-      File.open(destination_file, 'w') do |io|
-        import_strings.each do |import_string|
-          io.puts import_string
-        end unless import_strings.nil?
-        io.puts javascript
+        File.open(to_hash[:to], 'w') do |io|
+          chunks.each do |chunk|
+            io.puts chunk unless chunk.nil? || chunk == ''
+          end
+        end
       end
-    end
 
+    end
   end
 end

data/lib/bwoken/tasks/bwoken.rake

@@ -1,42 +1,41 @@
 require 'bwoken'
+require 'rake/clean'
 
-namespace :bwoken do
-  desc 'Create bwoken skeleton folders'
-  task :init do
-    paths = []
-    paths << Bwoken.results_path
-    paths << Bwoken.test_suite_path
-    paths << "#{Bwoken::Coffeescript.source_folder}/iphone"
-    paths << "#{Bwoken::Coffeescript.source_folder}/ipad"
-
-    paths.each do |path|
-      puts "Creating #{path}"
-      FileUtils.mkdir_p path
-    end
+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')
 
-    example = "#{Bwoken::Coffeescript.source_folder}/iphone/example.coffee"
-    unless File.file?(example)
-      puts "Creating #{example}"
-      open(example, 'w') do |io|
-        io.puts 'target = UIATarget.localTarget()'
-        io.puts 'window = target.frontMostApp().mainWindow()'
-      end
-    end
+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
+
+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
 
-desc 'Remove result and trace files'
-task :clean do
-  print "Removing #{Bwoken.tmp_path}/* ... "
-  system "rm -rf #{Bwoken.tmp_path}/*"
-  puts 'done.'
+file EXAMPLE_VENDOR_JS => VENDOR_JS_DIR do |t|
+  open(t.name, 'w') do |io|
+    io.puts '/* Place your javascript here */'
+  end
 end
 
-# task :clean_db do
-  # puts "Cleaning the application's sqlite cache database"
-  # system 'rm -rf ls -1d ~/Library/Application\ Support/iPhone\ Simulator/**/Applications/**/Library/Caches/TravisCI*.sqlite'
-# end
+namespace :bwoken do
+  desc 'Create bwoken skeleton folders'
+  task :init => [IPAD_DIR, RESULTS_DIR, EXAMPLE_COFFEE, EXAMPLE_VENDOR_JS]
+end
 
 desc 'Compile the workspace'
 task :build do
@@ -44,11 +43,31 @@ task :build do
   raise unless exit_status == 0
 end
 
-task :coffeescript do
-  Bwoken::Coffeescript.clean
-  Bwoken::Coffeescript.compile_all
+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}"
+  end
+end
+
+desc 'Compile coffeescript to javascript and copy vendor javascript'
+task :coffeescript => (COMPILED_COFFEE + COPIED_JAVASCRIPTS)
+
+CLEAN.include('integration/tmp/javascript')
+CLOBBER.include('integration/tmp')
+
+
+
+
 device_families = %w(iphone ipad)
 
 device_families.each do |device_family|

data/lib/bwoken/version.rb

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

data/lib/bwoken.rb

@@ -34,7 +34,7 @@ module Bwoken
     end
 
     def test_suite_path
-      Bwoken::Coffeescript.compiled_javascript_path
+      File.join(tmp_path, 'javascript')
     end
 
     def path_to_automation_template

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwoken
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
-  requirement: &70255276428720 !ruby/object:Gem::Requirement
+  requirement: &70103534295920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255276428720
+  version_requirements: *70103534295920
 - !ruby/object:Gem::Dependency
   name: colorful
-  requirement: &70255276427380 !ruby/object:Gem::Requirement
+  requirement: &70103534294320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255276427380
+  version_requirements: *70103534294320
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70255276426320 !ruby/object:Gem::Requirement
+  requirement: &70103534293180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255276426320
+  version_requirements: *70103534293180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70255276425800 !ruby/object:Gem::Requirement
+  requirement: &70103534292080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70255276425800
+  version_requirements: *70103534292080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70255276424840 !ruby/object:Gem::Requirement
+  requirement: &70103534290800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255276424840
+  version_requirements: *70103534290800
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70255276423820 !ruby/object:Gem::Requirement
+  requirement: &70103534289600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70255276423820
+  version_requirements: *70103534289600
 description: iOS UIAutomation Test Runner
 email:
 - brad@bendyworks.com
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1868550205244240029
+      hash: 4357248799734440989
 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: 1868550205244240029
+      hash: 4357248799734440989
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Runs your UIAutomation tests from the command line for both iPhone and iPad;