jasmine-headless-webkit 0.8.0 → 0.8.1

data/lib/jasmine/headless/files_list.rb

@@ -20,7 +20,7 @@ module Jasmine::Headless
         Gem::Specification.each do |spec|
           path = File.join(spec.gem_dir, 'vendor/assets/javascripts')
 
-          @vendor_asset_paths << path if File.directory?(path)
+          @vendor_asset_paths << path if File.directory?(path) && !@vendor_asset_paths.include?(path)
         end
 
         @vendor_asset_paths
@@ -68,7 +68,11 @@ module Jasmine::Headless
       @potential_files_to_filter = []
 
       self.class.default_files.each do |file|
-        @required_files << sprockets_environment.find_asset(file, :bundle => false)
+        begin
+          @required_files << sprockets_environment.find_asset(file, :bundle => false)
+        rescue InvalidUniqueAsset => e
+          raise StandardError.new("Not an asset: #{file}")
+        end
       end
 
       use_config! if config?
@@ -91,9 +95,10 @@ module Jasmine::Headless
     def search_paths
       return @search_paths if @search_paths
 
-      @search_paths = [ Jasmine::Core.path ]
+      @search_paths = [ Jasmine::Core.path, Jasmine::Headless.root.join('vendor/assets/javascripts').to_s ]
       @search_paths += self.class.vendor_asset_paths
       @search_paths += src_dir.collect { |dir| File.expand_path(dir) }
+      @search_paths += asset_paths.collect { |dir| File.expand_path(dir) }
       @search_paths += spec_dir.collect { |dir| File.expand_path(dir) }
 
       @search_paths
@@ -228,6 +233,10 @@ module Jasmine::Headless
       @spec_dir ||= config_dir_or_pwd('spec_dir')
     end
 
+    def asset_paths
+      @asset_paths ||= config_dir_or_pwd('asset_paths')
+    end
+
     def spec_file_searches
       @searches['spec_files']
     end

data/lib/jasmine/headless/unique_asset_list.rb

@@ -1,7 +1,7 @@
 module Jasmine::Headless
   class UniqueAssetList < ::Array
     def <<(asset)
-      raise StandardError.new("Not an asset") if !asset.respond_to?(:logical_path)
+      raise InvalidUniqueAsset.new("Not an asset: #{asset.inspect}") if !asset.respond_to?(:logical_path)
 
       super if !self.any? { |other| asset.logical_path == other.logical_path }
     end
@@ -10,5 +10,7 @@ module Jasmine::Headless
       self.collect(&:to_a).flatten
     end
   end
+
+  class InvalidUniqueAsset < StandardError ; end
 end
 

data/lib/jasmine/headless/version.rb

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

data/lib/jasmine/headless.rb

@@ -1,32 +1,34 @@
 require 'pathname'
 
-module Jasmine::Headless
-  autoload :CommandLine, 'jasmine/headless/command_line'
-
-  autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache'
-  autoload :SpecFileAnalyzer, 'jasmine/headless/spec_file_analyzer'
-  autoload :CacheableAction, 'jasmine/headless/cacheable_action'
-  autoload :VERSION, 'jasmine/headless/version'
-  autoload :Runner, 'jasmine/headless/runner'
-  autoload :Options, 'jasmine/headless/options'
-  autoload :Task, 'jasmine/headless/task'
-
-  autoload :FilesList, 'jasmine/headless/files_list'
-  autoload :UniqueAssetList, 'jasmine/headless/unique_asset_list'
-
-  autoload :TemplateWriter, 'jasmine/headless/template_writer'
-
-  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 :Report, 'jasmine/headless/report'
-  autoload :ReportMessage, 'jasmine/headless/report_message'
-
-  class << self
-    def root
-      @root ||= Pathname(File.expand_path('../../..', __FILE__))
+module Jasmine
+  module Headless
+    autoload :CommandLine, 'jasmine/headless/command_line'
+
+    autoload :CoffeeScriptCache, 'jasmine/headless/coffee_script_cache'
+    autoload :SpecFileAnalyzer, 'jasmine/headless/spec_file_analyzer'
+    autoload :CacheableAction, 'jasmine/headless/cacheable_action'
+    autoload :VERSION, 'jasmine/headless/version'
+    autoload :Runner, 'jasmine/headless/runner'
+    autoload :Options, 'jasmine/headless/options'
+    autoload :Task, 'jasmine/headless/task'
+
+    autoload :FilesList, 'jasmine/headless/files_list'
+    autoload :UniqueAssetList, 'jasmine/headless/unique_asset_list'
+
+    autoload :TemplateWriter, 'jasmine/headless/template_writer'
+
+    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 :Report, 'jasmine/headless/report'
+    autoload :ReportMessage, 'jasmine/headless/report_message'
+
+    class << self
+      def root
+        @root ||= Pathname(File.expand_path('../../..', __FILE__))
+      end
     end
   end
 end

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

