rspec-by 0.0.6 → 0.0.7

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.3.0
+
+install:
+  - bundle install
+
+script:
+  - bundle exec rspec

data/lib/rspec/by/core_ext.rb

@@ -42,12 +42,14 @@ module RSpec::Core
 
   class Example
     private
-    
+
     alias :start_without_reporter :start
 
     def start(reporter)
       start_without_reporter(reporter)
-      @example_group_instance.instance_variable_set(:@by_reporter, reporter)
+      if @example_group_instance
+        @example_group_instance.instance_variable_set(:@by_reporter, reporter)
+      end
     end
   end
 end

data/lib/rspec/by/formatter.rb

@@ -9,9 +9,11 @@ module RSpec
   module By
     class Formatter < RSpec::Core::Formatters::DocumentationFormatter
       RSpec::Core::Formatters.register self,
-                                   :example_failed,
+                                   :example_group_started,
+                                   :example_group_finished,
                                    :example_started,
                                    :example_passed,
+                                   :example_failed,
                                    :by_started,
                                    :by_ended
 
@@ -20,76 +22,111 @@ module RSpec
       def initialize(output)
         super(output)
         @failed_examples = []
-        @by_message_length = 0
+        @bullets = [Bullet.new('', true)]
+      end
+
+      def example_group_started(notification)
+        bullet_start(notification.group.description)
+      end
+
+      def example_group_finished(_notification)
+        @bullets.pop
       end
 
       def example_started(notification)
-        output.puts(
-          "#{current_indentation}Example: #{notification.example.description}")
-        @group_level += 1
-        @example_began = @during = RSpec::Core::Time.now
+        bullet_start(notification.example.description)
       end
 
       def example_passed(passed)
-        @group_level -= 1
-        passed_msg = indent("Passed")
-        end_msg = end_tm.rjust(RIGHT_MARGIN - passed_msg.length, ' ')
-        output.puts RSpec::Core::Formatters::ConsoleCodes.wrap(
-                      "#{passed_msg}#{end_msg}", :success)
+        bullet_end(:success)
       end
 
       def example_failed(failure)
-        @group_level -= 1
-        output.puts("#{current_indentation}Failed in #{end_tm}")
         @failed_examples << failure.example
         output.puts failure.fully_formatted(@failed_examples.size)
-        output.puts
+        bullet_end
       end
 
       def by_started message
-        res = indent message
-        @by_message_length = res.length
-        output.print by_output(res)
+        bullet_start(message, :cyan)
       end
 
       def by_ended(message)
-        message += during_tm
-        output.puts by_output(message.rjust(RIGHT_MARGIN - @by_message_length, ' '))
+        bullet_end(:cyan)
       end
 
       def indent message
         "#{current_indentation}#{message}"
       end
 
-      def by_output message
-        RSpec::Core::Formatters::ConsoleCodes.wrap(message, :cyan)
+      def current_indentation
+        '  ' * (@bullets.size - 1)
       end
 
-      def during_tm
-        temp = RSpec::Core::Time.now
-        delta = temp - @during
-        @during = temp
-        format_time(delta)
+      def current_bullet
+        @bullets.last
       end
 
-      def end_tm
-        delta = RSpec::Core::Time.now - @example_began
-        format_time(delta)
+      def bullet_start(message, color = :white)
+        unless current_bullet.nested?
+          offset = RIGHT_MARGIN - current_bullet.offset
+          output.print RSpec::Core::Formatters::ConsoleCodes.wrap(current_bullet.delta_t.rjust(offset, ' '), color)
+          output.puts ''
+          current_bullet.nest
+        end
+        res = indent message
+        output.print RSpec::Core::Formatters::ConsoleCodes.wrap(res, color)
+        @bullets.push(Bullet.new(res))
       end
 
-      def format_time(duration)
-        if duration > 60
-          minutes = duration.to_i / 60
-          seconds = duration - minutes * 60
-          "#{minutes}m #{format_seconds(seconds)}s"
-        else
-          "#{format_seconds(duration)}s"
+      def bullet_end(color = :white)
+        bullet = @bullets.pop
+        if bullet.nested?
+          bullet.message = ''
         end
+        offset = RIGHT_MARGIN - bullet.offset
+        output.puts RSpec::Core::Formatters::ConsoleCodes.wrap(bullet.delta_t.rjust(offset, ' '), color)
       end
 
