jasmine-headless-webkit 0.8.1 → 0.8.3

data/.gitignore

@@ -15,3 +15,4 @@ jhw-test
 _site/
 jhw.*.html
 coverage/
+tmp/

data/lib/jasmine/headless.rb

@@ -2,6 +2,9 @@ require 'pathname'
 
 module Jasmine
   module Headless
+    
+    EXCLUDED_FORMATS = %w{less sass scss erb str}
+    
     autoload :CommandLine, 'jasmine/headless/command_line'
 
     autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache'
@@ -16,11 +19,14 @@ module Jasmine
     autoload :UniqueAssetList, 'jasmine/headless/unique_asset_list'
 
     autoload :TemplateWriter, 'jasmine/headless/template_writer'
+    
+    autoload :FileChecker, 'jasmine/headless/file_checker'
 
     autoload :CoffeeTemplate, 'jasmine/headless/coffee_template'
     autoload :JSTemplate, 'jasmine/headless/js_template'
     autoload :JSTTemplate, 'jasmine/headless/jst_template'
     autoload :CSSTemplate, 'jasmine/headless/css_template'
+    autoload :NilTemplate, 'jasmine/headless/nil_template'
 
     autoload :Report, 'jasmine/headless/report'
     autoload :ReportMessage, 'jasmine/headless/report_message'

data/lib/jasmine/headless/coffee_template.rb

@@ -3,11 +3,17 @@ require 'rainbow'
 
 module Jasmine::Headless
   class CoffeeTemplate < Tilt::Template
+    include Jasmine::Headless::FileChecker
+    
     self.default_mime_type = 'application/javascript'
 
     def prepare ; end
 
     def evaluate(scope, locals, &block)
+      if bad_format?(file)
+        alert_bad_format(file)
+        return ''
+      end
       begin
         cache = Jasmine::Headless::CoffeeScriptCache.new(file)
         source = cache.handle

data/lib/jasmine/headless/css_template.rb

@@ -2,11 +2,16 @@ require 'tilt/template'
 
 module Jasmine::Headless
   class CSSTemplate < Tilt::Template
+    include Jasmine::Headless::FileChecker
     self.default_mime_type = 'text/css'
 
     def prepare ; end
 
     def evaluate(scope, locals, &block)
+      if bad_format?(file)
+        alert_bad_format(file)
+        return ''
+      end
       file ? %{<link rel="stylesheet" href="#{file}" type="text/css" />} : data
     end
   end

data/lib/jasmine/headless/file_checker.rb

