turnip_formatter 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf2cb89186ac950d7e5016cdf19bd3971bd99ea7
-  data.tar.gz: 806569c9a32ee90d4dd74cd436eb40873b59637c
+  metadata.gz: 5c2de1ecef64d4a95753fdf6bd9a9eeb6916bf95
+  data.tar.gz: 431ffff5eb2458aecf9d49612bcdf90942767296
 SHA512:
-  metadata.gz: 960fb26961d339b500bfd59d54d31849a28ff9fad2103cf9bc36cbaf36b8b16da8dd539b243bfeea2352a180135e57a302c8f7cd182929ab70e8f926293e9717
-  data.tar.gz: f93667549138a32b54ef8fe0ee814668e0b5bdd750b1cd82f904a1e1f0edb0e03280137bc77d20d25f1769c13b1328ea15c7d473efea57408525538d542095ff
+  metadata.gz: f0a0b433a65848792bb93990070b7e3d280a733511bb9e29a4b7e3b7971fadd0f5374b9fca5ebb0f157a79409190c1241dd719ce09322bbeb59ca7b26d0c4b57
+  data.tar.gz: a09fe98fd660bbe2f47ff24e6a11bbc7dd8cd6e46c0740899c5d05d462f53bb3a7b7af0725d265e08abf3db8f2e4afc0972c5803c75d2c7b113703846fcc7e04

data/.travis.yml

@@ -1,13 +1,27 @@
 language: ruby
+
+sudo: false
+cache: bundler
+
+branches:
+  only:
+    - master
+    - 0.4.0-dev
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/Gemfile-rspec-3.2.x
+    - rvm: ruby-head
+
 rvm:
   - 2.0.0
   - 2.1
   - 2.2
-  - jruby-1.7.10
+  - ruby-head
+  - jruby-9.0.0.0
+
 script: bundle exec rspec
+
 gemfile:
-  - spec/gemfiles/Gemfile-rspec-2.14.x
-  - spec/gemfiles/Gemfile-rspec-2.99.x
-  - spec/gemfiles/Gemfile-rspec-3.0.x
-  - spec/gemfiles/Gemfile-rspec-3.1.x
-  - spec/gemfiles/Gemfile-rspec-3.2.x
+  - gemfiles/Gemfile-rspec-3.2.x
+  - gemfiles/Gemfile-rspec-3.3.x

data/{spec/gemfiles → gemfiles}/Gemfile-rspec-3.2.x

@@ -1,4 +1,4 @@
 source 'http://rubygems.org'
 
-gemspec :path => '../..'
+gemspec :path => '..'
 gem 'rspec', '~> 3.2.0'

data/gemfiles/Gemfile-rspec-3.3.x

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+
+gemspec :path => '..'
+gem 'rspec', '~> 3.3.0'

data/lib/rspec/core/formatters/turnip_formatter.rb

@@ -6,8 +6,6 @@ require 'turnip_formatter/scenario/failure'
 require 'turnip_formatter/scenario/pending'
 require 'turnip_formatter/printer/index'
 require 'turnip_formatter/printer/scenario'
-require_relative './turnip_formatter/for_rspec2'
-require_relative './turnip_formatter/for_rspec3'
 
 module RSpec
   module Core
@@ -15,12 +13,11 @@ module RSpec
       class TurnipFormatter < BaseFormatter
         attr_accessor :scenarios
 
-        if Formatters.respond_to?(:register)
-          include TurnipFormatter::ForRSpec3
-          extend TurnipFormatter::ForRSpec3::Helper
-        else
-          include TurnipFormatter::ForRSpec2
-          extend TurnipFormatter::ForRSpec2::Helper
+        Formatters.register self, :example_passed, :example_pending, :example_failed, :dump_summary
+
+        def self.formatted_backtrace(example)
+          formatter = RSpec.configuration.backtrace_formatter
+          formatter.format_backtrace(example.exception.backtrace, example.metadata)
         end
 
         def initialize(output)
@@ -28,6 +25,31 @@ module RSpec
           @scenarios = []
         end
 
+        def dump_summary(summary)
+          print_params = {
+            scenarios:      scenarios,
+            failed_count:   summary.failure_count,
+            pending_count:  summary.pending_count,
+            total_time:     summary.duration
+          }
+          output_html(print_params)
+        end
+
+        def example_passed(notification)
+          scenario = ::TurnipFormatter::Scenario::Pass.new(notification.example)
+          scenarios << scenario
+        end
+
+        def example_pending(notification)
+          scenario = ::TurnipFormatter::Scenario::Pending.new(notification.example)
+          scenarios << scenario
+        end
+
+        def example_failed(notification)
+          scenario = ::TurnipFormatter::Scenario::Failure.new(notification.example)
+          scenarios << scenario
+        end
+
         private
 
         def output_html(params)

