luna-rspec-formatters 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34808699734331bb8e0ee5939f4f4a30baa39505
-  data.tar.gz: 7f706e4f352629f2ee2e3d647897fb6517eea655
+  metadata.gz: 2736dd9bc87741064d0ff98dfbbf2780379a5ee3
+  data.tar.gz: dac892532d6d808967e7f7468176d87136fa41ca
 SHA512:
-  metadata.gz: 9fdf6ddb69f0a8e9313c6f45f31243979009a358338ebfa6a5e33488b0c9166c72e0ad4b0cb84d4a47bf20ae88729657a2fedd749c9b710d101406d958e2ebc4
-  data.tar.gz: f460a6303dcdc1803d25592a313511b1b63d0046d43f370429ab1c351eac2a70e6d39a2d1c870cbc62d04632d35049518f43b3a14f8eecda007fbcf446784277
+  metadata.gz: 5b02dfe478d03cf3b8c6960cdbfa2e589cdd9d3b5a40e914002bf8eca82bf847f7ce6a8c19857a77ad5caceb2cc11383d7353badbeb96968de757147ce7e69b8
+  data.tar.gz: 4e0e36bd0d0edc864f5f3ba789c082a7d3287b29428c3880eed1d120fc0f2569b903d5f930df2196ec0cddbe1d80b166be040b7e8f9104a5304e5ecf7a1ed47e

data/README.md

@@ -4,12 +4,15 @@
 gem "luna-rspec-formatters"
 ```
 
-A set of `rspec` formatters that design things the way I like them.  `Doc2` is
-a formatter that outputs the full description as a single line rather than
+A set of `rspec` formatters that design things the way I like them.  `fulldesc`
+is a formatter that outputs the full description as a single line rather than
 nesting like documentation and `Checks` displays checkmark's and other UTF
 characters rather than dots.
 
 ```ruby
 require "luna/rspec/formatters/checks"
