auger 1.4.1 → 1.4.2

data/Gemfile

@@ -6,6 +6,7 @@ gem 'rainbow'
 gem 'net-dns'
 gem 'redis'
 gem 'json'
+gem 'net-ssh-gateway'
 
 group :development do
   gem 'gemcutter'

data/README.md

@@ -68,7 +68,7 @@ Reference config files using `aug foo`, to find `foo.rb` in
 ```ruby
 project "Front-end Web Servers" do
   server "web-fe-[01-02]"
-      
+
   http 8000 do
     get '/' do
       test 'status code is 200' do |response|
@@ -126,7 +126,7 @@ Let's extend our example to be more interesting.
 project "Front-end Web Servers" do
   server 'web-fe-[01-02]', :web
   server 'www.mydomain.com', :vip, :port => 80
-      
+
   socket 8000 do
     roles :web
     open? do
@@ -167,11 +167,26 @@ Servers can also have a hash of options, which will override
 the matching connection options for just that server. In this case
 we want to connect to port 80 on the vip rather than 8000.
 
+Server names may be given as strings (which will be parsed by HostRange),
+as arrays (or expressions returning arrays), or as a block returning
+an array. All arrays will be flattened. Hence the following are all
+equivalent:
+
+```ruby
+server "foo1", "foo2", "foo3"
+server "foo[1-3]"
+server HostRange.parse("foo[1-3]")
+server [ "foo1", "foo2", "foo3" ]
+server do
+  %w{ foo1 foo2 foo3 }
+end
+```
+
 The `header` command demonstrates setting options for a request,
 in this case setting an http request header.
 
 The `socket` command creates a connection to the given port, and
-`open?` returns true if the port is open. We just apply this to 
+`open?` returns true if the port is open. We just apply this to
 the real web servers and not the vip.
 
 The document title test demonstrates how to extract and return a regex
@@ -228,9 +243,9 @@ project "Elasticsearch" do
       end
     end
 
-    # I've discovered that a typical fail case with elasticsearch is 
+    # I've discovered that a typical fail case with elasticsearch is
     #   that on occassion, nodes will come up and not join the cluster
-    # This is an easy way to see if the number of nodes that the host 
+    # This is an easy way to see if the number of nodes that the host
     #   actually sees (actual_data_nodes) matches what we're
     #   expecting (expected_data_nodes).
     # TODO: dynamically update expected_data_nodes based on defined hosts:

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/auger/project.rb

@@ -4,7 +4,7 @@ module Auger
 
   class Project
     attr_accessor :name, :connections, :servers
-    
+
     def self.load(name, &block)
       project = new(name)
       project.instance_eval(&block)
@@ -20,10 +20,19 @@ module Auger
 
     ## set server, or list of server names, with optional roles and options
     ## e.g. server server1, server2, :roleA, :roleB, options => values
+    ## servers can be any combination in:
+    ##   strings: passed through HostRange to make an array
+    ##   array: or expressions that returns an array
+    ##   block: returning an array (arrays will be flattened)
+    ## roles are symbols
+    ## options are hash members, must be last args
     def server(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       roles = args.select { |arg| arg.class == Symbol }
-      servers = args.select { |arg| arg.class == String }.map { |arg| HostRange.parse(arg) }
+      servers =
+        args.select { |arg| arg.class == String }.map { |arg| HostRange.parse(arg) } +
+        args.select { |arg| arg.class == Array } +
+        (block_given? ? yield : [])
       @servers += servers.flatten.map do |name|
         Auger::Server.new(name, *roles, options)
       end
@@ -60,5 +69,5 @@ module Auger
     end
 
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auger
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: App && infrastructure testing DSL