data/lib/turnip_formatter/scenario/base.rb

@@ -85,20 +85,14 @@ module TurnipFormatter
       # @return  [Hash]  parent example group
       #
       def parent_example_group
-        if example.example_group.metadata.key?(:parent_example_group)
-          # RSpec 3
-          example.example_group.metadata[:parent_example_group]
-        else
-          # RSpec 2
-          example.example_group.metadata[:example_group][:example_group]
-        end
+        example.example_group.metadata[:parent_example_group]
       end
 
       #
       # @return  [OpenStruct or ::RSpec::Core::Example::ExecutionResult]
       #
       def execution_result
-        @execution_result ||= Helper.example_execution_result(example)
+        @execution_result ||= example.execution_result
       end
     end
   end

data/lib/turnip_formatter/scenario/pending.rb

@@ -33,8 +33,7 @@ module TurnipFormatter
       end
 
       def pending_message
-        result = TurnipFormatter::Helper.example_execution_result(example)
-        result.pending_message
+        example.execution_result.pending_message
       end
     end
   end

data/lib/turnip_formatter/step_template/exception.rb

@@ -35,8 +35,7 @@ module TurnipFormatter
       # @param  [RSpec::Core::Example]  example
       #
       def build_pending(example)
-        result = TurnipFormatter::Helper.example_execution_result(example)
-        build(result.pending_message, [example.location])
+        build(example.execution_result.pending_message, [example.location])
       end
 
       private

data/lib/turnip_formatter/step_template/source.rb

@@ -1,5 +1,4 @@
 require 'turnip_formatter/step_template/base'
-require 'rspec/core/formatters/snippet_extractor'
 
 module TurnipFormatter
   module StepTemplate
@@ -38,13 +37,21 @@ module TurnipFormatter
 
       private
 
-        def location(example)
-          formatted_backtrace(example).first
-        end
+      def location(example)
+        formatted_backtrace(example).first
+      end
 
-        def extractor
-          @extractor ||= ::RSpec::Core::Formatters::SnippetExtractor.new
-        end
+      def extractor
+        @extractor ||= begin
+                         # RSpec 3.4
+                         require 'rspec/core/formatters/html_snippet_extractor'
+                         ::RSpec::Core::Formatters::HtmlSnippetExtractor.new
+                       rescue LoadError
+                         # RSpec 3.3 or earlier
+                         require 'rspec/core/formatters/snippet_extractor'
+                         ::RSpec::Core::Formatters::SnippetExtractor.new
+                       end
+      end
     end
   end
 end

data/lib/turnip_formatter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module TurnipFormatter
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/lib/turnip_formatter.rb

@@ -43,7 +43,6 @@ module TurnipFormatter
   end
 
   require 'rspec/core/formatters/turnip_formatter'
-  require 'turnip_formatter/helper'
   require 'turnip_formatter/template'
   require 'turnip_formatter/step_template/exception'
   require 'turnip_formatter/step_template/source'

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
-require 'simplecov'
-require 'coveralls'
+if !defined?(JRUBY_VERSION)
+  require 'simplecov'
+  require 'coveralls'
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter 'spec/'
-  add_filter 'vendor/'
-  add_filter 'lib/turnip_formatter/ext'
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter 'spec/'
+    add_filter 'vendor/'
+    add_filter 'lib/turnip_formatter/ext'
+  end
 end
 
 require 'turnip_formatter'

data/spec/turnip_formatter/template_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe TurnipFormatter::Template do
   let(:template) { described_class }

data/turnip_formatter.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'turnip', '~> 1.3.0'
+  spec.add_dependency 'turnip', '~> 2.0.0'
   spec.add_dependency 'slim'
-  spec.add_dependency 'rspec', ['>=2.14.0', '<4.0']
+  spec.add_dependency 'rspec', [">=3.0", "<4.0"]
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'coveralls'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turnip_formatter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Wataru MIYAGUNI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turnip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -175,12 +175,11 @@ files:
 - example/spec/steps/escape_steps.rb
 - example/spec/steps/spell_steps.rb
 - example/spec/steps/steps.rb
+- gemfiles/Gemfile-rspec-3.2.x
+- gemfiles/Gemfile-rspec-3.3.x
 - lib/rspec/core/formatters/turnip_formatter.rb
-- lib/rspec/core/formatters/turnip_formatter/for_rspec2.rb
-- lib/rspec/core/formatters/turnip_formatter/for_rspec3.rb
 - lib/turnip_formatter.rb
 - lib/turnip_formatter/ext/turnip/rspec.rb
-- lib/turnip_formatter/helper.rb
 - lib/turnip_formatter/printer.rb
 - lib/turnip_formatter/printer/index.rb
 - lib/turnip_formatter/printer/runtime_error.rb
