teaspoon 0.8.0 → 0.9.0

data/lib/teaspoon/formatters/snowday_formatter.rb

@@ -3,7 +3,6 @@
 module Teaspoon
   module Formatters
     class SnowdayFormatter < DotFormatter
-
       protected
 
       def log_spec(result)

data/lib/teaspoon/formatters/swayze_or_oprah_formatter.rb

@@ -1,10 +1,9 @@
 module Teaspoon
   module Formatters
     class SwayzeOrOprahFormatter < Base
-
       protected
 
-      def log_result(result)
+      def log_result(_result)
         return log_str("\nNo quote for you.") if failures.size > 0
         names, quote = random_quote
         log_line("\n#{quote.inspect} -- Oprah Winfrey or Patrick Swayze?")
@@ -13,7 +12,7 @@ module Teaspoon
           log_line("\nYou got it right!\n")
         else
           log_line("\nWrong, too bad!\n")
-          raise the roof - YO && "Let's get busy"
+          raise the roof, YO && "Let's get busy"
         end
       end
 
@@ -92,8 +91,10 @@ module Teaspoon
         [set[:author], set[:quotes][rand(set[:quotes].size)]]
       end
 
-      def the(*args); Exception.new("poorly answered question"); end
+      def the(*_); Exception.new("poorly answered question"); end
+
       def roof; 0; end
+
       YO = 0
     end
   end

data/lib/teaspoon/formatters/tap_formatter.rb

@@ -1,10 +1,9 @@
 module Teaspoon
   module Formatters
     class TapFormatter < Base
-
       protected
 
-      def log_runner(result)
+      def log_runner(_result)
         log_line("1..#{@total_count}")
       end
 
@@ -22,7 +21,7 @@ module Teaspoon
       end
 
       def log_console(message)
-        log_line("# #{message.gsub(/\n$/, "")}")
+        log_line("# #{message.gsub(/\n$/, '')}")
       end
 
       def log_coverage(message)

data/lib/teaspoon/formatters/tap_y_formatter.rb

@@ -3,34 +3,33 @@ require "yaml"
 module Teaspoon
   module Formatters
     class TapYFormatter < Base
-
       protected
 
       def log_runner(result)
-        log "type"  => "suite",
+        log "type" => "suite",
             "start" => result.start,
             "count" => result.total,
-            "seed"  => 0,
-            "rev"   => 4
+            "seed" => 0,
+            "rev" => 4
       end
 
       def log_suite(result)
-        log "type"  => "case",
+        log "type" => "case",
             "label" => result.label,
             "level" => result.level
       end
 
       def log_passing_spec(result)
-        log "type"   => "test",
+        log "type" => "test",
             "status" => "pass",
-            "label"  => result.label,
+            "label" => result.label,
             "stdout" => @stdout
       end
 
       def log_pending_spec(result)
-        log "type"   => "test",
+        log "type" => "test",
             "status" => "pending",