-      def format_seconds(float, precision = nil)
-        precision ||= (float < 1) ? 5 : 2
-        sprintf("%.#{precision}f", float)
+      class Bullet
+        attr_accessor :message
+        def initialize(message = '', nested = false)
+          @t0 = RSpec::Core::Time.now
+          @nested = nested
+          @message = message
+        end
+
+        def delta_t
+          delta_t = RSpec::Core::Time.now - @t0
+          format_time(delta_t)
+        end
+
+        def offset
+          @message.size
+        end
+
+        def nest
+          @nested = true
+        end
+
+        def nested?
+          @nested
+        end
+
+        def format_time(duration)
+          if duration > 60
+            minutes = duration.to_i / 60
+            seconds = duration - minutes * 60
+            "#{minutes}m #{format_seconds(seconds)}s"
+          else
+            "#{format_seconds(duration)}s"
+          end
+        end
+
+        def format_seconds(float, precision = 2)
+          #precision ||= (float < 1) ? 5 : 2
+          sprintf("%.#{precision}f", float)
+        end
       end
     end
   end

data/lib/rspec/by/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module By
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/rspec/by/formatter_spec.rb

@@ -54,15 +54,38 @@ module RSpec::By
         end
     end
 
+    default_output = <<-EOS
+root                                                                       0.01s
+  context 1                                                                0.01s
+    nested example 1.1                                                     0.01s
+    nested example 1.2                                                     0.01s
+      knock knock                                                          0.01s
+        who's there?                                                       0.01s
+                                                                           0.01s
+      by                                                                   0.01s
+        by who?                                                            0.01s
+                                                                           0.01s
+      by by                                                                0.01s
+                                                                           0.01s
+    context 1.1                                                            0.01s
+      nested example 1.1.1                                                 0.01s
+      nested example 1.1.2                                                 0.01s
+  context 2                                                                0.01s
+    nested example 2.1                                                     0.01s
+    nested example 2.2                                                     0.01s
+EOS
+
     it "outputs correctly" do
       group = RSpec.describe("root")
       context1 = group.describe("context 1")
       context1.example("nested example 1.1"){}
       context1.example("nested example 1.2") do
-        by('knock knock') {}
-        and_by("who's there?") {}
-        and_by('by') {}
-        and_by('by who?') {}
+        by('knock knock') do
+          and_by("who's there?") {}
+        end
+        and_by('by') do
+          and_by('by who?') {}
+        end
         and_by('by by') {}
       end
 
@@ -78,29 +101,7 @@ module RSpec::By
 
       output = normalize_durations(formatter_output.string)
       output = remove_color(output)
-      expect(output).to eq(normalize_durations("
-root
-  context 1
-    Example: nested example 1.1
-    Passed                                                              0.00022s
-    Example: nested example 1.2
-      knock knock                                                       0.00022s
-      who's there?                                                      0.00022s
-      by                                                                0.00022s
-      by who?                                                           0.00022s
-      by by                                                             0.00022s
-    Passed                                                              0.00022s
-    context 1.1
-      Example: nested example 1.1.1
-      Passed                                                            0.00022s
-      Example: nested example 1.1.2
-      Passed                                                            0.00022s
-  context 2
-    Example: nested example 2.1
-    Passed                                                              0.00022s
-    Example: nested example 2.2
-    Passed                                                              0.00022s
-"))
+      expect(output).to eq(normalize_durations(default_output))
     end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-by
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
+  prerelease: 
 platform: ruby
 authors:
 - Masaki Matsuo
@@ -13,15 +14,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3'
 description: An RSpec formatter that provides step-like message output
@@ -30,8 +33,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -44,26 +48,27 @@ files:
 homepage: https://github.com/sleepn247/rspec-by
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RSpec formatter
 test_files:
 - spec/rspec/by/formatter_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9a240f474d6f0850c2b009b2ed17ffd1353c693b
-  data.tar.gz: ce5ac170951b10ed93d4a5ce3181aa7c6ced7c4e
-SHA512:
-  metadata.gz: d2aa9ae5ec968596cda13158c0d9060c2896657710560e2b3cfeee2a652be9b2f99d3e9396c1d926edac43458ff8e3053f4a62e5764f56e79e4ce92de21404d6
-  data.tar.gz: bdf054b06d30a54e930c48db5cf5c6fbdaad3a0e871f3d44050c04b2c678b16fbc2131eb7186dd77a6397f5a192b478d7fd943054ddbbbb3e467342cf70b1871