-require "luna/rspec/formatters/documentation"
+require "luna/rspec/formatters/fulldesc"
+require "luna/rspec/formatters/smilies"
+require "luna/rspec/formatters/hearts"
+require "luna/rspec/formatters/cats"
 ```

data/lib/luna/rspec/formatters/cats.rb

@@ -0,0 +1,45 @@
+require "luna/rspec/formatters/emoji"
+
+module Luna
+  module RSpec
+    module Formatters
+      class Smilies < Emoji
+        if Gem::Version.new(::RSpec::Version::STRING) >= Gem::Version.new("3.0")
+          ::RSpec::Core::Formatters.register self, *[
+            :start,
+            :start_dump,
+            :example_passed,
+            :example_pending,
+            :example_failed,
+            :dump_profile
+          ]
+        end
+
+        def example_passed(e)
+          newline_or_addup
+          output.print " ".freeze, success_color(
+            "\u1F63B"
+          )
+        end
+
+        def example_failed(e)
+          newline_or_addup
+          output.print " ".freeze, failure_color(
+            "\u1F63E"
+          )
+        end
+
+        def example_pending(e)
+          newline_or_addup
+          output.print " ".freeze, pending_color(
+            "\u1F63F"
+          )
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.formatter = "Luna::RSpec::Formatters::Smilies"
+end

data/lib/luna/rspec/formatters/checks.rb

@@ -1,52 +1,41 @@
-require "rspec/core/formatters/base_text_formatter"
-require "luna/rspec/formatters/profile"
-require "rspec/version"
+require "luna/rspec/formatters/emoji"
 
 module Luna
   module RSpec
     module Formatters
-      class Checks < ::RSpec::Core::Formatters::BaseTextFormatter
+      class Checks < Emoji
         include Profile
 
-        if ::RSpec::Version::STRING >= "3.0.0"
-          # Probably not available in the old version of RSpec.
-          then ::RSpec::Core::Formatters.register self, :start, :start_dump, \
-            :example_passed, :example_pending, :example_failed, :dump_profile
-        end
-
-        [:success, :failure, :pending].each do |m|
-          define_method "#{m}_color" do |v|
-            defined?(super) ? super(v) : \
-              ::RSpec::Core::Formatters::ConsoleCodes.wrap(v, m)
-          end
-        end
-
-        def start(*args)
-          super(*args) if defined?(super)
-          output.puts
-        end
-
-        def start_dump(*args)
-          super(*args) if defined?(super)
-          output.puts
+        if Gem::Version.new(::RSpec::Version::STRING) >= Gem::Version.new("3.0")
+          ::RSpec::Core::Formatters.register self, *[
+            :start,
+            :start_dump,
+            :example_passed,
+            :example_pending,
+            :example_failed,
+            :dump_profile
+          ]
         end
 
         def example_passed(e)
-          super(e) if defined?(super)
-          output.print("\s")
-          output.print(success_color("\u2713"))
+          newline_or_addup
+          output.print " ".freeze, success_color(
+            "\u2714"
+          )
         end
 
         def example_failed(e)
-          super(e) if defined?(super)
-          output.print("\s")
-          output.print(failure_color("\u2718"))
+          newline_or_addup
+          output.print " ".freeze, failure_color(
+            "\u2718"
+          )
         end
 
         def example_pending(e)
-          super(e) if defined?(super)
-          output.print("\s")
-          output.print(pending_color("\u203D"))
+          newline_or_addup
+          output.print " ".freeze, pending_color(
+            "\u203D"
+          )
         end
       end
     end

data/lib/luna/rspec/formatters/emoji.rb

@@ -0,0 +1,38 @@
+require "rspec/core/formatters/base_text_formatter"
+require "luna/rspec/formatters/profile"
+require "rspec/version"
+
+module Luna
+  module RSpec
+    module Formatters
+      class Emoji < ::RSpec::Core::Formatters::BaseTextFormatter
+        include Profile
+
+        [:success, :failure, :pending].each do |m|
+          define_method "#{m}_color" do |v|
+            defined?(super) ? super(v) : \
+              ::RSpec::Core::Formatters::ConsoleCodes.wrap(v, m)
+          end
+        end
+
+        def allowed_cols
+          @cols ||= (`tput cols 2>/dev/null || 80`.to_i / 1.6).floor
+        end
+
+        def start(*args)
+          @lines = 0
+          output.puts
+        end
+
+        def start_dump(*args)
+          output.puts
+        end
+
+        private
+        def newline_or_addup
+          @lines == allowed_cols ? (output.puts; @lines = 1) : @lines+=1
+        end
+      end
+    end
+  end
+end

data/lib/luna/rspec/formatters/fulldesc.rb

@@ -0,0 +1,77 @@
+require "rspec/core/formatters/base_text_formatter"
+require "luna/rspec/formatters/profile"
+require "rspec/version"
+require "coderay"
+
+module Luna
+  module RSpec
+    module Formatters
+      class Documentation < ::RSpec::Core::Formatters::BaseTextFormatter
+        include Profile
+
+        if Gem::Version.new(::RSpec::Version::STRING) >= Gem::Version.new("3.0")
+          ::RSpec::Core::Formatters.register self, *[
+            :start,
+            :start_dump,
+            :example_passed,
+            :example_pending,
+            :example_failed,
+            :dump_profile
+          ]
+        end
+
+        [:success, :failure, :pending].each do |m|
+          define_method "#{m}_color" do |v|
+            defined?(super) ? super(v) : ::RSpec::Core::Formatters::ConsoleCodes.wrap(
+              v, m
+            )
+          end
+        end
+
+        def start(*args)
+          output.puts
+        end
+
+        def start_dump(*args)
+          output.puts
+        end
+
+        def example_passed(struct)
+          output.print "\s"
+          print_description(
+            get_example(struct), :success
+          )
+        end
+
+        def example_failed(struct)
+          output.print "\s"
+          print_description(
+            get_example(struct), :failure
+          )
+        end
+
+        def example_pending(struct)
+          output.print "\s"
+          print_description(
+            get_example(struct), :pending
+          )
+        end
+
+        def get_example(struct)
+          return struct unless struct.respond_to?(:example)
+          struct.example
+        end
+
+        def print_description(example, type)
+          output.print send(
+            :"#{type}_color", "  " + example.full_description + "\n"
+          )
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.formatter = "Luna::RSpec::Formatters::Documentation"
+end

data/lib/luna/rspec/formatters/hearts.rb

@@ -0,0 +1,45 @@
+require "luna/rspec/formatters/emoji"
+
+module Luna
+  module RSpec
+    module Formatters
+      class Hearts < Emoji
+        if Gem::Version.new(::RSpec::Version::STRING) >= Gem::Version.new("3.0")
+          ::RSpec::Core::Formatters.register self, *[
+            :start,
+            :start_dump,
+            :example_passed,
+            :example_pending,
+            :example_failed,
+            :dump_profile
+          ]
+        end
+
+        def example_passed(e)
+          newline_or_addup
+          output.print " ".freeze, success_color(
+            "\u2764"
+          )
+        end
+
+        def example_failed(e)
+          newline_or_addup
+          output.print " ".freeze, failure_color(
+            "\u1F494"
+          )
+        end
+
+        def example_pending(e)
+          newline_or_addup
+          output.print " ".freeze, pending_color(
+            "\u2764"
+          )
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.formatter = "Luna::RSpec::Formatters::Hearts"
+end

data/lib/luna/rspec/formatters/profile.rb

@@ -2,10 +2,10 @@ module Luna
   module RSpec
     module Formatters
       module Profile
-        EXAMPLES = "  %{description} %{seconds} seconds: %{location}"
-          GROUPS = "  %{description} %{total} seconds over %{count} examples: %{location}"
+                 GROUPS = "  %{location} \u2910 %{count} for %{total}"
         EXAMPLES_HEADER = "\nTop %{size} slowest examples (%{seconds}s), %{per_cent}%% of total time:\n"
           GROUPS_HEADER = "\nTop %{size} slowest example groups:"
+               EXAMPLES = "  %{location} \u2910 %{seconds}"
 
 
         def helpers
@@ -14,40 +14,38 @@ module Luna
 
         def dump_profile(profile)
           dump_profile_slowest_examples(profile)
-          dump_profile_slowest_example_groups(profile)
+          dump_profile_slowest_example_groups(
+            profile
+          )
         end
 
         private
         def dump_profile_slowest_examples(profile)
-          unless profile.slowest_examples.any? { |e| e.execution_result.run_time >= 0.2 }
-            return
-          end
-
           examples_header(profile)
           profile.slowest_examples.each do |e|
+            sec = helpers.format_seconds(e.execution_result.run_time) + \
+              " seconds"
+
             @output.puts EXAMPLES % {
               location: format_caller(e.location),
-              seconds: failure_color(helpers.format_seconds(e.execution_result.run_time)),
+              seconds: sec.to_f < 1 ? success_color(sec) : failure_color(sec),
               description: e.full_description
             }
           end
         end
 
         def dump_profile_slowest_example_groups(profile)
-          unless !profile.slowest_groups.empty? && \
-              profile.slowest_groups.any? { |l, h| h[:average] >= 0.4 }
-
-            return
-          end
-
           groups_header(profile)
           profile.slowest_groups.each do |l, h|
-            @output.puts GROUPS % {
+            sec = helpers.format_seconds(h[:total_time]) + \
+              "seconds"
+
+            @output.puts color_blue(GROUPS % {
               description: h[:description],
-              total: failure_color(helpers.format_seconds(h[:total_time])),
-              count: helpers.pluralize(h[:count], "example"),
-              location: l
-            }
+              total: sec.to_f < 2 ? success_color(sec) : failure_color(sec),
+              location: color_blue(strip_relative(l)),
+              count: h[:count]
+            })
           end
         end
 
@@ -65,10 +63,22 @@ module Luna
           }
         end
 
+        def color_blue(str)
+          ::RSpec::Core::Formatters::ConsoleCodes.wrap(
+            str, :cyan
+          )
+        end
+
+        def strip_relative(path)
+          path.gsub(
+            /\A\.\//, ""
+          )
+        end
+
         def format_caller(caller_info)
-          ::RSpec.configuration.backtrace_formatter.backtrace_line(
+          color_blue strip_relative(::RSpec.configuration.backtrace_formatter.backtrace_line(
             caller_info.to_s.split(':in `block').first
