engineyard-serverside 2.0.0.pre3 → 2.0.0.pre4

data/lib/engineyard-serverside/servers.rb

@@ -0,0 +1,93 @@
+require 'engineyard-serverside/server'
+require 'forwardable'
+require 'set'
+
+module EY
+  module Serverside
+    class Servers
+
+      class DuplicateHostname < StandardError
+        def initialize(hostname)
+          super "EY::Serverside::Server '#{hostname}' duplicated!"
+        end
+      end
+
+      # Array compatibility
+      extend Forwardable
+      include Enumerable
+      def_delegators :@servers, :each, :size, :empty?
+      def select(*a, &b) self.class.new @servers.select(*a,&b) end
+      def reject(*a, &b) self.class.new @servers.reject(*a,&b) end
+      def to_a() @servers end
+      def ==(other) other.respond_to?(:to_a) && other.to_a == to_a end
+
+
+      def self.from_hashes(server_hashes)
+        servers = server_hashes.inject({}) do |memo, server_hash|
+          server = Server.from_hash(server_hash)
+          raise DuplicateHostname.new(server.hostname) if memo.key?(server.hostname)
+          memo[server.hostname] = server
+          memo
+        end
+        new(servers.values)
+      end
+
+      def initialize(servers)
+        @servers = servers
+        @cache = {}
+      end
+
+      def localhost
+        @servers.find {|server| server.local? }
+      end
+
+      def remote
+        reject { |server| server.local? }
+      end
+
+      # We look up the same set of servers over and over.
+      # Cache them so we don't have to find them every time
+      # Accepts a block (because it's confusing when you send a block to this
+      # method and it doesn't yield and it's better than raising)
+      def roles(*select_roles, &block)
+        if block_given?
+          return yield roles(*select_roles)
+        end
+
+        roles_set = Set.new select_roles.flatten.compact.map{|r| r.to_sym}
+        if roles_set.empty? || roles_set.include?(:all)
+          self
+        else
+          @cache[roles_set] ||= select { |server| server.matches_roles?(roles_set) }
+        end
+      end
+
+      # Run a command on this set of servers.
+      def run(cmd, &blk)
+        run_on_servers('sh -l -c', cmd, &blk)
+      end
+
+      # Run a sudo command on this set of servers.
+      def sudo(cmd, &blk)
+        run_on_servers('sudo sh -l -c', cmd, &blk)
+      end
+
+      private
+
+      def run_on_servers(prefix, cmd, &block)
+        commands = map do |server|
+          exec_cmd = server.command_on_server(prefix, cmd, &block)
+          proc { shell.logged_system(exec_cmd) }
+        end
+
+        futures = EY::Serverside::Future.call(commands)
+
+        unless EY::Serverside::Future.success?(futures)
+          failures = futures.select {|f| f.error? }.map {|f| f.inspect}.join("\n")
+          raise EY::Serverside::RemoteFailure.new(failures)
+        end
+      end
+
+    end
+  end
+end

data/lib/engineyard-serverside/task.rb

@@ -3,10 +3,11 @@ require 'engineyard-serverside/shell/helpers'
 module EY
   module Serverside
     class Task
-      attr_reader :config, :shell
+      attr_reader :servers, :config, :shell
       alias :c :config
 
-      def initialize(conf, shell = nil)
+      def initialize(servers, conf, shell)
+        @servers = servers
         @config = conf
         @shell = shell
         @roles = :all
@@ -69,7 +70,7 @@ module EY
       private
 
       def run_on_roles(prefix, cmd, &block)
-        servers = EY::Serverside::Server.from_roles(@roles)
+        servers = @servers.roles(@roles)
 
         commands = servers.map do |server|
           exec_cmd = server.command_on_server(prefix, cmd, &block)

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.0.0.pre3'
+    VERSION = '2.0.0.pre4'
   end
 end

data/spec/basic_deploy_spec.rb

@@ -7,11 +7,11 @@ describe "Deploying a simple application" do
     end
 
     it "creates a REVISION file" do
-      @deploy_dir.join('current', 'REVISION').should exist
+      deploy_dir.join('current', 'REVISION').should exist
     end
 
     it "restarts the app servers" do
-      restart = @deploy_dir.join('current', 'restart')
+      restart = deploy_dir.join('current', 'restart')
       restart.should exist
       restart.read.chomp.should == %|LANG="en_US.UTF-8" /engineyard/bin/app_rails31 deploy|
     end

data/spec/bundler_deploy_spec.rb

@@ -34,19 +34,19 @@ describe "Deploying an application that uses Bundler" do
     end
 
     it "has the binstubs in the path when migrating" do
