teaspoon 1.1.5 → 1.2.0

data/lib/teaspoon/framework/base.rb

@@ -13,7 +13,7 @@ module Teaspoon
           base._asset_paths = []
           base._template_paths = []
           base._install_path = "spec"
-          base._install_proc = proc {}
+          base._install_proc = proc { }
         end
 
         def framework_name(name = nil)

data/lib/teaspoon/instrumentation.rb

@@ -43,28 +43,28 @@ module Teaspoon
 
     protected
 
-    def self.ignored?(asset)
-      Array(Teaspoon::Coverage.configuration.ignore).any? do |ignore|
-        asset.pathname.to_s.match(ignore)
+      def self.ignored?(asset)
+        Array(Teaspoon::Coverage.configuration.ignore).any? do |ignore|
+          asset.filename.match(ignore)
+        end
+      rescue Teaspoon::UnknownCoverage
+        false
       end
-    rescue Teaspoon::UnknownCoverage
-      false
-    end
 
-    def add_instrumentation(asset)
-      source_path = asset.pathname.to_s
-      Dir.mktmpdir do |temp_path|
-        input_path = File.join(temp_path, File.basename(source_path)).sub(/\.js.+/, ".js")
-        File.open(input_path, "w") { |f| f.write(asset.source) }
-        instrument(input_path).gsub(input_path, source_path)
+      def add_instrumentation(asset)
+        source_path = asset.filename
+        Dir.mktmpdir do |temp_path|
+          input_path = File.join(temp_path, File.basename(source_path)).sub(/\.js.+/, ".js")
+          File.open(input_path, "w") { |f| f.write(asset.source) }
+          instrument(input_path).gsub(input_path, source_path)
+        end
       end
-    end
 
