marionetta 0.1.1 → 0.1.4

data/README.md

@@ -3,6 +3,10 @@
 A small ruby library for executing remote commands on a number
 of servers. Comes with puppet mastery built in.
 
+```
+gem install marionetta
+```
+
 ## Defining a group of servers
 
 Marionetta allows you to describe and manipulate a number of
@@ -46,7 +50,7 @@ require 'marionetta'
 
 servers = Marionetta::Group.new
 
-servers.add_server |s|
+servers.add_server do |s|
   s[:hostname] = 'ubuntu@example.com'
   s[:puppet][:manifest] = 'puppet/manifest.pp'
   s[:puppet][:modules] = 'puppet/modules'
@@ -65,16 +69,17 @@ for each of your groups.
 In your Rakefile you can do something like so:
 
 ``` ruby
+require 'marionetta'
 require 'marionetta/rake_helper'
 
 staging = Marionetta::Group.new
 
-staging.add_server |s|
+staging.add_server do |s|
   s[:hostname] = 'staging.example.com'
   s[:puppet][:manifest] = 'puppet/manifest.pp'
 end
 
-Marionetta::RakeHelper.new.install_group_tasks(staging)
+Marionetta::RakeHelper.new(staging).install_group_tasks
 ```
 
 The tasks `puppet:install` and `puppet:update` will now be
@@ -88,6 +93,24 @@ staging = Marionetta::Group.new(:staging)
 The tasks `staging:puppet:install` and `staging:puppet:update`
 will be installed instead.
 
+## Using the debployer
+
+Also included is a .deb deploying manipulator. You can use
+this to deploy your application over SSH as a .deb.
+
+``` ruby
+require 'marionetta'
+
+staging = Marionetta::Group.new(:staging)
+
+staging.add_server do |s|
+  s[:hostname] = 'staging.example.com'
+  s[:debployer] = {:excludes => ['spec']}
+end
+
+staging.manipulate_each_server(:debployer, :deploy)
+```
+
 ## Author
 
 Luke Morton a.k.a. DrPheltRight

data/lib/marionetta/group.rb

@@ -1,3 +1,5 @@
+require 'celluloid'
+
 module Marionetta
   class Group
     attr_reader :name, :groups
@@ -37,11 +39,19 @@ module Marionetta
     end
 
     def each_server()
+      futures = []
+
       servers.each do |s|
-        UnitOfWork.new.async.work do
-          yield s
+        server = s.clone.freeze
+
+        futures << Celluloid::Future.new do
+          yield server
         end
       end
+
+      futures.each do |f|
+        f.value
+      end
     end
 
     def manipulate_each_server(manipulator_name, method_name)

data/lib/marionetta/rake_helper.rb

@@ -5,10 +5,16 @@ module Marionetta
   class RakeHelper
     include ::Rake::DSL if defined?(::Rake::DSL)
 
-    def install_group_tasks(group)
+    attr_reader :group
+
+    def initialize(group)
+      @group = group
+    end
+
+    def install_group_tasks()
       Manipulators.all.each do |manipulator_name, manipulator_class|
         manipulator_class.tasks.each do |method_name|
-          task(task_name(group, manipulator_name, method_name)) do
+          task(task_name(manipulator_name, method_name)) do
             group.manipulate_each_server(manipulator_name, method_name)
           end
         end
@@ -17,7 +23,7 @@ module Marionetta
 
   private
 
-    def task_name(group, manipulator_name, method_name)
+    def task_name(manipulator_name, method_name)
       task_name_parts = [manipulator_name, method_name]
 
       if group.name

data/lib/marionetta.rb

@@ -1,12 +1,11 @@
 module Marionetta
-  VERSION     = '0.1.1'
+  VERSION     = '0.1.4'
   DESCRIPTION = 'For lightweight puppet mastery. Organise
                  multiple machines via rsync and SSH rather
                  than using puppet master'
 
   require_relative 'marionetta/ssh'
   require_relative 'marionetta/manipulators'
-  require_relative 'marionetta/unit_of_work'
   require_relative 'marionetta/group'
 
   def self.default_server()

data/spec/marionetta_group_spec.rb

@@ -9,6 +9,8 @@ describe Marionetta::Group do
       s[:hostname] = 'vagrant@192.168.33.11'
       s[:puppet] = {:manifest => File.dirname(__FILE__)+'/puppet/manifest.pp'}
     end
+
+    vagrant.servers.count.should == 1
   end
 
   it 'should add multiple server maps at once' do
@@ -32,15 +34,58 @@ describe Marionetta::Group do
 
     all = Marionetta::Group.new
     all.add_group(staging)
+
+    all.servers.count.should == 1
   end
 
   it 'should iterate over all servers' do
+    staging = Marionetta::Group.new
+
+    staging.add_server do |s|
+      s[:hostname] = 'vagrant@192.168.33.11'
+      s[:puppet] = {:manifest => File.dirname(__FILE__)+'/puppet/manifest.pp'}
+    end
+    
+    count = 0
+
+    staging.each_server do |s|
+      count += 1
+    end
+
+    count.should == 1
   end
 
   it 'should iterate over all servers including those of sub groups' do
+    staging = Marionetta::Group.new
+
+    staging.add_server do |s|
+      s[:hostname] = 'vagrant@192.168.33.11'
+      s[:puppet] = {:manifest => File.dirname(__FILE__)+'/puppet/manifest.pp'}
+    end
+
+    all = Marionetta::Group.new
+    all.add_group(staging)
+
+    count = 0
+
+    all.each_server do |s|
+      count += 1
+    end
+
+    count.should == 1
   end
 
   it 'should manipulate each server' do
-    # vagrant.manipulate_each_server(:puppet, :update)
+    vagrant = Marionetta::Group.new
+
+    vagrant.add_server do |s|
+      s[:hostname] = 'vagrant@192.168.33.11'
+      ssh_key_path = File.dirname(__FILE__)+'/vagrant/key'
+      s[:ssh][:flags] = ['-i', ssh_key_path]
+      s[:rsync][:flags] = ['-azP', '-e', "ssh -i #{ssh_key_path}", '--delete']
+      s[:puppet] = {:manifest => File.dirname(__FILE__)+'/puppet/manifest.pp'}
+    end
+
+    vagrant.manipulate_each_server(:puppet, :update)
   end
 end

data/spec/marionetta_rake_helper_spec.rb

@@ -4,6 +4,6 @@ require 'marionetta/rake_helper'
 describe Marionetta::RakeHelper do
   it 'should install rake tasks' do
     group = Marionetta::Group.new(:staging)
-    Marionetta::RakeHelper.new.install_group_tasks(group)
+    Marionetta::RakeHelper.new(group).install_group_tasks
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -93,7 +93,6 @@ files:
 - lib/marionetta/manipulators/puppet_manipulator.rb
 - lib/marionetta/rake_helper.rb
 - lib/marionetta/ssh.rb
-- lib/marionetta/unit_of_work.rb
 - marionetta.gemspec
 - spec/marionetta_group_spec.rb
 - spec/marionetta_manipulators_spec.rb

data/lib/marionetta/unit_of_work.rb

@@ -1,11 +0,0 @@
-require 'celluloid'
-
-module Marionetta
-  class UnitOfWork
-    include Celluloid
-
-    def work()
-      yield
-    end
-  end
-end