ghostbuster 0.0.4 → 0.1.0

data/README.md

@@ -1,6 +1,6 @@
 # Ghostbuster
 
-Automated browser testing via phantom.js, with all of the pain taken out!
+Automated browser testing via phantom.js, with all of the pain taken out! That means you get a *real browser*, with a *real DOM*, and can do *real testing*!
 
 ## Installation
 
@@ -8,7 +8,7 @@ To install first `gem install ghostbuster`. Once you've done that, you can run `
 
 ## Usage
 
-Once installed, you can simply use `ghostbuster path/to/tests` to run your tests. You should get some output that looks something liek this.
+Once installed, you can simply use `ghostbuster path/to/tests` to run your tests. You should get some output that looks something like this.
 
 ~~~~
 
@@ -70,11 +70,12 @@ The closures passed for matching have access to the real DOM node, however, they
 
 ## Before and after
 
-You can add an arbitrary number of before and after blocks to be run within the context of your test. Simple call `before` and `after` on your test to add them.
+You can add an arbitrary number of before and after blocks to be run within the context of your test. Simply call `before` and `after` on your test to add them. You have to call @succeed in the before block to continue processing your test.
 
 ~~~~
     phantom.test.before ->
       # do some setup
+      @succeed()
 
     phantom.test.after ->
       # do some teardown

data/bin/setup-ghostbuster

@@ -16,6 +16,8 @@ when /darwin/
         puts "Downloading and install phantom.js"
         system("curl #{phantom_url} -O") or raise("Unable to download from #{phantom_url}")
         system("open #{File.basename(phantom_url)}") or raise("Unable to open disk image")
+        puts("Giving time to mount the image...")
+        system("sleep 4")
       end
       system("cp -r /Volumes/phantomjs/phantomjs.app #{root}")
       File.exist?("#{root}/phantomjs.app") or raise("Unable to copy phantomjs from your disk image")

data/ghost/test_ghostmore.coffee

@@ -2,6 +2,7 @@ phantom.test.root = "http://127.0.0.1:4567"
 
 phantom.test.before ->
   @var = 'sample'
+  @succeed()
 
 phantom.test.add "Simple form", ->
   @get '/form', ->

data/lib/ghostbuster.coffee

@@ -19,8 +19,11 @@ class Test
       waiting = ->
         test.waitForAssertions(whenDone)
       setTimeout waiting, 10
-  run: (@callback) ->
-    @testBody.call(this)
+  actuallyRun: -> true
+  run: (callback) ->
+    @runWithFunction(@testBody, callback)
+  runWithFunction: (fn, @callback) ->
+    fn.call(this)
   get: (path, getCallback) ->
     @waitForAssertions ->
       test = this
@@ -176,7 +179,7 @@ class Body
 class PendingTest
   constructor: (@runner, @name) ->
   run: (callback) -> callback('pending')
-
+  actuallyRun: -> false
 class TestFile
   constructor: (@suite, @name) ->
     @tests = []
@@ -191,27 +194,39 @@ class TestFile
     for test in @tests
       throw("Identically named test already exists for name #{name} in #{@name}") if test.name == name
     @tests.push new Test(this, name, body)
-  run: (callback) ->
+  run: (callback, idx) ->
     throw "No root is defined" unless @root?
     testFile = this
     testStates = {}
     nextTest = (count) ->
-      test = testFile.tests[count]
-      before.call(test) for before in testFile.befores
-      try
-        if count < testFile.tests.length
+      if count >= testFile.tests.length
+        testFile.report(testStates)
+        callback()
+      else
+        test = testFile.tests[count]
+        if test.actuallyRun()
+          processBefore = (idx, callback) ->
+            if testFile.befores[idx]?
+              test.runWithFunction testFile.befores[idx], ->
+                processBefore(idx + 1, callback)
+            else
+              callback()
+            return
+          processBefore 0, ->
+            try
+              test.run (state) ->
+                testStates[test.name] = state
+                nextTest(count + 1)
+            catch e
+              testFile.lastErrors[test.name] = e.toString()
+              testStates[test.name] = false
+              nextTest(count + 1)
+            finally
+              after.call(test) for after in testFile.afters
+        else
           test.run (state) ->
             testStates[test.name] = state
             nextTest(count + 1)
-        else
-          testFile.report(testStates)
-          callback()
-      catch e
-        testFile.lastErrors[test.name] = e.toString()
-        testStates[test.name] = false
-        nextTest(count + 1)
-      finally
-        after.call(test) for before in testFile.afters
     nextTest(0)
   report: (testStates) ->
     success = 0

data/lib/ghostbuster.rb

@@ -12,18 +12,23 @@ class Ghostbuster
     @dir = File.directory?(@paths[0]) ? @paths[0] : File.dirname(@paths[0])
     @ghost_lib = File.expand_path(File.join(File.dirname(__FILE__), "ghostbuster.coffee"))
     @phantom_bin = File.join(ENV['HOME'], '.ghostbuster', 'phantomjs')
+    STDOUT.sync = true
   end
 
   def run
     files = Array(@paths).map{|path| Dir[path].to_a}.flatten.map{|f| File.expand_path(f)}
     status = 1
     Dir.chdir(@dir) do
-      sh "./start.sh"
-      sleep 2
+      spinner "Starting server" do
+        sh "./start.sh"
+        sleep 2
+      end
       begin
         _, status = Process.waitpid2 fork { exec("#{@phantom_bin} #{@ghost_lib} #{files.join(' ')}") }
       ensure
-        sh "./stop.sh"
+        spinner "Stopping server" do
+          sh "./stop.sh"
+        end
       end
     end
     exit(status)
@@ -32,4 +37,24 @@ class Ghostbuster
   def self.run(path)
     new(path).run
   end
+
+  private
+  def spinner(msg, &blk)
+    STDOUT.sync = true
+    print msg
+    print " "
+    spin = Thread.new do
+      i = 0
+      loop do
+        s = '/-\\|'
+        print s[i % 4].chr
+        i += 1
+        sleep 0.1
+        print "\b"
+      end
+    end
+    yield
+    spin.kill
+    puts
+  end
 end

data/lib/ghostbuster/version.rb

@@ -1,3 +1,3 @@
 class Ghostbuster
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ghostbuster
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Josh Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 -07:00
+date: 2011-08-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency