engineyard-serverside 2.7.8pre2 → 2.8.0.pre

data/bin/engineyard-serverside

@@ -8,4 +8,4 @@ $LOAD_PATH.push(File.expand_path("../lib", File.dirname(__FILE__)))
 
 require 'engineyard-serverside'
 
-EY::Serverside::CLI.start
+EY::Serverside::CLI::App.start

data/bin/engineyard-serverside-execute-hook

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #
 # This script is used to execute non-ruby deploy hooks. It's called from

data/bin/engineyard-serverside-execute-service-hook

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+#
+# This script is used to execute non-ruby service hooks. It's called from
+# EY::Serverside::Deploy#callback. If you'd like to call it directly you should
+# be careful to replicate everything done in EY::Serverside::Deploy or your
+# hook code may not execute as planned.
+#
+
+set -o nounset
+
+abort() {
+  echo "$*"
+  exit 1
+}
+
+HOOK=${1:-}
+[ -n "${HOOK}" ] || abort "No hook name provided."
+
+# We run all deploy hooks from the root directory of the current release of
+# their app.
+[ -n "${EY_DEPLOY_RELEASE_PATH:-}" ] || abort "EY_DEPLOY_RELEASE_PATH must be set."
+[ -d ${EY_DEPLOY_RELEASE_PATH} ] || abort "EY_DEPLOY_RELEASE_PATH must exist and be a directory"
+cd ${EY_DEPLOY_RELEASE_PATH}
+
+# Set up the service hook paths
+_app_path=$(dirname $(dirname ${EY_DEPLOY_RELEASE_PATH}))
+_service_hooks_path="${_app_path}/shared/hooks"
+
+# Run the hook.
+_hook_path="${service_hooks_path}/${HOOK}""
+if [ ! \( -f ${_hook_path} -a -x ${_hook_path} \) ]; then
+  abort "${_hook_path} must exist and be executable"
+fi
+exec ${_hook_path}

data/lib/engineyard-serverside.rb

@@ -28,7 +28,6 @@ require 'engineyard-serverside/about'
 require 'engineyard-serverside/task'
 require 'engineyard-serverside/server'
 require 'engineyard-serverside/deploy'
-require 'engineyard-serverside/deploy_hook'
 require 'engineyard-serverside/cli'
 require 'engineyard-serverside/configuration'
 require 'engineyard-serverside/deprecation'

data/lib/engineyard-serverside/about.rb

@@ -25,22 +25,25 @@ module EY
       end
 
       def gem_binary
-        File.join(Gem.default_bindir, 'gem')
+        gem_bin_path = File.join(Gem.default_bindir, 'gem')
+        if File.exists?("/usr/local/ey_resin/bin/ruby")
+          "/usr/local/ey_resin/bin/ruby -rubygems #{gem_bin_path}"
+        else
+          gem_bin_path
+        end
       end
 
       def binary
-        resin_path = "/usr/local/ey_resin/ruby/bin/engineyard-serverside"
-        if File.exists?(resin_path)
-          resin_path
-        else
-          #gem relative path causes deploy hook failures if gem version mismatches with other app servers
-          File.expand_path("../../../bin/#{gem_name}", __FILE__)
-        end
+        File.expand_path("../../../bin/#{gem_name}", __FILE__)
       end
 
       def hook_executor
         binary + "-execute-hook"
       end
+
+      def service_hook_executor
+        binary + "-execute-service-hook"
+      end
     end
   end
 end

data/lib/engineyard-serverside/callbacks.rb

@@ -0,0 +1,11 @@
+require 'engineyard-serverside/callbacks/collection'
+
+module EY
+  module Serverside
+    module Callbacks
+      def self.load(paths)
+        Collection.load(paths)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'engineyard-serverside/callbacks/collection/combined'
+
+module EY
+  module Serverside
+    module Callbacks
+
+      module Collection
+        attr_reader :app_hooks
+
+        def self.load(paths)
+          Combined.load(paths)
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,79 @@
+require 'engineyard-serverside/callbacks/distributor'
+require 'engineyard-serverside/callbacks/executor'
+
+module EY
+  module Serverside
+    module Callbacks
+
+      module Collection
+        class Base
+          def self.load(paths)
+            new(paths)
+          end
+
+          def initialize(paths)
+            @paths = paths
+            load_hooks
+          end
+
+          def all
+            hooks
+          end
+
+          def matching(callback)
+            favor(
+              :ruby,
+              all.select {|hook| hook.matches?(callback.to_sym)}
+            )
+          end
+
+          def distribute(runner, callback)
+            Distributor.distribute(
+              runner,
+              minimize_ruby(
+                matching(callback)
+              )
+            )
+          end
+
+          def execute(config, shell, callback)
+            Executor.execute(
+              config,
+              shell,
+              matching(callback)
+            )
+          end
+
+          private
+          def favor(flavor, hooks)
+            (
+              hooks.select {|hook| hook.flavor == flavor} + 
+              hooks.reject {|hook| hook.flavor == flavor}
+            ).first(1)
+          end
+
+          def minimize_ruby(hooks)
+            first_ruby = hooks.select {|hook| hook.flavor == :ruby}.first
+
+            return hooks unless first_ruby
+
+            ([first_ruby] + hooks.select {|hook| hook.flavor != :ruby}).flatten
+          end
+
+          def load_hooks
+            raise "Unimplemented"
+          end
+
+          def paths
+            @paths
+          end
+
+          def hooks
+            @hooks ||= []
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/collection/combined.rb

