marionetta 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 916de758cb7350958d2c59b1d18171bdf16f0349
-  data.tar.gz: f4bb66f2f4d5976981f58f6330927b046e96512f
+  metadata.gz: 2d19cd4eae22fc3ff4ca73e358acaec5faf6a710
+  data.tar.gz: 0af723a8a0ddd47b7dbb8835d19e7f5ca61c051a
 SHA512:
-  metadata.gz: c4dcafbe865cbf58019d638e92b09e6c1bc1969e899036964b8c5410d4fb452fc82a77e6112dcdd09858b8780d51d99694a60f952cb71927620f071c9d4dc576
-  data.tar.gz: 2319631fd9c16dfd14c6bbdaf10edcb21f547cbf7547744b1fe04dbe0343c35a1c79556bd8be145d07c3acd7ec7855f68c1345354c6d0c2dbf35001a94cf6de1
+  metadata.gz: 734f93e4d820a7fbf8609d4e15139ad6d7843e0a28361523a13c62e2beeef7cea2b3f6437999d50c85a18cda28aafbde22f599de2114e061c31e83f605a11ad7
+  data.tar.gz: 2c5862746ffc132ac920a00e6eb8377bb69c7a1790f81a715929b7ad21d99c023e6c3239b06cdae8576077c10d968c31f1459756bff084ab3a445109ff4035cf

data/lib/marionetta.rb

@@ -27,7 +27,7 @@
 # 
 module Marionetta
 
-  VERSION = '0.4.11'
+  VERSION = '0.4.12'
 
   ### Defining Servers
 

data/lib/marionetta/manipulators/deployer.rb

@@ -83,6 +83,8 @@ module Marionetta
       def deploy()
         release = create_release_name()
 
+        write_deploy_version_file()
+
         DirectorySync.sync(server, from_dir, cache_dir, server[:deployer])
         copy_cache_dir_to_release(release)
 
@@ -179,6 +181,19 @@ module Marionetta
         "#{releases_dir}/#{release}"
       end
 
+      def release_version()
+        if server[:deployer].has_key?(:version)
+          version_cmd = server[:deployer][:version][:command]
+          version = nil
+
+          cmd.system("cd #{from_dir} && #{version_cmd}") do |stdout|
+            version = stdout.read.strip
+          end
+
+          return version
+        end
+      end
+
       def current_dir()
         "#{to_dir}/current"
       end
@@ -204,18 +219,18 @@ module Marionetta
       def create_release_name()
         name = timestamp
 
-        if server[:deployer].has_key?(:version)
-          version_cmd = server[:deployer][:version][:command]
-
-          cmd.system("cd #{from_dir} && #{version_cmd}") do |stdout|
-            version = stdout.read.strip
-            name << "_#{version}" unless version.empty?
-          end
-        end
+        version = release_version()
+        name << "_#{version}" unless version.empty?
 
         return name
       end
 
+      def write_deploy_version_file()
+        if version = release_version()
+          cmd.system("echo #{version} > #{from_dir}/DEPLOY-VERSION")
+        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}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marionetta
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Luke Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4