dotpretty 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb44866622c88b9a0722ecfd42457185899d29c172a85022513da49842388ae3
-  data.tar.gz: 1109d0382e8d234177c9f7f94995347d15f01e2ee96609a7924e8a6258e350ed
+  metadata.gz: 8205f1decc125ec0d793587399cc4ff3f7969a7eef4af49f329417bb7242e857
+  data.tar.gz: 87de6c2d74f51077c24148848494b89409dfc468423bb9689f043370110cf6e2
 SHA512:
-  metadata.gz: 35502d2ff40f31df22c7084b460e93c19d4cb6ac7cc49e2d7c7fe2023e78664c7630976b2f3909afce7c2b8b8b9e9121be073366f01437d5f4bd4145bed9221d
-  data.tar.gz: 5329a2a735a9c600cd038606a113371827d26aaf8bd73f11bc0d4359ee614b585f9478811fbd308ad562c59ed126dfcb5907c189bb296cadd1b4d8707ae63631
+  metadata.gz: 5f4f1bdadaf2d027fcb3390e65e9f4dd2b40f403efe9c345b6448090c0fe5e33ddaef5a87e2a87075a17e7e33cc1e959e742d90cc5bbfdb77674e3bdf3fbe22d
+  data.tar.gz: 31208e1b8de1e11b30c7c3281f2e9677a2c8021fd593c6e85f8f620cdacf217a82e118123ca2f5d5b93e332dd00777c56c081f596e4bb63a3e8faa59e826109f

data/lib/dotpretty/aggregator.rb

@@ -5,6 +5,7 @@ module Dotpretty
     BUILD_FAILED = /^Build FAILED.$/
     TEST_FAILED = /^Failed/
     TEST_PASSED = /^Passed/
+    TEST_SKIPPED = /^Skipped/
     TEST_SUMMARY = /^Total tests/
     TESTS_STARTED = /^Starting test execution, please wait...$/
 
@@ -58,6 +59,9 @@ module Dotpretty
       elsif input_line.match(TEST_FAILED)
         match = input_line.match(/^Failed\s+(.+)$/)
         state_machine.trigger(:test_failed, match[1])
+      elsif input_line.match(TEST_SKIPPED)
+        match = input_line.match(/^Skipped\s+(.+)$/)
+        state_machine.trigger(:test_skipped, match[1])
       elsif input_line.match(TEST_SUMMARY)
         state_machine.trigger(:tests_completed, input_line)
       else
@@ -130,6 +134,10 @@ module Dotpretty
       reporter.test_passed(test_name)
     end
 
+    def test_skipped(test_name)
+      reporter.test_skipped(test_name)
+    end
+
     private
 
     attr_accessor :build_failure_details, :current_failing_test, :reporter

data/lib/dotpretty/colorers/bash.rb

@@ -5,6 +5,7 @@ module Dotpretty
       RESET="\e[0m"
       START_GREEN="\033[32m"
       START_RED="\033[31m"
+      START_YELLOW="\033[33m"
 
       def green(text)
         return "#{START_GREEN}#{text}#{RESET}"
@@ -14,6 +15,10 @@ module Dotpretty
         return "#{START_RED}#{text}#{RESET}"
       end
 
+      def yellow(text)
+        return "#{START_YELLOW}#{text}#{RESET}"
+      end
+
     end
   end
 end

data/lib/dotpretty/colorers/null.rb

@@ -10,6 +10,10 @@ module Dotpretty
         text
       end
 
+      def yellow(text)
+        text
+      end
+
     end
   end
 end

data/lib/dotpretty/parser.rb

@@ -40,6 +40,7 @@ module Dotpretty
           transition :received_other_input, :waiting_for_test_input
           transition :test_failed, :waiting_for_failure_details, :reset_current_failing_test
           transition :test_passed, :waiting_for_test_input, :test_passed
+          transition :test_skipped, :waiting_for_test_input, :test_skipped
           transition :tests_completed, :done, :show_test_summary
         end
         state :waiting_for_failure_details do

data/lib/dotpretty/reporters/basic.rb

@@ -1,8 +1,11 @@
+require "dotpretty/reporters/test_summary_formatter"
+
 module Dotpretty
   module Reporters
     class Basic
 
       def initialize(colorer:, output:)
+        self.colorer = colorer
         self.extend(colorer)
         self.output = output
       end
@@ -31,6 +34,10 @@ module Dotpretty
         output.puts("#{green("Passed")}   #{test_name}")
       end
 
