jasmine-headless-webkit 0.8.4 → 0.9.0.rc1

data/features/steps/then/runner/it_should_have_exit_status.rb

@@ -0,0 +1,3 @@
+Then /^the runner should have an exit status of (\d+)$/ do |exit_status|
+  @result.should == exit_status.to_i
+end

data/features/steps/then/runner/it_should_include_report_file.rb

@@ -0,0 +1,4 @@
+Then /^the command to run the runner should include the report file "([^"]*)"$/ do |file|
+  @runner.jasmine_command.should include("-r #{file}")
+end
+

data/features/steps/then/runner/it_should_not_include_report_file.rb

@@ -0,0 +1,3 @@
+Then /^the command to run the runner should not include a report file$/ do
+  @runner.jasmine_command.should_not include('-r')
+end

data/features/steps/then/templates/it_should_use_reporter.rb

@@ -0,0 +1,6 @@
+Then /^the template should use the "([^"]*)" reporter to "([^"]*)"$/ do |reporter, target|
+  output = @template_writer.render
+
+  output.should include(%{jasmine.HeadlessReporter.#{reporter}("#{target}")})
+end
+

data/features/steps/when/i_delete_file.rb

@@ -0,0 +1,3 @@
+When /^I delete the file "([^"]*)"$/ do |file|
+  FileUtils.rm_f(file)
+end

data/features/steps/when/i_get_runner.rb

@@ -0,0 +1,4 @@
+When /^I get a runner$/ do
+  @runner = Jasmine::Headless::Runner.new(@options)
+end
+

data/features/steps/when/i_get_template_writer.rb

@@ -0,0 +1,4 @@
+When /^I get a template writer$/ do
+  @template_writer = Jasmine::Headless::TemplateWriter.new(@runner)
+end
+

data/features/steps/when/i_run_executable.rb

@@ -0,0 +1,4 @@
+When /^I run `(.*)`$/ do |command|
+  @output = `#{command}`
+end
+

data/features/steps/when/i_run_runner.rb

@@ -0,0 +1,4 @@
+When /^I run the runner$/ do
+  @result = @runner.run
+end
+

data/features/support/env.rb

@@ -0,0 +1,7 @@
+require 'jasmine-headless-webkit'
+
+After do
+  FileUtils.rm_f 'spec/report.txt'
+  FileUtils.rm_f 'spec/runner.html'
+end
+

data/lib/jasmine/headless/file_checker.rb

@@ -1,14 +1,18 @@
 module Jasmine::Headless::FileChecker
+  def excluded_formats
+    ::Jasmine::Headless::EXCLUDED_FORMATS
+  end
+
   def bad_format?(file)
     return if file.nil?
 
-    ::Jasmine::Headless::EXCLUDED_FORMATS.any? do |format|
+    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) ]
+    Jasmine::Headless.warn("[%s] %s: %s" % [ 'Skipping File'.color(:red), file.color(:yellow), "unsupported format".color(:white) ])
   end
 
   def alert_if_bad_format?(file)

data/lib/jasmine/headless/files_list.rb

@@ -39,14 +39,23 @@ module Jasmine::Headless
       def reset!
         @asset_paths = nil
 
-        # register haml-sprockets if it's available...
-        %w{haml-sprockets}.each do |library|
+        # register haml-sprockets and handlebars_assets if it's available...
+        %w{haml-sprockets handlebars_assets}.each do |library|
           begin
             require library
           rescue LoadError
           end
         end
 
+        if ENV['JHW_ENV']
+          begin
+            require 'bundler'
+
+            Bundler.require(ENV['JHW_ENV'].to_sym)
+          rescue LoadError
+          end
+        end
+
         # ...and unregister ones we don't want/need
         Sprockets.instance_eval do
           EXCLUDED_FORMATS.each do |extension|
@@ -61,7 +70,10 @@ module Jasmine::Headless
       end
 
       def default_files