@@ -56,20 +56,24 @@ describe Jasmine::Headless::FilesList do
 
     let(:config) { {
       'src_dir' => src_dir,
-      'spec_dir' => spec_dir
+      'spec_dir' => spec_dir,
+      'asset_paths' => asset_paths
     } }
 
     let(:src_dir) { 'src dir' }
     let(:spec_dir) { 'spec dir' }
+    let(:asset_paths) { [] }
     let(:path) { 'path' }
 
     before do
       Jasmine::Headless::FilesList.stubs(:vendor_asset_paths).returns([])
     end
 
+    let(:vendor_path) { Jasmine::Headless.root.join('vendor/assets/javascripts').to_s }
+
     context 'no vendored gem paths' do
       it 'should take the src dir and spec dirs' do
-        files_list.search_paths.should == [ Jasmine::Core.path, File.expand_path(src_dir), File.expand_path(spec_dir) ]
+        files_list.search_paths.should == [ Jasmine::Core.path, vendor_path, File.expand_path(src_dir), File.expand_path(spec_dir) ]
       end
     end
 
@@ -79,18 +83,29 @@ describe Jasmine::Headless::FilesList do
       end
 
       it 'should add the vendor gem paths to the list' do
-        files_list.search_paths.should == [ Jasmine::Core.path, path, File.expand_path(src_dir), File.expand_path(spec_dir) ]
+        files_list.search_paths.should == [ Jasmine::Core.path, vendor_path, path, File.expand_path(src_dir), File.expand_path(spec_dir) ]
       end
     end
 
-    context 'src_dir is an array' do
+    context 'multiple dirs' do
       let(:dir_1) { 'dir 1' }
       let(:dir_2) { 'dir 2' }
 
-      let(:src_dir) { [ dir_1, dir_2 ] }
+      context 'src_dir is an array' do
+        let(:src_dir) { [ dir_1, dir_2 ] }
 
-      it 'should take the src dir and spec dirs' do
-        files_list.search_paths.should == [ Jasmine::Core.path, File.expand_path(dir_1), File.expand_path(dir_2), File.expand_path(spec_dir) ]
+        it 'should take the src dir and spec dirs' do
+          files_list.search_paths.should == [ Jasmine::Core.path, vendor_path, File.expand_path(dir_1), File.expand_path(dir_2), File.expand_path(spec_dir) ]
+        end
+      end
+
+      context 'asset_paths has entries' do
+        let(:src_dir) { dir_1 }
+        let(:asset_paths) { [ dir_2 ] }
+
+        it 'should take the src dir and spec dirs' do
+          files_list.search_paths.should == [ Jasmine::Core.path, vendor_path, File.expand_path(dir_1), File.expand_path(dir_2), File.expand_path(spec_dir) ]
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &2165048040 !ruby/object:Gem::Requirement
+  requirement: &2155294260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2165048040
+  version_requirements: *2155294260
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2165047320 !ruby/object:Gem::Requirement
+  requirement: &2155293840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165047320
+  version_requirements: *2155293840
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2165046600 !ruby/object:Gem::Requirement
+  requirement: &2155293380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165046600
+  version_requirements: *2155293380
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2165045900 !ruby/object:Gem::Requirement
+  requirement: &2155292960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165045900
+  version_requirements: *2155292960
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2165045140 !ruby/object:Gem::Requirement
+  requirement: &2155292460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,7 +67,7 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2165045140
+  version_requirements: *2155292460
 description: Run Jasmine specs headlessly
 email:
 - john@coswellproductions.com
@@ -232,18 +232,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4186613631936924069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4186613631936924069
 requirements: []
 rubyforge_project: jasmine-headless-webkit
 rubygems_version: 1.8.11
@@ -324,3 +318,4 @@ test_files:
 - spec/lib/jasmine/headless_spec.rb
 - spec/lib/qt/qmake_spec.rb
 - spec/spec_helper.rb
+has_rdoc: