marionetta 0.4.3 → 0.4.4

data/README.md

@@ -174,6 +174,38 @@ Create an issue and send a pull request if you get any bright
 ideas or have a fix. Feel free to create an issue and not send
 one too, feedback is always welcome.
 
+## Testing
+
+To test run this on your command line:
+
+```
+rake
+```
+
+You need to ensure `spec/vagrant/key` has `0600` permissions.
+
+## Generating documentation
+
+Generate documentation using the following command:
+
+```
+rake doc
+```
+
+Publishing the documentation to GitHub pages is a little messy
+to say the least. Try this:
+
+```
+rake doc
+mv docs docs-new
+git checkout gh-pages
+rm -rf docs
+mv -f docs-new docs
+git add docs
+git commit -m "Update documentation."
+git push origin gh-pages
+```
+
 ## License
 
-Licensed under MIT by Luke Morton, 2012.
+Licensed under MIT by Luke Morton, 2012.

data/Rakefile

@@ -7,17 +7,26 @@ RSpec::Core::RakeTask.new(:spec)
 
 task(:default => :spec)
 
+desc('Create .gem for version *committed* in lib/marionetta.rb')
 task(:gem => :spec) do
-  cmd = [
+  stash_cmd = [
     'git add -A',
     'git stash',
-    'gem build marionetta.gemspec',
-    'git stash pop',
-    'git reset',
   ]
-  system(cmd.join(' && '))
+  system(stash_cmd.join(' && '))
+
+  begin
+    system('gem build marionetta.gemspec')
+  ensure
+    unstash_cmd = [
+      'git stash pop',
+      'git reset',
+    ]
+    system(unstash_cmd.join(' && '))
+  end
 end
 
+desc('Publish version *committed* in lib/marionetta.rb')
 task(:publish => :gem) do
   version = Marionetta::VERSION
   git_tag = "v#{version}"
@@ -34,6 +43,7 @@ task(:publish => :gem) do
   system(cmd.join(' && '))
 end
 
+desc('Create documentation for current working directory')
 task(:doc) do
   docs_cmd = [
     'rm -rf docs',
@@ -43,6 +53,7 @@ task(:doc) do
   system(docs_cmd.join(' && '))
 end
 
+desc('Remove *.gem')
 task(:clean) do
   system('rm *.gem')
-end
+end

data/lib/marionetta/command_runner.rb

@@ -153,11 +153,13 @@ module Marionetta
     #     rsync('/var/www/logs', '/var/backups/www/logs')
     #     rsync('/var/www/logs', 'ubuntu@example.com:/var/backups/www/logs')
     # 
-    def rsync(from, to)
+    def rsync(from, to, *additional_flags)
       rsync_cmd = [server[:rsync][:command]]
 
       if server[:rsync].has_key?(:flags)
-        rsync_cmd << server[:rsync][:flags]
+        flags = server[:rsync][:flags].clone
+        flags.concat(additional_flags) unless additional_flags.empty?
+        rsync_cmd << flags
       end
       
       rsync_cmd << [from, to]
@@ -169,20 +171,20 @@ module Marionetta
     # to the same location on the local machine unless a path
     # is specified. 
     # 
-    def get(file_path, save_to = File.dirname(file_path))
-      rsync("#{server[:hostname]}:#{file_path}", save_to)
+    def get(file_path, save_to = File.dirname(file_path), *additional_flags)
+      rsync("#{server[:hostname]}:#{file_path}", save_to, *additional_flags)
     end
 
     # Short hand for putting a file to `:hostname` from the
     # local machine to the same location on the remote
     # machine unless a path is specified.
     # 
-    def put(file_path, save_to = File.dirname(file_path))
-      rsync(file_path, "#{server[:hostname]}:#{save_to}")
+    def put(file_path, save_to = File.dirname(file_path), *additional_flags)
+      rsync(file_path, "#{server[:hostname]}:#{save_to}", *additional_flags)
     end
 
   private
 
     attr_reader :server
   end
-end
+end

data/lib/marionetta/manipulators/deployer.rb

@@ -71,12 +71,8 @@ module Marionetta
       # 
       def deploy()
         release = timestamp
-        create_tmp_release_dir(release)
-        cmd.ssh("mkdir -p #{release_dir}")
 
-        unless cmd.put(tmp_release_dir(release), release_dir)
-          fatal('Could not rsync release')
-        end
+        send_files(release)
 
         run_script(:before, release)
         symlink_release_dir(release)
@@ -90,7 +86,7 @@ module Marionetta
       def releases()
         releases = []
 
-        cmd.ssh("ls -m #{release_dir}") do |stdout|
+        cmd.ssh("ls -m #{releases_dir}") do |stdout|
           stdout.read.split(/[,\s]+/).each do |release|
             releases << release unless release.index('skip-') == 0
           end
@@ -135,18 +131,16 @@ module Marionetta
         server[:deployer][:from]
       end
 
-      def tmp_release_dir(release)
-        "/tmp/#{server[:hostname]}/#{release}"
-      end
-
       def to_dir()
         server[:deployer][:to]
       end
 
-      def release_dir(release=nil)
-        dir = "#{to_dir}/releases"
-        dir << "/#{release}" unless release.nil?
-        return dir
+      def releases_dir()
+        "#{to_dir}/releases"
+      end
+      
+      def release_dir(release)
+        "#{releases_dir}/#{release}"
       end
 
       def current_dir()
@@ -159,6 +153,31 @@ module Marionetta
         exit(1)
       end
 
+      def rsync_exclude_flags(exclude_files)
+        exclude_files = exclude_files.clone
+        exclude_files.map! {|f| Dir["#{from_dir}/#{f}"]}
+        exclude_files.flatten!
+        exclude_files.map! {|f| f.sub(from_dir+'/', '')}
+        exclude_files.map! {|f| ['--exclude', f]}
+        exclude_files.flatten!
+        return exclude_files
+      end
+
+      def send_files(release)
+        release_dir = release_dir(release)
+        cmd.ssh("mkdir -p #{release_dir}")
+
+        args = [Dir[from_dir+'/*'], release_dir]
+
+        if server[:deployer].has_key?(:exclude)
+          args.concat(rsync_exclude_flags(server[:deployer][:exclude]))
+        end
+
+        unless cmd.put(*args)
+          fatal('Could not rsync release')
+        end
+      end
+
       def run_script(script, release)
         script_key = "#{script}_script".to_sym
 
@@ -170,24 +189,6 @@ module Marionetta
         end
       end
 
-      def create_tmp_release_dir(release)
-        tmp_release_dir = tmp_release_dir(release)
-
-        create_tmp_dir_cmds = [
-          "mkdir -p #{File.dirname(tmp_release_dir)}",
-          "cp -rf #{from_dir} #{tmp_release_dir}",
-        ]
-        cmd.system(create_tmp_dir_cmds.join(' && '))
-
-        if server[:deployer].has_key?(:exclude)
-          exclude_files = server[:deployer][:exclude]
-          exclude_files.map! {|f| Dir["#{tmp_release_dir}/#{f}"]}
-          exclude_files.flatten!
-
-          cmd.system("rm -rf #{exclude_files.join(' ')}") unless exclude_files.empty?
-        end
-      end
-
       def symlink_release_dir(release)
         release_dir = release_dir(release)
 
@@ -201,4 +202,4 @@ module Marionetta
       end
     end
   end
-end
+end

data/lib/marionetta.rb

@@ -27,7 +27,7 @@
 # 
 module Marionetta
 
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 
   ### Defining Servers
 

data/spec/debloyer_spec.rb

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

data/spec/deployer_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
-require "marionetta"
-require "marionetta/manipulators/deployer"
+require_relative '../lib/marionetta'
+require_relative '../lib/marionetta/manipulators/deployer'
 
 def deployer()
   Marionetta::Manipulators::Deployer.new(server)
@@ -14,7 +14,7 @@ describe Marionetta::Manipulators::Deployer do
   it 'should deploy' do
     cmd.ssh('rm -rf ~/app')
     deployer.deploy
-    cmd.ssh("[ -d ~/app/current ]").should == true
+    cmd.ssh("[ -L ~/app/current ]").should == true
     cmd.ssh("[ -d ~/app/releases ]").should == true
     cmd.ssh("[ -f ~/app/current/app.rb ]").should == true
     cmd.ssh("[ -f ~/app/current/app-copy.rb ]").should == true
@@ -30,4 +30,4 @@ describe Marionetta::Manipulators::Deployer do
   it 'should rollback' do
     deployer.rollback
   end
-end
+end

data/spec/group_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'marionetta/group'
+require_relative '../lib/marionetta/group'
 
 describe Marionetta::Group do
   it 'should add server map' do
@@ -88,4 +88,4 @@ describe Marionetta::Group do
       releases.length.should > 0
     end
   end
-end
+end

data/spec/manipulators_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require 'marionetta/manipulators'
+require_relative '../lib/marionetta/manipulators'
 
 describe Marionetta::Manipulators do
   it 'should maintain a list of manipulators' do
     Marionetta::Manipulators.all.count.should > 0
   end
-end
+end

data/spec/marionetta_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require 'marionetta'
+require_relative '../lib/marionetta'
 
 describe Marionetta do
   it 'should provide a default SSH map' do
     Marionetta.default_server
   end
-end
+end

data/spec/puppet_manipulator_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
-require 'marionetta/manipulators/puppet_manipulator'
+require_relative '../lib/marionetta/manipulators/puppet_manipulator'
 
 describe Marionetta::Manipulators::PuppetManipulator do
   it 'should manipulate one server map' do
     Marionetta::Manipulators::PuppetManipulator.new(server).update
   end
-end
+end

data/spec/rake_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
-require 'marionetta/group'
-require 'marionetta/rake_helper'
+require_relative '../lib/marionetta/group'
+require_relative '../lib/marionetta/rake_helper'
 
 describe Marionetta::RakeHelper do
   it 'should install rake tasks' do
@@ -14,4 +14,4 @@ describe Marionetta::RakeHelper do
     Rake::Task['deployer:vagrant:deploy'].invoke
     Rake::Task['deployer:vagrant:rollback'].invoke
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'vagrant'
 require 'celluloid'
-require 'marionetta'
+require_relative '../lib/marionetta'
 
 LIB = File.dirname(__FILE__)+'/../lib'
 
@@ -34,4 +34,4 @@ def server()
   }
 
   return s
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4