zfben_hanoi 0.0.1 → 0.0.2

data/bin/{hanoi → zfben_hanoi}

@@ -6,7 +6,7 @@ raise "Unknown path '#{path}'" unless File.directory?(path)
 templates_path = File.expand_path(File.dirname(__FILE__) + "/../templates")
 
 # Rakefile
-File.open(File.join(path, "Rakefile"), "a") { |f| f.write(File.readlines(File.join(templates_path, "fresh_rakefile")))}
+File.open(File.join(path, "Rakefile"), "a") { |f| f.write(File.read(File.join(templates_path, "fresh_rakefile")))}
 
 # JavaScript test directory
 name = File.directory?(File.join(path, "spec")) ? "spec" : "test"

data/lib/{hanoi → zfben_hanoi}/browsers/firefox.rb

@@ -4,7 +4,7 @@ class Firefox < Browser
   end
 
   def teardown
-    if macos?
+    if macos? || linux?
       system("killall firefox-bin")
     end
   end

data/lib/{hanoi → zfben_hanoi}/javascript_test_task.rb

@@ -1,5 +1,5 @@
 class JavaScriptTestTask < ::Rake::TaskLib
-  BROWSERS = %w( chrome safari firefox ie konqueror opera webkit ).freeze
+  BROWSERS = %w( firefox ).freeze
   attr_reader :sources_directory
 
   def initialize(name = :test)
@@ -45,7 +45,7 @@ class JavaScriptTestTask < ::Rake::TaskLib
 
           print "\nFinished in #{Time.now - t0} seconds."
           print @test_suite_results
-          browser.teardown
+          browser.teardown unless @test_suite_results.failed?
         else
           puts "\nSkipping #{browser}, not supported on this OS or not installed."
         end
@@ -55,7 +55,7 @@ class JavaScriptTestTask < ::Rake::TaskLib
       @server.shutdown
       t.join
 
-      exit 1 if @test_suite_results.failure? || @test_suite_results.error?
+      exit 1 if @test_suite_results.failed?
     end
   end
 
@@ -90,20 +90,8 @@ class JavaScriptTestTask < ::Rake::TaskLib
   def browser(browser)
     browser =
       case(browser)
-        when :chrome
-          Chrome.new
         when :firefox
           Firefox.new
-        when :safari
-          Safari.new
-        when :ie
-          InternetExplorer.new
-        when :konqueror
-          Konqueror.new
-        when :opera
-          Opera.new
-        when :webkit
-          Webkit.new
         else
           browser
       end

data/lib/zfben_hanoi/test_results.rb

@@ -0,0 +1,18 @@
+class TestResults
+  attr_reader :total, :passed, :failed, :filename
+  def initialize(query, filename)
+    @total = query['total'].to_i
+    @passed = query['passed'].to_i
+    @failed = query['failed'].to_i
+    @filename   = filename
+  end
+  
+  def failed?
+    @failed > 0
+  end
+  
+  def to_s
+    return "F" if failed?
+    "."
+  end
+end

data/lib/zfben_hanoi/test_suite_results.rb

@@ -0,0 +1,29 @@
+class TestSuiteResults
+  def initialize
+    @total = 0
+    @passed = 0
+    @failed = 0
+    @failed_files = []
+  end
+  
+  def <<(result)
+    @total += result.total
+    @passed += result.passed
+    @failed += result.failed
+    @filed_files.push(result.filename) if result.failed?
+  end
+  
+  def failed?
+    @failed > 0
+  end
+  
+  def to_s
+    str = ""
+    str << "\n  Filed: #{@failed_files.join(', ')}" if failed?
+    "#{str}\n#{summary}\n\n"
+  end
+  
+  def summary
+    "#{@total} tests, #{@passed} passed, #{@failed} failed."
+  end
+end

data/lib/zfben_hanoi.rb

@@ -1,16 +1,8 @@
-require "erb"
-require "webrick"
-require "rake/tasklib"
-require "hanoi/webrick"
-require "hanoi/browser"
-require "hanoi/browsers/chrome"
-require "hanoi/browsers/firefox"
-require "hanoi/browsers/internet_explorer"
-require "hanoi/browsers/konqueror"
-require "hanoi/browsers/webkit"
-require "hanoi/browsers/safari"
-require "hanoi/browsers/opera"
-require "hanoi/test_case"
-require "hanoi/test_results"
-require "hanoi/test_suite_results"
-require "hanoi/javascript_test_task"
+require 'erb'
+require 'webrick'
+require 'rake/tasklib'
+
+path = File.realpath(File.join(File.dirname(__FILE__), 'zfben_hanoi'))
+['webrick.rb', 'browser.rb', 'browsers/firefox.rb', 'test_case.rb', 'test_results.rb', 'test_suite_results.rb', 'javascript_test_task.rb'].each do |f|
+  require File.join(path, f)
+end

