RubyGems - ey-deploy - Versions diffs - 0.4.0 → 0.4.1 - Mend

ey-deploy 0.4.0 → 0.4.1

Files changed (9) hide show

data/lib/ey-deploy.rb +2 -0
data/lib/ey-deploy/cli.rb +6 -0
data/lib/ey-deploy/default_maintenance_page.html +29 -0
data/lib/ey-deploy/deploy.rb +107 -44
data/lib/ey-deploy/server.rb +1 -1
data/lib/ey-deploy/task.rb +12 -6
data/lib/ey-deploy/version.rb +1 -1
data/spec/custom_deploy_spec.rb +13 -13
metadata +16 -15

@@ -20,6 +20,8 @@ module EY
     @dna_json ||= `sudo cat /etc/chef/dna.json`
   end
+  RemoteFailure = Class.new StandardError
   private
   def self.deep_indifferentize(thing)
     if thing.kind_of?(Hash)

data/lib/ey-deploy/cli.rb CHANGED

@@ -4,6 +4,12 @@ require 'thor'
 module EY
   class CLI < Thor
+    def self.start(*)
+      super
+    rescue RemoteFailure
+      exit(1)
+    end
     method_option :migrate, :type     => :string,
                             :desc     => "Run migrations with this deploy",
                             :aliases  => ["-m"]

data/lib/ey-deploy/default_maintenance_page.html ADDED

