ey-deploy 0.3.3 → 0.4.0

data/lib/ey-deploy.rb

@@ -3,7 +3,6 @@ require 'escape'
 $LOAD_PATH.push(File.expand_path("ey-deploy", File.dirname(__FILE__)))
 
 require 'version'
-require 'compatibility'
 require 'strategies/git'
 require 'task'
 require 'server'

data/lib/ey-deploy/cli.rb

@@ -43,31 +43,6 @@ module EY
       EY::DeployHook.new(options).run(hook_name)
     end
 
-    desc "check", "Check whether the client gem is compatible with the server gem"
-    def check(client_version, server_requirement)
-      compat = EY::Compatibility.new(client_version, server_requirement)
-      return if compat.compatible?
-
-      if compat.server_newer?
-        puts "Server library is newer than supported by the engineyard gem"
-        puts "Please upgrade the engineyard gem"
-        exit(1)
-      end
-
-      system("sudo gem install ey-deploy -v '#{server_requirement}' > /dev/null 2>&1")
-      case $?.exitstatus
-      when 2
-        puts "Incompatible server component detected"
-        puts "Please contact us at http://cloud-support.engineyard.com"
-        exit 2
-      when 0
-        puts "Upgraded server component"
-        exit
-      else
-        exit 3
-      end
-    end
-
     desc "propagate", "Propagate the ey-deploy gem to the other instances in the cluster. This will install exactly version #{VERSION} and remove other versions if found."
     def propagate
       config          = EY::Deploy::Configuration.new

data/lib/ey-deploy/configuration.rb

@@ -11,6 +11,8 @@ module EY
     attr_reader :configuration
     alias :c :configuration
 
+    attr_writer :release_path
+
     def initialize(opts={})
       @release_path = opts[:release_path]
       config = JSON.parse(opts["config"] || "{}")

data/lib/ey-deploy/deploy.rb

@@ -17,23 +17,44 @@ module EY
       bundle
       symlink_configs
 
-      callback(:before_migrate)
-      migrate
-      callback(:after_migrate)
-
-      callback(:before_symlink)
-      symlink
-      callback(:after_symlink)
-
-      callback(:before_restart)
-      restart
-      callback(:after_restart)
+      with_maintenance_page do
+        run_with_callbacks(:migrate)
+        run_with_callbacks(:symlink)
+        run_with_callbacks(:restart)
+      end
 
       cleanup
 
       puts "~> finalizing deploy"
     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
+
+        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
+      end
+    end
+
+    def disable_maintenance_page
+      roles :app_master, :app, :solo do
+        run "rm -f #{File.join(c.shared_path, "system", "maintenance.html")}"
+      end
+    end
+
+    def run_with_callbacks(task, *args)
+      callback(:"before_#{task}")
+      send(task, *args)
+      callback(:"after_#{task}")
+    end
+
     # task
     def push_code
       puts "~> Pushing code to all servers"
@@ -77,10 +98,12 @@ module EY
     # task
     def rollback
       puts "~> rolling back to previous release"
-      symlink(c.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"
-      restart
+      with_maintenance_page { run_with_callbacks(:restart) }
     end
 
     # task
@@ -144,6 +167,14 @@ module EY
         end
       end
     end
+
+    protected
+
+    def with_maintenance_page
+      enable_maintenance_page
+      yield if block_given?
+      disable_maintenance_page
+    end
   end
 
   class Deploy < DeployBase

data/lib/ey-deploy/version.rb

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

data/spec/custom_deploy_spec.rb

@@ -3,8 +3,11 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "the EY::Deploy API" do
   it "calls tasks in the right order" do
     class TestDeploy < EY::Deploy
-      # cheat a bit; we don't actually want to do these things
+      # This happens before require_custom_tasks, so it's not
+      # overrideable. That's why it's not in @call_order.
       def update_repository_cache() end
+
+      # cheat a bit; we don't actually want to do these things
       def require_custom_tasks() end
       def callback(*_) end
       def puts(*_) 'stfu' end
@@ -15,20 +18,33 @@ 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 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
     end
 
     td = TestDeploy.new(EY::Deploy::Configuration.new)
     td.deploy
-    td.call_order.should == %w[push_code copy_repository_cache create_revision_file bundle symlink_configs migrate symlink restart cleanup]
+    td.call_order.should == %w(
+      push_code
+      copy_repository_cache
+      create_revision_file
+      bundle
+      symlink_configs
+      enable_maintenance_page
+      migrate
+      symlink
+      restart
+      disable_maintenance_page
+      cleanup)
   end
 
   describe "task overrides" do

data/spec/deploy_hook_spec.rb

@@ -1,13 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "the deploy-hook API" do
-  before(:all) do
-    module EY
-      def self.dna_json=(j) @dna_json = j; @node = nil end
-    end
-    EY.dna_json = {}.to_json
-  end
-
   before(:each) do
     @hook_runner = EY::DeployHook.new(options)
     @callback_context = EY::DeployHook::CallbackContext.new(@hook_runner, @hook_runner.config)

data/spec/spec_helper.rb

@@ -3,3 +3,17 @@ $LOAD_PATH.push File.expand_path("../lib", File.dirname(__FILE__))
 Bundler.require :default, :test
 require 'pp'
 require 'ey-deploy'
+
+module EY
+  def self.dna_json=(j)
+    @dna_json = j;
+    @node = nil
+    j
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.before(:all) do
+    EY.dna_json = {}.to_json
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -07:00
+date: 2010-06-11 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,6 @@ extra_rdoc_files: []
 files: 
 - bin/eysd
 - lib/ey-deploy/cli.rb
-- lib/ey-deploy/compatibility.rb
 - lib/ey-deploy/configuration.rb
 - lib/ey-deploy/deploy.rb
 - lib/ey-deploy/deploy_hook.rb

data/lib/ey-deploy/compatibility.rb

@@ -1,24 +0,0 @@
-module EY
-  class Compatibility
-    attr_reader :server_version, :client_version, :server_required
-
-    def initialize(client_version, server_required)
-      require 'rubygems'
-      @client_version = Gem::Version.new(client_version)
-      @server_required = Gem::Requirement.new(server_required)
-      @server_version = Gem::Version.new(EY::VERSION)
-    end
-
-    def server_required_version
-      server_required.requirements.first.last
-    end
-
-    def compatible?
-      server_required.satisfied_by?(server_version)
-    end
-
-    def server_newer?
-      server_version > server_required_version
-    end
-  end
-end