marionetta 0.1.6 → 0.1.7

data/lib/marionetta/group.rb

@@ -24,9 +24,9 @@ module Marionetta
       return groups
     end
 
-    def add_server()
-      server = Marionetta.default_server
-      yield server
+    def add_server(server = nil)
+      server ||= Marionetta.default_server
+      yield server if block_given?
       @servers << server
     end
 

data/lib/marionetta.rb

@@ -1,5 +1,5 @@
 module Marionetta
-  VERSION     = '0.1.6'
+  VERSION     = '0.1.7'
   DESCRIPTION = 'For lightweight puppet mastery. Organise
                  multiple machines via rsync and SSH rather
                  than using puppet master'

data/spec/marionetta_group_spec.rb

@@ -4,6 +4,12 @@ require 'marionetta/group'
 describe Marionetta::Group do
   it 'should add server map' do
     vagrant = Marionetta::Group.new
+    vagrant.add_server({:hostname => 'localhost'})
+    vagrant.servers.count.should == 1
+  end
+
+  it 'should add server map from block' do
+    vagrant = Marionetta::Group.new
 
     vagrant.add_server do |s|
       s[:hostname] = 'vagrant@192.168.33.11'
@@ -13,6 +19,17 @@ describe Marionetta::Group do
     vagrant.servers.count.should == 1
   end
 
+  it 'should extend provided map when block also given' do
+    vagrant = Marionetta::Group.new
+    
+    vagrant.add_server(:hostname => 'localhost') do |s|
+      s[:additional] = true
+    end
+
+    vagrant.servers.first.has_key?(:hostname).should == true
+    vagrant.servers.first.has_key?(:additional).should == true
+  end
+
   it 'should add sub groups' do
     staging = Marionetta::Group.new
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors: