tango 0.1.9 → 0.1.10

data/lib/tango/logger.rb

@@ -1,7 +1,20 @@
 # coding: utf-8
 
 module Tango
+  module TermANSIColorStubs
+    [:red, :green, :yellow].each do |color|
+      define_method(color) { |str| str }
+    end
+  end
+
   class Logger
+    begin
+      require 'term/ansicolor'
+      include Term::ANSIColor
+    rescue LoadError
+      include TermANSIColorStubs
+    end
+
     def self.instance
       @logger ||= Logger.new
     end
@@ -11,14 +24,19 @@ module Tango
       @depth = 0
     end
 
-    def enter(step_name)
-      log "#{step_name} {"
+    def begin_step(step_name)
+      log "#{yellow(step_name)} {"
       @depth += 1
     end
 
-    def leave(step_name)
+    def step_met(step_name)
+      @depth -= 1
+      log "} #{green("√ #{step_name}")}"
+    end
+
+    def step_not_met(step_name)
       @depth -= 1
-      log "} √ #{step_name}"
+      log "} #{red("✕ #{step_name}")}\n\n"
     end
 
     def log(message)

data/lib/tango/runner.rb

@@ -22,9 +22,15 @@ module Tango
       define_method(step_name) do |*args|
         description = step_description(step_name, args)
 
-        logger.enter(description)
-        result = instance_exec(*args, &block)
-        logger.leave(description)
+        logger.begin_step(description)
+        begin
+          result = instance_exec(*args, &block)
+        rescue StandardError
+          logger.step_not_met(description)
+          raise
+        else
+          logger.step_met(description)
+        end
 
         result
       end

data/lib/tango/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Tango
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/spec/logger_spec.rb

@@ -11,22 +11,27 @@ module Tango
       @logger = Logger.new(@io)
     end
 
-    it "should output the step name when entering a step" do
-      @logger.enter("example step")
+    it "should output the step name when beginning a step" do
+      @logger.begin_step("example step")
       @io.string.should == "example step {\n"
     end
 
-    it "should output a closing brace when leaving a step" do
-      @logger.enter("example step")
-      @logger.leave("example step")
+    it "should output a closing brace when a step is met" do
+      @logger.begin_step("example step")
+      @logger.step_met("example step")
       @io.string.should == "example step {\n} √ example step\n"
     end
 
+    it "should output a closing brace when a step is not met" do
+      @logger.begin_step("example step")
+      @logger.step_not_met("example step")
+      @io.string.should == "example step {\n} ✕ example step\n\n"
+    end
+
     it "should indent nested steps" do
-      @logger.enter("outer step")
-      @logger.enter("inner step")
+      @logger.begin_step("outer step")
+      @logger.begin_step("inner step")
       @io.string.should == "outer step {\n  inner step {\n"
     end
-
   end
 end

data/spec/runner_spec.rb

@@ -3,8 +3,9 @@
 require 'tango'
 
 class StubbedLogger
-  def enter(name); end
-  def leave(name); end
+  def begin_step(name); end
+  def step_not_met(name); end
+  def step_met(name); end
   def log(message); end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tango
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70112418398640 !ruby/object:Gem::Requirement
+  requirement: &70254852148920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112418398640
+  version_requirements: *70254852148920
 description: Experiment in deployment tools, taking ideas from babushka and elsewhere.
 email:
 - pete@notahat.com
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tango
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Experiment in deployment tools.