ey-deploy 0.8.2 → 0.9.1

data/lib/ey-deploy/deploy.rb

@@ -32,8 +32,6 @@ module EY
       disable_maintenance_page
 
       cleanup_old_releases
-
-      info "~> Finalizing deploy"
     rescue Exception
       puts_deploy_failure
       raise
@@ -108,7 +106,7 @@ module EY
         when "nginx_mongrel"
           sudo("monit restart all -g #{c.app}")
         when "nginx_passenger"
-          sudo("touch #{c.latest_release}/tmp/restart.txt")
+          sudo("touch #{c.current_path}/tmp/restart.txt")
         else
           raise "Unknown stack #{c.stack}; restart failed!"
         end
@@ -118,9 +116,9 @@ module EY
 
     # task
     def bundle
-      if File.exist?("#{c.latest_release}/Gemfile")
+      if File.exist?("#{c.release_path}/Gemfile")
         info "~> Gemfile detected, bundling gems"
-        lockfile = File.join(c.latest_release, "Gemfile.lock")
+        lockfile = File.join(c.release_path, "Gemfile.lock")
 
         bundler_version = if File.exist?(lockfile)
                             get_bundler_version(lockfile)
@@ -131,7 +129,7 @@ module EY
 
         sudo "#{$0} _#{VERSION}_ install_bundler #{bundler_version}"
 
-        run "cd #{c.latest_release} && bundle _#{bundler_version}_ install --without=development --without=test"
+        run "cd #{c.release_path} && bundle _#{bundler_version}_ install --without=development --without=test"
       end
     end
 
@@ -152,7 +150,7 @@ module EY
         info "~> Rolling back to previous release: #{short_log_message(revision)}"
 
         run_with_callbacks(:symlink, c.previous_release)
-        cleanup_latest_release
+        cleanup_current_release
         bundle
         info "~> Restarting with previous release"
         with_maintenance_page { run_with_callbacks(:restart) }
@@ -167,7 +165,7 @@ module EY
       return unless c.migrate?
       @migrations_reached = true
       roles :app_master, :solo do
-        cmd = "cd #{c.latest_release} && #{c.framework_envs} #{c.migration_command}"
+        cmd = "cd #{c.release_path} && #{c.framework_envs} #{c.migration_command}"
         info "~> Migrating: #{cmd}"
         run(cmd)
       end
@@ -182,7 +180,7 @@ module EY
       sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
     end
 
-    def symlink_configs(release_to_link=c.latest_release)
+    def symlink_configs(release_to_link=c.release_path)
       info "~> Symlinking configs"
       [ "chmod -R g+w #{release_to_link}",
         "rm -rf #{release_to_link}/log #{release_to_link}/public/system #{release_to_link}/tmp/pids",
@@ -203,7 +201,7 @@ module EY
     end
 
     # task
-    def symlink(release_to_link=c.latest_release)
+    def symlink(release_to_link=c.release_path)
       info "~> Symlinking code"
       sudo "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
       @symlink_changed = true
@@ -215,9 +213,9 @@ module EY
 
     def callback(what)
       @callbacks_reached ||= true
-      if File.exist?("#{c.latest_release}/deploy/#{what}.rb")
-        eysd_path = $0   # invoke others just like we were invoked
-        run "#{eysd_path} _#{VERSION}_ hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}" do |server, cmd|
+      if File.exist?("#{c.release_path}/deploy/#{what}.rb")
+        eydeploy_path = $0   # invoke others just like we were invoked
+        run "#{eydeploy_path} _#{VERSION}_ hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}" do |server, cmd|
           cmd << " --framework-env '#{c.environment}'"
           cmd << " --current-role '#{server.role}'"
           cmd << " --current-name '#{server.name}'" if server.name
@@ -255,12 +253,12 @@ module EY
     def with_failed_release_cleanup
       yield
     rescue Exception
-      cleanup_latest_release
+      cleanup_current_release
       raise
     end
 
-    def cleanup_latest_release
-      sudo "rm -rf #{c.latest_release}"
+    def cleanup_current_release
+      sudo "rm -rf #{c.release_path}"
     end
 
     def safe_yaml_load(loadable)

data/lib/ey-deploy/deploy_hook.rb

@@ -9,9 +9,9 @@ module EY
     end
 
     def run(hook)
-      hook_path = "#{c.latest_release}/deploy/#{hook}.rb"
+      hook_path = "#{c.release_path}/deploy/#{hook}.rb"
       if File.exist?(hook_path)
-        Dir.chdir(c.latest_release) do
+        Dir.chdir(c.release_path) do
           puts "~> running deploy hook: deploy/#{hook}.rb"
           if desc = syntax_error(hook_path)
             hook_name = File.basename(hook_path)

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.8.2'
+  VERSION = '0.9.1'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
-default_executable: eysd
+date: 2010-07-13 00:00:00 -07:00
+default_executable: ey-deploy
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -58,13 +58,13 @@ dependencies:
 description: 
 email: cloud@engineyard.com
 executables: 
-- eysd
+- ey-deploy
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- bin/eysd
+- bin/ey-deploy
 - lib/ey-deploy/cli.rb
 - lib/ey-deploy/configuration.rb
 - lib/ey-deploy/default_maintenance_page.html