matest 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84452e41b4f3cd9abc5a1bbc3f908700a9cc8861
-  data.tar.gz: 68d2dabb2017c46bc31eb36d8b67e918e8eddab7
+  metadata.gz: 561537ac4f243f07f82db71412c6b2c33d5973c5
+  data.tar.gz: 727f060832067bf531677a83f8b623329e513415
 SHA512:
-  metadata.gz: 16fa8463a914188a962999097d5c9b54182c56dc5ed3f528cf2a010dcf1bf75ae9b62dfa9d8c61ab6402c8116e6fce2181d2398afb2db80c35db6c822f7abd70
-  data.tar.gz: 35dcf6b249937b2a4eed2491dd8d4f2d5ed5c319a1973b45d64189bd38991f4f3127692e084ecb0e0d555810184c3dcffd395159490b7aa676971f6de91d28ad
+  metadata.gz: b8be26c780092220c71fdb57f70e287e1899a59e5d8f491f0ec34e5049cb2ca2ed82b3e5d528fae912754d9a6a630b9ee9f2d83d9615bb9c03b56ac3b517c8ed
+  data.tar.gz: f3edc5feb003a2f69efd06f61f918e6a38775d63e847d6475f3eed10574d8d048a41af3a28ffb0165620bc53fdb74518a541fed34e4bc45ebbe6ad1bc90844f5

data/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
-gemspec
+gemspec 
 

data/lib/matest.rb

@@ -1,5 +1,6 @@
 require "matest/version"
 
+require "matest/configure"
 require "matest/runner"
 require "matest/example_group"
 require "matest/example"

data/lib/matest/configure.rb

@@ -0,0 +1,18 @@
+module Matest
+  def self.configure(&block)
+    block.call(Configure) if block_given?
+  end
+  
+  
+  module Configure
+    module_function
+
+    def use_color?
+      @use_color ||= false
+    end
+
+    def use_color=(use_color)
+      @use_color = use_color
+    end
+  end
+end

data/lib/matest/spec_printer.rb

@@ -1,13 +1,28 @@
 require "matest/evaluator"
+require 'term/ansicolor'
+
+module Matest
+  module Color
+    module_function
+
+    Term::ANSIColor.attributes.each do |attr|
+      define_method(attr) do |str|
+        Matest::Configure.use_color? ? Term::ANSIColor.send(attr, str) : str
+      end
+    end
+  end
+end
 
 module Matest
   class SpecPrinter
+    include Color
+
     def print(res)
-      super res
+      super send(colors[res.class], res.to_s)
     end
-    
+
     def print_messages(runner)
-      puts "\n\n### Messages ###"
+      puts bright_blue("\n\n### Messages ###")
 
       statuses = []
       runner.info[:success] = true
@@ -21,41 +36,39 @@ module Matest
           runner.info[:num_specs][status.name] += 1
 
           if !status.is_a?(Matest::SpecPassed)
-            puts "\n[#{status.name}] #{status.description}"
-            puts "Location:\n  #{status.location}:"
+            puts send(colors[status.class], "\n[#{status.name}] #{status.description}")
+            puts header("Location")
+            puts " #{status.location}:"
 
             if status.is_a?(Matest::SpecFailed)
               runner.info[:success] = false
-              puts "Assertion: \n  #{status.example.example_block.assertion}"
-              puts "Variables: "
-              status.example.track_variables.each do |var, val|
-                puts "  #{var}: #{val.inspect}"
+              puts header("Assertion")
+              puts "  #{status.example.example_block.assertion}"
+              if status.example.track_variables.any?
+                puts header("Variables")
+                status.example.track_variables.each do |var, val|
+                  puts "  #{var}: #{val.inspect}"
+                end
               end
-              puts "Lets: "
-              status.example.track_lets.each do |var, val|
-                puts "  #{var}: #{val.inspect}"
+              if status.example.track_lets.any?
+                puts header("Lets")
+                status.example.track_lets.each do |var, val|
+                  puts "  #{var}: #{val.inspect}"
+                end
               end
 