data/templates/assets/callback.js

@@ -2,11 +2,9 @@ _done = QUnit.done;
 if(QUnit.urlParams.resultsURL){
   QUnit.done = function(result){
     $.get(QUnit.urlParams.resultsURL, {
-      modules: result.total,
-      tests: result.total,
-      assertions: result.total,
-      failures: result.failed,
-      errors: result.failed
+      total: result.total,
+      passed: result.passed,
+      failed: result.failed
     });
     _done(arguments[0]);
   }

data/templates/fresh_rakefile

@@ -1,5 +1,5 @@
-require "rubygems"
-require "hanoi"
+require 'rubygems'
+require 'zfben_hanoi'
 
 namespace :test do
   desc "Runs all the JavaScript tests and collects the results"

data/zfben_hanoi.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "zfben_hanoi"
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.authors     = ["Ben"]
   s.email       = ["ben@zfben.com"]
   s.homepage    = "https://github.com/benz303/zfben_hanoi"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_hanoi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ description: ''
 email:
 - ben@zfben.com
 executables:
-- hanoi
+- zfben_hanoi
 extensions: []
 extra_rdoc_files: []
 files:
@@ -24,21 +24,15 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- bin/hanoi
-- lib/hanoi/browser.rb
-- lib/hanoi/browsers/chrome.rb
-- lib/hanoi/browsers/firefox.rb
-- lib/hanoi/browsers/internet_explorer.rb
-- lib/hanoi/browsers/konqueror.rb
-- lib/hanoi/browsers/opera.rb
-- lib/hanoi/browsers/safari.rb
-- lib/hanoi/browsers/webkit.rb
-- lib/hanoi/javascript_test_task.rb
-- lib/hanoi/test_case.rb
-- lib/hanoi/test_results.rb
-- lib/hanoi/test_suite_results.rb
-- lib/hanoi/webrick.rb
+- bin/zfben_hanoi
 - lib/zfben_hanoi.rb
+- lib/zfben_hanoi/browser.rb
+- lib/zfben_hanoi/browsers/firefox.rb
+- lib/zfben_hanoi/javascript_test_task.rb
+- lib/zfben_hanoi/test_case.rb
+- lib/zfben_hanoi/test_results.rb
+- lib/zfben_hanoi/test_suite_results.rb
+- lib/zfben_hanoi/webrick.rb
 - spec/browser_spec.rb
 - spec/browsers/chrome_spec.rb
 - spec/browsers/firefox_spec.rb

data/lib/hanoi/browsers/chrome.rb

@@ -1,35 +0,0 @@
-class Chrome < Browser
-  def initialize(path = nil)
-    @path = path || File.join(
-      ENV['UserPath'] || ENV['UserProfile'] || "C:/Documents and Settings/Administrator",
-      "AppData",
-      "Local",
-      "Google",
-      "Chrome",
-      "Application",
-      "chrome.exe"
-    )
-  end
-
-  def supported?
-    windows? || macos?
-  end
-
-  def installed?
-    if macos?
-      File.exist?("/Applications/#{name}.app")
-    else
-      super
-    end
-  end
-
-  def name
-    "Google Chrome"
-  end
-
-  def teardown
-    if macos?
-      system("killall #{escaped_name}")
-    end
-  end
-end

data/lib/hanoi/browsers/internet_explorer.rb

@@ -1,26 +0,0 @@
-class InternetExplorer < Browser
-  def setup
-    require 'win32ole' if windows?
-  end
-
-  def supported?
-    windows?
-  end
-
-  def runnable?
-    supported?
-  end
-
-  def visit(url)
-    if windows?
-      ie = WIN32OLE.new('InternetExplorer.Application')
-      ie.visible = true
-      ie.Navigate(url)
-      sleep 0.01 while ie.Busy || ie.ReadyState != 4
-    end
-  end
-
-  def name
-    "Internet Explorer"
-  end
-end

data/lib/hanoi/browsers/konqueror.rb

@@ -1,29 +0,0 @@
-class Konqueror < Browser
-  @@config_dir = File.join((ENV['HOME'] || ''), '.kde', 'share', 'config')
-  @@global_config = File.join(@@config_dir, 'kdeglobals')
-  @@konqueror_config = File.join(@@config_dir, 'konquerorrc')
-
-  def supported?
-    linux?
-  end
-
-  # Forces KDE's default browser to be Konqueror during the tests, and forces
-  # Konqueror to open external URL requests in new tabs instead of a new
-  # window.
-  def setup
-    cd @@config_dir, :verbose => false do
-      copy @@global_config, "#{@@global_config}.bak", :preserve => true, :verbose => false
-      copy @@konqueror_config, "#{@@konqueror_config}.bak", :preserve => true, :verbose => false
-      # Too lazy to write it in Ruby...  Is sed dependency so bad?
-      system "sed -ri /^BrowserApplication=/d  '#{@@global_config}'"
-      system "sed -ri /^KonquerorTabforExternalURL=/s:false:true: '#{@@konqueror_config}'"
-    end
-  end
-
-  def teardown
-    cd @@config_dir, :verbose => false do
-      copy "#{@@global_config}.bak", @@global_config, :preserve => true, :verbose => false
-      copy "#{@@konqueror_config}.bak", @@konqueror_config, :preserve => true, :verbose => false
-    end
-  end
-end

data/lib/hanoi/browsers/opera.rb

@@ -1,17 +0,0 @@
-class Opera < Browser
-  def initialize(path = 'c:\Program Files\Opera\Opera.exe')
-    @path = path
-  end
-  
-  def setup
-    if windows?
-      puts %{
-        MAJOR ANNOYANCE on Windows.
-        You have to shut down Opera manually after each test
-        for the script to proceed.
-        Any suggestions on fixing this is GREATLY appreciated!
-        Thank you for your understanding.
-      }
-    end
-  end
-end

data/lib/hanoi/browsers/safari.rb

@@ -1,5 +0,0 @@
-class Safari < Webkit
-  def initialize(path = File.join(ENV['ProgramFiles'] || 'c:\Program Files', '\Safari\Safari.exe'))
-    @path = path
-  end
-end

data/lib/hanoi/browsers/webkit.rb

@@ -1,35 +0,0 @@
-class Webkit < Browser
-  def initialize(path = File.join(ENV['WEBKIT_HOME'] || ENV['ProgramFiles'] || 'C:\Program Files', 'Webkit', 'webkit.exe'))
-    @path = path
-  end
-
-  def supported?
-    macos? || windows?
-  end
-
-  def setup
-    applescript(%(tell application "#{name}" to make new document)) if macos?
-  end
-
-  def visit(url)
-    if macos?
-      applescript(%(tell application "#{name}" to set URL of front document to "#{url}"))
-    elsif windows?
-      system("#{path} #{url}")
-    end
-  end
-
-  def teardown
-    #applescript('tell application "Safari" to close front document')
-
-    if macos?
-      system("killall #{escaped_name}")
-    end
-  end
-
-  private
-    def applescript(script)
-      raise "Can't run AppleScript on #{host}" unless macos?
-      system "osascript -e '#{script}' 2>&1 >/dev/null"
-    end
-end

data/lib/hanoi/test_results.rb

@@ -1,25 +0,0 @@
-class TestResults
-  attr_reader :modules, :tests, :assertions, :failures, :errors, :filename
-  def initialize(query, filename)
-    @modules    = query['modules'].to_i
-    @tests      = query['tests'].to_i
-    @assertions = query['assertions'].to_i
-    @failures   = query['failures'].to_i
-    @errors     = query['errors'].to_i
-    @filename   = filename
-  end
-  
-  def error?
-    @errors > 0
-  end
-  
-  def failure?
-    @failures > 0
-  end
-  
-  def to_s
-    return "E" if error?
-    return "F" if failure?
-    "."
-  end
-end

data/lib/hanoi/test_suite_results.rb

@@ -1,40 +0,0 @@
-class TestSuiteResults
-  def initialize
-    @modules    = 0
-    @tests      = 0
-    @assertions = 0
-    @failures   = 0
-    @errors     = 0
-    @error_files   = []
-    @failure_files = []
-  end
-  
-  def <<(result)
-    @modules    += result.modules
-    @tests      += result.tests
-    @assertions += result.assertions
-    @failures   += result.failures
-    @errors     += result.errors
-    @error_files.push(result.filename)   if result.error?
-    @failure_files.push(result.filename) if result.failure?
-  end
-  
-  def error?
-    @errors > 0
-  end
-  
-  def failure?
-    @failures > 0
-  end
-  
-  def to_s
-    str = ""
-    str << "\n  Failures: #{@failure_files.join(', ')}" if failure?
-    str << "\n  Errors:   #{@error_files.join(', ')}" if error?
-    "#{str}\n#{summary}\n\n"
-  end
-  
-  def summary
-    "#{@modules} modules, #{@tests} tests, #{@assertions} assertions, #{@failures} failures, #{@errors} errors."
-  end
-end