marionetta 0.1.10 → 0.1.11

data/README.md

@@ -36,7 +36,7 @@ above, we will now iterate over the servers:
 ``` ruby
 servers.each_server do |s|
   # Run command on each server in parallel
-  Marionetta::SSH.new(s).run('whoami')
+  Marionetta::SSH.new(s).ssh('whoami')
 end
 ```
 

data/Rakefile

@@ -1,11 +1,10 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
-
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-
 require 'marionetta'
 
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
+
 task(:default => :spec)
 
 task(:gem => :spec) do

data/lib/marionetta.rb

@@ -1,13 +1,9 @@
 module Marionetta
-  VERSION     = '0.1.10'
+  VERSION     = '0.1.11'
   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/group'
-
   def self.default_server()
     {
       :ssh => {
@@ -18,6 +14,7 @@ module Marionetta
         :command => 'rsync',
         :flags   => ["-azP", "--delete"],
       },
+      :logger => Logger.new($stdout),
     }
   end
 end

data/lib/marionetta/{ssh.rb → command_runner.rb}

@@ -1,10 +1,22 @@
+require 'open4'
+
 module Marionetta
-  class SSH
+  class CommandRunner
     attr_reader :server
 
     def initialize(server)
       @server = server
     end
+    
+    def system(*args)
+      status = Open4::popen4(*args) do |pid, stdin, stdout, stderr|
+        server[:logger].info(args.join(' '))
+        server[:logger].debug(stdout.read)
+        server[:logger].debug(stderr.read)
+      end
+      
+      return status.exitstatus
+    end
 
     def get(local_dir, file)
       rsync("#{server[:hostname]}", local_dir)
@@ -32,7 +44,7 @@ module Marionetta
       system(*rsync_cmd.flatten)
     end
 
-    def run(command)
+    def ssh(command)
       ssh_cmd = [server[:ssh][:command]]
 
       if server[:ssh].has_key?(:flags)

data/lib/marionetta/group.rb

@@ -1,3 +1,5 @@
+require 'marionetta'
+require 'marionetta/manipulators'
 require 'celluloid'
 
 module Marionetta

data/lib/marionetta/manipulators/puppet_manipulator.rb

@@ -1,18 +1,41 @@
+require 'marionetta'
+require 'marionetta/command_runner'
+
 module Marionetta
   module Manipulators
     class PuppetManipulator
+      attr_writer :cmd
+
       def self.tasks()
         [:install, :update]
       end
       
-      attr_reader :server
-      
       def initialize(server)
         @server = server
       end
 
-      def ssh()
-        @ssh ||= SSH.new(server)
+      def install()
+        install_deb_repo
+        install_deb
+      end
+
+      def installed?()
+        cmd.ssh('which puppet')
+      end
+
+      def update()
+        install unless installed?
+        archive_files
+        send_archive
+        apply_archive
+      end
+
+    private
+    
+      attr_reader :server
+
+      def cmd()
+        @cmd ||= CommandRunner.new(server)
       end
 
       def install_deb_repo()
@@ -26,7 +49,7 @@ module Marionetta
 
         repo_check_cmd = "test -f /etc/apt/sources.list.d/puppetlabs.list"
 
-        ssh.run("#{repo_check_cmd} || { #{repo_install_cmd}; }")
+        cmd.ssh("#{repo_check_cmd} || { #{repo_install_cmd}; }")
       end
 
       def install_deb()
@@ -35,16 +58,7 @@ module Marionetta
           'sudo aptitude install -y puppet'
         ].join(' && ')
 
-        ssh.run("which puppet || { #{install_cmd}; }")
-      end
-
-      def install()
-        install_deb_repo
-        install_deb
-      end
-
-      def installed?()
-        ssh.run('which puppet')
+        cmd.ssh("which puppet || { #{install_cmd}; }")
       end
 
       def archive_files()
@@ -61,11 +75,11 @@ module Marionetta
         cmds << 'cd /tmp'
         cmds << 'tar cvfz puppet.tar.gz puppet'
 
-        system(cmds.join(' && '))
+        cmd.system(cmds.join(' && '))
       end
 
       def send_archive()
-        ssh.rsync('/tmp/puppet.tar.gz', "#{server[:hostname]}:/tmp")
+        cmd.rsync('/tmp/puppet.tar.gz', "#{server[:hostname]}:/tmp")
       end
 
       def apply_archive()