-      File.read(File.join(@deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
+      File.read(File.join(deploy_dir, 'path-when-migrating')).should include('ey_bundler_binstubs')
     end
 
     it "creates a ruby version file" do
-      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
+      File.exist?(File.join(deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
     end
 
     it "creates a system version file" do
-      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
+      File.exist?(File.join(deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
     end
 
     it "generates bundler binstubs" do
-      File.exist?(File.join(@deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
+      File.exist?(File.join(deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
     end
   end
 
@@ -68,11 +68,11 @@ describe "Deploying an application that uses Bundler" do
     end
 
     it "creates a ruby version file" do
-      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
+      File.exist?(File.join(deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
     end
 
     it "creates a system version file" do
-      File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
+      File.exist?(File.join(deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
     end
 
     it "sets GIT_SSH environment variable" do

data/spec/configuration_spec.rb

@@ -6,6 +6,7 @@ describe EY::Serverside::Deploy::Configuration do
       @tempdir = `mktemp -d -t ey_yml_spec.XXXXX`.strip
       @config = EY::Serverside::Deploy::Configuration.new({
         'repository_cache' => @tempdir,
+        'app' => 'app_name',
         'environment_name' => 'env_name',
         'account_name' => 'acc',
         'migrate' => nil,
@@ -13,7 +14,7 @@ describe EY::Serverside::Deploy::Configuration do
         'config' => {'custom' => 'custom_from_extra_config'}.to_json
       })
 
-      @deploy = FullTestDeploy.new(@config, test_shell)
+      @deploy = FullTestDeploy.new(test_servers, @config, test_shell)
 
       @yaml_data = {
         'environments' => {

data/spec/custom_deploy_spec.rb

@@ -33,7 +33,12 @@ describe "the EY::Serverside::Deploy API" do
       def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
     end
 
-    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new, test_shell)
+    config = EY::Serverside::Deploy::Configuration.new({
+      'app' => 'app_name',
+      'framework_env' => 'staging',
+    })
+
+    td = TestDeploy.new(test_servers, config, test_shell)
     td.deploy
     td.call_order.should == %w(
       push_code
@@ -58,8 +63,8 @@ describe "the EY::Serverside::Deploy API" do
 
     before(:each) do
       @tempdir = `mktemp -d -t custom_deploy_spec.XXXXX`.strip
-      @config = EY::Serverside::Deploy::Configuration.new('repository_cache' => @tempdir)
-      @deploy = TestQuietDeploy.new(@config, test_shell)
+      @config = EY::Serverside::Deploy::Configuration.new('app' => 'app_name', 'repository_cache' => @tempdir)
+      @deploy = TestQuietDeploy.new(test_servers, @config, test_shell)
     end
 
     def write_eydeploy(relative_path, contents = "def got_new_methods() 'from the file on disk' end")
@@ -91,7 +96,7 @@ describe "the EY::Serverside::Deploy API" do
         def value() 'base' end
       end
 
-      deploy = TestDeploySuper.new(@config, test_shell)
+      deploy = TestDeploySuper.new(test_servers, @config, test_shell)
       deploy.require_custom_tasks.should be_true
       deploy.value.should == "base + derived"
     end

data/spec/deploy_hook_spec.rb

@@ -7,16 +7,16 @@ describe "deploy hooks" do
     end
 
     it "runs all the hooks" do
-      @deploy_dir.join('current', 'before_bundle.ran' ).should exist
-      @deploy_dir.join('current', 'after_bundle.ran'  ).should exist
-      @deploy_dir.join('current', 'before_migrate.ran').should exist
-      @deploy_dir.join('current', 'after_migrate.ran' ).should exist
-      @deploy_dir.join('current', 'before_compile_assets.ran').should exist
-      @deploy_dir.join('current', 'after_compile_assets.ran' ).should exist
-      @deploy_dir.join('current', 'before_symlink.ran').should exist
-      @deploy_dir.join('current', 'after_symlink.ran' ).should exist
-      @deploy_dir.join('current', 'before_restart.ran').should exist
-      @deploy_dir.join('current', 'after_restart.ran' ).should exist
+      deploy_dir.join('current', 'before_bundle.ran' ).should exist
+      deploy_dir.join('current', 'after_bundle.ran'  ).should exist
+      deploy_dir.join('current', 'before_migrate.ran').should exist
+      deploy_dir.join('current', 'after_migrate.ran' ).should exist
+      deploy_dir.join('current', 'before_compile_assets.ran').should exist
+      deploy_dir.join('current', 'after_compile_assets.ran' ).should exist
+      deploy_dir.join('current', 'before_symlink.ran').should exist
+      deploy_dir.join('current', 'after_symlink.ran' ).should exist
+      deploy_dir.join('current', 'before_restart.ran').should exist
+      deploy_dir.join('current', 'after_restart.ran' ).should exist
     end
   end
 
@@ -30,15 +30,19 @@ describe "deploy hooks" do
 
     it "retains the failed release" do
       release_name = File.basename(@config.release_path)
-      @deploy_dir.join('releases_failed', release_name).should be_directory
+      deploy_dir.join('releases_failed', release_name).should be_directory
     end
   end
 
   context "deploy hook API" do
 
     def deploy_hook(options={})
-      config = EY::Serverside::Deploy::Configuration.new(options)
-      EY::Serverside::DeployHook.new(config, test_shell)
+      config = EY::Serverside::Deploy::Configuration.new({
+        'app' => 'app_name',
+        'framework_env' => 'staging',
+        'current_roles' => ['solo'],
+      }.merge(options))
+      EY::Serverside::DeployHook.new(config, test_shell, 'fake_test_hook')
     end
 
     context "#run" do
@@ -191,7 +195,7 @@ describe "deploy hooks" do
 
       def where_code_runs_with(code)
         scenarios.select do |role, name|
-          hook = deploy_hook(:current_roles => role.split(','), :current_name => name)
+          hook = deploy_hook('current_roles' => role.split(','), 'current_name' => name)
           hook.eval_hook("#{code} { 'ran' } == 'ran'")
         end.map do |scenario|
           scenario.compact.join("_")
@@ -244,9 +248,21 @@ describe "deploy hooks" do
       end
     end
 
+    context "errors in hooks" do
+      it "shows the error in a helpful way" do
+        lambda {
+          deploy_hook.eval_hook('methedo_no_existo')
+        }.should raise_error(NameError)
+        out = read_output
+        out.should =~ %r|FATAL: Exception raised in deploy hook "/data/app_name/releases/\d+/deploy/fake_test_hook.rb".|
+        out.should =~ %r|NameError: undefined local variable or method `methedo_no_existo' for|
+        out.should =~ %r|Please fix this error before retrying.|
+      end
+    end
+
     context "is compatible with older deploy hook scripts" do
       it "#current_role returns the first role" do
-        deploy_hook(:current_roles => %w(a b)).eval_hook('current_role').should == 'a'
+        deploy_hook('current_roles' => %w(a b)).eval_hook('current_role').should == 'a'
       end
 
       it "has info, warning, debug, logged_system, and access to shell" do

data/spec/ey_yml_customized_deploy_spec.rb

@@ -11,7 +11,7 @@ describe "Deploying an app with ey.yml" do
     end
 
     it "does not enable the maintenance page at all" do
-      @deploy_dir.join('current','maintenance_disabled').should exist
+      deploy_dir.join('current','maintenance_disabled').should exist
     end
   end
 
@@ -24,12 +24,12 @@ describe "Deploying an app with ey.yml" do
     it "excludes copy_excludes from releases" do
       cmd = @deployer.commands.grep(/rsync -aq/).first
       cmd.should include('rsync -aq --exclude=".git" --exclude="README"')
-      @deploy_dir.join('current', '.git').should_not exist
-      @deploy_dir.join('current', 'README').should_not exist
+      deploy_dir.join('current', '.git').should_not exist
+      deploy_dir.join('current', 'README').should_not exist
     end
 
     it "loads ey.yml at lower priority than command line options" do
-      @deploy_dir.join('current', 'REVISION').read.should == "somebranch\n"
+      deploy_dir.join('current', 'REVISION').read.should == "somebranch\n"
     end
 
     it "loads bundle_without from the config, which overrides the default" do
@@ -38,23 +38,25 @@ describe "Deploying an app with ey.yml" do
     end
 
     it "does not enable the maintenance page during migrations" do
-      @deploy_dir.join('current','maintenance_disabled').should exist
-      @deploy_dir.join('current','maintenance_enabled').should_not exist
+      deploy_dir.join('current','maintenance_disabled').should exist
+      deploy_dir.join('current','maintenance_enabled').should_not exist
     end
 
     it "does not remove an existing maintenance page" do
-      @deploy_dir.join('current','maintenance_disabled').delete
+      deploy_dir.join('current','maintenance_disabled').delete
       @deployer.enable_maintenance_page
-      @deploy_dir.join('shared','system','maintenance.html').should exist
+      deploy_dir.join('shared','system','maintenance.html').should exist
       redeploy_test_application
-      read_output.should =~ /Maintenance page is still up. You must remove it manually./
-      @deploy_dir.join('shared','system','maintenance.html').should exist
-      @deploy_dir.join('current','maintenance_disabled').should_not exist
-      @deploy_dir.join('current','maintenance_enabled').should exist
+      read_output.should =~ /Maintenance page is still up./
+      deploy_dir.join('shared','system','maintenance.html').should exist
+      deploy_dir.join('current','maintenance_disabled').should_not exist
+      deploy_dir.join('current','maintenance_enabled').should exist
+      @deployer.disable_maintenance_page
+      deploy_dir.join('shared','system','maintenance.html').should_not exist
     end
 
     it "makes custom variables available to hooks" do
-      @deploy_dir.join('current', 'custom_hook').read.should include("custom_from_ey_yml")
+      deploy_dir.join('current', 'custom_hook').read.should include("custom_from_ey_yml")
     end
 
     it "doesn't display the database adapter warning with ignore_database_adapter_warning: true" do
@@ -68,8 +70,8 @@ describe "Deploying an app with ey.yml" do
     end
 
     it "always installs maintenance pages" do
-      @deploy_dir.join('current','maintenance_enabled').should exist
-      @deploy_dir.join('current','maintenance_disabled').should_not exist
+      deploy_dir.join('current','maintenance_enabled').should exist
+      deploy_dir.join('current','maintenance_disabled').should_not exist
     end
 
     it "displays the database adapter warning without ignore_database_adapter_warning" do

data/spec/rails31_deploy_spec.rb

@@ -7,7 +7,7 @@ describe "Deploying a Rails 3.1 application" do
     end
 
     it "precompiles assets" do
-      @deploy_dir.join('current', 'precompiled').should exist
+      deploy_dir.join('current', 'precompiled').should exist
     end
   end
 
@@ -17,7 +17,7 @@ describe "Deploying a Rails 3.1 application" do
     end
 
     it "precompiles assets" do
-      @deploy_dir.join('current', 'precompiled').should exist
+      deploy_dir.join('current', 'precompiled').should exist
     end
   end
 
@@ -27,7 +27,7 @@ describe "Deploying a Rails 3.1 application" do
     end
 
     it "does not precompile assets" do
-      @deploy_dir.join('current', 'precompiled').should_not exist
+      deploy_dir.join('current', 'precompiled').should_not exist
     end
   end
 
@@ -37,7 +37,7 @@ describe "Deploying a Rails 3.1 application" do
     end
 
     it "precompiles assets" do
-      @deploy_dir.join('current', 'precompiled').should_not exist
+      deploy_dir.join('current', 'precompiled').should_not exist
     end
   end
 
@@ -47,10 +47,10 @@ describe "Deploying a Rails 3.1 application" do
     end
 
     it "does not replace the public/assets directory" do
-      @deploy_dir.join('current', 'custom_compiled').should exist
-      @deploy_dir.join('current', 'precompiled').should_not exist
-      @deploy_dir.join('current', 'public', 'assets').should be_directory
-      @deploy_dir.join('current', 'public', 'assets').should_not be_symlink
+      deploy_dir.join('current', 'custom_compiled').should exist
+      deploy_dir.join('current', 'precompiled').should_not exist
+      deploy_dir.join('current', 'public', 'assets').should be_directory
+      deploy_dir.join('current', 'public', 'assets').should_not be_symlink
     end
   end
 end

data/spec/restart_spec.rb

@@ -20,7 +20,8 @@ describe "EY::Serverside::Deploy#restart_with_maintenance_page" do
   end
 
   it "puts up the maintenance page if necessary, restarts, and takes down the maintenance page" do
-    deployer = TestRestartWithMaintenancePage.new(EY::Serverside::Deploy::Configuration.new)
+    config = EY::Serverside::Deploy::Configuration.new('app' => 'app_name')
+    deployer = TestRestartWithMaintenancePage.new(test_servers, config, test_shell)
     deployer.restart_with_maintenance_page
     deployer.call_order.should == %w(
       require_custom_tasks
@@ -35,7 +36,7 @@ describe "glassfish stack" do
 
   it "requires a maintenance page" do
     config = EY::Serverside::Deploy::Configuration.new(:stack => 'glassfish')
-    deployer = TestRestartDeploy.new(config)
+    deployer = TestRestartDeploy.new(test_servers, config, test_shell)
     deployer.restart_with_maintenance_page
     deployer.call_order.should include('enable_maintenance_page')
   end