-            "label"  => result.label,
+            "label" => result.label,
             "stdout" => @stdout,
             "exception" => {
               "message" => result.message
@@ -38,18 +37,18 @@ module Teaspoon
       end
 
       def log_failing_spec(result)
-        log "type"   => "test",
+        log "type" => "test",
             "status" => "fail",
-            "label"  => result.label,
+            "label" => result.label,
             "stdout" => @stdout,
             "exception" => {
-              "message"   => result.message,
+              "message" => result.message,
               "backtrace" => ["#{result.link}#:0"],
-              "file"      => "unknown",
-              "line"      => "unknown",
-              "source"    => "unknown",
-              "snippet"   => {"0" => result.link},
-              "class"     => "Unknown"
+              "file" => "unknown",
+              "line" => "unknown",
+              "source" => "unknown",
+              "snippet" => { "0" => result.link },
+              "class" => "Unknown"
             }
       end
 
@@ -58,11 +57,11 @@ module Teaspoon
             "time" => result.elapsed,
             "counts" => {
               "total" => @run_count,
-              "pass"  => @passes.size,
-              "fail"  => @failures.size,
+              "pass" => @passes.size,
+              "fail" => @failures.size,
               "error" => @errors.size,
-              "omit"  => 0,
-              "todo"  => @pendings.size
+              "omit" => 0,
+              "todo" => @pendings.size
             }
       end
 

data/lib/teaspoon/formatters/teamcity_formatter.rb

@@ -1,9 +1,8 @@
 module Teaspoon
   module Formatters
     class TeamcityFormatter < Base
-
       def initialize(*args)
-        log("enteredTheMatrix timestamp='#{Time.now.to_json.gsub('"', "")}'")
+        log("enteredTheMatrix timestamp='#{Time.now.to_json.gsub('"', '')}'")
         super
       end
 
@@ -58,7 +57,7 @@ module Teaspoon
 
       def log_complete(failure_count)
         log_line("\nFinished in #{@result.elapsed} seconds")
-        stats = "#{pluralize("example", run_count)}, #{pluralize("failure", failure_count)}"
+        stats = "#{pluralize('example', run_count)}, #{pluralize('failure', failure_count)}"
         stats << ", #{pendings.size} pending" if pendings.size > 0
         log_line(stats)
         log_line if failure_count > 0
@@ -70,7 +69,7 @@ module Teaspoon
         log("testSuiteFinished name='#{escape(@last_suite.label)}'") if @last_suite
       end
 
-      def log_teamcity_spec(opts, &block)
+      def log_teamcity_spec(opts, &_block)
         log("#{opts[:type]} name='#{opts[:desc]}' captureStandardOutput='true'")
         log_line(@stdout.gsub(/\n$/, "")) unless @stdout.blank?
         yield if block_given?
@@ -87,7 +86,7 @@ module Teaspoon
       end
 
       def escape_trace(trace)
-        lines = trace.map { |t| ["#{t["file"]}:#{t["line"]}", t["function"]].compact.join(" ") }
+        lines = trace.map { |t| ["#{t['file']}:#{t['line']}", t["function"]].compact.join(" ") }
         escape(lines.join("\n"))
       end
     end

data/lib/teaspoon/instrumentation.rb

@@ -10,11 +10,11 @@ module Teaspoon
     end
 
     def self.add?(response, env)
-      executable &&                                                   # we have an executable
-      env["QUERY_STRING"].to_s =~ /instrument=(1|true)/ &&            # the instrument param was provided
-      response[0] == 200 &&                                           # the status is 200 (304 might be needed here too)
-      response[1]["Content-Type"].to_s == "application/javascript" && # the format is something that we care about
-      response[2].respond_to?(:source)                                # it looks like an asset
+      executable &&                                                     # we have an executable
+        env["QUERY_STRING"].to_s =~ /instrument=(1|true)/ &&            # the instrument param was provided
+        response[0] == 200 &&                                           # the status is 200 (304 maybe?)
+        response[1]["Content-Type"].to_s == "application/javascript" && # the format is something that we care about
+        response[2].respond_to?(:source)                                # it looks like an asset
     end
 
     def self.executable
@@ -45,7 +45,7 @@ module Teaspoon
       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) }
+        File.open(input_path, "w") { |f| f.write(asset.source) }
         instrument(input_path).gsub(input_path, source_path)
       end
     end
@@ -53,7 +53,7 @@ module Teaspoon
     def instrument(input)
       result = %x{#{self.class.executable} instrument --embed-source #{input.shellescape}}
       return result if $?.exitstatus == 0
-      raise Teaspoon::DependencyFailure, "Could not generate instrumentation for #{File.basename(input)}"
+      raise Teaspoon::DependencyFailure, "Could not generate instrumentation for #{File.basename(input)}."
     end
   end
 

data/lib/teaspoon/result.rb

@@ -1,5 +1,4 @@
 module Teaspoon
-
   RESULT_ATTRS = [
     :type,
     :suite,
@@ -18,9 +17,8 @@ module Teaspoon
   ]
 
   class Result < Struct.new(*RESULT_ATTRS)
-
     def self.build_from_json(json)
-      new(*RESULT_ATTRS.map{ |attr| json[attr.to_s] })
+      new(*RESULT_ATTRS.map { |attr| json[attr.to_s] })
     end
 
     def description

data/lib/teaspoon/runner.rb

@@ -3,13 +3,12 @@ require "teaspoon/result"
 
 module Teaspoon
   class Runner
-
     attr_reader :failure_count
 
     def initialize(suite_name = :default)
       @suite_name = suite_name
       @failure_count = 0
-      @formatters = Teaspoon.configuration.formatters.map{ |f| resolve_formatter(f) }
+      @formatters = Teaspoon.configuration.formatters.map { |f| resolve_formatter(f) }
     end
 
     def process(line)

data/lib/teaspoon/server.rb

@@ -4,7 +4,6 @@ require "webrick"
 
 module Teaspoon
   class Server
-
     attr_accessor :port
 
     def initialize
@@ -12,6 +11,8 @@ module Teaspoon
     end
 
     def start
+      return if responsive?
+
       thread = Thread.new do
         disable_logging
         server = Rack::Server.new(rack_options)

data/lib/teaspoon/suite.rb

@@ -1,6 +1,5 @@
 module Teaspoon
   class Suite
-
     def self.all
       @all ||= Teaspoon.configuration.suite_configs.keys.map { |suite| Teaspoon::Suite.new(suite: suite) }
     end
@@ -8,14 +7,14 @@ module Teaspoon
     def self.resolve_spec_for(file)
       all.each do |suite|
         spec = suite.include_spec_for?(file)
-        return {suite: suite.name, path: spec} if spec
+        return { suite: suite.name, path: spec } if spec
       end
       false
     end
 
     attr_accessor :config, :name
-    delegate      :helper, :stylesheets, :javascripts, :boot_partial, :body_partial, :no_coverage, :hooks,
-                  to: :config
+    delegate :helper, :stylesheets, :javascripts, :boot_partial, :body_partial, :no_coverage, :hooks,
+             to: :config
 
     def initialize(options = {})
       @options = options
@@ -25,7 +24,7 @@ module Teaspoon
     end
 
     def spec_files
-      glob.map { |file| {path: file, name: asset_from_file(file)} }
+      glob.map { |file| { path: file, name: asset_from_file(file) } }
     end
 
     def spec_assets(include_helper = true)
@@ -38,9 +37,20 @@ module Teaspoon
       glob.include?(file)
     end
 
+    def ignored_file?(file)
+      for ignored in no_coverage
+        if ignored.is_a?(String)
+          return true if File.basename(file) == ignored
+        elsif ignored.is_a?(Regexp)
+          return true if file =~ ignored
+        end
+      end
+      false
+    end
+
     def include_spec_for?(file)
       return file if glob.include?(file)
-      paths = glob.select { |path| path.include?(file)  }
+      paths = glob.select { |path| path.include?(file) }
       return paths unless paths.empty?
       false
     end
@@ -54,9 +64,9 @@ module Teaspoon
     end
 
     def asset_tree(sources)
-      sources.collect do |source|
+      sources.map do |source|
         asset = @env.find_asset(source)
-        if asset && asset.respond_to?(:logical_path)
+        if asset && asset.respond_to?(:logical_path) && config.expand_assets
           asset.to_a.map { |a| asset_url(a) }
         else
           source unless source.blank?
@@ -72,14 +82,7 @@ module Teaspoon
 
     def instrument_file?(file)
       return false unless @options[:coverage] || Teaspoon.configuration.use_coverage
-      return false if include_spec?(file)
-      for ignored in no_coverage
-        if ignored.is_a?(String)
-          return false if File.basename(file) == ignored
-        elsif ignored.is_a?(Regexp)
-          return false if file =~ ignored
-        end
-      end
+      return false if include_spec?(file) || ignored_file?(file)
       true
     end
 
@@ -94,7 +97,7 @@ module Teaspoon
     end
 
     def normalize_js_extension(filename)
-      filename.gsub('.erb', '').gsub(/(\.js\.coffee|\.coffee)$/, ".js")
+      filename.gsub(".erb", "").gsub(/(\.js\.coffee|\.coffee)$/, ".js")
     end
 
     def glob

data/lib/teaspoon/utility.rb

@@ -1,16 +1,14 @@
 module Teaspoon
   module Utility
-
     # Cross-platform way of finding an executable in the $PATH.
     # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-    #
     def which(cmd)
       exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
 
       ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
           exe = "#{path}/#{cmd}#{ext}"
-          return exe if File.executable?(exe)
+          return exe if File.file?(exe) && File.executable?(exe)
         end
       end
 

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/dummy/config/application.rb

@@ -3,30 +3,26 @@ require File.expand_path('../boot', __FILE__)
 require "action_controller/railtie"
 require "sprockets/railtie"
 
-Bundler.require
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
 
 module Dummy
   class Application < Rails::Application
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
 
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
 
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Moved from initializers.
-    config.session_store :cookie_store, key: '_dummy_session'
-    config.secret_token = 'bc510a13d2fb96575782e90e9f2f64afc0ba4e63e5869b6139613686f104d4d3dd92ee696468de5bcbbb74daedb702d3da97554efbc6792abe75091b9df0a2ab'
-    config.secret_key_base = 'bc510a13d2fb96575782e90e9f2f64afc0ba4e63e5869b6139613686f104d4d3dd92ee696468de5bcbbb74daedb702d3da97554efbc6792abe75091b9df0a2ab'
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
 
+    # Change our relative root url to show that if relative paths are setup properly, teaspoon will
+    # continue to work and load the proper urls.
     config.relative_url_root = "/relative"
     config.assets.prefix = "/relative/assets" # this must be set for any asset paths to be correct!
   end

data/spec/dummy/config/boot.rb

@@ -1,7 +1,3 @@
-require "rubygems"
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-# Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../../Gemfile", __FILE__)
-
-require "bundler/setup" if File.exists?(ENV["BUNDLE_GEMFILE"])
-require "rubygems"
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-Dummy::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!