teaspoon 1.1.2 → 1.2.1

data/lib/teaspoon/formatter/tap.rb

@@ -5,35 +5,35 @@ module Teaspoon
     class Tap < Base
       protected
 
-      def log_runner(_result)
-        log_line("1..#{@total_count}")
-      end
-
-      def log_passing_spec(result)
-        log_line("ok #{@run_count} - #{result.description}")
-      end
-
-      def log_pending_spec(result)
-        log_line("ok #{@run_count} - [pending] #{result.description}")
-      end
-
-      def log_failing_spec(result)
-        log_line("not ok #{@run_count} - #{result.description}")
-        log_line("  FAIL #{result.message}")
-      end
-
-      def log_console(message)
-        log_line("# #{message.gsub(/\n$/, '')}")
-      end
-
-      def log_coverage(message)
-        log_line("# #{message.gsub(/\n/, "\n# ")}")
-      end
-
-      def log_threshold_failure(message)
-        log_line("not ok #{@run_count + 1} - Coverage threshold failed")
-        log_line("# #{message.gsub(/\n/, "\n# ")}")
-      end
+        def log_runner(_result)
+          log_line("1..#{@total_count}")
+        end
+
+        def log_passing_spec(result)
+          log_line("ok #{@run_count} - #{result.description}")
+        end
+
+        def log_pending_spec(result)
+          log_line("ok #{@run_count} - [pending] #{result.description}")
+        end
+
+        def log_failing_spec(result)
+          log_line("not ok #{@run_count} - #{result.description}")
+          log_line("  FAIL #{result.message}")
+        end
+
+        def log_console(message)
+          log_line("# #{message.gsub(/\n$/, '')}")
+        end
+
+        def log_coverage(message)
+          log_line("# #{message.gsub(/\n/, "\n# ")}")
+        end
+
+        def log_threshold_failure(message)
+          log_line("not ok #{@run_count + 1} - Coverage threshold failed")
+          log_line("# #{message.gsub(/\n/, "\n# ")}")
+        end
     end
   end
 end

data/lib/teaspoon/formatter/tap_y.rb

@@ -6,71 +6,71 @@ module Teaspoon
     class TapY < Base
       protected
 
-      def log_runner(result)
-        log "type" => "suite",
-            "start" => result.start,
-            "count" => result.total,
-            "seed" => 0,
-            "rev" => 4
-      end
+        def log_runner(result)
+          log "type" => "suite",
+              "start" => result.start,
+              "count" => result.total,
+              "seed" => 0,
+              "rev" => 4
+        end
 
-      def log_suite(result)
-        log "type" => "case",
-            "label" => result.label,
-            "level" => result.level
-      end
+        def log_suite(result)
+          log "type" => "case",
+              "label" => result.label,
+              "level" => result.level
+        end
 
-      def log_passing_spec(result)
-        log "type" => "test",
-            "status" => "pass",
-            "label" => result.label,
-            "stdout" => @stdout
-      end
+        def log_passing_spec(result)
+          log "type" => "test",
+              "status" => "pass",
+              "label" => result.label,
+              "stdout" => @stdout
+        end
 
-      def log_pending_spec(result)
-        log "type" => "test",
-            "status" => "pending",
-            "label" => result.label,
-            "stdout" => @stdout,
-            "exception" => {
-              "message" => result.message
-            }
-      end
+        def log_pending_spec(result)
+          log "type" => "test",
+              "status" => "pending",
+              "label" => result.label,
+              "stdout" => @stdout,
+              "exception" => {
+                "message" => result.message
+              }
+        end
 
-      def log_failing_spec(result)
-        log "type" => "test",
-            "status" => "fail",
-            "label" => result.label,
-            "stdout" => @stdout,
-            "exception" => {
-              "message" => result.message,
-              "backtrace" => ["#{result.link}#:0"],
-              "file" => "unknown",
-              "line" => "unknown",
-              "source" => "unknown",
-              "snippet" => { "0" => result.link },
-              "class" => "Unknown"
-            }
-      end
+        def log_failing_spec(result)
+          log "type" => "test",
+              "status" => "fail",
+              "label" => result.label,
+              "stdout" => @stdout,
+              "exception" => {
+                "message" => result.message,
+                "backtrace" => ["#{result.link}#:0"],
+                "file" => "unknown",
+                "line" => "unknown",
+                "source" => "unknown",
+                "snippet" => { "0" => result.link },
+                "class" => "Unknown"
+              }
+        end
 
-      def log_result(result)
-        log "type" => "final",
-            "time" => result.elapsed,
-            "counts" => {
-              "total" => @run_count,
-              "pass" => @passes.size,
-              "fail" => @failures.size,
-              "error" => @errors.size,
-              "omit" => 0,
-              "todo" => @pendings.size
-            }
-      end
+        def log_result(result)
+          log "type" => "final",
+              "time" => result.elapsed,
+              "counts" => {
+                "total" => @run_count,
+                "pass" => @passes.size,
+                "fail" => @failures.size,
+                "error" => @errors.size,
+                "omit" => 0,
+                "todo" => @pendings.size
+              }
+        end
 
       private
 
-      def log(hash)
-        log_str(hash.to_yaml)
-      end
+        def log(hash)
+          log_str(hash.to_yaml)
+        end
     end
   end
 end

data/lib/teaspoon/formatter/teamcity.rb

@@ -10,87 +10,87 @@ module Teaspoon
 
       protected
 
-      def log_runner(result)
-        log("testCount count='#{result.total}' timestamp='#{result.start}'")
-      end
-
-      def log_suite(result)
-        log_end_suite
-        log("testSuiteStarted name='#{result.label}'")
-      end
+        def log_runner(result)
+          log("testCount count='#{result.total}' timestamp='#{result.start}'")
+        end
 
-      def log_passing_spec(result)
-        log_teamcity_spec(type: "testStarted", desc: escape(result.description))
-      end
+        def log_suite(result)
+          log_end_suite
+          log("testSuiteStarted name='#{result.label}'")
+        end
 
-      def log_pending_spec(result)
-        log_teamcity_spec(type: "testIgnored", desc: escape(result.description))
-      end
+        def log_passing_spec(result)
+          log_teamcity_spec(type: "testStarted", desc: escape(result.description))
+        end
 
-      def log_failing_spec(result)
-        log_teamcity_spec(type: "testStarted", desc: escape(result.description)) do
-          log("testFailed name='#{escape(result.description)}' message='#{escape(result.message)}'")
+        def log_pending_spec(result)
+          log_teamcity_spec(type: "testIgnored", desc: escape(result.description))
         end
-      end
 
-      def log_error(result)
-        log("message text='#{escape(result.message)}' errorDetails='#{escape_trace(result.trace)}' status='ERROR'")
-      end
+        def log_failing_spec(result)
+          log_teamcity_spec(type: "testStarted", desc: escape(result.description)) do
+            log("testFailed name='#{escape(result.description)}' message='#{escape(result.message)}'")
+          end
+        end
 
-      def log_result(result)
-        log_end_suite
-        @result = result
-      end
+        def log_error(result)
+          log("message text='#{escape(result.message)}' errorDetails='#{escape_trace(result.trace)}' status='ERROR'")
+        end
 
-      def log_coverage(message)
-        log("testSuiteStarted name='Coverage summary'")
-        log_line(message)
-        log("testSuiteFinished name='Coverage summary'")
-      end
+        def log_result(result)
+          log_end_suite
+          @result = result
+        end
 
-      def log_threshold_failure(message)
-        log("testSuiteStarted name='Coverage thresholds'")
-        log_teamcity_spec(type: "testStarted", desc: "Coverage thresholds") do
-          log("testFailed name='Coverage thresholds' message='were not met'")
+        def log_coverage(message)
+          log("testSuiteStarted name='Coverage summary'")
           log_line(message)
+          log("testSuiteFinished name='Coverage summary'")
         end
-        log("testSuiteFinished name='Coverage thresholds'")
-      end
 
-      def log_complete(failure_count)
-        log_line("\nFinished in #{@result.elapsed} seconds")
-        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
-      end
+        def log_threshold_failure(message)
+          log("testSuiteStarted name='Coverage thresholds'")
+          log_teamcity_spec(type: "testStarted", desc: "Coverage thresholds") do
+            log("testFailed name='Coverage thresholds' message='were not met'")
+            log_line(message)
+          end
+          log("testSuiteFinished name='Coverage thresholds'")
+        end
+
+        def log_complete(failure_count)
+          log_line("\nFinished in #{@result.elapsed} seconds")
+          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
+        end
 
       private
 
-      def log_end_suite
-        log("testSuiteFinished name='#{escape(@last_suite.label)}'") if @last_suite
-      end
+        def log_end_suite
+          log("testSuiteFinished name='#{escape(@last_suite.label)}'") if @last_suite
+        end
 
-      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?
-        log("testFinished name='#{opts[:desc]}'")
-      end
+        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?
+          log("testFinished name='#{opts[:desc]}'")
+        end
 
-      def log(str)
-        log_line("##teamcity[#{str}]")
-      end
+        def log(str)
+          log_line("##teamcity[#{str}]")
+        end
 
-      def escape(str)
-        str = str.gsub(/[|'\[\]]/) { |c| "|#{c}" }
-        str.gsub("\n", "|n").gsub("\r", "|r")
-      end
+        def escape(str)
+          str = str.gsub(/[|'\[\]]/) { |c| "|#{c}" }
+          str.gsub("\n", "|n").gsub("\r", "|r")
+        end
 
-      def escape_trace(trace)
-        lines = trace.map { |t| ["#{t['file']}:#{t['line']}", t["function"]].compact.join(" ") }
-        escape(lines.join("\n"))
-      end
+        def escape_trace(trace)
+          lines = trace.map { |t| ["#{t['file']}:#{t['line']}", t["function"]].compact.join(" ") }
+          escape(lines.join("\n"))
+        end
     end
   end
 end

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,11 +22,11 @@ module Teaspoon
       if !(driver = @registry[normalize_name(name)])
         raise not_found_exception.new(name: name, available: available.keys)
       end
-      
+
       driver.call
     end
 
-    def equal?(one, two)
+    def matches?(one, two)
       normalize_name(one) == normalize_name(two)
     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