-              puts "Explanation:"
-              subexpressions = Sorcerer.subexpressions(status.example.example_block.assertion_sexp).reverse.uniq.reverse
-              subexpressions.each do |code|
-                print_subexpression(code, status)
-              end
+              print_explanation_for(status)
             end
             if status.is_a?(Matest::NotANaturalAssertion)
               runner.info[:success] = false
               puts "  # => #{status.result.inspect}"
-              puts "Explanation:"
-              subexpressions = Sorcerer.subexpressions(status.example.example_block.assertion_sexp).reverse.uniq.reverse
-              subexpressions.each do |code|
-                print_subexpression(code, status)
-              end
+              print_explanation_for(status)
             end
             if status.is_a?(Matest::ExceptionRaised)
               runner.info[:success] = false
-              puts "EXCEPTION >> #{status.result}"
+              puts bright_red("EXCEPTION >> #{status.result}")
               status.result.backtrace.each do |l|
-                puts "  #{l}"
+                puts red("  #{l}")
               end
 
             end
@@ -64,22 +77,52 @@ module Matest
       end
     end
 
+    def print_explanation_for(status)
+      subexpressions = Sorcerer.subexpressions(status.example.example_block.assertion_sexp).reverse.uniq.reverse
+      if subexpressions.any?
+        puts header("Explanation")
+        subexpressions.all? do |code|
+          print_subexpression(code, status)
+        end
+      end
+    end
+
     def print_subexpression(code, status)
       just_before_assertion = status.example.just_before_assertion
       result = Evaluator.new(just_before_assertion, just_before_assertion.before_assertion_block).eval_string(code)
       if result.class != Matest::EvalErr
-        puts <<-CODE
-  #{code}
-    # => #{result}
-      CODE
+        explanation = []
+        explanation << yellow("  #{code}")
+        explanation << "\n"
+        explanation << bright_blue("    # => #{result}")
+        puts explanation.join
+        true
       else
-        puts <<-CODE
+        code = <<-CODE
   The assertion couldn't be explained.
   The error message was:
     #{result}
   Make sure you are not calling any local vaiables on your code assertion.
       CODE
+        puts red(code)
+        false
       end
     end
+
+    private
+
+    def header(str)
+      blue(str + ":")
+    end
+
+    def colors
+      {
+        Matest::SpecPassed           => :green,
+        Matest::SpecFailed           => :red,
+        Matest::SpecSkipped          => :yellow,
+        Matest::NotANaturalAssertion => :cyan,
+        Matest::ExceptionRaised      => :red,
+      }
+    end
   end
 end

data/lib/matest/version.rb

@@ -1,3 +1,3 @@
 module Matest
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/matest.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_dependency "sorcerer", "~> 1.0.2"
+  spec.add_dependency "term-ansicolor", "~> 1.3.0"
 end

data/spec/matest_specs/aliases_spec.rb

@@ -1,3 +1,7 @@
+Matest.configure do |c|
+  c.use_color = true
+end
+
 scope do
   spec { true }
   xspec { false }

data/spec/matest_specs/printing_assertion_spec.rb

@@ -1,6 +1,6 @@
 scope do
   let(:three) { 3 }
-  spec "variables and lets" do
+  xspec "variables and lets" do
     one = 2
     two = 2
 
@@ -10,13 +10,13 @@ scope do
     @one_plus_two_plus_three.to_i == @res
   end
 
-  spec "again?" do
+  xspec "again?" do
     @arr = %w[a b c d e]
 
     @arr.pop == "k"
   end
 
-  spec "not natural" do
+  xspec "not natural" do
     one = 2
     two = 2
 
@@ -25,5 +25,4 @@ scope do
 
     @res = @one_plus_two_plus_three.to_i + @res.to_i
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matest
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Federico Iachetti
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: Natural assertions test suite.
 email:
 - iachetti.federico@gmail.com
@@ -67,6 +81,7 @@ files:
 - Rakefile
 - bin/matest
 - lib/matest.rb
+- lib/matest/configure.rb
 - lib/matest/evaluator.rb
 - lib/matest/example.rb
 - lib/matest/example_block.rb