jasmine-headless-webkit 0.4.0 → 0.4.1

data/Rakefile

@@ -1,3 +1,5 @@
+include Rake::DSL if defined?(Rake::DSL)
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/bin/jasmine-headless-webkit

@@ -1,19 +1,25 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
+require 'rainbow'
 
 def gem_dir
   File.expand_path('../..', __FILE__)
 end
 
 $:.unshift(File.join(gem_dir, 'lib'))
+require 'jasmine/headless/errors'
+require 'jasmine/headless/runner'
+require 'jasmine/headless/options'
 
-puts "Running Jasmine specs..."
-
-require 'jasmine/headless/cli'
 begin
-  exit Jasmine::Headless::CLI.run
+  puts "Running Jasmine specs...".color(:white)
+  exit Jasmine::Headless::Runner.run(Jasmine::Headless::Options.from_command_line)
+rescue CoffeeScript::CompilationError
+  exit 1
 rescue StandardError => e
+  $stderr.puts "[%s] %s (%s)" % [ "jasmine-headless-webkit".color(:red), e.message.color(:white), e.class.name.color(:yellow) ]
+  $stderr.puts e.backtrace.collect { |line| "  #{line}" }.join("\n")
   exit 1
 end
 

data/lib/jasmine/files_list.rb

@@ -1,4 +1,13 @@
-require 'jasmine'
+begin
+  require 'jasmine'
+rescue NameError => e
+  if e.message['ActiveSupport::Concern']
+    $stderr.puts "[%s] %s (%s)" % [ "jasmine-gem".color(:red), e.message.color(:white), e.class.name.color(:yellow) ]
+    $stderr.puts "#{'Jasmine'.color(:red)} believes Rails 3 is available. Try using #{'Bundler'.color(:green)} and running via #{'bundle exec'.color(:green)}."
+  else
+    raise e
+  end
+end
 
 module Jasmine
   class FilesList
@@ -66,7 +75,7 @@ module Jasmine
 
     def ensure_coffeescript_run!(files)
       data = StringIO.new
-      files.each { |file| data << File.read(file) }
+      files.each { |file| data << File.read(file) << "\n" }
       data.rewind
 
       %{<script type="text/javascript">#{CoffeeScript.compile(data)}</script>}

data/lib/jasmine/headless/errors.rb

@@ -1,6 +1,9 @@
 module Jasmine
   module Headless
     class NoRunnerError < StandardError
+      def message
+        "The jasmine-headless-webkit specrunner (jasmine-webkit-specrunner) could not be found! Try reinstalling the gem."
+      end
     end
   end
 end

data/lib/jasmine/headless/options.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'getoptlong'
 
 module Jasmine
   module Headless

data/lib/jasmine-headless-webkit/version.rb

@@ -1,7 +1,7 @@
 module Jasmine
   module Headless
     module Webkit
-      VERSION = "0.4.0"
+      VERSION = "0.4.1"
     end
   end
 end

data/spec/lib/jasmine/files_list_spec.rb

@@ -129,7 +129,7 @@ describe Jasmine::FilesList do
 
         File.open('test.coffee', 'w') { |fh| fh.print "first" }
 
-        CoffeeScript.stubs(:compile).with() { |field| field.read == "first" }.returns("i compiled")
+        CoffeeScript.stubs(:compile).with() { |field| field.read == "first\n" }.returns("i compiled")
       end
 
       context '#files_to_html' do
@@ -172,7 +172,7 @@ describe Jasmine::FilesList do
 
       context '#files_to_html' do
         it "should create the right HTML" do
-          CoffeeScript.stubs(:compile).with() { |field| field.read == "firstsecond" }.returns("i compiled")
+          CoffeeScript.stubs(:compile).with() { |field| field.read == "first\nsecond\n" }.returns("i compiled")
 
           files_list.files_to_html.should == [
             %{<script type="text/javascript" src="test.js"></script>},
@@ -184,7 +184,7 @@ describe Jasmine::FilesList do
 
       context '#filtered_files_to_html' do
         it "should create the right HTML" do
-          CoffeeScript.stubs(:compile).with() { |field| field.read == "first" }.returns("i compiled")
+          CoffeeScript.stubs(:compile).with() { |field| field.read == "first\n" }.returns("i compiled")
 
           files_list.filtered_files_to_html.should == [
             %{<script type="text/javascript" src="test.js"></script>},

metadata

@@ -2,7 +2,7 @@
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - John Bintz
@@ -12,11 +12,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-18 00:00:00 -04:00
+date: 2011-06-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jasmine
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -24,10 +25,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: coffee-script
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,10 +36,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.2"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rainbow
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,7 +47,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 description: Run Jasmine specs headlessly
 email: 
@@ -81,7 +81,6 @@ files:
 - lib/jasmine-headless-webkit.rb
 - lib/jasmine-headless-webkit/version.rb
 - lib/jasmine/files_list.rb
-- lib/jasmine/headless/cli.rb
 - lib/jasmine/headless/errors.rb
 - lib/jasmine/headless/options.rb
 - lib/jasmine/headless/railtie.rb
@@ -113,7 +112,6 @@ files:
 - spec/jasmine/success_with_error/success_with_error.yml
 - spec/jasmine/success_with_error/success_with_error_spec.js
 - spec/lib/jasmine/files_list_spec.rb
-- spec/lib/jasmine/headless/cli_spec.rb
 - spec/lib/jasmine/headless/options_spec.rb
 - spec/lib/jasmine/headless/runner_spec.rb
 - spec/lib/jasmine/template_writer_spec.rb
@@ -132,18 +130,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -433867453609600622
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -433867453609600622
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -178,7 +170,6 @@ test_files:
 - spec/jasmine/success_with_error/success_with_error.yml
 - spec/jasmine/success_with_error/success_with_error_spec.js
 - spec/lib/jasmine/files_list_spec.rb
-- spec/lib/jasmine/headless/cli_spec.rb
 - spec/lib/jasmine/headless/options_spec.rb
 - spec/lib/jasmine/headless/runner_spec.rb
 - spec/lib/jasmine/template_writer_spec.rb

data/lib/jasmine/headless/cli.rb

@@ -1,17 +0,0 @@
-require 'jasmine/headless/runner'
-require 'jasmine/headless/options'
-require 'getoptlong'
-
-module Jasmine
-  module Headless
-    class CLI
-      def self.run
-        Runner.run(Options.from_command_line)
-      rescue NoRunnerError
-        puts "The Qt WebKit widget is not compiled! Try re-installing this gem."
-        1
-      end
-    end
-  end
-end
-

data/spec/lib/jasmine/headless/cli_spec.rb

@@ -1 +0,0 @@
-