@@ -89,14 +103,7 @@ module Marionetta
 
         cmds << puppet_cmd
         
-        ssh.run(cmds.join(' && '))
-      end
-
-      def update()
-        install unless installed?
-        archive_files
-        send_archive
-        apply_archive
+        cmd.ssh(cmds.join(' && '))
       end
     end
   end

data/lib/marionetta/rake_helper.rb

@@ -1,4 +1,5 @@
 require 'marionetta'
+require 'marionetta/manipulators'
 require 'rake'
 
 module Marionetta
@@ -24,7 +25,7 @@ module Marionetta
     def install_group_tasks_for(group)
       Manipulators.all.each do |manipulator_name, manipulator_class|
         manipulator_class.tasks.each do |method_name|
-          desc("#{manipulator_name} #{method_name} (marionetta)")
+          desc("#{method_name} #{manipulator_name} on #{group.name} (marionetta)")
           task(task_name(group, manipulator_name, method_name)) do
             group.manipulate_each_server(manipulator_name, method_name)
           end

data/marionetta.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
+  s.add_dependency('open4')
   s.add_dependency('celluloid')
 
   s.add_development_dependency('rake')

data/spec/marionetta_group_spec.rb

@@ -1,4 +1,4 @@
-require 'marionetta'
+require 'spec_helper'
 require 'marionetta/group'
 
 describe Marionetta::Group do

data/spec/marionetta_manipulators_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'marionetta/manipulators'
 
 describe Marionetta::Manipulators do

data/spec/marionetta_puppet_manipulator_spec.rb

@@ -1,4 +1,5 @@
-require 'marionetta/manipulators'
+require 'spec_helper'
+require 'marionetta/manipulators/puppet_manipulator'
 
 describe Marionetta::Manipulators::PuppetManipulator do
   it 'should manipulate one server map' do

data/spec/marionetta_rake_helper_spec.rb

@@ -1,10 +1,21 @@
-require 'marionetta'
+require 'spec_helper'
 require 'marionetta/rake_helper'
 
 describe Marionetta::RakeHelper do
   it 'should install rake tasks' do
-    group = Marionetta::Group.new(:staging)
-    Marionetta::RakeHelper.new(group).install_group_tasks
+    vagrant = Marionetta::Group.new(:vagrant)
+
+    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
+
+    Marionetta::RakeHelper.new(vagrant).install_group_tasks
     Rake::Task.tasks.count.should > 0
+
+    Rake::Task['vagrant:puppet:update'].invoke
   end
 end

data/spec/marionetta_spec.rb

@@ -1,8 +1,5 @@
+require 'spec_helper'
 require 'marionetta'
-require 'vagrant'
-
-env = Vagrant::Environment.new(:cwd => File.dirname(__FILE__)+'/vagrant')
-env.cli('up')
 
 describe Marionetta do
   it 'should provide a default SSH map' do

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'vagrant'
+require 'celluloid'
+
+env = Vagrant::Environment.new(:cwd => File.dirname(__FILE__)+'/vagrant')
+env.cli('up')
+
+Celluloid.logger.level = Logger::WARN

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -88,11 +104,11 @@ files:
 - README.md
 - Rakefile
 - lib/marionetta.rb
+- lib/marionetta/command_runner.rb
 - lib/marionetta/group.rb
 - lib/marionetta/manipulators.rb
 - lib/marionetta/manipulators/puppet_manipulator.rb
 - lib/marionetta/rake_helper.rb
-- lib/marionetta/ssh.rb
 - marionetta.gemspec
 - spec/marionetta_group_spec.rb
 - spec/marionetta_manipulators_spec.rb
@@ -100,6 +116,7 @@ files:
 - spec/marionetta_rake_helper_spec.rb
 - spec/marionetta_spec.rb
 - spec/puppet/manifest.pp
+- spec/spec_helper.rb
 - spec/vagrant/Vagrantfile
 - spec/vagrant/key
 homepage: https://github.com/DrPheltRight/marionetta
@@ -134,5 +151,6 @@ test_files:
 - spec/marionetta_rake_helper_spec.rb
 - spec/marionetta_spec.rb
 - spec/puppet/manifest.pp
+- spec/spec_helper.rb
 - spec/vagrant/Vagrantfile
 - spec/vagrant/key