@@ -0,0 +1,21 @@
+module Jasmine::Headless::FileChecker
+  def bad_format?(file)
+    return if file.nil?
+
+    ::Jasmine::Headless::EXCLUDED_FORMATS.any? do |format|
+      file[%r{\.#{format}(\.|$)}]
+    end
+  end
+  
+  def alert_bad_format(file)
+    puts "[%s] %s: %s" % [ 'Skipping File'.color(:red), file.color(:yellow), "unsupported format".color(:white) ]
+  end
+
+  def alert_if_bad_format?(file)
+    if result = bad_format?(file)
+      alert_bad_format(file)
+    end
+
+    result
+  end
+end

data/lib/jasmine/headless/files_list.rb

@@ -7,6 +7,8 @@ require 'sprockets/engines'
 
 module Jasmine::Headless
   class FilesList
+    include FileChecker
+
     class << self
       def vendor_asset_paths
         return @vendor_asset_paths if @vendor_asset_paths
@@ -39,8 +41,8 @@ module Jasmine::Headless
 
         # ...and unregister ones we don't want/need
         Sprockets.instance_eval do
-          %w{less sass scss erb str}.each do |extension|
-            @engines.delete(".#{extension}")
+          EXCLUDED_FORMATS.each do |extension|
+            register_engine ".#{extension}", Jasmine::Headless::NilTemplate
           end
 
           register_engine '.coffee', Jasmine::Headless::CoffeeTemplate
@@ -53,6 +55,12 @@ module Jasmine::Headless
       def default_files
         %w{jasmine.js jasmine-html jasmine.css jasmine-extensions intense headless_reporter_result jasmine.HeadlessConsoleReporter jsDump beautify-html}
       end
+
+      def extension_filter
+        extensions = (%w{.js .css} + Sprockets.engine_extensions)
+
+        %r{(#{extensions.join('|')})$}
+      end
     end
 
     PLEASE_WAIT_IM_WORKING_TIME = 2
@@ -118,7 +126,10 @@ module Jasmine::Headless
       if is_outside_scope = !spec_filter.empty?
         is_outside_scope = spec_dir.any? do |dir|
           spec_file_searches.any? do |search|
-            !spec_files.any? { |file| File.fnmatch?(File.join(dir, search), file) }
+            !spec_files.any? do |file|
+              target = File.join(dir, search)
+              File.fnmatch?(target, file) || File.fnmatch?(target.gsub(%{^**/}, ''), file)
+            end
           end
         end
       end
@@ -208,11 +219,17 @@ module Jasmine::Headless
     end
 
     def expanded_dir(path)
-      Dir[path].find_all { |file| file[extension_filter] }.collect { |file| File.expand_path(file) }.find_all { |path| File.file?(path) }
+      Dir[path].find_all { |file|
+        file[extension_filter] && !alert_if_bad_format?(file)
+      }.collect {
+        |file| File.expand_path(file)
+      }.find_all {
+        |path| File.file?(path)
+      }
     end
 
     def extension_filter
-      %r{(#{(%w{.js .css} + Sprockets.engine_extensions).join('|')})$}
+      self.class.extension_filter
     end
 
     def add_path(path, type)

data/lib/jasmine/headless/js_template.rb

@@ -2,11 +2,16 @@ require 'tilt/template'
 
 module Jasmine::Headless
   class JSTemplate < Tilt::Template
+    include Jasmine::Headless::FileChecker
     self.default_mime_type = 'application/javascript'
 
     def prepare ; end
 
     def evaluate(scope, locals, &block)
+      if bad_format?(file)
+        alert_bad_format(file)
+        return ''
+      end
       if data[%r{^<script type="text/javascript"}]
         data
       else

data/lib/jasmine/headless/jst_template.rb

@@ -2,7 +2,12 @@ require 'sprockets/jst_processor'
 
 module Jasmine::Headless
   class JSTTemplate < Sprockets::JstProcessor
+    include Jasmine::Headless::FileChecker
     def evaluate(*args)
+      if bad_format?(file)
+        alert_bad_format(file)
+        return ''
+      end
       %{<script type="text/javascript">#{super}</script>}
     end
   end

data/lib/jasmine/headless/nil_template.rb

@@ -0,0 +1,14 @@
+require 'tilt/template'
+require 'rainbow'
+
+module Jasmine::Headless
+  class NilTemplate < Tilt::Template
+    
+    def prepare ; end
+
+    def evaluate(scope, locals, &block)
+      return ''
+    end
+  end
+end
+

data/lib/jasmine/headless/runner.rb

@@ -78,8 +78,14 @@ module Jasmine
         )
 
         @_targets = template_writer.write!(files_list)
+
         run_targets = @_targets.dup
-        run_targets.pop if (!@options[:full_run] && files_list.filtered?) || files_list.has_spec_outside_scope?
+
+        if run_targets.length == 2
+          if (!@options[:full_run] && files_list.filtered?) || files_list.has_spec_outside_scope?
+            run_targets.pop
+          end
+        end
 
         system jasmine_command(run_targets)
 

data/lib/jasmine/headless/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Headless
-    VERSION = "0.8.1"
+    VERSION = "0.8.3"
   end
 end

data/spec/integration/sprockets_spec.rb

@@ -4,16 +4,20 @@ describe 'sprockets' do
   it 'should pull in the code via sprockets' do
     files = %x{bin/jasmine-headless-webkit -l -j spec/jasmine/with_sprockets_includes/with_sprockets_includes.yml}
     $?.exitstatus.should == 0
-
     files.lines.to_a.should contain_in_order_in_file_list(
+      'assets/application.js.erb: unsupported format',
       'vendor/assets/javascripts/jquery.js',
       'templates/that.jst.ejs',
       'templates/this.jst',
+      'things/jquery.string.js',
       'assets/things/required.js',
       'assets/things/code.js',
       'assets/things/subcode/more_code.js',
       'spec_helper.js',
       'spec/things/code_spec.js'
     )
+
+    files.lines.to_a.any? { |line| line['assets/jquery.string.js: unsupported format'] }.should be_false
   end
 end
+

data/spec/jasmine/with_sprockets_includes/assets/things/required.js

@@ -1,2 +1,3 @@
 //= require 'jquery'
+//= require 'things/jquery.string'
 

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Jasmine::Headless::FileChecker do
+  include FakeFS::SpecHelpers
+
+  let(:test_class) do
+    object = Object.new
+    object.class.send(:include, Jasmine::Headless::FileChecker)
+    object
+  end
+
+  context "bad_format?" do
+    it "should return false wth correct format" do
+      test_class.bad_format?('foobar.js').should be_false
+    end
+
+    it "should return false wth wrong format" do
+      test_class.bad_format?('foobar.js.erb').should be_true
+    end
+
+    it "should check for the whole extension" do
+      test_class.bad_format?('foobar.string.js').should be_false
+    end
+  end
+end

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

@@ -204,15 +204,23 @@ describe Jasmine::Headless::FilesList do
       10.times do |index|
         File.open(File.join(dir, "file-#{index}.js"), 'wb')
       end
+
+      File.open(File.join(dir, 'file.js.erb'), 'wb')
     end
 
-    it 'should load spec files in a random order' do
+    before do
       files_list.send(:add_files, [ '*' ], 'spec_files', [ dir ])
+    end
 
+    it 'should load spec files in a random order' do
       files_list.files.collect { |name| name[%r{\d+}] }.should == %w{6 7 1 0 5 3 4 8 2 9}
 
       FileUtils.rm_rf dir
     end
+
+    it 'should not load an excluded format' do
+      files_list.files.any? { |file| file['.erb'] }.should be_false
+    end
   end
 end
 

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

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Jasmine::Headless::NilTemplate do
+  include FakeFS::SpecHelpers
+
+  let(:template) { described_class.new(file) { data } }
+  let(:file) { 'file' }
+  let(:data) { '' }
+
+  subject { template.render }
+
+  before do
+    File.open(file, 'wb') if file
+  end
+
+  context "no file'" do
+    let(:file) { nil }
+
+    it { should == data }
+  end
+
+  context 'file' do
+    it { should == '' }
+  end
+
+  context 'script as first thing' do
+    let(:data) { '' }
+
+    it { should == data }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000Z
+date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &2155294260 !ruby/object:Gem::Requirement
+  requirement: &2165681500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2155294260
+  version_requirements: *2165681500
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2155293840 !ruby/object:Gem::Requirement
+  requirement: &2165681040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155293840
+  version_requirements: *2165681040
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2155293380 !ruby/object:Gem::Requirement
+  requirement: &2165680320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155293380
+  version_requirements: *2165680320
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2155292960 !ruby/object:Gem::Requirement
+  requirement: &2165679860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155292960
+  version_requirements: *2165679860
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2155292460 !ruby/object:Gem::Requirement
+  requirement: &2165678120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,7 +67,7 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2155292460
+  version_requirements: *2165678120
 description: Run Jasmine specs headlessly
 email:
 - john@coswellproductions.com
@@ -110,9 +110,11 @@ files:
 - lib/jasmine/headless/command_line.rb
 - lib/jasmine/headless/css_template.rb
 - lib/jasmine/headless/errors.rb
+- lib/jasmine/headless/file_checker.rb
 - lib/jasmine/headless/files_list.rb
 - lib/jasmine/headless/js_template.rb
 - lib/jasmine/headless/jst_template.rb
+- lib/jasmine/headless/nil_template.rb
 - lib/jasmine/headless/options.rb
 - lib/jasmine/headless/railtie.rb
 - lib/jasmine/headless/report.rb
@@ -179,6 +181,7 @@ files:
 - spec/jasmine/success_with_error/success_with_error_spec.js
 - spec/jasmine/with_sprockets_includes/assets/application.js.erb
 - spec/jasmine/with_sprockets_includes/assets/things/code.js
+- spec/jasmine/with_sprockets_includes/assets/things/jquery.string.js
 - spec/jasmine/with_sprockets_includes/assets/things/required.js
 - spec/jasmine/with_sprockets_includes/assets/things/subcode/more_code.js
 - spec/jasmine/with_sprockets_includes/assets/things/templates/that.jst.ejs
@@ -194,9 +197,11 @@ files:
 - spec/lib/jasmine/headless/coffee_script_cache_spec.rb
 - spec/lib/jasmine/headless/coffee_template_spec.rb
 - spec/lib/jasmine/headless/css_template_spec.rb
+- spec/lib/jasmine/headless/file_checker_spec.rb
 - spec/lib/jasmine/headless/files_list_spec.rb
 - spec/lib/jasmine/headless/js_template_spec.rb
 - spec/lib/jasmine/headless/jst_template_spec.rb
+- spec/lib/jasmine/headless/nil_template_spec.rb
 - spec/lib/jasmine/headless/options_spec.rb
 - spec/lib/jasmine/headless/report_message/spec_spec.rb
 - spec/lib/jasmine/headless/report_spec.rb
@@ -232,12 +237,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3207600471375665921
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3207600471375665921
 requirements: []
 rubyforge_project: jasmine-headless-webkit
 rubygems_version: 1.8.11
@@ -289,6 +300,7 @@ test_files:
 - spec/jasmine/success_with_error/success_with_error_spec.js
 - spec/jasmine/with_sprockets_includes/assets/application.js.erb
 - spec/jasmine/with_sprockets_includes/assets/things/code.js
+- spec/jasmine/with_sprockets_includes/assets/things/jquery.string.js
 - spec/jasmine/with_sprockets_includes/assets/things/required.js
 - spec/jasmine/with_sprockets_includes/assets/things/subcode/more_code.js
 - spec/jasmine/with_sprockets_includes/assets/things/templates/that.jst.ejs
@@ -304,9 +316,11 @@ test_files:
 - spec/lib/jasmine/headless/coffee_script_cache_spec.rb
 - spec/lib/jasmine/headless/coffee_template_spec.rb
 - spec/lib/jasmine/headless/css_template_spec.rb
+- spec/lib/jasmine/headless/file_checker_spec.rb
 - spec/lib/jasmine/headless/files_list_spec.rb
 - spec/lib/jasmine/headless/js_template_spec.rb
 - spec/lib/jasmine/headless/jst_template_spec.rb
+- spec/lib/jasmine/headless/nil_template_spec.rb
 - spec/lib/jasmine/headless/options_spec.rb
 - spec/lib/jasmine/headless/report_message/spec_spec.rb
 - spec/lib/jasmine/headless/report_spec.rb
@@ -318,4 +332,3 @@ test_files:
 - spec/lib/jasmine/headless_spec.rb
 - spec/lib/qt/qmake_spec.rb
 - spec/spec_helper.rb
-has_rdoc: