engineyard-serverside 2.6.19 → 2.7.0.pre

data/lib/engineyard-serverside/callbacks/distributor/ruby/distributor.rb

@@ -0,0 +1,57 @@
+require 'engineyard-serverside/callbacks/distributor/base'
+
+require 'escape'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Distributor
+        module Ruby
+
+          class Distributor < Base
+            def distribute
+              shell.status "Running deploy hook: #{hook}.rb"
+
+              runner.run escaped_command(hook) do |server, cmd|
+                instance_args = [
+                  '--current-roles', server.roles.to_a.join(' ')
+                ]
+
+                if server.name
+                  instance_args.push('--current-name')
+                  instance_args.push(server.name.to_s)
+                end
+
+                instance_args.push('--config')
+                instance_args.push(config.to_json)
+
+                cmd << " " << Escape.shell_command(instance_args)
+              end
+            end
+
+            private
+            def escaped_command(hook)
+              Escape.shell_command(command_for(hook.callback_name))
+            end
+            def command_for(hook_name)
+              cmd = [
+                About.binary,
+                'hook', hook_name.to_s,
+                '--app', config.app,
+                '--environment-name', config.environment_name,
+                '--account-name', config.account_name,
+                '--release-path', paths.active_release.to_s,
+                '--framework-env', config.framework_env.to_s
+              ]
+
+              cmd.push('--verbose') if config.verbose
+
+              cmd
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/hooks/app.rb

@@ -0,0 +1,17 @@
+require 'engineyard-serverside/callbacks/hooks/base'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Hooks
+
+        class App < Base
+          def to_s
+            "deploy/#{callback_name}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/hooks/base.rb

@@ -0,0 +1,39 @@
+require 'pathname'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Hooks
+
+        class Base
+          attr_reader :path, :callback_name, :flavor
+
+          def initialize(file_path)
+            @path = Pathname.new(file_path)
+
+            filename = path.basename
+
+            callback = filename.basename('.rb')
+
+            @flavor = filename == callback ? :executable : :ruby
+
+            @callback_name = callback.to_s.to_sym
+          end
+
+          def matches?(callback)
+            callback_name == callback
+          end
+
+          def read
+            path.read
+          end
+
+          def to_s
+            raise "Unimplemented"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/hooks/service.rb

@@ -0,0 +1,24 @@
+require 'engineyard-serverside/callbacks/hooks/base'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Hooks
+
+        class Service < Base
+          attr_reader :service_name
+
+          def initialize(file_path)
+            super
+            @service_name = path.dirname.basename.to_s
+          end
+
+          def to_s
+            "service/#{service_name}/#{callback_name}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/service_hook.rb

@@ -0,0 +1,20 @@
+require 'pathname'
+
+require 'engineyard-serverside/callbacks/base_hook'
+
+module EY
+  module Serverside
+    module Callbacks
+
+      class ServiceHook < BaseHook
+        attr_reader :service_name
+
+        def initialize(file_path)
+          super
+          @service_name = path.dirname.basename.to_s
+        end
+      end
+
+    end
+  end
+end

data/lib/engineyard-serverside/deploy.rb

@@ -5,6 +5,7 @@ require 'engineyard-serverside/rails_assets'
 require 'engineyard-serverside/maintenance'
 require 'engineyard-serverside/dependency_manager'
 require 'engineyard-serverside/dependency_manager/legacy_helpers'
+require 'engineyard-serverside/callbacks'
 
 module EY
   module Serverside
@@ -450,27 +451,9 @@ defaults:
       end
 
       def callback(what)
+        load_callbacks
         @callbacks_reached ||= true
-
-        if paths.deploy_hook(what).exist?
-          shell.status "Running deploy hook: deploy/#{what}.rb"
-          run Escape.shell_command(base_callback_command_for(what)) do |server, cmd|
-            per_instance_args = []
-            per_instance_args << '--current-roles' << server.roles.to_a.join(' ')
-            per_instance_args << '--current-name'  << server.name.to_s if server.name
-            per_instance_args << '--config'        << config.to_json
-            cmd << " " << Escape.shell_command(per_instance_args)
-          end
-        elsif paths.executable_deploy_hook(what).executable?
-          shell.status "Running deploy hook: deploy/#{what}"
-          run [About.hook_executor, what.to_s].join(' ') do |server, cmd|
-            cmd = hook_env_vars(server).reject{|k,v| v.nil?}.map{|k,v|
-              "#{k}=#{Escape.shell_command([v])}"
-            }.join(' ') + ' ' + config.framework_envs + ' ' + cmd
-          end
-        elsif paths.executable_deploy_hook(what).exist?
-          shell.warning "Skipping possible deploy hook deploy/#{what} because it is not executable."
-        end
+        @callbacks_collection.distribute(self, what)
       end
 
       def source