@@ -214,11 +213,6 @@ files:
 - lib/turnip_formatter/template/turnip_formatter.js
 - lib/turnip_formatter/template/turnip_formatter.scss
 - lib/turnip_formatter/version.rb
-- spec/gemfiles/Gemfile-rspec-2.14.x
-- spec/gemfiles/Gemfile-rspec-2.99.x
-- spec/gemfiles/Gemfile-rspec-3.0.x
-- spec/gemfiles/Gemfile-rspec-3.1.x
-- spec/gemfiles/Gemfile-rspec-3.2.x
 - spec/spec_helper.rb
 - spec/support/example_helper.rb
 - spec/support/passed.feature
@@ -258,16 +252,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RSpec custom formatter for Turnip
 test_files:
-- spec/gemfiles/Gemfile-rspec-2.14.x
-- spec/gemfiles/Gemfile-rspec-2.99.x
-- spec/gemfiles/Gemfile-rspec-3.0.x
-- spec/gemfiles/Gemfile-rspec-3.1.x
-- spec/gemfiles/Gemfile-rspec-3.2.x
 - spec/spec_helper.rb
 - spec/support/example_helper.rb
 - spec/support/passed.feature

data/lib/rspec/core/formatters/turnip_formatter/for_rspec2.rb

@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module RSpec
-  module Core
-    module Formatters
-      class TurnipFormatter < BaseFormatter
-        module ForRSpec2
-          def dump_summary(duration, _, failure_count, pending_count)
-            print_params = {
-              scenarios:      scenarios,
-              failed_count:   failure_count,
-              pending_count:  pending_count,
-              total_time:     duration
-            }
-            output_html(print_params)
-          end
-
-          def example_passed(example)
-            scenario = ::TurnipFormatter::Scenario::Pass.new(example)
-            scenarios << scenario
-          end
-
-          def example_pending(example)
-            scenario = ::TurnipFormatter::Scenario::Pending.new(example)
-            scenarios << scenario
-          end
-
-          def example_failed(example)
-            scenario = ::TurnipFormatter::Scenario::Failure.new(example)
-            scenarios << scenario
-          end
-
-          module Helper
-            def formatted_backtrace(example)
-              RSpec::Core::BacktraceFormatter.format_backtrace(example.exception.backtrace, example.metadata)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rspec/core/formatters/turnip_formatter/for_rspec3.rb

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module RSpec
-  module Core
-    module Formatters
-      class TurnipFormatter < BaseFormatter
-        module ForRSpec3
-          def self.included(klass)
-            RSpec::Core::Formatters.register klass, :example_passed, :example_pending, :example_failed, :dump_summary
-          end
-
-          def dump_summary(summary)
-            print_params = {
-              scenarios:      scenarios,
-              failed_count:   summary.failure_count,
-              pending_count:  summary.pending_count,
-              total_time:     summary.duration
-            }
-            output_html(print_params)
-          end
-
-          def example_passed(notification)
-            scenario = ::TurnipFormatter::Scenario::Pass.new(notification.example)
-            scenarios << scenario
-          end
-
-          def example_pending(notification)
-            scenario = ::TurnipFormatter::Scenario::Pending.new(notification.example)
-            scenarios << scenario
-          end
-
-          def example_failed(notification)
-            scenario = ::TurnipFormatter::Scenario::Failure.new(notification.example)
-            scenarios << scenario
-          end
-
-          module Helper
-            def formatted_backtrace(example)
-              formatter = RSpec.configuration.backtrace_formatter
-              formatter.format_backtrace(example.exception.backtrace, example.metadata)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/turnip_formatter/helper.rb

@@ -1,22 +0,0 @@
-module TurnipFormatter
-  module Helper
-    module HelperMethods
-      #
-      # @param  [RSpec::Core::Example]  example
-      # @param  [OpenStruct or ::RSpec::Core::Example::ExecutionResult]
-      #
-      def example_execution_result(example)
-        case example.execution_result
-        when Hash
-          # RSpec 2
-          OpenStruct.new(example.execution_result)
-        when ::RSpec::Core::Example::ExecutionResult
-          # RSpec 3
-          example.execution_result
-        end
-      end
-    end
-
-    extend HelperMethods
-  end
-end

data/spec/gemfiles/Gemfile-rspec-2.14.x

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec :path => '../..'
-gem 'rspec', '~> 2.14.0'

data/spec/gemfiles/Gemfile-rspec-2.99.x

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec :path => '../..'
-gem 'rspec', '~> 2.99.0'

data/spec/gemfiles/Gemfile-rspec-3.0.x

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec :path => '../..'
-gem 'rspec', '~> 3.0.0'

data/spec/gemfiles/Gemfile-rspec-3.1.x

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec :path => '../..'
-gem 'rspec', '~> 3.1.0'