jasmine-headless-webkit 0.6.1 → 0.6.2

data/lib/qt/qmake.rb

@@ -1,10 +1,13 @@
 require 'rbconfig'
+require 'rubygems/version'
 
 module Qt
   class NotInstalledError < StandardError; end
 
   class Qmake
     class << self
+      QMAKES = %w{qmake-qt4 qmake}
+
       def installed?
         path != nil
       end
@@ -29,7 +32,6 @@ module Qt
 
         check_make!
         check_qmake!
-        check_qmake_version!
 
         system command
         system %{make}
@@ -39,7 +41,7 @@ module Qt
       # We need integration tests for these!
       #
       def path
-        get_exe_path('qmake-qt4') || get_exe_path('qmake')
+        @path ||= best_qmake
       end
 
       def make_path
@@ -57,15 +59,24 @@ module Qt
         end
       end
 
-      def qt_version
-        @qt_version ||= %x{#{path} -v}.lines.to_a[1][%r{Using Qt version ([^ ]+) },1]
+      def qt_version_of(qmake_path)
+        Gem::Version.new(%x{#{qmake_path} -v}.lines.to_a[1][%r{Using Qt version ([^ ]+) },1])
       end
 
-      def qt_47_or_better?
-        return false if !qt_version
-        return true if (major = qt_version.split('.')[0].to_i) > 4
-        return false if major < 4
-        qt_version.split('.')[1].to_i >= 7
+      def best_qmake
+        if qmake_path = QMAKES.collect do |path|
+          result = nil
+          if qmake_path = get_exe_path(path)
+            if (qt_version = qt_version_of(qmake_path)) >= Gem::Version.create('4.7')
+              result = [ qmake_path, qt_version ]
+            end
+          end
+          result
+        end.compact.sort { |a, b| b.last <=> a.last }.first
+          qmake_path.first
+        else
+          nil
+        end
       end
 
       private
@@ -98,7 +109,7 @@ MSG
 
       def check_qmake!
         if !installed?
-          install_method = strip(
+          install_method = (
             case platform
             when :linux
               <<-MSG
@@ -107,7 +118,7 @@ Nokia's prebuilt binary at http://qt.nokia.com/downloads/
 MSG
             when :freebsd
               <<-MSG
-Install /usr/ports/devel/qmake4.
+Install /usr/ports/www/qt4-webkit and /usr/ports/devel/qmake4.
 MSG
             when :darwin
               <<-MSG
@@ -115,39 +126,12 @@ sudo port install qt4-mac (for the patient) or downloading Nokia's pre-built bin
 at http://qt.nokia.com/downloads/
 MSG
             end
-          )
+          ).strip
 
           $stderr.puts <<-MSG
-qmake is not installed. You'll need to install it to build #{@name}.
+qmake is not installed or is not the right version (#{@name} needs Qt 4.7 or above). 
+You'll need to install it to build #{@name}.
 #{install_method} should do it for you.
-MSG
-        end
-      end
-
-      def check_qmake_version!
-        if !qt_47_or_better?
-          install_method = strip(
-            case platform
-            when :linux
-              <<-MSG
-sudo apt-get install libqt4-dev qt4-qmake on Debian-based systems, or downloading
-Nokia's prebuilt binary at http://qt.nokia.com/downloads/
-MSG
-            when :freebsd
-              <<-MSG
-Install /usr/ports/www/qt4-webkit.
-MSG
-            when :darwin
-              <<-MSG
-sudo port install qt4-mac (for the patient) or downloading Nokia's pre-built binary
-at http://qt.nokia.com/downloads/
-MSG
-            end
-          )
-
-          $stderr.puts <<-MSG
-qmake is not version 4.7 or above (currently version #{qt_version}. You'll need to install version 4.7 or higher
-to build #{@name}. #{install_method} should do it for you.
 MSG
         end
       end

data/spec/bin/jasmine-headless-webkit_spec.rb

@@ -64,8 +64,6 @@ describe "jasmine-headless-webkit" do
     it "should not leave the page nor loop" do
       system %{bin/jasmine-headless-webkit -j spec/jasmine/leave_page/leave_page.yml --report #{report}}
       $?.exitstatus.should == 1
-
-      report.should be_a_report_containing(2, 0, false)
     end
   end
 

data/spec/javascripts/jasmine.headless-reporter_spec.coffee

@@ -14,3 +14,25 @@ describe 'HeadlessReporterResult', ->
 
     result = new HeadlessReporterResult('test', [ 'other', 'of', 'test' ])
     expect(result._findSpecLine().lineNumber).toEqual(10)
+
+describe 'jasmine.HeadlessReporter', ->
+  reporter = null
+
+  beforeEach ->
+    reporter = new jasmine.HeadlessReporter()
+
+  it 'should stop running specs if there are errors reported', ->
+    # otherwise it gets really confusing!
+
+    suite = { finish: -> null }
+    spec = new jasmine.Spec("env", suite, "test")
+
+    spyOn(reporter, 'hasError').andReturn(true)
+    spyOn(spec, 'finish')
+    spyOn(suite, 'finish')
+
+    reporter.reportSpecStarting(spec)
+    
+    expect(spec.finish).toHaveBeenCalled()
+    expect(suite.finish).toHaveBeenCalled()
+

data/spec/lib/jasmine/files_list_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 require 'jasmine/files_list'
 require 'fakefs/spec_helpers'
@@ -219,6 +221,7 @@ describe 'test', ->
   context 'yes', ->
     it 'should do something', ->
       "yes"
+      "PR.registerLangHandler(PR.createSimpleLexer([[\"com\",/^#[^\\n\\r]*/,null,\"#\"],[\"pln\",/^[\\t\\n\\r \\xa0]+/,null,\"\\t\\n\\r \xC2\\xa0\"],[\"str\",/^\"(?:[^\"\\\\]|\\\\[\\S\\s])*(?:\"|$)/,null,'\"']],[[\"kwd\",/^(?:ADS|AD|AUG|BZF|BZMF|CAE|CAF|CA|CCS|COM|CS|DAS|DCA|DCOM|DCS|DDOUBL|DIM|DOUBLE|DTCB|DTCF|DV|DXCH|EDRUPT|EXTEND|INCR|INDEX|NDX|INHINT|LXCH|MASK|MSK|MP|MSU|NOOP|OVSK|QXCH|RAND|READ|RELINT|RESUME|RETURN|ROR|RXOR|SQUARE|SU|TCR|TCAA|OVSK|TCF|TC|TS|WAND|WOR|WRITE|XCH|XLQ|XXALQ|ZL|ZQ|ADD|ADZ|SUB|SUZ|MPY|MPR|MPZ|DVP|COM|ABS|CLA|CLZ|LDQ|STO|STQ|ALS|LLS|LRS|TRA|TSQ|TMI|TOV|AXT|TIX|DLY|INP|OUT)\\s/,\n"
         SPEC
       end
 

data/spec/lib/qt/qmake_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'qt/qmake'
 require 'rbconfig'
+require 'rubygems/version'
 
 describe Qt::Qmake do
   describe '.make_installed?' do
@@ -64,29 +65,75 @@ describe Qt::Qmake do
     end
   end
 
-  describe '.qt_47_or_better?' do
-    subject { described_class }
-
+  describe '.best_qmake' do
     before do
-      Qt::Qmake.stubs(:qt_version).returns(version)
+      Qt::Qmake.stubs(:get_exe_path).with('qmake-qt4').returns(path_one)
+      Qt::Qmake.stubs(:get_exe_path).with('qmake').returns(path_two)
+
+      Qt::Qmake.stubs(:qt_version_of).with(path_one).returns(Gem::Version.create(version_one))
+      Qt::Qmake.stubs(:qt_version_of).with(path_two).returns(Gem::Version.create(version_two))
     end
-    
-    context 'no version' do
-      let(:version) { nil }
 
-      it { should_not be_qt_47_or_better }
+    subject { described_class.best_qmake }
+
+    let(:path_one) { nil }
+    let(:path_two) { nil }
+    let(:version_one) { nil }
+    let(:version_two) { nil }
+
+    context 'nothing found' do
+      it { should be_nil }
     end
 
-    context 'not better' do
-      let(:version) { '4.6.0' }
+    context 'one found' do
+      let(:path_one) { 'one' }
+
+      context 'not good' do
+        let(:version_one) { '4.5' }
+
+        it { should be_nil }
+      end
+
+      context 'good' do
+        let(:version_one) { '4.7' }
 
-      it { should_not be_qt_47_or_better }
+        it { should == path_one }
+      end
     end
 
-    context 'better' do
-      let(:version) { '4.7.0' }
+    context 'two found' do
+      let(:path_one) { 'one' }
+      let(:path_two) { 'two' }
+
+      context 'neither good' do
+        let(:version_one) { '4.5' }
+        let(:version_two) { '4.5' }
+
+        it { should be_nil }
+      end
+
+      context 'one good' do
+        let(:version_one) { '4.7' }
+        let(:version_two) { '4.5' }
+
+        it { should == path_one }
+      end
+
+      context 'both good' do
+        context 'one better' do
+          let(:version_one) { '4.7' }
+          let(:version_two) { '4.8' }
+
+          it { should == path_two }
+        end
+
+        context 'both same' do
+          let(:version_one) { '4.7' }
+          let(:version_two) { '4.7' }
 
-      it { should be_qt_47_or_better }
+          it { should == path_one }
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-26 00:00:00.000000000Z
+date: 2011-08-10 00:00:00.000000000 -04:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &2156835500 !ruby/object:Gem::Requirement
+  requirement: &70920300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +24,10 @@ dependencies:
         version: 1.1.beta
   type: :runtime
   prerelease: false
-  version_requirements: *2156835500
+  version_requirements: *70920300
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2156835000 !ruby/object:Gem::Requirement
+  requirement: &70920050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +35,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *2156835000
+  version_requirements: *70920050
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2156834620 !ruby/object:Gem::Requirement
+  requirement: &70919860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156834620
+  version_requirements: *70919860
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2156834160 !ruby/object:Gem::Requirement
+  requirement: &70919630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +57,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156834160
+  version_requirements: *70919630
 description: Run Jasmine specs headlessly
 email:
 - john@coswellproductions.com
@@ -76,6 +77,12 @@ files:
 - bin/jasmine-headless-webkit
 - dev-bin/hooks/pre-commit
 - dev-bin/install-hooks
+- ext/jasmine-webkit-specrunner/HeadlessSpecRunner/ConsoleOutput.cpp
+- ext/jasmine-webkit-specrunner/HeadlessSpecRunner/ConsoleOutput.h
+- ext/jasmine-webkit-specrunner/HeadlessSpecRunner/Page.cpp
+- ext/jasmine-webkit-specrunner/HeadlessSpecRunner/Page.h
+- ext/jasmine-webkit-specrunner/HeadlessSpecRunner/Runner.cpp
+- ext/jasmine-webkit-specrunner/HeadlessSpecRunner/Runner.h
 - ext/jasmine-webkit-specrunner/Info.plist
 - ext/jasmine-webkit-specrunner/extconf.rb
 - ext/jasmine-webkit-specrunner/specrunner.cpp
@@ -142,6 +149,7 @@ files:
 - spec/lib/jasmine/template_writer_spec.rb
 - spec/lib/qt/qmake_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -162,53 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jasmine-headless-webkit
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Run Jasmine specs headlessly in a WebKit browser
-test_files:
-- spec/bin/jasmine-headless-webkit_spec.rb
-- spec/jasmine/click_button/click_button.js
-- spec/jasmine/click_button/click_button.yml
-- spec/jasmine/click_button/click_button_spec.js
-- spec/jasmine/coffeescript_error/coffeescript_error.yml
-- spec/jasmine/coffeescript_error/spec.coffee
-- spec/jasmine/coffeescript_error/src.coffee
-- spec/jasmine/console_log/console_log.js
-- spec/jasmine/console_log/console_log.yml
-- spec/jasmine/console_log/console_log_spec.js
-- spec/jasmine/failure/failure.js
-- spec/jasmine/failure/failure.yml
-- spec/jasmine/failure/failure_spec.js
-- spec/jasmine/filtered_failure/failure_spec.js
-- spec/jasmine/filtered_failure/filtered_failure.yml
-- spec/jasmine/filtered_failure/src.js
-- spec/jasmine/filtered_failure/success_spec.js
-- spec/jasmine/filtered_success/filtered_success.yml
-- spec/jasmine/filtered_success/src.js
-- spec/jasmine/filtered_success/success_one_spec.js
-- spec/jasmine/filtered_success/success_other_file.js
-- spec/jasmine/filtered_success/success_two_spec.js
-- spec/jasmine/filtered_success_with_console/filtered_success.yml
-- spec/jasmine/filtered_success_with_console/src.js
-- spec/jasmine/filtered_success_with_console/success_one_spec.js
-- spec/jasmine/filtered_success_with_console/success_two_spec.js
-- spec/jasmine/leave_page/leave_page.js
-- spec/jasmine/leave_page/leave_page.yml
-- spec/jasmine/leave_page/leave_page_spec.js
-- spec/jasmine/success/success.js
-- spec/jasmine/success/success.yml
-- spec/jasmine/success/success_spec.js
-- spec/jasmine/success_with_error/success_with_error.js
-- spec/jasmine/success_with_error/success_with_error.yml
-- spec/jasmine/success_with_error/success_with_error_spec.js
-- spec/javascripts/jasmine.headless-reporter_spec.coffee
-- spec/javascripts/support/jasmine.yml
-- spec/javascripts/support/jquery-1.6.2.min.js
-- spec/lib/jasmine/files_list_spec.rb
-- spec/lib/jasmine/headless/options_spec.rb
-- spec/lib/jasmine/headless/runner_spec.rb
-- spec/lib/jasmine/headless/task_spec.rb
-- spec/lib/jasmine/template_writer_spec.rb
-- spec/lib/qt/qmake_spec.rb
-- spec/spec_helper.rb
+test_files: []