@@ -480,31 +463,6 @@ defaults:
 
       protected
 
-      def base_callback_command_for(what)
-        cmd =  [About.binary, 'hook', what.to_s]
-        cmd << '--app'              << config.app
-        cmd << '--environment-name' << config.environment_name
-        cmd << '--account-name'     << config.account_name
-        cmd << '--release-path'     << paths.active_release.to_s
-        cmd << '--framework-env'    << config.framework_env.to_s
-        cmd << '--verbose' if config.verbose
-        cmd
-      end
-
-      def hook_env_vars(server)
-        {
-          'EY_DEPLOY_ACCOUNT_NAME' => config.account_name,
-          'EY_DEPLOY_APP' => config.app,
-          'EY_DEPLOY_CONFIG' => config.to_json,
-          'EY_DEPLOY_CURRENT_ROLES' => server.roles.to_a.join(' '),
-          'EY_DEPLOY_CURRENT_NAME' => server.name ? server.name.to_s : nil,
-          'EY_DEPLOY_ENVIRONMENT_NAME' => config.environment_name,
-          'EY_DEPLOY_FRAMEWORK_ENV' => config.framework_env.to_s,
-          'EY_DEPLOY_RELEASE_PATH' => paths.active_release.to_s,
-          'EY_DEPLOY_VERBOSE' => (config.verbose ? '1' : '0'),
-        }
-      end
-
       # FIXME: Legacy method, warn and remove.
       def serverside_bin
         About.binary
@@ -554,6 +512,10 @@ defaults:
       def compile_assets
         RailsAssets.detect_and_compile(config, shell, self)
       end
+
+      def load_callbacks
+        @callbacks_collection ||= Callbacks.load(paths)
+      end
     end   # DeployBase
 
     class Deploy < DeployBase

data/lib/engineyard-serverside/deploy_hook.rb

@@ -1,4 +1,6 @@
 require 'engineyard-serverside/shell/helpers'
+require 'engineyard-serverside/deploy_hook/callback_context'
+require 'engineyard-serverside/callbacks'
 require 'rbconfig'
 
 module EY
@@ -10,36 +12,32 @@ module EY
         @config, @shell, @hook_name = config, shell, hook_name
       end
 
-      def hook_path
-        config.paths.deploy_hook(hook_name)
-      end
-
-      def callback_context
-        @context ||= CallbackContext.new(config, shell, hook_path)
-      end
-
       def call
-        if hook_path.exist?
+        hooks.each do |hook|
           Dir.chdir(config.paths.active_release.to_s) do
-            if desc = syntax_error(hook_path)
-              hook_name = hook_path.basename
+            if desc = syntax_error(hook.path)
+              hook_name = hook.path.basename
               abort "*** [Error] Invalid Ruby syntax in hook: #{hook_name} ***\n*** #{desc.chomp} ***"
             else
-              eval_hook(hook_path.read)
+              eval_hook(hook.read, hook.path)
             end
           end
         end
       end
 
-      def eval_hook(code)
-        display_deprecation_warnings(code)
-        callback_context.instance_eval(code)
+      def eval_hook(code, hook_path = nil)
+        hook_path ||= config.paths.deploy_hook(hook_name)
+        shell.info "Executing #{hook_path} ..."
+        display_deprecation_warnings(code, hook_path)
+        CallbackContext.
+          new(config, shell, hook_path).
+          instance_eval(code)
       rescue Exception => exception
         display_hook_error(exception, code, hook_path)
         raise exception
       end
 
-      def display_deprecation_warnings(code)
+      def display_deprecation_warnings(code, hook_path)
         if code =~ /@configuration/
           shell.warning("Use of `@configuration` in deploy hooks is deprecated.\nPlease use `config`, which provides access to the same object.\n\tin #{hook_path}")
         end
@@ -68,73 +66,12 @@ Please fix this error before retrying.
         output unless output =~ /Syntax OK/
       end
 
