auger 1.4.0 → 1.4.1

data/README.md

@@ -2,7 +2,7 @@
 
 The Auger library implements a ruby DSL for describing tests to be run
 against remote applications on multiple servers. The gem includes
-'aug', a multi-threaded command-line client.
+'aug', a multi-process command-line client.
 
 The primary goal of Auger is test-driven operations: unit testing for
 application admins. The library can also be used as a framework for

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/auger.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["rlister@gmail.com", "heffergm@gmail.com"]
   gem.description   = %q{Auger: test-driven ops}
   gem.summary       = %q{App && infrastructure testing DSL}
-  gem.homepage      = "https://rubygems.org/gems/auger"
+  gem.homepage      = "https://github.com/brewster/auger"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/bin/aug

@@ -38,6 +38,11 @@ OptionParser.new do |opts|
          end.flatten.sort)
     exit
   end
+
+  opts.on('-T', '--tunnel [USER@]HOST', 'Set a [user@]host to use as ssh tunnel.') do |t|
+    options[:tunnel] = t
+  end
+
 end.parse!
 
 ## load plugins
@@ -88,6 +93,7 @@ end || ARGV[0]
 Auger::Config.load(cfg).projects.each do |project|
 
   servers = project.servers.map do |server|
+    server.options[:tunnel] = options[:tunnel]
 
     pipes = project.connections(*server.roles).map do |connection|
       read, write = IO.pipe

data/lib/auger/connection.rb

@@ -1,7 +1,8 @@
+require 'net/ssh/gateway'
 module Auger
 
   class Connection
-    attr_accessor :requests, :connection, :response, :roles, :options
+    attr_accessor :requests, :connection, :response, :roles, :options, :gateway
 
     def self.load(port, &block)
       connection = new(port)
@@ -29,9 +30,14 @@ module Auger
       @options[method] = arg
     end
 
-    ## call plugin open() and return plugin-specific connection object, or exception
+    ## setup options and call appropriate connection open()
     def try_open(server)
-      options = @options.merge(server.options)
+      options = @options.merge(server.options) # merge connection and server options
+      options[:tunnel] ? try_open_tunnel(server, options) : try_open_direct(server, options)
+    end
+
+    ## call plugin open() and return plugin-specific connection object, or exception
+    def try_open_direct(server, options)
       begin
         self.open(server.name, options)
       rescue => e
@@ -39,10 +45,25 @@ module Auger
       end
     end
     
+    ## call plugin open() via an ssh tunnel
+    def try_open_tunnel(server, options)
+      host, user = options[:tunnel].split('@').reverse #for ssh to the gateway host
+      user ||= ENV['USER']
+      begin
+        @gateway = Net::SSH::Gateway.new(host, user)
+        gateway.open(server.name, options[:port]) do |port|
+          self.open('127.0.0.1', options.merge({:port => port}))
+        end
+      rescue => e
+        e
+      end
+    end
+
     ## safe way to call plugin close() (rescue if the connection did not exist)
     def try_close(conn)
       begin
         self.close(conn)
+        @gateway.shutdown! if @gateway
       rescue => e
         e
       end

data/lib/auger/plugin/dns.rb

@@ -9,13 +9,11 @@ module Auger
   end
   
   class Dns < Auger::Connection
-    def domain(&block)
-      @requests << DnsDomainRequest.load(nil, &block)
-    end
-
     def open(host, options)
       options[:nameserver] = host
-      dns = Net::DNS::Resolver.new(options)
+      ## resolver checks args and raises error if no matching method, so only pass valid options
+      safe_options = options.select{ |key| Net::DNS::Resolver.method_defined? key }
+      dns = Net::DNS::Resolver.new(safe_options)
       dns.use_tcp = true if options[:use_tcp]
       dns
     end
@@ -24,19 +22,23 @@ module Auger
       dns = nil
     end
 
+    def domain(&block)
+      @requests << DnsDomainRequest.load(nil, &block)
+    end
+
     def query(name, &block)
       @requests << DnsQueryRequest.load(name, &block)
     end
   end
 
   class DnsDomainRequest < Auger::Request
-    def run(dns)
+    def run(dns, ignored_arg)
       dns.domain
     end
   end
   
   class DnsQueryRequest < Auger::Request
-    def run(dns)
+    def run(dns, ignored_arg)
       dns.query(@arg)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auger
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -130,7 +130,7 @@ files:
 - lib/auger/status.rb
 - lib/auger/test.rb
 - lib/auger/version.rb
-homepage: https://rubygems.org/gems/auger
+homepage: https://github.com/brewster/auger
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: App && infrastructure testing DSL