marionetta 0.1.4 → 0.1.5

data/README.md

@@ -72,7 +72,7 @@ In your Rakefile you can do something like so:
 require 'marionetta'
 require 'marionetta/rake_helper'
 
-staging = Marionetta::Group.new
+staging = Marionetta::Group.new(:staging)
 
 staging.add_server do |s|
   s[:hostname] = 'staging.example.com'
@@ -82,16 +82,10 @@ end
 Marionetta::RakeHelper.new(staging).install_group_tasks
 ```
 
-The tasks `puppet:install` and `puppet:update` will now be
-available in your Rakefile. If you want to namespace the tasks
-further pass in a name to your `Marionetta::Group` like so:
-
-``` ruby
-staging = Marionetta::Group.new(:staging)
-```
-
 The tasks `staging:puppet:install` and `staging:puppet:update`
-will be installed instead.
+will now be available in your Rakefile.
+
+**Groups must have names if you want to generate rake tasks.**
 
 ## Using the debployer
 
@@ -105,7 +99,11 @@ staging = Marionetta::Group.new(:staging)
 
 staging.add_server do |s|
   s[:hostname] = 'staging.example.com'
-  s[:debployer] = {:excludes => ['spec']}
+  s[:debployer] = {
+    :deploy_from => '/my-app',
+    :deploy_to   => '/home/staging/www'
+    :excludes    => ['spec'],
+  }
 end
 
 staging.manipulate_each_server(:debployer, :deploy)

data/lib/marionetta/group.rb

@@ -2,7 +2,7 @@ require 'celluloid'
 
 module Marionetta
   class Group
-    attr_reader :name, :groups
+    attr_reader :name
 
     def initialize(name = nil)
       @name = name
@@ -14,24 +14,26 @@ module Marionetta
       @groups << group
     end
 
+    def groups()
+      groups = @groups
+
+      groups.each do |g|
+        groups.concat(g.groups)
+      end
+
+      return groups
+    end
+
     def add_server()
       server = Marionetta.default_server
       yield server
       @servers << server
     end
 
-    def add_servers(range)
-      range.each do |i|
-        server = Marionetta.default_server
-        yield server, i
-        @servers << server
-      end
-    end
-
     def servers()
       servers = @servers
 
-      groups.each do |g|
+      @groups.each do |g|
         servers.concat(g.servers)
       end
 

data/lib/marionetta/manipulators.rb

@@ -1,10 +1,12 @@
 module Marionetta
   module Manipulators
+    require_relative 'manipulators/debployer'
     require_relative 'manipulators/puppet_manipulator'
 
     def self.all()
       {
-        :puppet => PuppetManipulator,
+        :debployer => Debployer,
+        :puppet    => PuppetManipulator,
       }
     end
 

data/lib/marionetta/rake_helper.rb

@@ -12,6 +12,16 @@ module Marionetta
     end
 
     def install_group_tasks()
+      install_group_tasks_for(group)
+
+      group.groups.each do |g|
+        install_group_tasks_for(g)
+      end
+    end
+
+  private
+
+    def install_group_tasks_for(group)
       Manipulators.all.each do |manipulator_name, manipulator_class|
         manipulator_class.tasks.each do |method_name|
           task(task_name(manipulator_name, method_name)) do
@@ -21,16 +31,12 @@ module Marionetta
       end
     end
 
-  private
-
     def task_name(manipulator_name, method_name)
-      task_name_parts = [manipulator_name, method_name]
-
-      if group.name
-        task_name_parts.unshift(group.name)
+      unless group.name
+        raise 'Group must be named'
       end
 
-      return task_name_parts.join(':')
+      return "#{group.name}:#{manipulator_name}:#{method_name}"
     end
   end
 end

data/lib/marionetta.rb

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

data/spec/marionetta_group_spec.rb

@@ -13,19 +13,8 @@ describe Marionetta::Group do
     vagrant.servers.count.should == 1
   end
 
-  it 'should add multiple server maps at once' do
-    production = Marionetta::Group.new
-
-    production.add_servers (1..2) do |s, i|
-      s[:hostname] = "vagrant@192.168.33.11"
-      s[:puppet] = {:manifest => File.dirname(__FILE__)+'/puppet/manifest.pp'}
-    end
-
-    production.servers.count.should == 2
-  end
-
   it 'should add sub groups' do
-  	staging = Marionetta::Group.new
+    staging = Marionetta::Group.new
 
     staging.add_server do |s|
       s[:hostname] = 'vagrant@192.168.33.11'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid