marionetta 0.3.6 → 0.4.0

data/README.md

@@ -1,6 +1,6 @@
 # Marionetta
 
-Marionetta is a ruby library for executing commands to one
+Marionetta is a ruby library for executing commands on one
 or more remote machines via SSH.
 
 It provides puppet provisioning without the need for a puppet
@@ -18,10 +18,38 @@ gem install marionetta
 Or – better yet – in your Gemfile:
 
 ``` ruby
-source "http://rubygems.org"
+source 'http://rubygems.org'
 gem 'marionetta'
 ```
 
+## Using Marionetta in your Rakefile
+
+Marionetta provides an easy mechanism to generate rake tasks
+for each of your groups.
+
+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[:ssh][:flags] << ['-i', 'keys/private.key']
+  s[:puppet][:manifest] = 'puppet/manifest.pp'
+  s[:deployer][:from] = '/my-app'
+  s[:deployer][:to] = '/home/staging/www'
+end
+
+Marionetta::RakeHelper.install_group_tasks(staging)
+```
+
+The tasks `puppet:staging:install`, `puppet:staging:update`,
+`deployer:staging:deploy` and `deployer:staging:rollback`
+will now be available in your Rakefile.
+
 ## Defining a group of servers
 
 Marionetta allows you to describe and manipulate a number of
@@ -121,35 +149,6 @@ Oh and you can rollback to the last release too!
 staging.manipulate_each_server(:deployer, :rollback)
 ```
 
-## Using Marionetta in your Rakefile
-
-Marionetta provides an easy mechanism to generate rake tasks
-for each of your groups.
-
-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[:deployer][:from] = '/my-app'
-  s[:deployer][:to] = '/home/staging/www'
-end
-
-Marionetta::RakeHelper.new(staging).install_group_tasks
-```
-
-The tasks `puppet:staging:install`, `puppet:staging:update`,
-`deployer:staging:deploy` and `deployer:staging:rollback`
-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/rake_helper.rb

@@ -3,16 +3,12 @@ require 'marionetta/manipulators'
 require 'rake'
 
 module Marionetta
-  class RakeHelper
-    include ::Rake::DSL if defined?(::Rake::DSL)
-
-    attr_reader :group
+  module RakeHelper
+    extend self
 
-    def initialize(group)
-      @group = group
-    end
+    include ::Rake::DSL if defined?(::Rake::DSL)
 
-    def install_group_tasks()
+    def install_group_tasks(group)
       install_group_tasks_for(group)
 
       group.groups.each do |g|

data/lib/marionetta.rb

@@ -1,4 +1,4 @@
-# Marionetta is a ruby library for executing commands to one
+# Marionetta is a ruby library for executing commands on one
 # or more remote machines via SSH.
 # 
 # It provides puppet provisioning without the need for a
@@ -13,7 +13,7 @@
 # 
 # Or – better yet – in your Gemfile:
 # 
-#   source "http://rubygems.org"
+#   source 'http://rubygems.org'
 #   gem 'marionetta'
 # 
 # Marionetta is written by [Luke Morton][author] and licensed
@@ -25,7 +25,7 @@
 # [github]: https://github.com/DrPheltRight/marionetta
 module Marionetta
 
-  VERSION = '0.3.6'
+  VERSION = '0.4.0'
 
   ### Defining Servers
 

data/marionetta.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Luke Morton"]
   s.email       = ["lukemorton.dev@gmail.com"]
   s.summary     = "Provision using puppet and deploy your servers over SSH."
-  s.description = "Marionetta is a ruby library for executing commands to one
+  s.description = "Marionetta is a ruby library for executing commands on one
                    or more remote machines via SSH. It provides puppet
                    provisioning without the need for a puppet master and can
                    also deploy your application code (with rollbacks) via

data/spec/rake_helper_spec.rb

@@ -7,7 +7,7 @@ describe Marionetta::RakeHelper do
     vagrant = Marionetta::Group.new(:vagrant)
     vagrant.add_server(server)
 
-    Marionetta::RakeHelper.new(vagrant).install_group_tasks
+    Marionetta::RakeHelper.install_group_tasks(vagrant)
     Rake::Task.tasks.count.should > 0
 
     Rake::Task['puppet:vagrant:update'].invoke

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -123,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "Marionetta is a ruby library for executing commands to one\n                   or
+description: ! "Marionetta is a ruby library for executing commands on one\n                   or
   more remote machines via SSH. It provides puppet\n                   provisioning
   without the need for a puppet master and can\n                   also deploy your
   application code (with rollbacks) via\n                   rsync. With a RakeHelper