jasmine-headless-webkit 0.2.3 → 0.4.0

data/Gemfile

@@ -11,3 +11,4 @@ gem 'guard-shell'
 gem 'guard-coffeescript'
 gem 'growl'
 gem 'rake', '0.8.7'
+gem 'mocha', '0.9.12'

data/Guardfile

@@ -9,7 +9,7 @@ end
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec', :version => 2, :all_on_start => false do
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{^bin/(.+)})     { |m| "spec/bin/#{m[1]}_spec.rb" }

data/bin/jasmine-headless-webkit

@@ -8,105 +8,12 @@ end
 
 $:.unshift(File.join(gem_dir, 'lib'))
 
-require 'yaml'
-require 'fileutils'
-require 'getoptlong'
-
-require 'jasmine/base'
-require 'coffee-script'
-require 'rainbow'
-
-require 'jasmine/cli'
-include Jasmine::CLI
-
-if !File.file?(File.join(gem_dir, RUNNER))
-  puts "The Qt WebKit widget is not compiled! Try re-installing this gem."
-  exit 1
-end
-
-opts = GetoptLong.new(
-  [ '--colors', '-c', GetoptLong::NO_ARGUMENT ],
-  [ '--no-colors', GetoptLong::NO_ARGUMENT ],
-  [ '--keep', GetoptLong::NO_ARGUMENT ],
-  [ '--report', GetoptLong::REQUIRED_ARGUMENT ],
-  [ '--jasmine-config', '-j', GetoptLong::REQUIRED_ARGUMENT ]
-)
-
-options = {
-  :colors => false, 
-  :remove_html_file => true,
-  :jasmine_config => 'spec/javascripts/support/jasmine.yml',
-  :report => false
-}
-
-@process_options = lambda { |*args|
-  opt, arg = args.flatten[0..1]
-
-  case opt
-  when '--colors', '-c'
-    options[:colors] = true
-  when '--no-colors', '-nc'
-    options[:colors] = false
-  when '--keep'
-    options[:remove_html_file] = false
-  when '--report'
-    options[:report] = arg
-  when '--jasmine-config', '-j'
-    options[:jasmine_config] = arg
-  end
-}
-
-read_defaults_files!
-opts.each(&@process_options)
-@spec_filter = ARGV.dup
-
-data = YAML.load_file(options[:jasmine_config])
-
 puts "Running Jasmine specs..."
 
-files = %w{jasmine jasmine-html}.collect { |name| File.join(Jasmine.root, "lib/#{name}.js") }
-files << File.join(gem_dir, 'jasmine/jasmine.headless-reporter.js')
-
-[ [ 'src_files', 'src_dir' ], [ 'stylesheets', 'src_dir' ], [ 'helpers', 'spec_dir' ], [ 'spec_files', 'spec_dir' ] ].each do |searches, root|
-  if data[searches] ||= DEFAULTS[searches]
-    data[root] ||= DEFAULTS[root]
-
-    data[searches].collect do |search|
-      path = search
-      path = File.join(data[root], path) if data[root]
-      found_files = Dir[path]
-      if searches == 'spec_files'
-        found_files = found_files.find_all { |file| use_spec?(file) }
-      end
-      files += found_files
-    end
-  end
+require 'jasmine/headless/cli'
+begin
+  exit Jasmine::Headless::CLI.run
+rescue StandardError => e
+  exit 1
 end
 