-          )
+          ))
         end
       end
     end

data/lib/luna/rspec/formatters/smilies.rb

@@ -0,0 +1,45 @@
+require "luna/rspec/formatters/emoji"
+
+module Luna
+  module RSpec
+    module Formatters
+      class Smilies < Emoji
+        if Gem::Version.new(::RSpec::Version::STRING) >= Gem::Version.new("3.0")
+          ::RSpec::Core::Formatters.register self, *[
+            :start,
+            :start_dump,
+            :example_passed,
+            :example_pending,
+            :example_failed,
+            :dump_profile
+          ]
+        end
+
+        def example_passed(e)
+          newline_or_addup
+          output.print " ".freeze, success_color(
+            "\u263A"
+          )
+        end
+
+        def example_failed(e)
+          newline_or_addup
+          output.print " ".freeze, failure_color(
+            "\u2639"
+          )
+        end
+
+        def example_pending(e)
+          newline_or_addup
+          output.print " ".freeze, pending_color(
+            "\u2639"
+          )
+        end
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.formatter = "Luna::RSpec::Formatters::Smilies"
+end

data/lib/luna/rspec/formatters/version.rb

@@ -1,7 +1,7 @@
 module Luna
   module Rspec
     module Formatters
-      VERSION = "3.3.2"
+      VERSION = "3.4.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luna-rspec-formatters
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -40,9 +40,13 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- lib/luna/rspec/formatters/cats.rb
 - lib/luna/rspec/formatters/checks.rb
