marionetta 0.1.11 → 0.2.0

data/.gitignore

@@ -3,4 +3,5 @@
 Gemfile.lock
 pkg/*
 coverage/*
-spec/vagrant/.vagrant
+spec/vagrant/.vagrant
+*.deb

data/README.md

@@ -14,7 +14,7 @@ servers in parallel via SSH. First you need to define a group
 of servers:
 
 ``` ruby
-require 'marionetta'
+require 'marionetta/group'
 
 servers = Marionetta::Group.new
 
@@ -34,9 +34,18 @@ Continuing on from our example of defining a group of servers
 above, we will now iterate over the servers:
 
 ``` ruby
+# Each block executes in it's own asynchronous thread
 servers.each_server do |s|
-  # Run command on each server in parallel
-  Marionetta::SSH.new(s).ssh('whoami')
+  cmd = Marionetta::CommandRunner.new(s)
+
+  # Send a command via SSH
+  cmd.ssh('whoami')
+
+  # Get a file
+  cmd.get('/var/backups/database')
+
+  # Put a file
+  cmd.put('/etc/motd')
 end
 ```
 
@@ -46,7 +55,7 @@ Instead of running a puppet master server you can use
 Marionetta to orchestrate a number instances.
 
 ``` ruby
-require 'marionetta'
+require 'marionetta/group'
 
 servers = Marionetta::Group.new
 
@@ -69,7 +78,7 @@ for each of your groups.
 In your Rakefile you can do something like so:
 
 ``` ruby
-require 'marionetta'
+require 'marionetta/group'
 require 'marionetta/rake_helper'
 
 staging = Marionetta::Group.new(:staging)
@@ -87,6 +96,25 @@ will now be available in your Rakefile.
 
 **Groups must have names if you want to generate rake tasks.**
 
+## Using the debloyer
+
+Also included is a .deb deploying manipulator. You can use
+this to deploy your application over SSH as a .deb.
+
+``` ruby
+require 'marionetta/group'
+
+staging = Marionetta::Group.new(:staging)
+
+staging.add_server do |s|
+  s[:hostname] = 'staging.example.com'
+  s[:debloyer][:from] = '/my-app'
+  s[:debloyer][:to] = '/home/staging/www'
+end
+
+staging.manipulate_each_server(:debployer, :deploy)
+```
+
 ## Author
 
 Luke Morton a.k.a. DrPheltRight

data/Rakefile

@@ -35,5 +35,5 @@ task(:publish => :gem) do
 end
 
 task(:clean) do
-  system('rm -rf *.gem')
+  system('rm *.gem')
 end

data/lib/marionetta.rb

@@ -1,5 +1,5 @@
 module Marionetta
-  VERSION     = '0.1.11'
+  VERSION     = '0.2.0'
   DESCRIPTION = 'For lightweight puppet mastery. Organise
                  multiple machines via rsync and SSH rather
                  than using puppet master'
@@ -15,6 +15,17 @@ module Marionetta
         :flags   => ["-azP", "--delete"],
       },
       :logger => Logger.new($stdout),
+
+      :debloyer => {
+        :name => 'debloyer',
+        :fpm => {
+          :command => 'fpm',
+          :flags => [
+            '-s', 'dir',
+            '-t', 'deb',
+          ],
+        },
+      },
     }
   end
 end

data/lib/marionetta/command_runner.rb

@@ -10,26 +10,14 @@ module Marionetta
     
     def system(*args)
       status = Open4::popen4(*args) do |pid, stdin, stdout, stderr|
+        yield stdout, stderr if block_given?
+
         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)
-    end
-
-    def put(remote_path, base_name = File.basename(remote_path))
-      require 'tempfile'
-      
-      Tempfile.open(base_name) do |fp|
-        fp.puts yield
-        fp.flush
-        rsync(fp.path, "#{server[:hostname]}:#{remote_path}")
-      end
+      return status.exitstatus == 0
     end
 
     def rsync(from, to)
@@ -44,7 +32,15 @@ module Marionetta
       system(*rsync_cmd.flatten)
     end
 
-    def ssh(command)
+    def get(file_path, save_to = File.dirname(file_path))
+      rsync("#{server[:hostname]}:#{file_path}", save_to)
+    end
+
+    def put(file_path, save_to = File.dirname(file_path))
+      rsync(file_path, "#{server[:hostname]}:#{save_to}")
+    end
+
+    def ssh(command, &block)
       ssh_cmd = [server[:ssh][:command]]
 
       if server[:ssh].has_key?(:flags)
@@ -54,7 +50,7 @@ module Marionetta
       ssh_cmd << server[:hostname]
       ssh_cmd << command
 
-      system(*ssh_cmd.flatten)
+      system(*ssh_cmd.flatten, &block)
     end
   end
 end

data/lib/marionetta/manipulators.rb

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

data/lib/marionetta/manipulators/debloyer.rb

@@ -0,0 +1,75 @@
+require 'marionetta/command_runner'
+
+module Marionetta
+  module Manipulators
+    class Debloyer
+      def self.tasks()
+        [:deploy]
+      end
+      
+      attr_writer :cmd
+
+      def initialize(server)
+        @server = server
+      end
+
+      def deploy()
+        deb_path = create_deb_path
+        build_deb(deb_path)
+        send_deb(deb_path)
+        apply_deb(deb_path)
+      end
+
+    private
+      
+      attr_reader :server
+
+      def cmd()
+        @cmd ||= CommandRunner.new(server)
+      end
+
+      def from_dir()
+        server[:debloyer][:from]
+      end
+
+      def to_dir()
+        server[:debloyer][:to]
+      end
+
+      def timestamp()
+        Time.new.strftime('%F_%T')
+      end
+
+      def create_deb_path()
+        "/tmp/#{server[:debloyer][:name]}_#{timestamp}.deb"
+      end
+
+      def build_cmd()
+        server[:debloyer][:fpm][:command]
+      end
+
+      def build_options(deb_path)
+        options = server[:debloyer][:fpm][:flags]
+
+        options << ['-n', server[:debloyer][:name]]
+        options << ['-p', deb_path]
+        options << ['-C', from_dir]
+        options << ['--prefix', to_dir]
+
+        options
+      end
+
+      def build_deb(deb_path)
+        cmd.system(*[build_cmd, build_options(deb_path), '.'].flatten)
+      end
+
+      def send_deb(deb_path)
+        cmd.put(deb_path, '/tmp')
+      end
+
+      def apply_deb(deb_path)
+        cmd.ssh("sudo dpkg -i #{deb_path}")
+      end
+    end
+  end
+end

data/lib/marionetta/manipulators/puppet_manipulator.rb

@@ -1,14 +1,13 @@
-require 'marionetta'
 require 'marionetta/command_runner'
 
 module Marionetta
   module Manipulators
     class PuppetManipulator
-      attr_writer :cmd
-
       def self.tasks()
         [:install, :update]
       end
+
+      attr_writer :cmd
       
       def initialize(server)
         @server = server
@@ -79,7 +78,7 @@ module Marionetta
       end
 
       def send_archive()
-        cmd.rsync('/tmp/puppet.tar.gz', "#{server[:hostname]}:/tmp")
+        cmd.put('/tmp/puppet.tar.gz')
       end
 
       def apply_archive()

data/lib/test.rb

@@ -0,0 +1,11 @@
+def a(*args)
+  yield args if block_given?
+end
+
+def b(*args, &block)
+  a(*args, &block)
+end
+
+b do |str|
+  puts str, 'cool'
+end

data/marionetta.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('open4')
   s.add_dependency('celluloid')
+  s.add_dependency('fpm')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')

data/spec/app/app.rb

@@ -0,0 +1,5 @@
+def app()
+  puts 'hello world'
+end
+
+app

data/spec/marionetta_debloyer_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+require "marionetta"
+require "marionetta/manipulators/debloyer"
+
+describe Marionetta::Manipulators::Debloyer do
+  it 'should deploy a deb' do
+    Marionetta::Manipulators::Debloyer.new(server).deploy
+  end
+end

data/spec/marionetta_group_spec.rb

@@ -83,15 +83,7 @@ describe Marionetta::Group do
 
   it 'should manipulate each server' do
     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.add_server(server)
     vagrant.manipulate_each_server(:puppet, :update)
   end
 end

data/spec/marionetta_puppet_manipulator_spec.rb

@@ -3,16 +3,6 @@ require 'marionetta/manipulators/puppet_manipulator'
 
 describe Marionetta::Manipulators::PuppetManipulator do
   it 'should manipulate one server map' do
-    ssh_key_path = File.dirname(__FILE__)+'/vagrant/key'
-
-    server = Marionetta.default_server
-    server[:hostname] = 'vagrant@192.168.33.11'
-    server[:ssh][:flags] = ['-i', ssh_key_path]
-    server[:rsync][:flags] = ['-azP', '-e', "ssh -i #{ssh_key_path}", '--delete']
-    server[:puppet] = {
-      :manifest => File.dirname(__FILE__)+'/puppet/manifest.pp',
-    }
-
     Marionetta::Manipulators::PuppetManipulator.new(server).update
   end
 end

data/spec/marionetta_rake_helper_spec.rb

@@ -4,14 +4,7 @@ require 'marionetta/rake_helper'
 describe Marionetta::RakeHelper do
   it 'should install rake tasks' do
     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
+    vagrant.add_server(server)
 
     Marionetta::RakeHelper.new(vagrant).install_group_tasks
     Rake::Task.tasks.count.should > 0

data/spec/marionetta_ssh_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'marionetta/command_runner'
+
+def cmd()
+  Marionetta::CommandRunner.new(server)
+end
+
+describe Marionetta::CommandRunner do
+  it 'should get file' do
+    cmd.get('/etc/hostname', '/tmp/hosting')
+    File.open('/tmp/hosting', 'rb').read.should == "precise64\n"
+  end
+
+  it 'should put file' do
+    file_path = "#{LIB}/marionetta.rb"
+    cmd.put(file_path, '/tmp')
+    local = File.open(file_path, 'rb').read
+
+    tmp_path = '/tmp/marionetta.rb'
+    cmd.get(tmp_path)
+    remote = File.open(tmp_path, 'rb').read
+    remote.should == local
+  end
+
+  it 'should run commands' do
+    cmd.ssh('whoami') do |stdout, stderr|
+      stdout.read.should == "vagrant\n"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,27 @@
 require 'vagrant'
 require 'celluloid'
+require 'marionetta'
+
+LIB = File.dirname(__FILE__)+'/../lib'
 
 env = Vagrant::Environment.new(:cwd => File.dirname(__FILE__)+'/vagrant')
 env.cli('up')
 
-Celluloid.logger.level = Logger::WARN
+def server()
+    s = Marionetta.default_server
+
+    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[:debloyer][:from] = File.dirname(__FILE__)+'/app'
+    s[:debloyer][:to] = '/home/vagrant'
+    s[:debloyer][:name] = 'test'
+
+    s[:puppet] = {
+      :manifest => File.dirname(__FILE__)+'/puppet/manifest.pp',
+    }
+
+    return s
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fpm
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +123,19 @@ files:
 - lib/marionetta/command_runner.rb
 - lib/marionetta/group.rb
 - lib/marionetta/manipulators.rb
+- lib/marionetta/manipulators/debloyer.rb
 - lib/marionetta/manipulators/puppet_manipulator.rb
 - lib/marionetta/rake_helper.rb
+- lib/test.rb
 - marionetta.gemspec
+- spec/app/app.rb
+- spec/marionetta_debloyer_spec.rb
 - spec/marionetta_group_spec.rb
 - spec/marionetta_manipulators_spec.rb
 - spec/marionetta_puppet_manipulator_spec.rb
 - spec/marionetta_rake_helper_spec.rb
 - spec/marionetta_spec.rb
+- spec/marionetta_ssh_spec.rb
 - spec/puppet/manifest.pp
 - spec/spec_helper.rb
 - spec/vagrant/Vagrantfile
@@ -145,11 +166,14 @@ specification_version: 3
 summary: For lightweight puppet mastery. Organise multiple machines via rsync and
   SSH rather than using puppet master
 test_files:
+- spec/app/app.rb
+- spec/marionetta_debloyer_spec.rb
 - spec/marionetta_group_spec.rb
 - spec/marionetta_manipulators_spec.rb
 - spec/marionetta_puppet_manipulator_spec.rb
 - spec/marionetta_rake_helper_spec.rb
 - spec/marionetta_spec.rb
+- spec/marionetta_ssh_spec.rb
 - spec/puppet/manifest.pp
 - spec/spec_helper.rb
 - spec/vagrant/Vagrantfile