-files = files.collect { |file|
-  case File.extname(file)
-  when '.js'
-    %{<script type="text/javascript" src="#{file}"></script>}
-  when '.coffee'
-    begin
-      %{<script type="text/javascript">#{CoffeeScript.compile(fh = File.open(file))}</script>}
-    rescue CoffeeScript::CompilationError => e
-      puts "[%s] %s: %s" % [ 'coffeescript'.color(:red), file.color(:yellow), e.message.to_s.color(:white) ]
-      exit 1
-    ensure
-      fh.close
-    end
-  when '.css'
-    %{<link rel="stylesheet" href="#{file}" type="text/css" />}
-  end
-}
-
-output = jasmine_html_template(files)
-
-File.open(target = "specrunner.#{$$}.html", 'w') { |fh| fh.print output }
-system jasmine_command(options, target)
-status = $?.exitstatus
-FileUtils.rm_f target if options[:remove_html_file] || (status == 0)
-
-exit status
-

data/ext/jasmine-webkit-specrunner/specrunner.cpp

@@ -26,6 +26,7 @@
 #include <QFile>
 #include <QTextStream>
 #include <iostream>
+#include <QQueue>
 
 #if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
 #error Use Qt 4.7 or later version
@@ -64,9 +65,10 @@ class HeadlessSpecRunner: public QObject
     Q_OBJECT
 public:
     HeadlessSpecRunner();
-    void load(const QString &spec);
     void setColors(bool colors);
     void reportFile(const QString &file);
+    void addFile(const QString &spec);
+    void go();
 public slots:
     void log(const QString &msg);
     void specPassed();
@@ -78,6 +80,7 @@ private slots:
     void watch(bool ok);
     void errorLog(const QString &msg, int lineNumber, const QString &sourceID);
     void internalLog(const QString &note, const QString &msg);
+    void addJHW();
 protected:
     bool hasElement(const char *select);
     void timerEvent(QTimerEvent *event);
@@ -91,12 +94,14 @@ private:
     bool isFinished;
     bool didFail;
     bool consoleNotUsedThisRun;
+    QQueue<QString> runnerFiles;
     QString reportFilename;
     
     void red();
     void green();
     void yellow();
     void clear();
+    void loadSpec();
 };
 
 HeadlessSpecRunner::HeadlessSpecRunner()
@@ -113,14 +118,30 @@ HeadlessSpecRunner::HeadlessSpecRunner()
     connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(watch(bool)));
     connect(&m_page, SIGNAL(consoleLog(QString, int, QString)), this, SLOT(errorLog(QString, int, QString)));
     connect(&m_page, SIGNAL(internalLog(QString, QString)), this, SLOT(internalLog(QString, QString)));
+    connect(m_page.mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJHW()));
 }
 
-void HeadlessSpecRunner::load(const QString &spec)
+void HeadlessSpecRunner::addFile(const QString &spec)
+{
+  runnerFiles.enqueue(spec);
+}
+
+void HeadlessSpecRunner::go()
 {
     m_ticker.stop();
-    m_page.mainFrame()->addToJavaScriptWindowObject("JHW", this);
-    m_page.mainFrame()->load(spec);
     m_page.setPreferredContentsSize(QSize(1024, 600));
+    addJHW();
+    loadSpec();
+}
+void HeadlessSpecRunner::addJHW()
+{
+    m_page.mainFrame()->addToJavaScriptWindowObject("JHW", this);
+}
+
+void HeadlessSpecRunner::loadSpec()
+{
+    m_page.mainFrame()->load(runnerFiles.dequeue());
+    m_ticker.start(200, this);
 }
 
 void HeadlessSpecRunner::watch(bool ok)
@@ -298,7 +319,12 @@ void HeadlessSpecRunner::timerEvent(QTimerEvent *event)
         }
       }
 
-      QApplication::instance()->exit(exitCode);
+      if ((exitCode == 0 && runnerFiles.count() == 0) || (exitCode != 0)) {
+        QApplication::instance()->exit(exitCode);
+      } else {
+        isFinished = false;
+        loadSpec();
+      }
     }
 
     if (m_runs > 30) {
@@ -311,7 +337,6 @@ void HeadlessSpecRunner::timerEvent(QTimerEvent *event)
 
 int main(int argc, char** argv)
 {
-    char *filename = NULL;
     char *reporter = NULL;
     char showColors = false;
 
@@ -328,16 +353,9 @@ int main(int argc, char** argv)
       }
     }
 
-    bool filenameFound = false;
-
-    for (index = optind; index < argc; index++) {
-      filename = argv[index];
-      filenameFound = true;
-    }
-
-    if (!filenameFound) {
+    if (optind == argc) {
         std::cerr << "Run Jasmine's SpecRunner headlessly" << std::endl << std::endl;
-        std::cerr << "  specrunner [-c] SpecRunner.html" << std::endl;
+        std::cerr << "  specrunner [-c] [-r <report file>] specrunner.html ..." << std::endl;
         return 1;
     }
 
@@ -345,7 +363,12 @@ int main(int argc, char** argv)
     HeadlessSpecRunner runner;
     runner.setColors(true);
     runner.reportFile(reporter);
-    runner.load(QString::fromLocal8Bit(filename));
+
+    for (index = optind; index < argc; index++) {
+      runner.addFile(QString::fromLocal8Bit(argv[index]));
+    }
+    runner.go();
+
     return app.exec();
 }
 