-        %w{jasmine.js jasmine-html jasmine.css jasmine-extensions intense headless_reporter_result jasmine.HeadlessConsoleReporter jsDump beautify-html}
+        %w{jasmine.js jasmine-html jasmine.css jasmine-extensions
+           intense headless_reporter_result jasmine.HeadlessReporter
+           jasmine.HeadlessReporter.ConsoleBase
+           jsDump beautify-html}
       end
 
       def extension_filter
@@ -73,25 +85,33 @@ module Jasmine::Headless
 
     PLEASE_WAIT_IM_WORKING_TIME = 2
 
-    attr_reader :required_files, :potential_files_to_filter
+    attr_reader :options, :required_files, :potential_files_to_filter
 
     def initialize(options = {})
       @options = options
 
-      Kernel.srand(@options[:seed]) if @options[:seed]
+      Kernel.srand(options[:seed]) if options[:seed]
 
       @required_files = UniqueAssetList.new
       @potential_files_to_filter = []
 
+      load_initial_assets
+
+      use_config if config?
+    end
+
+    def load_initial_assets
       self.class.default_files.each do |file|
         begin
-          @required_files << sprockets_environment.find_asset(file, :bundle => false)
+          add_path(file)
         rescue InvalidUniqueAsset => e
           raise StandardError.new("Not an asset: #{file}")
         end
       end
 
-      use_config! if config?
+      (options[:reporters] || []).each do |reporter, identifier, file|
+        add_path("jasmine.HeadlessReporter.#{reporter}")
+      end
     end
 
     def files
@@ -117,6 +137,7 @@ module Jasmine::Headless
       @search_paths += asset_paths.collect { |dir| File.expand_path(dir) }
       @search_paths += spec_dir.collect { |dir| File.expand_path(dir) }
 
+      @search_paths.uniq!
       @search_paths
     end
 
@@ -194,7 +215,7 @@ module Jasmine::Headless
       'spec_files' => 'spec_dir'
     }
 
-    def use_config!
+    def use_config
       @config = @options[:config].dup
       @searches = {}
       @potential_files_to_filter = []
@@ -207,13 +228,13 @@ module Jasmine::Headless
     end
 
     def add_files(patterns, type, dirs)
-      dirs.product(patterns).each do |search|
-        files = expanded_dir(File.join(*search))
+      patterns.each do |pattern|
+        dirs.collect { |dir| expanded_dir(File.join(dir, pattern)) }.each do |files|
+          files.sort! { |a, b| Kernel.rand(3) - 1 } if type == 'spec_files'
 
-        files.sort! { |a, b| Kernel.rand(3) - 1 } if type == 'spec_files'
-
-        files.each do |path|
-          add_path(path, type)
+          files.each do |path|
+            add_path(path, type)
+          end
         end
       end
 
@@ -240,7 +261,7 @@ module Jasmine::Headless
       self.class.extension_filter
     end
 
-    def add_path(path, type)
+    def add_path(path, type = nil)
       asset = sprockets_environment.find_asset(path)
 
       @required_files << asset
@@ -251,7 +272,7 @@ module Jasmine::Headless
     end
 
     def src_dir
-      @src_dir ||= config_dir_or_pwd('src_dir')
+      @src_dir ||= config_dir_or_pwd('src_dir') + asset_paths
     end
 
     def spec_dir
@@ -259,7 +280,7 @@ module Jasmine::Headless
     end
 
     def asset_paths
-      @asset_paths ||= config_dir_or_pwd('asset_paths')
+      @asset_paths ||= config_dir('asset_paths')
     end
 
     def spec_file_searches
@@ -267,9 +288,15 @@ module Jasmine::Headless
     end
 
     def config_dir_or_pwd(dir)
-      found_dir = (@options[:config] && @options[:config][dir]) || Dir.pwd
+      if (found = config_dir(dir)).empty?
+        found = [ Dir.pwd ]
+      end
+
+      found
+    end
 
-      [ found_dir ].flatten.collect { |dir| File.expand_path(dir) }
+    def config_dir(dir)
+      [ @options[:config] && @options[:config][dir] ].flatten.compact.collect { |dir| File.expand_path(dir) }
     end
 
     def filter_for_requested_specs(files)

