chinchilla 0.0.1 → 0.1.0

data/chinchilla.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.add_dependency 'capybara'
+  gem.add_dependency 'poltergeist'
+  gem.add_dependency 'colorize'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/assets/javascripts/{chinchilla.js → qunit-runner.js}

@@ -1,17 +1,19 @@
-var Chinchilla = {
+(function() {
+
+QUnit.Runner = {
   done: false,
   dots: "",
   results: []
 };
 
-Chinchilla.getResults = function() {
-  return JSON.stringify(Chinchilla.results);
+QUnit.Runner.getResults = function() {
+  return JSON.stringify(QUnit.Runner.results);
 };
 
 var currentTest = {};
 QUnit.testDone = function(results) {
-  Chinchilla.dots += (results.failed > 0 ? "F" : ".");
-  Chinchilla.results.push({
+  QUnit.Runner.dots += (results.failed > 0 ? "F" : ".");
+  QUnit.Runner.results.push({
     name: results.name,
     passed: results.failed === 0,
     message: currentTest.message
@@ -34,7 +36,9 @@ QUnit.log = function(results) {
 };
 
 QUnit.done = function(results) {
-  Chinchilla.done = true;
+  QUnit.Runner.done = true;
 };
 
 QUnit.config.autorun = false;
+
+})();

data/lib/chinchilla/runner/{test_runner.rb → test.rb}

@@ -1,11 +1,11 @@
 module Chinchilla
   class Runner
-    class TestRunner
-      attr_reader :runner, :test
+    class Test
+      attr_reader :runner, :url
 
-      def initialize(runner, test)
+      def initialize(runner, url)
         @runner = runner
-        @test = test
+        @url = url
       end
 
       def session
@@ -23,24 +23,35 @@ module Chinchilla
         passed?
       end
 
+      def colorize_dots(dots)
+        dots = dots.chars.map do |d|
+          case d
+          when 'E', 'F'; d.red
+          when 'P'; d.yellow
+          when '.'; d.green
+          else;     d
+          end
+        end
+        dots.join ''
+      end
+
       def examples
         @results ||= begin
-          session.visit(test.url)
-
-          previous_results = ""
+          session.visit(url)
 
-          session.wait_until(300) do
-            dots = session.evaluate_script('Chinchilla.dots')
-            io.print dots.sub(/^#{Regexp.escape(previous_results)}/, '')
-            io.flush
-            previous_results = dots
-            session.evaluate_script('Chinchilla.done')
-          end
+          dots_printed = 0
 
-          dots = session.evaluate_script('Chinchilla.dots')
-          io.print dots.sub(/^#{Regexp.escape(previous_results)}/, '')
+          begin
+            sleep 0.1
+            done, dots = session.evaluate_script('[QUnit.Runner.done, QUnit.Runner.dots]')
+            if dots
+              io.write colorize_dots(dots[dots_printed..-1])
+              io.flush
+              dots_printed = dots.length
+            end
+          end until done
 
-          JSON.parse(session.evaluate_script('Chinchilla.getResults()')).map do |row|
+          JSON.parse(session.evaluate_script('QUnit.Runner.getResults()')).map do |row|
             Example.new(row)
           end
         end

data/lib/chinchilla/runner.rb

@@ -1,16 +1,39 @@
 require 'chinchilla/runner/example'
-require 'chinchilla/runner/test_runner'
+require 'chinchilla/runner/test'
 
 module Chinchilla
   class Runner
-    attr_reader :suite, :io
+    def self.run(options={})
+      self.new(options).run
+    end
+
+    def initialize(options)
+      options[:urls] = [options.delete(:url)] if options.has_key?(:url)
+      @options = options
+    end
+
+    def io
+      @io ||= @options[:io] || STDOUT
+    end
+
+    def urls
+      @urls ||= @options[:urls] || ['/']
+    end
+
+    def driver
+      @driver ||= @options[:driver] || :poltergeist
+    end
+
+    def application
+      @application ||= @options[:application] || default_application
+    end
 
-    def initialize(io=STDOUT)
-      @io = io
+    def default_application
+      defined?(Rails) ? Rails.application : nil
     end
 
-    def test_runner(test)
-      TestRunner.new(self, test)
+    def tests
+      @tests ||= urls.map {|url| Test.new(self, url) }
     end
 
     def run
@@ -31,7 +54,7 @@ module Chinchilla
     end
 
     def examples
-      test_runners.map { |test_runner| test_runner.examples }.flatten
+      tests.map { |test| test.examples }.flatten
     end
 
     def failed_examples
@@ -39,31 +62,21 @@ module Chinchilla
     end
 
     def passed?
-      test_runners.all? { |test_runner| test_runner.passed? }
+      tests.all? { |test| test.passed? }
     end
 
     def dots
-      test_runners.map { |test_runner| test_runner.dots }.join
+      tests.map { |test| test.dots }.join
     end
 
     def failure_messages
       unless passed?
-        test_runners.map { |test_runner| test_runner.failure_messages }.compact.join("\n\n")
+        tests.map { |test| test.failure_messages }.compact.join("\n\n")
       end
     end
 
     def session
-      @session ||= Capybara::Session.new(Chinchilla.driver, Chinchilla.application)
-    end
-
-    def suite
-      @suite ||= Chinchilla::Suite.new(Chinchilla.mounted_at)
-    end
-
-    protected
-
-    def test_runners
-      @test_runners ||= suite.tests.map { |test| TestRunner.new(self, test) }
+      @session ||= Capybara::Session.new(driver, application)
     end
   end
 end

data/lib/chinchilla/version.rb

@@ -1,3 +1,3 @@
 module Chinchilla
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/chinchilla.rb

@@ -1,17 +1,14 @@
 require "chinchilla/version"
-require "chinchilla/test"
-require "chinchilla/suite"
-require "chinchilla/runner"
 
-module Chinchilla
-  class Engine < ::Rails::Engine
-  end
+require "capybara"
+require "capybara/poltergeist"
+require "colorize"
 
-  class << self
-    attr_accessor :application, :driver, :mounted_at
+require "chinchilla/runner"
 
-    def configure
-      yield self
+if defined?(::Rails)
+  module Chinchilla
+    class Engine < ::Rails::Engine
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chinchilla
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  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: colorize
+  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'
 description: QUnit test runner
 email:
 - paul@chavard.net
@@ -40,13 +72,11 @@ files:
 - README.md
 - Rakefile
 - chinchilla.gemspec
-- lib/assets/javascripts/chinchilla.js
+- lib/assets/javascripts/qunit-runner.js
 - lib/chinchilla.rb
 - lib/chinchilla/runner.rb
 - lib/chinchilla/runner/example.rb
-- lib/chinchilla/runner/test_runner.rb
-- lib/chinchilla/suite.rb
-- lib/chinchilla/test.rb
+- lib/chinchilla/runner/test.rb
 - lib/chinchilla/version.rb
 homepage: ''
 licenses: []
@@ -62,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1080271884884927784
+      hash: -3891497850019772180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -71,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1080271884884927784
+      hash: -3891497850019772180
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/chinchilla/suite.rb

@@ -1,13 +0,0 @@
-module Chinchilla
-  class Suite
-    attr_reader :mounted_at
-
-    def initialize(mounted_at)
-      @mounted_at = mounted_at
-    end
-
-    def tests
-      [Test.new(mounted_at)]
-    end
-  end
-end

data/lib/chinchilla/test.rb

@@ -1,9 +0,0 @@
-module Chinchilla
-  class Test
-    attr_reader :url
-
-    def initialize(url)
-      @url = url
-    end
-  end
-end