auger 1.2.4 → 1.3.0

data/README.md

@@ -103,6 +103,19 @@ a request, in the case of `http` the response is an HTTP::Reponse object.
 and the response is passed to a block. The result of executing the block is
 presented as the result of this test (in this case true or false).
 
+For better control over the result, it is possible to construct and
+return an Auger::Result object, with an outcome (string to be
+printed) and a boolean status (which aug client will use to print
+the result in green or red), for example:
+
+```ruby
+    test 'http status code' do |response|
+      Result(r.code, r.code == '200')
+    end
+```
+
+will always show the code, in green if 200, red otherwise.
+
 Save the config to a file `fe_web` and run with the `aug` command:
 
     $ aug ./fe_web

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.3.0

data/bin/aug

@@ -74,6 +74,32 @@ def format_outcome(outcome)
   end
 end
 
+## pretty-print Result object
+module Auger
+  class Result
+    def format
+      output = 
+        case self.outcome
+        when TrueClass  then "\u2713"
+        when MatchData  then outcome.captures.empty? ? "\u2713" : outcome.captures.join(' ')
+        when FalseClass then "\u2717"
+        when NilClass   then "nil"
+        when Exception  then "#{outcome.class}: #{outcome.to_s}"
+        else                 outcome.to_s
+        end
+
+      color =
+        case self.status
+        when FalseClass, NilClass then :red
+        when Exception            then :magenta
+        else                           :green
+        end
+    
+      return output.color(color)
+    end
+  end
+end
+
 Auger::Config.load(cfg).projects.each do |project|
 
   threads = Hash.new { |h,k| h[k] = [] }
@@ -103,8 +129,7 @@ Auger::Config.load(cfg).projects.each do |project|
     threads[server].each do |thread| 
       results = thread.value    # this waits on thread
       results.flatten.each do |result|
-        output = format_outcome(result.outcome)
-        puts "  %+#{max_test_length}s  %-30s" % [result.test.name, output]
+        puts "  %+#{max_test_length}s  %-30s" % [result.test.name, result.format]
       end
     end
   end

data/lib/auger/project.rb

@@ -59,6 +59,14 @@ module Auger
 
     alias :fqdn :fqdns
 
+    def tests
+      @connections.map do |connection|
+        connection.requests.map do |request|
+          request.tests.map { |test| test }
+        end
+      end.flatten
+    end
+
   end
   
 end

data/lib/auger/request.rb

@@ -18,6 +18,11 @@ module Auger
       @tests << Test.new(name, block)
     end
 
+    ## called within test block to return a Result object
+    def Result(*args)
+      Auger::Result.new(*args)
+    end
+
     ## callback to be run after request, but before tests
     def before_tests(&block)
       @before_tests_proc = block

data/lib/auger/result.rb

@@ -1,26 +1,30 @@
 module Auger
-  
+
   class Result
-    attr_accessor :test, :outcome
-    def initialize(test, outcome)
-      @test = test
+    attr_accessor :test, :outcome, :status
+
+    # def initialize(test, outcome)
+    #   @test = test
+    #   @outcome = outcome
+    # end
+
+    # def initialize(*args)
+    #   hash = args.last.is_a?(Hash) ? args.pop : {}
+    #   hash.each { |k,v| puts "got hash: #{k} = #{v}" }
+    #   (@outcome, @status) = args
+    # end
+
+    ## optional args are outcome, status, Hash of instance variables
+    # def initialize(*args)
+    #   hash = args.last.is_a?(Hash) ? args.pop : {}
+    #   (@outcome, @status) = args
+    #   hash.each { |k,v| self.instance_variable_set("@#{k}", v) }
+    # end
+
+    def initialize(outcome = nil, status = outcome)
       @outcome = outcome
+      @status  = status
     end
-    
-    # def to_s
-    #   case @outcome
-    #   when MatchData then
-    #     @outcome.captures.empty? ? "\u2713" : @outcome.captures.join(' ')
-    #   when TrueClass then
-    #     "\u2713"
-    #   when FalseClass then
-    #     "\u2717"
-    #   when NilClass then
-    #     "\u2717"
-    #   else
-    #     @outcome.to_s
-    #   end
-    # end
 
   end
 

data/lib/auger/test.rb

@@ -1,7 +1,7 @@
 module Auger
   
   class Test
-    attr_accessor :name, :block
+    attr_accessor :name, :block, :id
 
     def initialize(name, block)
       @name = name
@@ -14,10 +14,12 @@ module Auger
         if response.is_a?(Exception) or @block.nil?
           response
         else
-          @block.call(response) rescue $!
+          @block.call(response) rescue $! # run the test
         end
 
-      Auger::Result.new(self, outcome)
+      result = outcome.is_a?(Result) ? outcome : Auger::Result.new(outcome)
+      result.test = self
+      result
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auger
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: App && infrastructure testing DSL