@@ -0,0 +1,29 @@
+<!DOCTYPE html >
+<html>
+<head>
+  <title>Undergoing Maintenance</title>
+  <style type="text/css">
+    body{font-size: 75%;font-family: Helvetica,Arial,sans-serif;color:#333;background:#FDFDFD;}
+    .container{font-size:1.1em;width:700px;text-align:center;margin:80px auto;}
+    .message{background:#FFF;border:1px solid #EEE;padding:30px;}
+    h1{margin:0 0 0.5em;font-weight:normal;}
+    p{margin:0;line-height:1.75em;}
+    .foot{color:#999;margin-top:30px}
+    .foot a{color:#666;text-decoration:none}
+  </style>
+</head>
+<body>
+  <div class="container">
+    <div class="message">
+      <h1>This site is currently undergoing some maintenance.</h1>
+      <p>Customize this maintenance page by updating the file located at: /public/maintenance.html</p>
+    </div>
+    <div class="foot">
+      Hosted by <a href="http://www.engineyard.com">Engine Yard</a>
+    </div>
+  </div>
+</body>
+</html>

data/lib/ey-deploy/deploy.rb CHANGED

@@ -11,39 +11,66 @@ module EY
       push_code
       puts "~> Starting full deploy"
       copy_repository_cache
-      create_revision_file
-      bundle
-      symlink_configs
-      with_maintenance_page do
+      with_failed_release_cleanup do
+        create_revision_file
+        bundle
+        symlink_configs
+        conditionally_enable_maintenance_page
         run_with_callbacks(:migrate)
-        run_with_callbacks(:symlink)
-        run_with_callbacks(:restart)
+        callback(:before_symlink)
+        symlink
       end
-      cleanup
+      callback(:after_symlink)
+      run_with_callbacks(:restart)
+      disable_maintenance_page
+      cleanup_old_releases
       puts "~> finalizing deploy"
+    rescue Exception
+      puts_deploy_failure
+      raise
     end
     def enable_maintenance_page
-      if c.migrate? || c.stack == "nginx_mongrel"
-        # put in the maintenance page
-        maintenance_file = ["public/maintenance.html.custom", "public/maintenance.html.tmp", "public/maintenance.html", "public/system/maintenance.html.default"].detect do |file|
-          File.exists?(File.join(c.latest_release, file))
-        end
+      maintenance_page_candidates = [
+        "public/maintenance.html.custom",
+        "public/maintenance.html.tmp",
+        "public/maintenance.html",
+        "public/system/maintenance.html.default",
+      ].map do |file|
+        File.join(c.latest_release, file)
+      end
-        if maintenance_file
-          roles :app_master, :app, :solo do
-            run "cp #{File.join(c.latest_release, maintenance_file)} #{File.join(c.shared_path, "system", "maintenance.html")}"
-          end
-        end
+      # this one is guaranteed to exist
+      maintenance_page_candidates <<  File.expand_path(
+        "default_maintenance_page.html",
+        File.dirname(__FILE__)
+        )
+      # put in the maintenance page
+      maintenance_file = maintenance_page_candidates.detect do |file|
+        File.exists?(file)
+      end
+      @maintenance_up = true
+      roles :app_master, :app, :solo do
+        visible_maint_page = File.join(c.shared_path, "system", "maintenance.html")
+        run "cp '#{maintenance_file}' '#{visible_maint_page}'"
+      end
+    end
+    def conditionally_enable_maintenance_page
+      if c.migrate? || c.stack == "nginx_mongrel"
+        enable_maintenance_page
       end
     end
     def disable_maintenance_page
+      @maintenance_up = false
       roles :app_master, :app, :solo do
         run "rm -f #{File.join(c.shared_path, "system", "maintenance.html")}"
       end
@@ -65,6 +92,7 @@ module EY
     # task
     def restart
+      @restart_failed = true
       puts "~> Restarting app servers"
       puts "~> restarting app: #{c.latest_release}"
       roles :app_master, :app, :solo do
@@ -77,6 +105,7 @@ module EY
           sudo("touch #{c.latest_release}/tmp/restart.txt")
         end
       end
+      @restart_failed = false
     end
     # task
@@ -84,37 +113,44 @@ module EY
       roles :app_master, :app, :solo do
         if File.exist?("#{c.latest_release}/Gemfile")
           puts "~> Gemfile detected, bundling gems"
-          run %|cd #{c.latest_release} && bundle install|
+          run "cd #{c.latest_release} && bundle install"
         end
       end
     end
     # task
-    def cleanup
+    def cleanup_old_releases
+      @cleanup_failed = true
       puts "~> cleaning up old releases"
       sudo "ls #{c.release_dir} | head -n -3 | xargs -I{} rm -rf #{c.release_dir}/{}"
+      @cleanup_failed = false
     end
     # task
     def rollback
-      puts "~> rolling back to previous release"
-      c.release_path = c.previous_release
-      run_with_callbacks(:symlink, c.previous_release)
-      FileUtils.rm_rf c.latest_release
-      bundle
-      puts "~> restarting with previous release"
-      with_maintenance_page { run_with_callbacks(:restart) }
+      if c.all_releases.size > 1
+        puts "~> rolling back to previous release"
+        c.release_path = c.previous_release
+        run_with_callbacks(:symlink, c.previous_release)
+        cleanup_latest_release
+        bundle
+        puts "~> restarting with previous release"
+        with_maintenance_page { run_with_callbacks(:restart) }
+      else
+        puts "~> Already at oldest release, nothing to roll back to"
+        exit(1)
+      end
     end
     # task
     def migrate
+      return unless c.migrate?
+      @migrations_reached = true
       roles :app_master, :solo do
-        if c.migrate?
-          puts "~> migrating"
-          cmd = "cd #{c.latest_release} && #{c.framework_envs} #{c.migration_command}"
-          puts "~> Migrating: #{cmd}"
-          run(cmd)
-        end
+        puts "~> migrating"
+        cmd = "cd #{c.latest_release} && #{c.framework_envs} #{c.migration_command}"
+        puts "~> Migrating: #{cmd}"
+        run(cmd)
       end
     end
@@ -150,31 +186,58 @@ module EY
     # task
     def symlink(release_to_link=c.latest_release)
       puts "~> symlinking code"
-      begin
-        sudo "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
-      rescue => e
-        sudo "rm -f #{c.current_path} && ln -nfs #{c.previous_release(release_to_link)} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
-        sudo "rm -rf #{release_to_link}"
-        raise e
-      end
+      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
+    rescue Exception
+      sudo "rm -f #{c.current_path} && ln -nfs #{c.previous_release(release_to_link)} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
+      @symlink_changed = false
+      raise
     end
     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
-        EY::Server.all.each do |server|
-          server.run("#{eysd_path} hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}")
-        end
+        run "#{eysd_path} hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}"
       end
     end
     protected
+    def puts_deploy_failure
+      if @cleanup_failed
+        puts "~> [Relax] Your site is running new code, but cleaning up old deploys failed"
+      elsif @maintenance_up
+        puts "~> [Attention] Maintenance page still up, consider the following before removing:"
+        puts " * any deploy hooks ran, be careful if they were destructive" if @callbacks_reached
+        puts " * any migrations ran, be careful if they were destructive" if @migrations_reached
+        if @symlink_changed
+          puts " * your new code is symlinked as current"
+        else
+          puts " * your old code is still symlinked as current"
+        end
+        puts " * application servers failed to restart" if @restart_failed
+      else
+        puts "~> [Relax] Your site is still running old code and nothing destructive could have occurred"
+      end
+    end
     def with_maintenance_page
-      enable_maintenance_page
+      conditionally_enable_maintenance_page
       yield if block_given?
       disable_maintenance_page
     end
+    def with_failed_release_cleanup
+      yield
+    rescue Exception
+      cleanup_latest_release
+      raise
+    end
+    def cleanup_latest_release
+      sudo "rm -rf #{c.latest_release}"
+    end
   end
   class Deploy < DeployBase

data/lib/ey-deploy/server.rb CHANGED

@@ -80,7 +80,7 @@ module EY
     end
     def ssh_command
-      "ssh -i /home/#{config.user}/.ssh/internal"
+      "ssh -i /home/#{config.user}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
     end
   end
 end

data/lib/ey-deploy/task.rb CHANGED

@@ -37,15 +37,11 @@ module EY
     end
     def run(cmd)
-      EY::Server.from_roles(@roles).each do |server|
-        server.run prepare_run(cmd)
-      end
+      run_on_roles { prepare_run cmd }
     end
     def sudo(cmd)
-      EY::Server.from_roles(@roles).each do |server|
-        server.run prepare_sudo(cmd)
-      end
+      run_on_roles { prepare_sudo cmd }
     end
     def prepare_run(command)
@@ -55,5 +51,15 @@ module EY
     def prepare_sudo(command)
       Escape.shell_command ["sudo", "sh", "-l", "-c", command]
     end
+    private
+    def run_on_roles
+      cmd = yield
+      EY::Server.from_roles(@roles).inject(false) do |acc, server|
+        failure = !server.run(cmd)
+        acc || failure
+      end && raise(EY::RemoteFailure)
+    end
   end
 end

data/lib/ey-deploy/version.rb CHANGED

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/custom_deploy_spec.rb CHANGED

@@ -18,17 +18,17 @@ describe "the EY::Deploy API" do
         @call_order = []
       end
-      def push_code()                @call_order << 'push_code'                end
-      def copy_repository_cache()    @call_order << 'copy_repository_cache'    end
-      def create_revision_file()     @call_order << 'create_revision_file'     end
-      def bundle()                   @call_order << 'bundle'                   end
-      def symlink_configs()          @call_order << 'symlink_configs'          end
-      def migrate()                  @call_order << 'migrate'                  end
-      def symlink()                  @call_order << 'symlink'                  end
-      def restart()                  @call_order << 'restart'                  end
-      def cleanup()                  @call_order << 'cleanup'                  end
-      def enable_maintenance_page()  @call_order << 'enable_maintenance_page'  end
-      def disable_maintenance_page() @call_order << 'disable_maintenance_page' end
+      def push_code()                              @call_order << 'push_code'                              end
+      def copy_repository_cache()                  @call_order << 'copy_repository_cache'                  end
+      def create_revision_file()                   @call_order << 'create_revision_file'                   end
+      def bundle()                                 @call_order << 'bundle'                                 end
+      def symlink_configs()                        @call_order << 'symlink_configs'                        end
+      def migrate()                                @call_order << 'migrate'                                end
+      def symlink()                                @call_order << 'symlink'                                end
+      def restart()                                @call_order << 'restart'                                end
+      def cleanup_old_releases()                   @call_order << 'cleanup_old_releases'                   end
+      def conditionally_enable_maintenance_page()  @call_order << 'conditionally_enable_maintenance_page'  end
+      def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
     end
     td = TestDeploy.new(EY::Deploy::Configuration.new)
@@ -39,12 +39,12 @@ describe "the EY::Deploy API" do
       create_revision_file
       bundle
       symlink_configs
-      enable_maintenance_page
+      conditionally_enable_maintenance_page
       migrate
       symlink
       restart
       disable_maintenance_page
-      cleanup)
+      cleanup_old_releases)
   end
   describe "task overrides" do

metadata CHANGED

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors:
 - EY Cloud Team
@@ -14,25 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-06-11 00:00:00 -07:00
+date: 2010-06-16 00:00:00 -07:00
 default_executable: eysd
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rake
-  requirement: &id001 !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         segments:
         - 0
         version: "0"
+  name: rake
+  prerelease: false
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: escape
-  requirement: &id002 !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -41,20 +39,22 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
+  name: escape
+  prerelease: false
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: json
-  requirement: &id003 !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         segments:
         - 0
         version: "0"
+  name: json
+  prerelease: false
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
 description:
 email: cloud@engineyard.com
 executables:
@@ -67,6 +67,7 @@ files:
 - bin/eysd
 - lib/ey-deploy/cli.rb
 - lib/ey-deploy/configuration.rb
+- lib/ey-deploy/default_maintenance_page.html
 - lib/ey-deploy/deploy.rb
 - lib/ey-deploy/deploy_hook.rb
 - lib/ey-deploy/server.rb