+      def test_skipped(test_name)
+        output.puts("#{yellow("Skipped")}  #{test_name}")
+      end
+
       def test_failed(failing_test)
         output.puts("#{red("Failed")}   #{failing_test[:name]}")
         failing_test[:details].each do |line|
@@ -47,15 +54,13 @@ module Dotpretty
       private
 
       def colored_message(summary)
-        message = "Total tests: #{summary[:totalTests]}. Passed: #{summary[:passedTests]}. Failed: #{summary[:failedTests]}. Skipped: #{summary[:skippedTests]}."
-        if summary[:passedTests] == summary[:totalTests]
-          return green(message)
-        else
-          return red(message)
-        end
+        return Dotpretty::Reporters::TestSummaryFormatter.new({
+          colorer: colorer,
+          summary: summary
+        }).colored_message
       end
 
-      attr_accessor :output
+      attr_accessor :colorer, :output
 
     end
   end

data/lib/dotpretty/reporters/json.rb

@@ -28,6 +28,13 @@ module Dotpretty
         }
       end
 
+      def test_skipped(test_name)
+        tests << {
+          name: test_name,
+          result: "skipped"
+        }
+      end
+
       def test_failed(failing_test)
         tests << failing_test.merge({
           result: "failed"

data/lib/dotpretty/reporters/progress.rb

@@ -3,8 +3,10 @@ module Dotpretty
     class Progress
 
       def initialize(colorer:, output:)
+        self.colorer = colorer
         self.extend(colorer)
         self.failing_tests = []
+        self.skipped_test_names = []
         self.output = output
       end
 
@@ -27,6 +29,7 @@ module Dotpretty
       def show_test_summary(summary)
         output.puts("")
         output.puts("")
+        show_skipped_summary if !skipped_test_names.empty?
         show_failure_summary if !failing_tests.empty?
         output.puts(formatted_test_summary(summary))
       end
@@ -44,15 +47,18 @@ module Dotpretty
         output.print(green("."))
       end
 
+      def test_skipped(test_name)
+        skipped_test_names << test_name
+        output.print(yellow("*"))
+      end
+
       private
 
       def formatted_test_summary(summary)
-        message = "Total tests: #{summary[:totalTests]}. Passed: #{summary[:passedTests]}. Failed: #{summary[:failedTests]}. Skipped: #{summary[:skippedTests]}."
-        if summary[:totalTests] == summary[:passedTests]
-          return green(message)
-        else
-          return red(message)
-        end
+        return Dotpretty::Reporters::TestSummaryFormatter.new({
+          colorer: colorer,
+          summary: summary
+        }).colored_message
       end
 
       def show_failure_summary
@@ -68,7 +74,17 @@ module Dotpretty
         end
         output.puts("")
       end
-      attr_accessor :failing_tests, :output
+
+      def show_skipped_summary
+        output.puts("Skipped:")
+        output.puts("")
+        skipped_test_names.each_with_index do |test_name, index|
+          output.puts(yellow("  #{index + 1}) #{test_name}"))
+        end
+        output.puts("")
+      end
+
+      attr_accessor :colorer, :failing_tests, :output, :skipped_test_names
 
     end
   end

data/lib/dotpretty/reporters/test_summary_formatter.rb

@@ -0,0 +1,27 @@
+module Dotpretty
+  module Reporters
+    class TestSummaryFormatter
+
+      def initialize(colorer:, summary:)
+        self.extend(colorer)
+        self.summary = summary
+      end
+
+      def colored_message
+        message = "Total tests: #{summary[:totalTests]}. Passed: #{summary[:passedTests]}. Failed: #{summary[:failedTests]}. Skipped: #{summary[:skippedTests]}."
+        if summary[:passedTests] == summary[:totalTests]
+          return green(message)
+        elsif summary[:failedTests] > 0
+          return red(message)
+        else
+          return yellow(message)
+        end
+      end
+
+      private
+
+      attr_accessor :summary
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotpretty
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Eric Meyer
@@ -28,6 +28,7 @@ files:
 - lib/dotpretty/reporters/json.rb
 - lib/dotpretty/reporters/names.rb
 - lib/dotpretty/reporters/progress.rb
+- lib/dotpretty/reporters/test_summary_formatter.rb
 - lib/dotpretty/runner.rb
 - lib/dotpretty/state_details.rb
 - lib/dotpretty/state_machine.rb