auger 1.3.4 → 1.3.5

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

data/bin/aug

@@ -59,6 +59,7 @@ cfg =
 ## pretty-print Result object
 module Auger
   class Result
+
     def format
       output = 
         case self.outcome
@@ -74,6 +75,13 @@ module Auger
         case self.status
         when FalseClass, NilClass then :red
         when Exception            then :magenta
+        when Status               then
+          case self.status.value
+            when :ok        then :green
+            when :warn      then :yellow
+            when :exception then :magenta
+          else                   :red
+          end
         else                           :green
         end
     

data/lib/auger.rb

@@ -6,7 +6,9 @@ require 'auger/connection'
 require 'auger/request'
 require 'auger/test'
 require 'auger/result'
+require 'auger/status'
 
+## plugins
 require 'auger/plugin/dns.rb'
 require 'auger/plugin/http.rb'
 require 'auger/plugin/redis.rb'

data/lib/auger/plugin/http.rb

@@ -62,6 +62,7 @@ module Auger
 
   class HttpRequest < Auger::Request
     attr_accessor :method, :headers, :user, :password, :data
+    alias_method :url, :arg
 
     def initialize(url)
       @method ||= :get          # default
@@ -87,8 +88,8 @@ module Auger
       @password = password
     end
 
-    def run(http)
-      request = Net::HTTP::const_get(@method.capitalize).new(@arg) # e.g. Net::HTTP::Get
+    def run(http, url)
+      request = Net::HTTP::const_get(@method.capitalize).new(url) # e.g. Net::HTTP::Get
       request.basic_auth(@user, @password || '') if @user
       @headers.each { |k,v| request[k] = v }
       request.set_form_data(@data)

data/lib/auger/request.rb

@@ -1,7 +1,7 @@
 module Auger
 
   class Request 
-    attr_accessor :tests, :before_tests_proc, :arg
+    attr_accessor :tests, :before_tests_proc, :before_request_proc, :arg
 
     def self.load(arg, &block)
       request = new(arg)
@@ -23,6 +23,15 @@ module Auger
       Auger::Result.new(*args)
     end
 
+    ## called within test block to return a Status object
+    def Status(*args)
+      Auger::Status.new(*args)
+    end
+
+    def before_request(&block)
+      @before_request_proc = block
+    end
+
     ## callback to be run after request, but before tests
     def before_tests(&block)
       @before_tests_proc = block
@@ -32,7 +41,10 @@ module Auger
     def do_run(conn)
       return conn if conn.is_a? Exception
       begin
-        response = self.run(conn)
+        arg = @arg
+        arg = self.before_request_proc.call(conn) if self.before_request_proc
+
+        response = self.run(conn, arg)
         response = self.before_tests_proc.call(response) if self.before_tests_proc
         response
       rescue => e

data/lib/auger/status.rb

@@ -0,0 +1,18 @@
+module Auger
+
+  class Status
+    VALUES = [:ok, :warn, :error, :exception]
+    attr_accessor :value
+    
+    def initialize(value)
+      raise ArgumentError, "illegal status value" unless VALUES.include? value
+      @value = value
+    end
+
+    def to_s
+      @value.to_s
+    end
+
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auger
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -125,6 +125,7 @@ files:
 - lib/auger/request.rb
 - lib/auger/result.rb
 - lib/auger/server.rb
+- lib/auger/status.rb
 - lib/auger/test.rb
 - lib/auger/version.rb
 homepage: https://rubygems.org/gems/auger