-- lib/luna/rspec/formatters/documentation.rb
+- lib/luna/rspec/formatters/emoji.rb
+- lib/luna/rspec/formatters/fulldesc.rb
+- lib/luna/rspec/formatters/hearts.rb
 - lib/luna/rspec/formatters/profile.rb
+- lib/luna/rspec/formatters/smilies.rb
 - lib/luna/rspec/formatters/version.rb
 homepage: https://github.com/envygeeks/luna-rspec-formatters
 licenses:
@@ -64,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: RSpec formatters dedicated to Luna.

data/lib/luna/rspec/formatters/documentation.rb

@@ -1,61 +0,0 @@
-require "rspec/core/formatters/base_text_formatter"
-require "luna/rspec/formatters/profile"
-require "rspec/version"
-require "coderay"
-
-module Luna
-  module RSpec
-    module Formatters
-      class Documentation < ::RSpec::Core::Formatters::BaseTextFormatter
-        include Profile
-
-        if ::RSpec::Version::STRING >= "3.0.0"
-          # Probably not available in the old version of RSpec.
-          ::RSpec::Core::Formatters.register self, :start, :start_dump, \
-            :example_passed, :example_pending, :example_failed, :dump_profile
-        end
-
-        [:success, :failure, :pending].each do |m|
-          define_method "#{m}_color" do |v|
-            defined?(super) ? super(v) : \
-              ::RSpec::Core::Formatters::ConsoleCodes.wrap(v, m)
-          end
-        end
-
-        def start(*args)
-          super(*args) if defined?(super)
-          output.puts
-        end
-
-        def start_dump(*args)
-          super(*args) if defined?(super)
-          output.puts
-        end
-
-        def example_passed(e)
-          output.print("\s")
-          print_description(e, :success)
-        end
-
-        def example_failed(e)
-          output.print("\s")
-          print_description(e, :failure)
-        end
-
-        def example_pending(e)
-          output.print("\s")
-          print_description(e, :pending)
-        end
-
-        def print_description(example, type)
-          output.print send(:"#{type}_color",
-            "\t" + example.full_description + "\n")
-        end
-      end
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.formatter = "Luna::RSpec::Formatters::Documentation"
-end