@@ -0,0 +1,45 @@
+require 'engineyard-serverside/callbacks/collection/base'
+require 'engineyard-serverside/callbacks/collection/deploy_hooks'
+require 'engineyard-serverside/callbacks/collection/service_hooks'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Collection
+
+        class Combined < Base
+          def all
+            collections.
+              map {|collection| collection.all}.
+              flatten
+          end
+
+          def matching(callback)
+            collections.
+              map {|collection| collection.matching(callback)}.
+              flatten
+          end
+
+          private
+          def load_hooks
+            @service_hooks = ServiceHooks.load(paths)
+            @app_hooks = DeployHooks.load(paths)
+          end
+
+          def app_hooks
+            @app_hooks
+          end
+
+          def service_hooks
+            @service_hooks
+          end
+
+          def collections
+            [service_hooks, app_hooks]
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/collection/deploy_hooks.rb

@@ -0,0 +1,21 @@
+require 'engineyard-serverside/callbacks/collection/base'
+require 'engineyard-serverside/callbacks/hooks/app'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Collection
+
+        class DeployHooks < Base
+          private
+          def load_hooks
+            Dir["#{paths.deploy_hooks}/*"].each do |hook_path|
+              hooks.push(Hooks::App.new(hook_path))
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/collection/service_hooks.rb

@@ -0,0 +1,17 @@
+require 'engineyard-serverside/callbacks/collection/service_hooks/combined'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Collection
+
+        module ServiceHooks
+          def self.load(paths)
+            Combined.load(paths)
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/collection/service_hooks/collection.rb

@@ -0,0 +1,24 @@
+require 'engineyard-serverside/callbacks/collection/base'
+require 'engineyard-serverside/callbacks/hooks/service'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Collection
+        module ServiceHooks
+
+          class Collection < EY::Serverside::Callbacks::Collection::Base
+
+            private
+            def load_hooks
+              Dir["#{paths}/*"].each do |hook_path|
+                hooks.push(Hooks::Service.new(hook_path))
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/engineyard-serverside/callbacks/collection/service_hooks/combined.rb

@@ -0,0 +1,40 @@
+require 'engineyard-serverside/callbacks/collection/base'
+require 'engineyard-serverside/callbacks/collection/service_hooks/collection'
+
+module EY
+  module Serverside
+    module Callbacks
+      module Collection
+        module ServiceHooks
+
+          class Combined < EY::Serverside::Callbacks::Collection::Base
+
+            def all
+              collections.
+                map {|collection| collection.all}.
+                flatten
+            end
+
+            def matching(callback)
+              collections.
+                map {|collection| collection.matching(callback)}.
+                flatten
+            end
+
+            private
+            def load_hooks
+              Dir["#{paths.shared_hooks}/*"].each do |service_path|
+                collections.push(ServiceHooks::Collection.load(service_path))
+              end
+            end
+
+            def collections
+              @collections ||= []
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'engineyard-serverside/callbacks/distributor/remote'
+require 'engineyard-serverside/callbacks/distributor/viability_filter'
+
+module EY
+  module Serverside
+    module Callbacks
+
+      module Distributor
+        def self.distribute(runner, hooks)
+          ViabilityFilter.
+            new.
+            call({:candidates => hooks, :shell => runner.shell}).
+            and_then {|callback_name|
+              Remote.distribute(runner, callback_name)
+            }
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+module EY
+  module Serverside
+    module Callbacks
+      module Distributor
+
+        class Remote
+          attr_reader :runner, :hook
+
+          def self.distribute(runner, hook)
+            new(runner, hook).distribute
+          end
+
+          def initialize(runner, hook)
+            @runner = runner
+            @hook = hook
+          end
+
+          def distribute
+            shell.status "Running deploy hook: #{hook}"
+
+            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 config
+            runner.config
+          end
+
+          def shell
+            runner.shell
+          end
+
+          def paths
+            runner.paths
+          end
+
+          def escaped_command(hook)
+            Escape.shell_command(command_for(hook))
+          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
+