-    def instrument(input)
-      result = %x{#{self.class.executable} instrument --embed-source #{input.shellescape}}
-      return result if $?.exitstatus == 0
-      raise Teaspoon::DependencyError.new("Unable to add instrumentation to #{File.basename(input)}.")
-    end
+      def instrument(input)
+        result = %x{#{self.class.executable} instrument --embed-source #{input.shellescape}}
+        return result if $?.exitstatus == 0
+        raise Teaspoon::DependencyError.new("Unable to add instrumentation to #{File.basename(input)}.")
+      end
   end
 
   module SprocketsInstrumentation

data/lib/teaspoon/registry.rb

@@ -22,7 +22,7 @@ module Teaspoon
       if !(driver = @registry[normalize_name(name)])
         raise not_found_exception.new(name: name, available: available.keys)
       end
-      
+
       driver.call
     end
 
@@ -36,12 +36,12 @@ module Teaspoon
 
     private
 
-    def normalize_name(name)
-      name.to_s.gsub(/[-|\s]/, '_').to_sym
-    end
+      def normalize_name(name)
+        name.to_s.gsub(/[-|\s]/, "_").to_sym
+      end
 
-    def not_found_exception
-      @not_found_exception || Teaspoon::NotFoundInRegistry
-    end
+      def not_found_exception
+        @not_found_exception || Teaspoon::NotFoundInRegistry
+      end
   end
-end
+end

data/lib/teaspoon/registry/has_default.rb

@@ -2,10 +2,10 @@ module Teaspoon
   module Registry
     module HasDefault
       def default
-        available.find do |formatter,options|
+        available.find do |formatter, options|
           options[:default]
         end.first
       end
     end
   end
-end
+end

data/lib/teaspoon/runner.rb

@@ -20,50 +20,50 @@ module Teaspoon
 
     private
 
-    def resolve_formatter(formatter)
-      formatter, output = formatter.to_s.split(">")
-      Teaspoon::Formatter.fetch(formatter).new(@suite_name, output)
-    end
+      def resolve_formatter(formatter)
+        formatter, output = formatter.to_s.split(">")
+        Teaspoon::Formatter.fetch(formatter).new(@suite_name, output)
+      end
 
-    def notify_formatters(event, result)
-      @formatters.each { |f| f.send(event, result) if f.respond_to?(event) }
-      send(:"on_#{event}", result) if respond_to?(:"on_#{event}", true)
-    end
+      def notify_formatters(event, result)
+        @formatters.each { |f| f.send(event, result) if f.respond_to?(event) }
+        send(:"on_#{event}", result) if respond_to?(:"on_#{event}", true)
+      end
 
-    def result_from_line(line)
-      json = JSON.parse(line)
-      return false unless json && json["_teaspoon"] && json["type"]
-      json["original_json"] = line
-      return result_from_json(json)
-    rescue JSON::ParserError
-      false
-    end
+      def result_from_line(line)
+        json = JSON.parse(line)
+        return false unless json && json["_teaspoon"] && json["type"]
+        json["original_json"] = line
+        result_from_json(json)
+      rescue JSON::ParserError
+        false
+      end
 
-    def result_from_json(json)
-      result = Teaspoon::Result.build_from_json(json)
-      @failure_count += 1 if result.failing?
-      result
-    end
+      def result_from_json(json)
+        result = Teaspoon::Result.build_from_json(json)
+        @failure_count += 1 if result.failing?
+        result
+      end
 
-    def on_exception(result)
-      raise Teaspoon::RunnerError.new(result.message)
-    end
+      def on_exception(result)
+        raise Teaspoon::RunnerError.new(result.message)
+      end
 
-    def on_result(result)
-      resolve_coverage(result.coverage)
-      notify_formatters("complete", @failure_count)
-    end
+      def on_result(result)
+        resolve_coverage(result.coverage)
+        notify_formatters("complete", @failure_count)
+      end
 
-    def resolve_coverage(data)
-      return unless Teaspoon.configuration.use_coverage
-      raise Teaspoon::IstanbulNotFoundError unless Teaspoon::Instrumentation.executable
+      def resolve_coverage(data)
+        return unless Teaspoon.configuration.use_coverage
+        raise Teaspoon::IstanbulNotFoundError unless Teaspoon::Instrumentation.executable
 
-      coverage = Teaspoon::Coverage.new(@suite_name, data)
-      coverage.generate_reports { |msg| notify_formatters("coverage", msg) }
-      coverage.check_thresholds do |msg|
-        notify_formatters("threshold_failure", msg)
-        @failure_count += 1
+        coverage = Teaspoon::Coverage.new(@suite_name, data)
+        coverage.generate_reports { |msg| notify_formatters("coverage", msg) }
+        coverage.check_thresholds do |msg|
+          notify_formatters("threshold_failure", msg)
+          @failure_count += 1
+        end
       end
-    end
   end
 end

data/lib/teaspoon/server.rb

@@ -37,38 +37,39 @@ module Teaspoon
 
     protected
 
-    def wait_until_started(thread)
-      Timeout.timeout(Teaspoon.configuration.server_timeout.to_i) { thread.join(0.1) until responsive? }
-    rescue Timeout::Error
-      raise Timeout::Error.new("consider increasing the timeout with `config.server_timeout`")
-    end
+      def wait_until_started(thread)
+        Timeout.timeout(Teaspoon.configuration.server_timeout.to_i) { thread.join(0.1) until responsive? }
+      rescue Timeout::Error
+        raise Timeout::Error.new("consider increasing the timeout with `config.server_timeout`")
+      end
 
-    def disable_logging
-      return unless defined?(Thin)
-      if Teaspoon.configuration.suppress_log
-        Thin::Logging.silent = true
-      else
-        Thin::Logging.trace = false
+      def disable_logging
+        return unless defined?(Thin)
+        if Teaspoon.configuration.suppress_log
+          Thin::Logging.silent = true
+        else
+          Thin::Logging.trace = false
+        end
       end
-    end
 
-    def rack_options
-      {
-        app: Rails.application,
-        Host: host,
-        Port: port,
-        environment: "test",
-        AccessLog: [],
-        Logger: Rails.logger,
-        server: Teaspoon.configuration.server
-      }
-    end
+      def rack_options
+        {
+          app: Rails.application,
+          Host: host,
+          Port: port,
+          environment: "test",
+          AccessLog: [],
+          Logger: Rails.logger,
+          server: Teaspoon.configuration.server,
+          Silent: true
+        }
+      end
 
-    def find_available_port
-      server = TCPServer.new(host, 0)
-      server.addr[1]
-    ensure
-      server.close if server
-    end
+      def find_available_port
+        server = TCPServer.new(host, 0)
+        server.addr[1]
+      ensure
+        server.close if server
+      end
   end
 end

data/lib/teaspoon/suite.rb

@@ -42,78 +42,89 @@ module Teaspoon
 
     protected
 
-    def specs
-      files = specs_from_file
-      return files unless files.empty?
-      glob.map { |file| asset_from_file(file) }
-    end
+      def specs
+        files = specs_from_file
+        return files unless files.empty?
+        glob.map { |file| asset_from_file(file) }
+      end
 
-    def asset_tree(sources)
-      sources.flat_map do |source|
-        asset = @env.find_asset(source)
+      def asset_tree(sources)
+        sources.flat_map do |source|
+          asset = @env.find_asset(source, accept: "application/javascript", pipeline: :debug)
+
+          if asset && asset.respond_to?(:logical_path)
+            asset_and_dependencies(asset).map { |a| asset_url(a) }
+          else
+            source.blank? ? [] : [source]
+          end
+        end.compact.uniq
+      end
 
-        if asset && asset.respond_to?(:logical_path)
-          assets = config.expand_assets ? asset.to_a : [asset]
-          assets.map { |a| asset_url(a) }
+      def asset_url(asset)
+        params = []
+        params << "body=1" if config.expand_assets
+        params << "instrument=1" if instrument_file?(asset.filename)
+        url = asset.logical_path
+        url += "?#{params.join("&")}" if params.any?
+        url
+      end
+
+      def asset_and_dependencies(asset)
+        if config.expand_assets
+          if asset.respond_to?(:to_a)
+            asset.to_a
+          else
+            asset.metadata[:included].map { |uri| @env.load(uri) }
+          end
         else
-          source.blank? ? [] : [source]
+          [asset]
         end
-      end.compact.uniq
-    end
+      end
 
-    def asset_url(asset)
-      params = []
-      params << "body=1" if config.expand_assets
-      params << "instrument=1" if instrument_file?(asset.pathname.to_s)
-      url = asset.logical_path
-      url += "?#{params.join("&")}" if params.any?
-      url
-    end
+      def instrument_file?(file)
+        return false unless coverage_requested?
+        return false if matched_spec_file?(file)
+        true
+      end
 
-    def instrument_file?(file)
-      return false unless coverage_requested?
-      return false if matched_spec_file?(file)
-      true
-    end
+      def coverage_requested?
+        @options[:coverage] || Teaspoon.configuration.use_coverage
+      end
 
-    def coverage_requested?
-      @options[:coverage] || Teaspoon.configuration.use_coverage
-    end
+      def matched_spec_file?(file)
+        glob.include?(file)
+      end
 
-    def matched_spec_file?(file)
-      glob.include?(file)
-    end
+      def asset_from_file(original)
+        filename = original
+        Rails.application.config.assets.paths.each do |path|
+          filename = filename.gsub(%r(^#{Regexp.escape(path.to_s)}[\/|\\]), "")
+        end
 
-    def asset_from_file(original)
-      filename = original
-      Rails.application.config.assets.paths.each do |path|
-        filename = filename.gsub(%r(^#{Regexp.escape(path.to_s)}[\/|\\]), "")
+        raise Teaspoon::AssetNotServableError.new(filename: filename) if filename == original
+        normalize_js_extension(filename)
       end
 
-      raise Teaspoon::AssetNotServableError.new(filename: filename) if filename == original
-      normalize_js_extension(filename)
-    end
-
-    def normalize_js_extension(original_filename)
-      config.js_extensions.inject(original_filename.gsub(".erb", "")) do |filename, extension|
-        filename.gsub(Regexp.new(extension.to_s + "$"), ".js")
+      def normalize_js_extension(original_filename)
+        config.js_extensions.inject(original_filename.gsub(".erb", "")) do |filename, extension|
+          filename.gsub(Regexp.new(extension.to_s + "$"), ".js")
+        end
       end
-    end
 
-    def glob
-      @glob ||= Dir[config.matcher.present? ? Teaspoon.configuration.root.join(config.matcher) : ""].sort!
-    end
+      def glob
+        @glob ||= Dir[config.matcher.present? ? Teaspoon.configuration.root.join(config.matcher) : ""].sort!
+      end
 
-    def suite_configuration
-      config = Teaspoon.configuration.suite_configs[name]
-      raise Teaspoon::UnknownSuite.new(name: name) unless config.present?
-      config[:instance] ||= Teaspoon::Configuration::Suite.new(name, &config[:block])
-    end
+      def suite_configuration
+        config = Teaspoon.configuration.suite_configs[name]
+        raise Teaspoon::UnknownSuite.new(name: name) unless config.present?
+        config[:instance] ||= Teaspoon::Configuration::Suite.new(name, &config[:block])
+      end
 
-    def specs_from_file
-      Array(@options[:file]).map do |filename|
-        asset_from_file(File.expand_path(Teaspoon.configuration.root.join(filename)))
+      def specs_from_file
+        Array(@options[:file]).map do |filename|
+          asset_from_file(File.expand_path(Teaspoon.configuration.root.join(filename)))
+        end
       end
-    end
   end
 end

data/lib/teaspoon/utility.rb

@@ -1,4 +1,10 @@
+require "pathname"
+
 module Teaspoon
+  def self.root
+    defined?(Rails) ? Rails.root : Pathname.new(Dir.pwd)
+  end
+
   def self.abort(message = nil, code = 1)
     STDOUT.print("#{message}\n") if message
     exit(code)

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - jejacks0n
+- mikepack
 - jayzes
 - jedschneider
-- mikepack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -20,9 +20,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,13 +27,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-description: Run Javascript tests using Jasmine, Mocha or QUnit in the browser or
-  headless using PhantomJS, Selenium Webdriver, or Capybara Webkit
+description: Run your Javascript tests using Jasmine, Mocha or QUnit using a variety
+  of platforms.
 email:
-- info@modeset.com
+- jejacks0n@gmail.com
 executables:
 - teaspoon
 extensions: []
@@ -96,7 +90,6 @@ files:
 - lib/teaspoon/driver.rb
 - lib/teaspoon/driver/base.rb
 - lib/teaspoon/driver/browserstack.rb
-- lib/teaspoon/driver/capybara_webkit.rb
 - lib/teaspoon/driver/phantomjs.rb
 - lib/teaspoon/driver/phantomjs/runner.js
 - lib/teaspoon/driver/selenium.rb
@@ -130,7 +123,7 @@ files:
 - lib/teaspoon/suite.rb
 - lib/teaspoon/utility.rb
 - lib/teaspoon/version.rb
-homepage: https://github.com/modeset/teaspoon
+homepage: https://github.com/jejacks0n/teaspoon
 licenses:
 - MIT
 metadata: {}
@@ -140,17 +133,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Teaspoon: A Javascript test runner built on top of Rails'