data/jasmine/jasmine.headless-reporter.coffee

@@ -1,5 +1,5 @@
 if !jasmine?
-  throw new Exception("jasmine not laoded!")
+  throw new Error("jasmine not laoded!")
 
 class HeadlessReporterResult
   constructor: (name) ->
@@ -28,17 +28,17 @@ class jasmine.HeadlessReporter
     @startTime = new Date()
   reportSpecResults: (spec) ->
     results = spec.results()
+    @length++
     if results.passed()
       JHW.specPassed()
     else
       JHW.specFailed()
+      @failedCount++
       failureResult = new HeadlessReporterResult(spec.getFullName())
       for result in results.getItems()
         do (result) =>
           if result.type == 'expect' and !result.passed_
-            @failedCount += 1
             failureResult.addResult(result.message)
       @results.push(failureResult)
   reportSpecStarting: (spec) ->
   reportSuiteResults: (suite) ->
-    @length += suite.specs().length

data/jasmine/jasmine.headless-reporter.js

@@ -2,7 +2,7 @@
   var HeadlessReporterResult;
   var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
   if (!(typeof jasmine !== "undefined" && jasmine !== null)) {
-    throw new Exception("jasmine not laoded!");
+    throw new Error("jasmine not laoded!");
   }
   HeadlessReporterResult = (function() {
     function HeadlessReporterResult(name) {
@@ -51,15 +51,16 @@
     HeadlessReporter.prototype.reportSpecResults = function(spec) {
       var failureResult, result, results, _fn, _i, _len, _ref;
       results = spec.results();
+      this.length++;
       if (results.passed()) {
         return JHW.specPassed();
       } else {
         JHW.specFailed();
+        this.failedCount++;
         failureResult = new HeadlessReporterResult(spec.getFullName());
         _ref = results.getItems();
         _fn = __bind(function(result) {
           if (result.type === 'expect' && !result.passed_) {
-            this.failedCount += 1;
             return failureResult.addResult(result.message);
           }
         }, this);
@@ -71,9 +72,7 @@
       }
     };
     HeadlessReporter.prototype.reportSpecStarting = function(spec) {};
-    HeadlessReporter.prototype.reportSuiteResults = function(suite) {
-      return this.length += suite.specs().length;
-    };
+    HeadlessReporter.prototype.reportSuiteResults = function(suite) {};
     return HeadlessReporter;
   })();
 }).call(this);

data/lib/jasmine/files_list.rb

