marionetta 0.2.0 → 0.2.1

data/README.md

@@ -70,51 +70,54 @@ end
 servers.manipulate_each_server(:puppet, :update)
 ```
 
-## Using Marionetta in your Rakefile
-
-Marionetta provides an easy mechanism to generate rake tasks
-for each of your groups.
+## Using the debloyer
 
-In your Rakefile you can do something like so:
+Also included is a .deb deploying manipulator. You can use
+this to deploy your application over SSH as a .deb.
 
 ``` ruby
 require 'marionetta/group'
-require 'marionetta/rake_helper'
 
 staging = Marionetta::Group.new(:staging)
 
 staging.add_server do |s|
   s[:hostname] = 'staging.example.com'
-  s[:puppet][:manifest] = 'puppet/manifest.pp'
+  s[:debloyer][:from] = '/my-app'
+  s[:debloyer][:to] = '/home/staging/www'
 end
 
-Marionetta::RakeHelper.new(staging).install_group_tasks
+staging.manipulate_each_server(:debloyer, :deploy)
 ```
 
-The tasks `staging:puppet:install` and `staging:puppet:update`
-will now be available in your Rakefile.
-
-**Groups must have names if you want to generate rake tasks.**
+## Using Marionetta in your Rakefile
 
-## Using the debloyer
+Marionetta provides an easy mechanism to generate rake tasks
+for each of your groups.
 
-Also included is a .deb deploying manipulator. You can use
-this to deploy your application over SSH as a .deb.
+In your Rakefile you can do something like so:
 
 ``` ruby
 require 'marionetta/group'
+require 'marionetta/rake_helper'
 
 staging = Marionetta::Group.new(:staging)
 
 staging.add_server do |s|
   s[:hostname] = 'staging.example.com'
+  s[:puppet][:manifest] = 'puppet/manifest.pp'
   s[:debloyer][:from] = '/my-app'
   s[:debloyer][:to] = '/home/staging/www'
 end
 
-staging.manipulate_each_server(:debployer, :deploy)
+Marionetta::RakeHelper.new(staging).install_group_tasks
 ```
 
+The tasks `staging:puppet:install`, `staging:puppet:update`
+`staging:debloyer:deploy` will now be available in your
+Rakefile.
+
+**Groups must have names if you want to generate rake tasks.**
+
 ## Author
 
 Luke Morton a.k.a. DrPheltRight

data/lib/marionetta/manipulators.rb

@@ -5,8 +5,8 @@ module Marionetta
 
     def self.all()
       {
-        :debployer => Debloyer,
-        :puppet    => PuppetManipulator,
+        :debloyer => Debloyer,
+        :puppet   => PuppetManipulator,
       }
     end
 

data/lib/marionetta.rb

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

data/spec/marionetta_rake_helper_spec.rb

@@ -10,5 +10,6 @@ describe Marionetta::RakeHelper do
     Rake::Task.tasks.count.should > 0
 
     Rake::Task['vagrant:puppet:update'].invoke
+    Rake::Task['vagrant:debloyer:deploy'].invoke
   end
 end

metadata

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