data/lib/jasmine/headless/options.rb

@@ -13,16 +13,21 @@ module Jasmine
         :remove_html_file => true,
         :runner_output_filename => false,
         :jasmine_config => 'spec/javascripts/support/jasmine.yml',
-        :report => false,
         :do_list => false,
         :full_run => true,
         :enable_cache => true,
-        :files => []
+        :files => [],
+        :reporters => [ [ 'Console' ] ],
+        :quiet => false,
+        :use_server => false,
+        :server_port => nil
       }
 
       DEFAULTS_FILE = File.join(Dir.pwd, '.jasmine-headless-webkit')
       GLOBAL_DEFAULTS_FILE = File.expand_path('~/.jasmine-headless-webkit')
 
+      REPORT_DEPRECATED_MESSAGE = "--report is deprecated. Use --format HeadlessFileReporter --out <filename>"
+
       def self.from_command_line
         options = new
         options.process_command_line_args
@@ -35,6 +40,7 @@ module Jasmine
         srand
         @options[:seed] = rand(10000)
         read_defaults_files
+
         opts.each { |k, v| @options[k] = v if v }
       end
 
@@ -53,7 +59,10 @@ module Jasmine
         when '--keep'
           @options[:remove_html_file] = false
         when '--report'
-          @options[:report] = arg
+          warn REPORT_DEPRECATED_MESSAGE
+
+          add_reporter('File', arg)
+          add_reporter('Console')
         when '--runner-out'
           @options[:runner_output_filename] = arg
         when '--jasmine-config', '-j'
@@ -62,8 +71,22 @@ module Jasmine
           @options[:full_run] = false
         when '--list', '-l'
           @options[:do_list] = true
+        when '--quiet', '-q'
+          @options[:quiet] = true
         when '--seed'
           @options[:seed] = arg.to_i
+        when '--format', '-f'
+          add_reporter(arg)
+        when '--use-server'
+          @options[:use_server] = true
+        when '--server-port'
+          @options[:server_port] = arg.to_i
+        when '--out'
+          add_reporter_file(arg)
+        when '-h', '--help'
+          print_help
+
+          exit
         end
       end
 
@@ -80,18 +103,103 @@ module Jasmine
           [ '--colors', '-c', GetoptLong::NO_ARGUMENT ],
           [ '--no-colors', GetoptLong::NO_ARGUMENT ],
           [ '--cache', GetoptLong::NO_ARGUMENT ],
