engineyard-serverside 1.3.2 → 1.3.3

data/lib/engineyard-serverside/cli.rb

@@ -158,6 +158,41 @@ module EY
       EY::Deploy.new(config).cached_deploy
     end
 
+    method_option :app,             :type     => :string,
+                                    :required => true,
+                                    :desc     => "Application to deploy",
+                                    :aliases  => ["-a"]
+
+    method_option :stack,           :type     => :string,
+                                    :desc     => "Web stack (so we can restart it correctly)"
+
+    method_option :instances,       :type     => :array,
+                                    :desc     => "Hostnames of instances to deploy to, e.g. --instances localhost app1 app2"
+
+    method_option :instance_roles,  :type     => :hash,
+                                    :default  => {},
+                                    :desc     => "Roles of instances, keyed on hostname, comma-separated. e.g. instance1:app_master,etc instance2:db,memcached ..."
+
+    method_option :instance_names,  :type     => :hash,
+                                    :default  => {},
+                                    :desc     => "Instance names, keyed on hostname. e.g. instance1:name1 instance2:name2"
+
+    method_option :verbose,         :type     => :boolean,
+                                    :default  => false,
+                                    :desc     => "Verbose output",
+                                    :aliases  => ["-v"]
+    desc "restart", "Restart app servers, conditionally enabling maintenance page"
+    def restart
+      EY::LoggedOutput.verbose = options[:verbose]
+      EY::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-restart.log")
+
+      config = EY::Deploy::Configuration.new(options)
+      EY::Server.load_all_from_array(assemble_instance_hashes(config))
+
+      invoke :propagate
+
+      EY::Deploy.new(config).restart_with_maintenance_page
+    end
 
     desc "install_bundler [VERSION]", "Make sure VERSION of bundler is installed (in system ruby)"
     def install_bundler(version)

data/lib/engineyard-serverside/deploy.rb

@@ -44,6 +44,13 @@ module EY
       raise
     end
 
+    def restart_with_maintenance_page
+      require_custom_tasks
+      conditionally_enable_maintenance_page
+      restart
+      disable_maintenance_page
+    end
+
     def enable_maintenance_page
       maintenance_page_candidates = [
         "public/maintenance.html.custom",

data/lib/engineyard-serverside/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/spec/restart_spec.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "EY::Deploy#restart_with_maintenance_page" do
+
+  class TestRestartWithMaintenancePage < EY::Deploy
+    attr_reader :call_order
+    def initialize(*a)
+      super
+      @call_order = []
+    end
+
+    def require_custom_tasks()                   @call_order << 'require_custom_tasks'                   end
+    def restart()                                @call_order << 'restart'                                end
+    def conditionally_enable_maintenance_page()  @call_order << 'conditionally_enable_maintenance_page'  end
+    def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
+  end
+
+  it "puts up the maintenance page if necessary, restarts, and takes down the maintenance page" do
+    deployer = TestRestartWithMaintenancePage.new(EY::Deploy::Configuration.new)
+    deployer.restart_with_maintenance_page
+    deployer.call_order.should == %w(
+      require_custom_tasks
+      conditionally_enable_maintenance_page
+      restart
+      disable_maintenance_page
+    )
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -07:00
+date: 2010-09-16 00:00:00 -07:00
 default_executable: engineyard-serverside
 dependencies: []
 
@@ -235,7 +235,6 @@ files:
 - LICENSE
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -243,6 +242,7 @@ files:
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
 - spec/real_deploy_spec.rb
+- spec/restart_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/lockfiles/0.9-no-bundler
@@ -287,7 +287,6 @@ summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -295,6 +294,7 @@ test_files:
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
 - spec/real_deploy_spec.rb
+- spec/restart_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/lockfiles/0.9-no-bundler