hubcap 0.0.5 → 0.0.6

data/README.md

@@ -51,19 +51,20 @@ application('readme', :recipes => 'deploy') {
   cap_set('repository', 'git@github.com:joseph/readme.git')
 
   # Declare that all servers will have the 'baseline' puppet class.
-  role(:puppet => 'baseline')
+  puppet_role('baseline')
 
   group('staging') {
-    # Puppet gets a $::exception_subject_prefix variable on these servers.
+    # Puppet will have a $::exception_subject_prefix variable on these servers.
     param('exception_subject_prefix' => '[STAGING] ')
     # For simple staging, just one server that does everything.
-    server('readme.stage') {
-      role(:cap => [:web, :app, :db], :puppet => ['proxy', 'app', 'db'])
+    server('readme.stage', :address => '0.0.0.0') {
+      cap_role(:web, :app, :db)
+      puppet_role('proxy', 'app', 'db')
     }
   }
 
   group('production') {
-    # Puppet gets these top-scope variables on servers in this group.
+    # Puppet will have these top-scope variables on all these servers.
     param(
       'exception_subject_prefix' => '[PRODUCTION] ',
       'env' => {
@@ -75,7 +76,8 @@ application('readme', :recipes => 'deploy') {
 
     group('proxy') {
       # Servers will have the :web role and the 'proxy' puppet class.
-      role(:cap => :web, :puppet => 'proxy')
+      cap_role(:web)
+      puppet_role('proxy')
       server('proxy-1', :address => '10.10.10.5')
     }
 
@@ -153,7 +155,7 @@ The Hubcap DSL is very simple. This is the basic set of statements:
 * `role` - Add a role to the list of Capistrano roles for servers within
   this group. By default, these roles are supplied as classes to apply to the 
   host in Puppet. You can specify that a role is Capistrano-only with
-  `:cap => '...'`, or Puppet-only with :puppet => `'...'`. This is additive:
+  `cap_role()`, or Puppet-only with `puppet_role()`. This is additive:
   if you have multiple role declarations in your tree, all of them apply.
 
 * `param` - Add to a hash of 'parameters' that will be supplied to Puppet

data/lib/hubcap/group.rb

@@ -18,7 +18,7 @@ class Hubcap::Group
     end
     @cap_attributes = {}
     @cap_roles = []
-    @puppet_roles = []
+    @puppet_roles = {}
     @params = {}
     @hosts = {}
     @children = []
@@ -142,15 +142,44 @@ class Hubcap::Group
   # or:
   #   role(:cap => [:app, :db], :puppet => 'relishapp')
   #
+  # def role(*args)
+  #   if args.length == 1 && args.first.kind_of?(Hash)
+  #     h = args.first
+  #     @cap_roles += [h[:cap]].flatten  if h.has_key?(:cap)
+  #     @puppet_roles += [h[:puppet]].flatten  if h.has_key?(:puppet)
+  #   else
+  #     @cap_roles += args
+  #     @puppet_roles += args
+  #   end
+  # end
+
+
   def role(*args)
-    if args.length == 1 && args.first.kind_of?(Hash)
-      h = args.first
-      @cap_roles += [h[:cap]].flatten  if h.has_key?(:cap)
-      @puppet_roles += [h[:puppet]].flatten  if h.has_key?(:puppet)
-    else
-      @cap_roles += args
-      @puppet_roles += args
-    end
+    cap_role(*args)
+    puppet_role(*args)
+  end
+
+
+  def cap_role(*args)
+    inv = args.select { |a| !a.kind_of?(String) && !a.kind_of?(Symbol) }
+    raise "Capistrano role must be string or symbol: #{inv}"  if inv.any?
+    @cap_roles += args
+  end
+
+
+  def puppet_role(*args)
+    args.each { |a|
+      if a.kind_of?(String) || a.kind_of?(Symbol)
+        update_with_stringified_keys(@puppet_roles, { a => nil })
+      elsif a.kind_of?(Hash)
+        inv = []
+        a.each_pair { |k, v| inv << v  unless v.kind_of?(Hash) }
+        raise "Puppet role parameters must be a hash: #{inv}"  if inv.any?
+        update_with_stringified_keys(@puppet_roles, a)
+      else
+        raise "Puppet role must be a string, symbol or hash: #{a}"
+      end
+    }
   end
 
 
@@ -171,15 +200,7 @@ class Hubcap::Group
         raise(Hubcap::InvalidParamKeyType, k.inspect)
       end
     }
-
-    recurse = lambda { |dest, src|
-      src.each_pair { |k, v|
-        v = recurse.call({}, v)  if v.is_a?(Hash)
-        dest.update(k.to_s => v)
-      }
-      dest
-    }
-    recurse.call(@params, hash)
+    update_with_stringified_keys(@params, hash)
   end
 
 
@@ -215,7 +236,7 @@ class Hubcap::Group
 
 
   def puppet_roles
-    @parent ? @parent.puppet_roles + @puppet_roles : @puppet_roles
+    @parent ? @parent.puppet_roles.merge(@puppet_roles) : @puppet_roles
   end
 
 
@@ -300,6 +321,13 @@ class Hubcap::Group
     end
 
 
+    def update_with_stringified_keys(dest, src)
+      src.each_pair { |k, v|
+        v = update_with_stringified_keys({}, v)  if v.is_a?(Hash)
+        dest.update(k.to_s => v)
+      }
+      dest
+    end
 
 
   class Hubcap::GroupWithoutParent < StandardError; end

data/lib/hubcap/server.rb

@@ -41,10 +41,7 @@ class Hubcap::Server < Hubcap::Group
 
 
   def yaml
-    {
-      'classes' => puppet_roles.collect(&:to_s),
-      'parameters' => params
-    }.to_yaml
+    { 'classes' => puppet_roles, 'parameters' => params }.to_yaml
   end
 
 

data/lib/hubcap/version.rb

@@ -1,5 +1,5 @@
 module Hubcap
 
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
 end

data/test/data/readme.rb

@@ -4,14 +4,15 @@ application('readme', :recipes => 'deploy') {
   cap_set('repository', 'git@github.com:joseph/readme.git')
 
   # Declare that all servers will have the 'baseline' puppet class.
-  role(:puppet => 'baseline')
+  puppet_role('baseline')
 
   group('staging') {
     # Puppet will have a $::exception_subject_prefix variable on these servers.
     param('exception_subject_prefix' => '[STAGING] ')
     # For simple staging, just one server that does everything.
     server('readme.stage', :address => '0.0.0.0') {
-      role(:cap => [:web, :app, :db], :puppet => ['proxy', 'app', 'db'])
+      cap_role(:web, :app, :db)
+      puppet_role('proxy', 'app', 'db')
     }
   }
 
@@ -28,7 +29,8 @@ application('readme', :recipes => 'deploy') {
 
     group('proxy') {
       # Servers will have the :web role and the 'proxy' puppet class.
-      role(:cap => :web, :puppet => 'proxy')
+      cap_role(:web)
+      puppet_role('proxy')
       server('proxy-1', :address => '10.10.10.5')
     }
 

data/test/unit/test_group.rb

@@ -119,7 +119,7 @@ class Hubcap::TestGroup < Test::Unit::TestCase
       server('test')
     }
     assert_equal([:baseline], hub.servers.first.cap_roles)
-    assert_equal([:baseline], hub.servers.first.puppet_roles)
+    assert_equal({ 'baseline' => nil }, hub.servers.first.puppet_roles)
 
     # Multiple roles in a single declaration
     hub = Hubcap.hub {
@@ -127,7 +127,10 @@ class Hubcap::TestGroup < Test::Unit::TestCase
       server('test')
     }
     assert_equal([:baseline, :app], hub.servers.first.cap_roles)
-    assert_equal([:baseline, :app], hub.servers.first.puppet_roles)
+    assert_equal(
+      { 'baseline' => nil, 'app' => nil },
+      hub.servers.first.puppet_roles
+    )
 
     # Multiple declarations are additive
     hub = Hubcap.hub {
@@ -135,26 +138,46 @@ class Hubcap::TestGroup < Test::Unit::TestCase
       server('test') { role(:db) }
     }
     assert_equal([:baseline, :db], hub.servers.first.cap_roles)
-    assert_equal([:baseline, :db], hub.servers.first.puppet_roles)
+    assert_equal(
+      { 'baseline' => nil, 'db' => nil },
+      hub.servers.first.puppet_roles
+    )
 
     # Separate cap and puppet roles
     hub = Hubcap.hub {
-      role(:cap => :app, :puppet => 'testapp')
+      cap_role(:app)
+      puppet_role('testapp')
       server('test')
     }
     assert_equal([:app], hub.servers.first.cap_roles)
-    assert_equal(['testapp'], hub.servers.first.puppet_roles)
+    assert_equal({ 'testapp' => nil }, hub.servers.first.puppet_roles)
 
     # Separate cap/puppet roles can be defined with an array
     # Also shows that multiple role declarations are additive
     hub = Hubcap.hub {
-      role(:cap => [:app, :db])
+      cap_role(:app, :db)
       server('test') { role(:baseline) }
     }
     assert_equal([:app, :db], hub.cap_roles)
-    assert_equal([], hub.puppet_roles)
+    assert_equal({}, hub.puppet_roles)
     assert_equal([:app, :db, :baseline], hub.servers.first.cap_roles)
-    assert_equal([:baseline], hub.servers.first.puppet_roles)
+    assert_equal({ 'baseline' => nil }, hub.servers.first.puppet_roles)
+
+    # Puppet roles can be passed parameters in a hash.
+    hub = Hubcap.hub {
+      puppet_role(:foo, :bar, { :garply => { :grault => 'x' } }, :garp)
+      server('test') { role(:baseline) }
+    }
+    assert_equal(
+      {
+        'foo' => nil,
+        'bar' => nil,
+        'garply' => { 'grault' => 'x' },
+        'garp' => nil,
+        'baseline' => nil
+      },
+      hub.servers.first.puppet_roles
+    )
   end
 
 

data/test/unit/test_server.rb

@@ -60,7 +60,7 @@ class Hubcap::TestServer < Test::Unit::TestCase
       }
     }
     hash = YAML.load(hub.servers.first.yaml)
-    assert_equal(['baseline', 'test::server'], hash['classes'])
+    assert_equal({ 'baseline' => nil, 'test::server' => nil }, hash['classes'])
     assert_equal(['classes', 'parameters'], hash.keys.sort)
     assert_equal(['bar', 'foo'], hash['parameters'].keys.sort)
     assert_equal([1, 2], hash['parameters'].values.sort)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Joseph Pearson
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-01 00:00:00 +10:00
+date: 2012-11-01 00:00:00 +11:00
 default_executable: 
 dependencies: []