-          [ '--no-t stcache', GetoptLong::NO_ARGUMENT ],
+          [ '--no-cache', GetoptLong::NO_ARGUMENT ],
           [ '--keep', GetoptLong::NO_ARGUMENT ],
           [ '--runner-out', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--report', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--jasmine-config', '-j', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--no-full-run', GetoptLong::NO_ARGUMENT ],
           [ '--list', '-l', GetoptLong::NO_ARGUMENT ],
-          [ '--seed', GetoptLong::REQUIRED_ARGUMENT ]
+          [ '--seed', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--format', '-f', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--out', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--use-server', GetoptLong::NO_ARGUMENT ],
+          [ '--server-port', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '-h', '--help', GetoptLong::NO_ARGUMENT ],
+          [ '-q', '--quiet', GetoptLong::NO_ARGUMENT ]
         )
 
         command_line_args.each { |*args| process_option(*args) }
       end
+
+      def reporters
+        file_index = 0
+
+        @options[:reporters].collect do |reporter, file|
+          output = [ reporter ]
+          if file
+            output << "report:#{file_index}"
+            output << file
+            file_index += 1
+          else
+            output << "stdout"
+          end
+
+          output
+        end
+      end
+
+      def file_reporters
+        reporters.find_all { |reporter| reporter[1]["report:"] }
+      end
+
+      private
+      def add_reporter(name, file = nil)
+        if !@added_reporter
+          @options[:reporters] = []
+          @added_reporter = true
+        end
+
+        if (parts = name.split(':')).length == 2
+          name, file = parts
+        end
+
+        @options[:reporters] << [ name ]
+
+        add_reporter_file(file) if file
+      end
+
+      def add_reporter_file(file)
+        @options[:reporters].last << file
+      end
+
+      def print_help
+        options = [
+          [ '-c, --colors', 'Enable colors (default: disabled)' ],
+          [ '-nc, --no-colors', 'Disable colors' ],
+          [ '--cache', 'Enable cache (default: enabled)' ],
+          [ '--no-cache', 'Disable cache' ],
+          [ '--keep', 'Keep runner files on failure' ],
+          [ '--runner-out <filename>', 'Write runner to specified filename' ],
+          [ '-j, --jasmine-config <config file>', 'Jasmine Yaml config to use' ],
+          [ '--no-full-run', 'Do not perform a full spec run after a successful targeted spec run' ],
+          [ '--use-server', 'Load tests from an HTTP server instead of from filesystem' ],
+          [ '-l, --list', 'List files in the order they will be required' ],
+          [ '--seed <seed>', 'Random order seed for spec file ordering' ],
+          [ '-f, --format <reporter<:filename>>', 'Specify an output reporter and possibly output filename' ],
+          [ '--out <filename>', 'Specify output filename for last defined reporter' ],
+          [ '-q, --quiet', "Silence most non-test related warnings" ],
+          [ '-h, --help', "You're looking at it" ]
+        ]
+
+        longest_length = options.collect(&:first).collect(&:length).max
+
+        puts <<-HELP
+Usage: #{$0} [ options ] [ spec files ]
+
+Options:
+#{options.collect { |option, description| "  #{option.ljust(longest_length)}  #{description}" }.join("\n")}
+
+Available reporters:
+  Console  Write out spec results to the console in a progress format (default)
+  Verbose  Write out spec results to the console in a verbose format
+  File     Write spec results in jasmine-headless-webkit ReportFile format
+  Tap      Write spec results in TAP format
+
+Add reporters to the jasmine.HeadlessReporter object to access them
+  (ex: jasmine.HeadlessReporter.Teamcity for the Teamcity reporter)
+HELP
+      end
     end
   end
 end

data/lib/jasmine/headless/report.rb

@@ -60,8 +60,13 @@ module Jasmine::Headless
       }.collect(&:filename).uniq.compact
     end
 
-    private
+    def seed
+      if seed = report.find { |entry| entry.respond_to?(:seed) }
+        seed.seed
+      end
+    end
 
+    private
     def last_total
       @report.reverse.find { |entry| entry.respond_to?(:total) }
     end

data/lib/jasmine/headless/report_message/console.rb

@@ -1,9 +1,7 @@
 module Jasmine::Headless::ReportMessage
   class Console
-    class << self
-      def new_from_parts(parts)
-        new(parts.first)
-      end
+    def self.new_from_parts(parts)
+      new(parts.first)
     end
 
     attr_reader :message

data/lib/jasmine/headless/report_message/seed.rb

@@ -0,0 +1,14 @@
+module Jasmine::Headless::ReportMessage
+  class Seed
+    def self.new_from_parts(parts)
+      new(parts.first)
+    end
+
+    attr_reader :seed
+
+    def initialize(seed)
+      @seed = seed.to_i
+    end
+  end
+end
+

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

@@ -1,11 +1,9 @@
 module Jasmine::Headless::ReportMessage
   class Spec
-    class << self
-      def new_from_parts(parts)
-        file_info = parts.pop
+    def self.new_from_parts(parts)
+      file_info = parts.pop
 
-        new(parts.join(' '), file_info)
-      end
+      new(parts.join(' '), file_info)
     end
 
     attr_reader :statement, :file_info

data/lib/jasmine/headless/report_message.rb

@@ -6,6 +6,7 @@ module Jasmine::Headless
     autoload :Console, 'jasmine/headless/report_message/console'
     autoload :Error, 'jasmine/headless/report_message/error'
     autoload :Total, 'jasmine/headless/report_message/total'
+    autoload :Seed, 'jasmine/headless/report_message/seed'
   end
 end