teabag 0.5.3 → 0.5.4

data/README.md

@@ -11,6 +11,7 @@ Ok, another Javascript test runner, right? Really? Yeah, that's tough, but we're
 
 Feedback, ideas and pull requests are always welcome, or you can hit us up on Twitter [@modeset_](https://twitter.com/modeset_).
 
+If you'd like to use Teabag with [Guard](https://github.com/guard/guard), check out the [guard-teabag](https://github.com/modeset/guard-teabag) project.
 
 ## Screenshots
 

data/app/assets/javascripts/teabag/base/teabag.coffee

@@ -24,6 +24,19 @@ class @Teabag
     new Teabag.Runner()
 
 
+  # provides interface for AMD usage -- pass all dependencies in as an array, and params will be checked for matches
+  @resolveDependenciesFromParams: (all = []) ->
+    deps = []
+    return all if (paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) == null
+
+    for path in paths
+      parts = decodeURIComponent(path.replace(/\+/g, " ")).match(/\/(.+)\.(js|js.coffee|coffee)$/i)
+      continue if parts == null
+      file = parts[1].substr(parts[1].lastIndexOf("/") + 1)
+      for dep in all then deps.push(dep) if dep.indexOf(file) >= 0
+    deps
+
+
   # logging methods -- used by selenium / phantomJS to get information back to ruby
   @log: ->
     @messages.push(arguments[0])

data/app/assets/javascripts/teabag-jasmine.js

@@ -2635,6 +2635,32 @@ jasmine.version_= {
       return new Teabag.Runner();
     };
 
+    Teabag.resolveDependenciesFromParams = function(all) {
+      var dep, deps, file, parts, path, paths, _i, _j, _len, _len1;
+      if (all == null) {
+        all = [];
+      }
+      deps = [];
+      if ((paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+        return all;
+      }
+      for (_i = 0, _len = paths.length; _i < _len; _i++) {
+        path = paths[_i];
+        parts = decodeURIComponent(path.replace(/\+/g, " ")).match(/\/(.+)\.(js|js.coffee|coffee)$/i);
+        if (parts === null) {
+          continue;
+        }
+        file = parts[1].substr(parts[1].lastIndexOf("/") + 1);
+        for (_j = 0, _len1 = all.length; _j < _len1; _j++) {
+          dep = all[_j];
+          if (dep.indexOf(file) >= 0) {
+            deps.push(dep);
+          }
+        }
+      }
+      return deps;
+    };
+
     Teabag.log = function() {
       var _ref;
       this.messages.push(arguments[0]);

data/app/assets/javascripts/teabag-mocha.js

@@ -5373,6 +5373,32 @@
       return new Teabag.Runner();
     };
 
+    Teabag.resolveDependenciesFromParams = function(all) {
+      var dep, deps, file, parts, path, paths, _i, _j, _len, _len1;
+      if (all == null) {
+        all = [];
+      }
+      deps = [];
+      if ((paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+        return all;
+      }
+      for (_i = 0, _len = paths.length; _i < _len; _i++) {
+        path = paths[_i];
+        parts = decodeURIComponent(path.replace(/\+/g, " ")).match(/\/(.+)\.(js|js.coffee|coffee)$/i);
+        if (parts === null) {
+          continue;
+        }
+        file = parts[1].substr(parts[1].lastIndexOf("/") + 1);
+        for (_j = 0, _len1 = all.length; _j < _len1; _j++) {
+          dep = all[_j];
+          if (dep.indexOf(file) >= 0) {
+            deps.push(dep);
+          }
+        }
+      }
+      return deps;
+    };
+
     Teabag.log = function() {
       var _ref;
       this.messages.push(arguments[0]);

data/app/assets/javascripts/teabag-qunit.js

@@ -2011,6 +2011,32 @@
       return new Teabag.Runner();
     };
 
+    Teabag.resolveDependenciesFromParams = function(all) {
+      var dep, deps, file, parts, path, paths, _i, _j, _len, _len1;
+      if (all == null) {
+        all = [];
+      }
+      deps = [];
+      if ((paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+        return all;
+      }
+      for (_i = 0, _len = paths.length; _i < _len; _i++) {
+        path = paths[_i];
+        parts = decodeURIComponent(path.replace(/\+/g, " ")).match(/\/(.+)\.(js|js.coffee|coffee)$/i);
+        if (parts === null) {
+          continue;
+        }
+        file = parts[1].substr(parts[1].lastIndexOf("/") + 1);
+        for (_j = 0, _len1 = all.length; _j < _len1; _j++) {
+          dep = all[_j];
+          if (dep.indexOf(file) >= 0) {
+            deps.push(dep);
+          }
+        }
+      }
+      return deps;
+    };
+
     Teabag.log = function() {
       var _ref;
       this.messages.push(arguments[0]);

data/lib/teabag/console.rb

@@ -6,17 +6,19 @@ module Teabag
 
     def initialize(options = nil, files = [])
       @options = options || {}
-      @files = files
+      @suites = {}
+      @files = []
 
       Teabag::Environment.load(@options)
-      require "teabag/server"
-      Rails.application.config.assets.debug = false if Teabag.configuration.driver == 'phantomjs'
+      Rails.application.config.assets.debug = false if Teabag.configuration.driver == "phantomjs"
+
       start_server
+      resolve(files)
     end
 
     def execute(options = {}, files = [])
       @options = @options.merge(options) if options.present?
-      @files = files unless files.blank?
+      resolve(files)
 
       failure_count = 0
       suites.each do |suite|
@@ -36,28 +38,42 @@ module Teabag
 
     protected
 
+    def resolve(files)
+      return if files.length == 0
+      @suites = {}
+      @files = files
+      files.uniq.each do |path|
+        if result = Teabag::Suite.resolve_spec_for(path)
+          suite = @suites[result[:suite]] ||= []
+          suite << result[:path]
+        end
+      end
+    end
+
     def start_server
       @server = Teabag::Server.new
       @server.start
     end
 
     def suites
-      @options[:suite].present? ? [@options[:suite]] : Teabag.configuration.suites.keys
+      return [@options[:suite]] if @options[:suite].present?
+      return @suites.keys if @suites.present?
+      Teabag.configuration.suites.keys
     end
 
     def driver
       @driver ||= Teabag::Drivers.const_get("#{Teabag.configuration.driver.to_s.camelize}Driver").new
     end
 
-    def filter
+    def filter(suite)
       parts = []
       parts << "grep=#{URI::encode(@options[:filter])}" if @options[:filter].present?
-      @files.each { |file| parts << "file[]=#{URI::encode(file)}" }
+      (@suites[suite] || @files).each { |file| parts << "file[]=#{URI::encode(file)}" }
       "?#{parts.join('&')}" if parts.present?
     end
 
     def url(suite)
-      ["#{@server.url}#{Teabag.configuration.mount_at}", suite, filter].compact.join("/")
+      ["#{@server.url}#{Teabag.configuration.mount_at}", suite, filter(suite)].compact.join("/")
     end
   end
 end

data/lib/teabag/environment.rb

@@ -10,6 +10,8 @@ module Teabag
       end
 
       require "teabag"
+      require "teabag/suite"
+      require "teabag/server"
 
       configure_from_options(options)
     end

data/lib/teabag/server.rb

@@ -11,7 +11,7 @@ module Teabag
     end
 
     def start
-      STDOUT.print "Starting server...\n" unless Teabag.configuration.suppress_log
+      STDOUT.print "Starting the Teabag server...\n" unless Teabag.configuration.suppress_log
       @thread = Thread.new do
         server = Rack::Server.new(rack_options)
         server.start

data/lib/teabag/suite.rb

@@ -2,7 +2,6 @@ module Teabag
   class Suite
 
     attr_accessor :config, :name
-    delegate :stylesheets, :helper, to: :config
 
     def self.all
       Teabag.configuration.suites.keys.map { |suite| Teabag::Suite.new(suite: suite) }
@@ -23,6 +22,14 @@ module Teabag
       @config = suite_configuration
     end
 
+    def stylesheets
+      config.stylesheets
+    end
+
+    def helper
+      config.helper
+    end
+
     def javascripts
       [core_javascripts, spec_javascripts].flatten
     end

data/lib/teabag/version.rb

@@ -1,3 +1,3 @@
 module Teabag
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end