marionetta 0.4.4 → 0.4.5

data/lib/marionetta/manipulators/deployer.rb

@@ -4,6 +4,7 @@
 # Using a directory structure similar to capistrano `Deployer`
 # maintains a folder of releases so you may rollback quickly.
 # 
+require 'marionetta'
 require 'marionetta/command_runner'
 
 module Marionetta
@@ -54,9 +55,10 @@ module Marionetta
       # Call `.deploy()` to run a deploy to your remote
       # server. The process involves:
       # 
-      #  - `:from` directory copied to temporary directory
-      #  - `:exclude` files are removed
-      #  - rsync'd to a releases directory
+      #  - `:from` directory rsync'd to remote cache directory
+      #    with `:exclude` files being ignored
+      #  - cache directory copied on remote machine to
+      #    releases directory
       #  - `:before_script` run
       #  - release directory symlinked to a current directory
       #  - `:after_script` run
@@ -64,16 +66,20 @@ module Marionetta
       # The directory structure under `server[:deployer][:to]`
       # looks something like this:
       # 
-      #   current/ -> ./releases/2012-09-20_14:04:39
-      #   releases/
-      #     2012-09-20_13:59:15
-      #     2012-09-20_14:04:39
+      #     cache/
+      #     current/ -> ./releases/2012-09-20_14:04:39
+      #     releases/
+      #       2012-09-20_13:59:15
+      #       2012-09-20_14:04:39
       # 
       def deploy()
-        release = timestamp
+        release = create_release_name()
 
-        send_files(release)
+        create_cache_dir()
+        sync_cache_dir()
+        copy_cache_dir_to_release(release)
 
+        send_scripts()
         run_script(:before, release)
         symlink_release_dir(release)
         run_script(:after, release)
@@ -135,6 +141,18 @@ module Marionetta
         server[:deployer][:to]
       end
 
+      def tmp_dir()
+        if server[:deployer].has_key?(:tmp)
+          server[:deployer][:tmp]
+        else
+          Marionetta.default_server[:deployer][:tmp]
+        end
+      end
+
+      def cache_dir()
+        "#{to_dir}/cache"
+      end
+
       def releases_dir()
         "#{to_dir}/releases"
       end
@@ -153,6 +171,10 @@ module Marionetta
         exit(1)
       end
 
+      def create_release_name()
+        timestamp
+      end
+
       def rsync_exclude_flags(exclude_files)
         exclude_files = exclude_files.clone
         exclude_files.map! {|f| Dir["#{from_dir}/#{f}"]}
@@ -163,18 +185,40 @@ module Marionetta
         return exclude_files
       end
 
-      def send_files(release)
-        release_dir = release_dir(release)
-        cmd.ssh("mkdir -p #{release_dir}")
+      def create_cache_dir()
+        cmd.ssh("test -d #{cache_dir} || mkdir -p #{cache_dir}")
+      end
 
-        args = [Dir[from_dir+'/*'], release_dir]
+      def sync_cache_dir()
+        args = [Dir[from_dir+'/*'], cache_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')
+          fatal('Could not rsync cache dir')
+        end
+      end
+
+      def copy_cache_dir_to_release(release)
+        release_dir = release_dir(release)
+        cmd.ssh("mkdir -p #{releases_dir} && cp -r #{cache_dir} #{release_dir}")
+      end
+
+      def send_scripts()
+        files = []
+
+        [:before, :after].each do |script|
+          script_key = "#{script}_script".to_sym
+
+          if server[:deployer].has_key?(script_key)
+            files << server[:deployer][script_key]
+          end
+        end
+
+        unless files.empty?
+          cmd.put(files, tmp_dir)
         end
       end
 
@@ -183,8 +227,7 @@ module Marionetta
 
         if server[:deployer].has_key?(script_key)
           script = server[:deployer][script_key]
-          cmd.put(script, '/tmp')
-          tmp_script = "/tmp/#{File.basename(script)}"
+          tmp_script = "#{tmp_dir}/#{File.basename(script)}"
           cmd.ssh("chmod +x #{tmp_script} && exec #{tmp_script} #{release}")
         end
       end

data/lib/marionetta.rb

@@ -27,7 +27,7 @@
 # 
 module Marionetta
 
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 
   ### Defining Servers
 
@@ -74,7 +74,9 @@ module Marionetta
 
       :puppet => {},
 
-      :deployer => {},
+      :deployer => {
+        :tmp => '/tmp'
+      },
 
       :debloyer => {
         :name => 'debloyer',

data/spec/deployer_spec.rb

@@ -14,6 +14,7 @@ describe Marionetta::Manipulators::Deployer do
   it 'should deploy' do
     cmd.ssh('rm -rf ~/app')
     deployer.deploy
+    deployer.deploy
     cmd.ssh("[ -L ~/app/current ]").should == true
     cmd.ssh("[ -d ~/app/releases ]").should == true
     cmd.ssh("[ -f ~/app/current/app.rb ]").should == true

metadata

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