@@ -0,0 +1,122 @@
+require 'jasmine'
+
+module Jasmine
+  class FilesList
+    attr_reader :files, :filtered_files
+
+    DEFAULT_FILES = [
+      File.join(Jasmine.root, "lib/jasmine.js"),
+      File.join(Jasmine.root, "lib/jasmine-html.js"),
+      File.expand_path('../../../jasmine/jasmine.headless-reporter.js', __FILE__)
+    ]
+
+    def initialize(options = {})
+      @options = options
+      @files = DEFAULT_FILES.dup
+      @filtered_files = @files.dup
+      use_config! if config?
+
+      @code_for_file = {}
+    end
+
+    def use_spec?(file)
+      spec_filter.empty? || spec_filter.include?(file)
+    end
+
+    def filtered?
+      files != filtered_files
+    end
+
+    def files_to_html
+      to_html(files)
+    end
+
+    def filtered_files_to_html
+      to_html(filtered_files)
+    end
+
+    private
+    def to_html(files)
+      coffeescript_run = []
+
+      files.collect { |file|
+        next @code_for_file[file] if @code_for_file[file]
+
+        coffeescript_run << file if (ext = File.extname(file)) == '.coffee'
+          
+        output = []
+        if (files.last == file or ext != '.coffee') and !coffeescript_run.empty?
+          output << ensure_coffeescript_run!(coffeescript_run)
+        end
+
+        if ext != '.coffee'
+          output << case File.extname(file)
+          when '.js'
+            %{<script type="text/javascript" src="#{file}"></script>}
+          when '.css'
+            %{<link rel="stylesheet" href="#{file}" type="text/css" />}
+          end
+        end
+
+        @code_for_file[file] = output if output.length == 1
+
+        output
+      }.flatten.reject(&:empty?)
+    end
+
+    def ensure_coffeescript_run!(files)
+      data = StringIO.new
+      files.each { |file| data << File.read(file) }
+      data.rewind
+
+      %{<script type="text/javascript">#{CoffeeScript.compile(data)}</script>}
+    rescue CoffeeScript::CompilationError => e
+      files.each do |file|
+        begin
+          CoffeeScript.compile(fh = File.open(file))
+        rescue CoffeeScript::CompilationError => ne
+          puts "[%s] %s: %s" % [ 'coffeescript'.color(:red), file.color(:yellow), ne.message.to_s.color(:white) ]
+          raise ne
+        ensure
+          fh.close
+        end
+      end
+    rescue StandardError => e
+      puts "[%s] Error in compiling one of the followng: %s" % [ 'coffeescript'.color(:red), files.join(' ').color(:yellow) ]
+      raise e
+    ensure
+      files.clear
+    end
+
+    def spec_filter
+      @options[:only] || []
+    end
+
+    def use_config!
+      @filtered_files = @files.dup
+
+      data = @options[:config].dup
+      [ [ 'src_files', 'src_dir' ], [ 'stylesheets', 'src_dir' ], [ 'helpers', 'spec_dir' ], [ 'spec_files', 'spec_dir' ] ].each do |searches, root|
+        if data[searches]
+          data[searches].collect do |search|
+            path = search
+            path = File.join(data[root], path) if data[root]
+            found_files = Dir[path] - @files
+
+            @files += found_files
+
+            if searches == 'spec_files'
+              found_files = found_files.find_all { |file| use_spec?(file) }
+            end
+            @filtered_files += found_files
+          end
+        end
+      end
+    end
+
+    def config?
+      @options[:config]
+    end
+  end
+end
+

data/lib/jasmine/headless/cli.rb

@@ -0,0 +1,17 @@
+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/lib/jasmine/headless/errors.rb

@@ -0,0 +1,7 @@
+module Jasmine
+  module Headless
+    class NoRunnerError < StandardError
+    end
+  end
+end
+

data/lib/jasmine/headless/options.rb

@@ -0,0 +1,76 @@
+require 'forwardable'
+
+module Jasmine
+  module Headless
+    class Options
+      extend Forwardable
+
+      def_delegators :@options, :[], :[]=
+
+      DEFAULT_OPTIONS = {
+        :colors => false,
+        :remove_html_file => true,
+        :jasmine_config => 'spec/javascripts/support/jasmine.yml',
+        :report => false,
+        :full_run => true,
+        :files => []
+      }
+
+      DEFAULTS_FILE = '.jasmine-headless-webkit'
+      GLOBAL_DEFAULTS_FILE = File.expand_path("~/#{DEFAULTS_FILE}")
+
+      def self.from_command_line
+        options = new
+        options.process_command_line_args
+        options[:files] = ARGV
+        options
+      end
+
+      def initialize(opts = {})
+        @options = DEFAULT_OPTIONS.dup
+        opts.each { |k, v| @options[k] = v if v }
+      end
+
+      def process_option(*args)
+        opt, arg = args.flatten[0..1]
+
+        case opt
+        when '--colors', '-c'
+          @options[:colors] = true
+        when '--no-colors', '-nc'
+          @options[:colors] = false
+        when '--keep'
+          @options[:remove_html_file] = false
+        when '--report'
+          @options[:report] = arg
+        when '--jasmine-config', '-j'
+          @options[:jasmine_config] = arg
+        when '--no-full-run'
+          @options[:full_run] = false
+        end
+      end
+
+      def read_defaults_files
+        [ GLOBAL_DEFAULTS_FILE, DEFAULTS_FILE ].each do |file|
+          if File.file?(file)
+            File.readlines(file).collect { |line| line.strip.split(' ', 2) }.each { |*args| process_option(*args) }
+          end
+        end
+      end
+
+      def process_command_line_args
+        command_line_args = GetoptLong.new(
+          [ '--colors', '-c', GetoptLong::NO_ARGUMENT ],
+          [ '--no-colors', GetoptLong::NO_ARGUMENT ],
+          [ '--keep', GetoptLong::NO_ARGUMENT ],
+          [ '--report', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--jasmine-config', '-j', GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--no-full-run', GetoptLong::NO_ARGUMENT ]
+        )
+
+        command_line_args.each { |*args| process_option(*args) }
+      end
+    end
+  end
+end
+

data/lib/jasmine/headless/railtie.rb

@@ -1,5 +1,25 @@
 require 'jasmine/headless/task'
 
+module Digest
+  class JasmineTest
+    def self.file(file)
+      new
+    end
+
+    def file(file)
+      self
+    end
+    
+    def hexdigest
+      'test'
+    end
+
+    def update(prefix)
+      self
+    end
+  end
+end
+
 module Jasmine
   module Headless
     class Railtie < Rails::Railtie
@@ -7,6 +27,15 @@ module Jasmine
         Jasmine::Headless::Task.new do |t|
           t.colors = true
         end
+
+        if Rails.version >= "3.1.0"
+          desc 'Force generate static assets without an MD5 hash, all assets end with -test.<ext>'
+          task 'assets:precompile:for_testing' => :environment do
+            Rails.application.assets.digest_class = Digest::JasmineTest
+
+            Rake::Task['assets:precompile'].invoke
+          end
+        end
       end
     end
   end

data/lib/jasmine/headless/runner.rb

@@ -0,0 +1,75 @@
+require 'jasmine/headless/errors'
+require 'jasmine/headless/options'
+
+require 'fileutils'
+
+require 'jasmine/base'
+require 'coffee-script'
+require 'rainbow'
+
+require 'jasmine/files_list'
+require 'jasmine/template_writer'
+
+module Jasmine
+  module Headless
+    class Runner
+      JASMINE_DEFAULTS = {
+        'spec_files' => [ '**/*[sS]pec.js' ],
+        'helpers' => [ 'helpers/**/*.js' ],
+        'spec_dir' => 'spec/javascripts',
+        'src_dir' => nil,
+        'stylesheets' => [],
+        'src_files' => []
+      }
+
+      RUNNER = File.expand_path('../../../../ext/jasmine-webkit-specrunner/jasmine-webkit-specrunner', __FILE__)
+
+      attr_reader :options
+
+      def self.run(options = {})
+        options = Options.new(options) if !options.kind_of?(Options)
+        new(options).run
+      end
+
+      def initialize(options)
+        raise NoRunnerError if !File.file?(RUNNER)
+
+        @options = options
+      end
+
+      def jasmine_config
+        @jasmine_config ||= JASMINE_DEFAULTS.dup.merge(YAML.load_file(@options[:jasmine_config]))
+      end
+
+      def jasmine_command(*targets)
+        [
+          RUNNER,
+          @options[:colors] ? '-c' : nil,
+          @options[:report] ? "-r #{@options[:report]}" : nil,
+          *targets
+        ].compact.join(" ")
+      end
+
+      def run
+        files_list = Jasmine::FilesList.new(
+          :config => jasmine_config,
+          :only => @options[:files]
+        )
+
+        targets = Jasmine::TemplateWriter.write!(files_list)
+        run_targets = targets.dup
+        run_targets.pop if !@options[:full_run] && files_list.filtered?
+
+        system jasmine_command(run_targets)
+        status = $?.exitstatus
+
+        if @options[:remove_html_file] || (status == 0)
+          targets.each { |target| FileUtils.rm_f target }
+        end
+
+        status
+      end
+    end
+  end
+end
+

data/lib/jasmine/headless/task.rb

@@ -1,6 +1,10 @@
+require 'jasmine/headless/runner'
+
 module Jasmine
   module Headless
     class Task
+      include Rake::DSL if defined?(Rake::DSL)
+
       attr_accessor :colors, :keep_on_error, :jasmine_config
 
       def initialize(name = 'jasmine:headless')
@@ -12,7 +16,11 @@ module Jasmine
 
         desc 'Run Jasmine specs headlessly'
         task name do
-          system %{jasmine-headless-webkit #{@colors ? "-c" : "--no-colors"} #{@keep_on_error ? "--keep" : ""} #{@jasmine_config ? "-j #{@jasmine_config}" : ""}}
+          Jasmine::Headless::Runner.run(
+            :colors => colors, 
+            :remove_html_file => !@keep_on_error, 
+            :jasmine_config => @jasmine_config
+          )
         end
       end
     end