-      class CallbackContext
-        include EY::Serverside::Shell::Helpers
-
-        attr_reader :shell, :hook_path
-
-        def initialize(config, shell, hook_path)
-          @configuration = config
-          @configuration.set_framework_envs
-          @shell = shell
-          @node = config.node
-          @hook_path = hook_path
-        end
-
-        def config
-          @configuration
-        end
-
-        def inspect
-          "#<DeployHook::CallbackContext #{hook_path.inspect}>"
-        end
-
-        def method_missing(meth, *args, &blk)
-          if @configuration.respond_to?(meth)
-            shell.warning "Use of `#{meth}` (via method_missing) is deprecated in favor of `config.#{meth}` for improved error messages and compatibility.\n\tin #{hook_path}"
-            @configuration.send(meth, *args, &blk)
-          else
-            super
-          end
-        end
-
-        def respond_to?(*a)
-          @configuration.respond_to?(*a) || super
-        end
-
-        def run(cmd)
-          shell.logged_system(Escape.shell_command(["sh", "-l", "-c", cmd])).success?
-        end
-
-        def run!(cmd)
-          run(cmd) or raise("run!: Command failed. #{cmd}")
-        end
-
-        def sudo(cmd)
-          shell.logged_system(Escape.shell_command(["sudo", "sh", "-l", "-c", cmd])).success?
-        end
-
-        def sudo!(cmd)
-          sudo(cmd) or raise("sudo!: Command failed. #{cmd}")
-        end
-
-        # convenience functions for running on certain instance types
-        def on_app_master(&blk)                 on_roles(%w[solo app_master],          &blk) end
-        def on_app_servers(&blk)                on_roles(%w[solo app_master app],      &blk) end
-        def on_app_servers_and_utilities(&blk)  on_roles(%w[solo app_master app util], &blk) end
-
-        def on_utilities(*names, &blk)
-          names.flatten!
-          on_roles(%w[util]) do
-            blk.call if names.empty? || names.include?(config.current_name)
-          end
-        end
-
-        private
-        def on_roles(desired_roles)
-          yield if desired_roles.any? { |role| config.current_roles.include?(role) }
-        end
-
+      private
+      def hooks
+        @hooks ||= Callbacks.
+          load(config.paths).
+          matching(hook_name.to_s).
+          select {|hook| hook.flavor == :ruby}
       end
 
     end

data/lib/engineyard-serverside/deploy_hook/callback_context.rb

@@ -0,0 +1,77 @@
+require 'engineyard-serverside/shell/helpers'
+
+module EY
+  module Serverside
+    class DeployHook
+
+      class CallbackContext
+        include EY::Serverside::Shell::Helpers
+
+        attr_reader :shell, :hook_path
+
+        def initialize(config, shell, hook_path)
+          @configuration = config
+          @configuration.set_framework_envs
+          @shell = shell
+          @node = config.node
+          @hook_path = hook_path
+        end
+
+        def config
+          @configuration
+        end
+
+        def inspect
+          "#<DeployHook::CallbackContext #{hook_path.inspect}>"
+        end
+
+        def method_missing(meth, *args, &blk)
+          if @configuration.respond_to?(meth)
+            shell.warning "Use of `#{meth}` (via method_missing) is deprecated in favor of `config.#{meth}` for improved error messages and compatibility.\n\tin #{hook_path}"
+            @configuration.send(meth, *args, &blk)
+          else
+            super
+          end
+        end
+
+        def respond_to?(*a)
+          @configuration.respond_to?(*a) || super
+        end
+
+        def run(cmd)
+          shell.logged_system(Escape.shell_command(["sh", "-l", "-c", cmd])).success?
+        end
+
+        def run!(cmd)
+          run(cmd) or raise("run!: Command failed. #{cmd}")
+        end
+
+        def sudo(cmd)
+          shell.logged_system(Escape.shell_command(["sudo", "sh", "-l", "-c", cmd])).success?
+        end
+
+        def sudo!(cmd)
+          sudo(cmd) or raise("sudo!: Command failed. #{cmd}")
+        end
+
+        # convenience functions for running on certain instance types
+        def on_app_master(&blk)                 on_roles(%w[solo app_master],          &blk) end
+        def on_app_servers(&blk)                on_roles(%w[solo app_master app],      &blk) end
+        def on_app_servers_and_utilities(&blk)  on_roles(%w[solo app_master app util], &blk) end
+
+        def on_utilities(*names, &blk)
+          names.flatten!
+          on_roles(%w[util]) do
+            blk.call if names.empty? || names.include?(config.current_name)
+          end
+        end
+
+        private
+        def on_roles(desired_roles)
+          yield if desired_roles.any? { |role| config.current_roles.include?(role) }
+        end
+      end
+
+    end
+  end
+end