engineyard-serverside 2.0.0.pre5 → 2.0.0.rc1

data/lib/engineyard-serverside/cli.rb

@@ -162,7 +162,7 @@ module EY
               shell.status "Installing engineyard-serverside on #{server.hostname}"
 
               shell.logged_system(Escape.shell_command([
-                'scp', '-i', "#{ENV['HOME']}/.ssh/internal",
+                'scp', '-i', config.paths.internal_key.to_s,
                 "-o", "StrictHostKeyChecking=no",
                 local_gem_file,
                "#{config.user}@#{server.hostname}:#{remote_gem_file}",

data/lib/engineyard-serverside/configuration.rb

@@ -178,6 +178,15 @@ module EY
         "uname -m"
       end
 
+      def active_revision
+        paths.active_revision.read.strip
+      end
+
+      def latest_revision
+        paths.latest_revision.read.strip
+      end
+      alias revision latest_revision
+
       def migrate?
         !!migration_command
       end

data/lib/engineyard-serverside/deploy.rb

@@ -34,9 +34,9 @@ module EY
           check_for_ey_config
           symlink_configs
           setup_sqlite3_if_necessary
+          run_with_callbacks(:compile_assets) # defined in RailsAssetSupport
           enable_maintenance_page
           run_with_callbacks(:migrate)
-          run_with_callbacks(:compile_assets) # defined in RailsAssetSupport
           callback(:before_symlink)
           # We don't use run_with_callbacks for symlink because we need
           # to clean up manually if it fails.
@@ -60,7 +60,7 @@ module EY
       end
 
       def create_revision_file_command
-        strategy.create_revision_file_command(config.release_path)
+        strategy.create_revision_file_command(config.paths.active_release)
       end
 
       def short_log_message(revision)
@@ -68,7 +68,7 @@ module EY
       end
 
       def parse_configured_services
-        result = YAML.load_file "#{c.paths.shared_config}/ey_services_config_deploy.yml"
+        result = YAML.load_file "#{config.paths.shared_config}/ey_services_config_deploy.yml"
         return {} unless result.is_a?(Hash)
         result
       rescue
@@ -141,7 +141,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       def push_code
         shell.status "Pushing code to all servers"
         commands = servers.remote.map do |server|
-          cmd = server.sync_directory_command(config.repository_cache)
+          cmd = server.sync_directory_command(config.paths.repository_cache)
           proc { shell.logged_system(cmd) }
         end
         futures = EY::Serverside::Future.call(commands)
@@ -159,7 +159,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       end
 
       def restart_command
-        %{LANG="en_US.UTF-8" /engineyard/bin/app_#{c.app} deploy}
+        %{LANG="en_US.UTF-8" /engineyard/bin/app_#{config.app} deploy}
       end
 
       # GIT_SSH needs to be defined in the environment for customers with private bundler repos in their Gemfile.
@@ -173,7 +173,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
                               roles :app_master, :app, :solo, :util do
                                 run(generate_ssh_wrapper)
                               end
-                              ssh_wrapper_path
+                              config.paths.ssh_wrapper
                             end
       end
 
@@ -183,22 +183,18 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       # Learned this at http://lists.mindrot.org/pipermail/openssh-unix-dev/2009-February/027271.html
       # (Thanks Jim L.)
       def generate_ssh_wrapper
-        path = ssh_wrapper_path
+        path = config.paths.ssh_wrapper
         <<-SCRIPT
-mkdir -p #{File.dirname(path)}
+mkdir -p #{path.dirname}
 [[ -x #{path} ]] || cat > #{path} <<'SSH'
 #!/bin/sh
 unset SSH_AUTH_SOCK
-ssh -o CheckHostIP=no -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o LogLevel=INFO -o IdentityFile=#{c.ssh_identity_file} -o IdentitiesOnly=yes $*
+ssh -o CheckHostIP=no -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o LogLevel=INFO -o IdentityFile=#{config.paths.deploy_key} -o IdentitiesOnly=yes $*
 SSH
 chmod 0700 #{path}
         SCRIPT
       end
 
-      def ssh_wrapper_path
-        "#{c.paths.shared_config}/#{c.app}-ssh-wrapper"
-      end
-
       # task
       def bundle
         roles :app_master, :app, :solo, :util do
@@ -209,8 +205,8 @@ chmod 0700 #{path}
 
       # task
       def cleanup_old_releases
-        clean_release_directory(c.release_dir)
-        clean_release_directory(c.failed_release_dir)
+        clean_release_directory(config.paths.releases)
+        clean_release_directory(config.paths.releases_failed)
       end
 
       # Remove all but the most-recent +count+ releases from the specified
@@ -227,10 +223,10 @@ chmod 0700 #{path}
 
       # task
       def rollback
-        if c.rollback_paths!
+        if config.rollback_paths!
           begin
-            rolled_back_release = c.paths.latest_release
-            shell.status "Rolling back to previous release: #{short_log_message(c.active_revision)}"
+            rolled_back_release = config.paths.latest_release
+            shell.status "Rolling back to previous release: #{short_log_message(config.active_revision)}"
             run_with_callbacks(:symlink)
             sudo "rm -rf #{rolled_back_release}"
             bundle
@@ -252,9 +248,9 @@ chmod 0700 #{path}
 
       # task
       def migrate
-        return unless c.migrate?
+        return unless config.migrate?
         @migrations_reached = true
-        cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} #{c.migration_command}"
+        cmd = "cd #{config.paths.active_release} && PATH=#{config.paths.binstubs}:$PATH #{config.framework_envs} #{config.migration_command}"
         roles :app_master, :solo do
           shell.status "Migrating: #{cmd}"
           run(cmd)
@@ -263,12 +259,12 @@ chmod 0700 #{path}
 
       # task
       def copy_repository_cache
-        shell.status "Copying to #{c.release_path}"
-        exclusions = Array(c.copy_exclude).map { |e| %|--exclude="#{e}"| }.join(' ')
-        run("mkdir -p #{c.release_path} #{c.failed_release_dir} #{c.paths.shared_config} && rsync -aq #{exclusions} #{c.repository_cache}/ #{c.release_path}")
+        shell.status "Copying to #{config.paths.active_release}"
+        exclusions = Array(config.copy_exclude).map { |e| %|--exclude="#{e}"| }.join(' ')
+        run("mkdir -p #{config.paths.active_release} #{config.paths.releases_failed} #{config.paths.shared_config} && rsync -aq #{exclusions} #{config.paths.repository_cache}/ #{config.paths.active_release}")
 
         shell.status "Ensuring proper ownership."
-        sudo("chown -R #{c.user}:#{c.group} #{c.release_path} #{c.failed_release_dir}")
+        sudo("chown -R #{config.user}:#{config.group} #{config.paths.active_release} #{config.paths.releases_failed}")
       end
 
       def create_revision_file
@@ -306,78 +302,78 @@ Deploy again if your services configuration appears incomplete or out of date.
       def setup_sqlite3_if_necessary
         if gemfile? && lockfile && lockfile.uses_sqlite3?
           [
-           ["Create databases directory if needed", "mkdir -p #{c.shared_path}/databases"],
-           ["Creating SQLite database if needed", "touch #{c.shared_path}/databases/#{c.framework_env}.sqlite3"],
-           ["Create config directory if needed", "mkdir -p #{c.release_path}/config"],
+           ["Create databases directory if needed", "mkdir -p #{config.paths.shared}/databases"],
+           ["Creating SQLite database if needed", "touch #{config.paths.shared}/databases/#{config.framework_env}.sqlite3"],
+           ["Create config directory if needed", "mkdir -p #{config.paths.active_release_config}"],
            ["Generating SQLite config", <<-WRAP],
-cat > #{c.paths.shared_config}/database.sqlite3.yml<<'YML'
-#{c.framework_env}:
+cat > #{config.paths.shared_config}/database.sqlite3.yml<<'YML'
+#{config.framework_env}:
   adapter: sqlite3
-  database: #{c.shared_path}/databases/#{c.framework_env}.sqlite3
+  database: #{config.paths.shared}/databases/#{config.framework_env}.sqlite3
   pool: 5
   timeout: 5000
 YML
 WRAP
-           ["Symlink database.yml", "ln -nfs #{c.paths.shared_config}/database.sqlite3.yml #{c.release_path}/config/database.yml"],
+           ["Symlink database.yml", "ln -nfs #{config.paths.shared_config}/database.sqlite3.yml #{config.paths.active_release_config}/database.yml"],
           ].each do |what, cmd|
             shell.status "#{what}"
             run(cmd)
           end
 
-          owner = [c.user, c.group].join(':')
+          owner = [config.user, config.group].join(':')
           shell.status "Setting ownership to #{owner}"
-          sudo "chown -R #{owner} #{c.release_path}"
+          sudo "chown -R #{owner} #{config.paths.active_release}"
         end
       end
 
-      def symlink_configs(release_to_link=c.release_path)
+      def symlink_configs
         shell.status "Preparing shared resources for release."
-        symlink_tasks(release_to_link).each do |what, cmd|
+        symlink_tasks.each do |what, cmd|
           shell.substatus what
           run(cmd)
         end
-        owner = [c.user, c.group].join(':')
+        owner = [config.user, config.group].join(':')
         shell.status "Setting ownership to #{owner}"
-        sudo "chown -R #{owner} #{release_to_link}"
+        sudo "chown -R #{owner} #{config.paths.active_release}"
       end
 
-      def symlink_tasks(release_to_link)
+      def symlink_tasks
         [
-          ["Set group write permissions", "chmod -R g+w #{release_to_link}"],
-          ["Remove revision-tracked shared directories from deployment", "rm -rf #{release_to_link}/log #{release_to_link}/public/system #{release_to_link}/tmp/pids"],
-          ["Create tmp directory", "mkdir -p #{release_to_link}/tmp"],
-          ["Symlink shared log directory", "ln -nfs #{c.paths.shared_log} #{release_to_link}/log"],
-          ["Create public directory if needed", "mkdir -p #{release_to_link}/public"],
-          ["Create config directory if needed", "mkdir -p #{release_to_link}/config"],
-          ["Create system directory if needed", "ln -nfs #{c.paths.shared_system} #{release_to_link}/public/system"],
-          ["Symlink shared pids directory", "ln -nfs #{c.shared_path}/pids #{release_to_link}/tmp/pids"],
-          ["Symlink other shared config files", "find #{c.paths.shared_config} -type f -not -name 'database.yml' -exec ln -s {} #{release_to_link}/config \\;"],
-          ["Symlink mongrel_cluster.yml", "ln -nfs #{c.paths.shared_config}/mongrel_cluster.yml #{release_to_link}/config/mongrel_cluster.yml"],
-          ["Symlink database.yml", "ln -nfs #{c.paths.shared_config}/database.yml #{release_to_link}/config/database.yml"],
-          ["Symlink newrelic.yml if needed", "if [ -f \"#{c.paths.shared_config}/newrelic.yml\" ]; then ln -nfs #{c.paths.shared_config}/newrelic.yml #{release_to_link}/config/newrelic.yml; fi"],
+          ["Set group write permissions", "chmod -R g+w #{config.paths.active_release}"],
+          ["Remove revision-tracked shared directories from deployment", "rm -rf #{config.paths.active_log} #{config.paths.public_system} #{config.paths.active_release}/tmp/pids"],
+          ["Create tmp directory", "mkdir -p #{config.paths.active_release}/tmp"],
+          ["Symlink shared log directory", "ln -nfs #{config.paths.shared_log} #{config.paths.active_log}"],
+          ["Create public directory if needed", "mkdir -p #{config.paths.public}"],
+          ["Create config directory if needed", "mkdir -p #{config.paths.active_release_config}"],
+          ["Create system directory if needed", "ln -nfs #{config.paths.shared_system} #{config.paths.public_system}"],
+          ["Symlink shared pids directory", "ln -nfs #{config.paths.shared}/pids #{config.paths.active_release}/tmp/pids"],
+          ["Symlink other shared config files", "find #{config.paths.shared_config} -type f -not -name 'database.yml' -exec ln -s {} #{config.paths.active_release_config} \\;"],
+          ["Symlink mongrel_cluster.yml", "ln -nfs #{config.paths.shared_config}/mongrel_cluster.yml #{config.paths.active_release_config}/mongrel_cluster.yml"],
+          ["Symlink database.yml", "ln -nfs #{config.paths.shared_config}/database.yml #{config.paths.active_release_config}/database.yml"],
+          ["Symlink newrelic.yml if needed", "if [ -f \"#{config.paths.shared_config}/newrelic.yml\" ]; then ln -nfs #{config.paths.shared_config}/newrelic.yml #{config.paths.active_release_config}/newrelic.yml; fi"],
         ]
       end
 
       # task
-      def symlink(release_to_link=c.release_path)
+      def symlink
         shell.status "Symlinking code."
-        run "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && find #{c.current_path} -not -user #{c.user} -or -not -group #{c.group} -exec chown #{c.user}:#{c.group} {} +"
+        run "rm -f #{config.paths.current} && ln -nfs #{config.paths.active_release} #{config.paths.current} && find #{config.paths.current} -not -user #{config.user} -or -not -group #{config.group} -exec chown #{config.user}:#{config.group} {} +"
         @symlink_changed = true
       rescue Exception
-        sudo "rm -f #{c.current_path} && ln -nfs #{c.previous_release(release_to_link)} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
+        sudo "rm -f #{config.paths.current} && ln -nfs #{config.paths.previous_release(config.paths.active_release)} #{config.paths.current} && chown -R #{config.user}:#{config.group} #{config.paths.current}"
         @symlink_changed = false
         raise
       end
 
       def callback(what)
         @callbacks_reached ||= true
-        if File.exist?("#{c.release_path}/deploy/#{what}.rb")
+        if config.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'        << c.to_json
+            per_instance_args << '--config'        << config.to_json
             cmd << " " << Escape.shell_command(per_instance_args)
           end
         end
@@ -394,15 +390,15 @@ WRAP
         ENV['GIT_SSH'] = ssh_executable
         @strategy ||= config.strategy_class.new(
           shell,
-          :repository_cache => config[:repository_cache],
-          :app              => config[:app],
+          :repository_cache => config.paths.repository_cache.to_s,
+          :app              => config.app,
           :repo             => config[:repo],
           :ref              => config[:branch]
         )
       end
 
       def gemfile?
-        File.exist?("#{c.release_path}/Gemfile")
+        config.paths.gemfile.exist?
       end
 
       def base_callback_command_for(what)
@@ -410,7 +406,7 @@ WRAP
         cmd << '--app'              << config.app
         cmd << '--environment-name' << config.environment_name
         cmd << '--account-name'     << config.account_name
-        cmd << '--release-path'     << config.release_path.to_s
+        cmd << '--release-path'     << config.paths.active_release.to_s
         cmd << '--framework-env'    << config.framework_env.to_s
         cmd << '--verbose' if config.verbose
         cmd
@@ -449,18 +445,18 @@ WRAP
       def with_failed_release_cleanup
         yield
       rescue Exception
-        shell.status "Release #{c.release_path} failed, saving release to #{c.failed_release_dir}."
-        sudo "mv #{c.release_path} #{c.failed_release_dir}"
+        shell.status "Release #{config.paths.active_release} failed, saving release to #{config.paths.releases_failed}."
+        sudo "mv #{config.paths.active_release} #{config.paths.releases_failed}"
         raise
       end
 
       def bundler_config
         version = LockfileParser.default_version
         options = [
-          "--gemfile #{c.gemfile_path}",
-          "--path #{c.bundled_gems_path}",
-          "--binstubs #{c.binstubs_path}",
-          "--without #{c.bundle_without}"
+          "--gemfile #{config.paths.gemfile}",
+          "--path #{config.paths.bundled_gems}",
+          "--binstubs #{config.paths.binstubs}",
+          "--without #{config.bundle_without}"
         ]
 
         if lockfile
@@ -472,9 +468,9 @@ WRAP
       end
 
       def lockfile
-        lockfile_path = File.join(c.release_path, "Gemfile.lock")
-        if File.exist?(lockfile_path)
-          @lockfile_parser ||= LockfileParser.new(File.read(lockfile_path))
+        lockfile_path = config.paths.gemfile_lock
+        if lockfile_path.exist?
+          @lockfile_parser ||= LockfileParser.new(lockfile_path.read)
         else
           nil
         end
@@ -488,7 +484,7 @@ WRAP
 
           bundler_version, install_switches = bundler_config
           sudo "#{clean_environment} && #{serverside_bin} install_bundler #{bundler_version}"
-          run  "#{clean_environment} && cd #{c.release_path} && ruby -S bundle _#{bundler_version}_ install #{install_switches}"
+          run  "#{clean_environment} && cd #{config.paths.active_release} && ruby -S bundle _#{bundler_version}_ install #{install_switches}"
 
           write_system_version
         end
@@ -496,25 +492,25 @@ WRAP
 
       def clean_bundle_on_system_version_change
         # diff exits with 0 for same and 1/2 for different/file not found.
-        check_ruby   = "#{c.ruby_version_command} | diff - #{c.ruby_version_file} >/dev/null 2>&1"
-        check_system = "#{c.system_version_command} | diff - #{c.system_version_file} >/dev/null 2>&1"
+        check_ruby   = "#{config.ruby_version_command} | diff - #{config.paths.ruby_version} >/dev/null 2>&1"
+        check_system = "#{config.system_version_command} | diff - #{config.paths.system_version} >/dev/null 2>&1"
         say_cleaning = "echo 'New deploy or system version change detected, cleaning bundled gems.'"
-        clean_bundle = "rm -Rf #{c.bundled_gems_path}"
+        clean_bundle = "rm -Rf #{config.paths.bundled_gems}"
 
         run "#{check_ruby} && #{check_system} || (#{say_cleaning} && #{clean_bundle})"
       end
 
       def write_system_version
-        store_ruby_version   = "#{c.ruby_version_command} > #{c.ruby_version_file}"
-        store_system_version = "#{c.system_version_command} > #{c.system_version_file}"
+        store_ruby_version   = "#{config.ruby_version_command} > #{config.paths.ruby_version}"
+        store_system_version = "#{config.system_version_command} > #{config.paths.system_version}"
 
-        run "mkdir -p #{c.bundled_gems_path} && #{store_ruby_version} && #{store_system_version}"
+        run "mkdir -p #{config.paths.bundled_gems} && #{store_ruby_version} && #{store_system_version}"
       end
 
       def check_node_npm
-        if File.exist?("#{c.release_path}/package.json")
+        if config.paths.package_json.exist?
           shell.info "~> package.json detected, installing npm packages"
-          run "cd #{c.release_path} && npm install"
+          run "cd #{config.paths.active_release} && npm install"
         end
       end
     end   # DeployBase

data/lib/engineyard-serverside/deploy_hook.rb

@@ -8,7 +8,7 @@ module EY
       end
 
       def hook_path
-        "#{@config.release_path}/deploy/#{@hook_name}.rb"
+        @config.paths.deploy_hook(@hook_name)
       end
 
       def callback_context
@@ -16,13 +16,13 @@ module EY
       end
 
       def call
-        if File.exist?(hook_path)
-          Dir.chdir(@config.release_path) do
+        if hook_path.exist?
+          Dir.chdir(@config.paths.active_release.to_s) do
             if desc = syntax_error(hook_path)
-              hook_name = File.basename(hook_path)
+              hook_name = hook_path.basename
               abort "*** [Error] Invalid Ruby syntax in hook: #{hook_name} ***\n*** #{desc.chomp} ***"
             else
-              eval_hook(IO.read(hook_path))
+              eval_hook(hook_path.read)
             end
           end
         end
@@ -37,7 +37,7 @@ module EY
 
       def display_hook_error(exception, code, hook_path)
         @shell.fatal <<-ERROR
-Exception raised in deploy hook #{hook_path.inspect}.
+Exception raised in deploy hook #{hook_path}.
 
 #{exception.class}: #{exception.to_s}
 

data/lib/engineyard-serverside/deprecation.rb

@@ -3,7 +3,7 @@ require 'engineyard-serverside/shell/helpers'
 module EY
   module Serverside
     def self.deprecation_warning(msg)
-      $stderr.puts "DEPRECATION WARNING: #{msg}"
+      $stderr.puts "DEPRECATION WARNING: #{msg}\n\t#{caller(2).first}"
     end
 
     def self.const_missing(const)

data/lib/engineyard-serverside/maintenance.rb

@@ -17,6 +17,7 @@ module EY
       def manually_enable
         if paths.deployed?
           enable
+          shell.info "Maintenance page enabled"
         else
           shell.fatal "Cannot enabled maintenance page. Application #{config.app_name} has never been deployed."
           false
@@ -26,6 +27,7 @@ module EY
       def manually_disable
         if paths.deployed?
           disable
+          shell.info "Maintenance page disabled"
         else
           shell.fatal "Cannot enabled maintenance page. Application #{config.app_name} has never been deployed."
           false

data/lib/engineyard-serverside/paths.rb

@@ -5,26 +5,34 @@ module EY
     class Paths
 
       module LegacyHelpers
-        def deploy_to()                     paths.deploy_root.to_s                      end
-        def release_dir()                   paths.releases.to_s                         end
-        def failed_release_dir()            paths.releases_failed.to_s                  end
-        def release_path()                  paths.active_release.to_s                   end
-        def all_releases()                  paths.all_releases.map { |path| path.to_s } end
-        def previous_release(*a)            paths.previous_release(*a).to_s             end
-        def latest_release()                paths.latest_release.to_s                   end
-        def current_path()                  paths.current.to_s                          end
-        def shared_path()                   paths.shared.to_s                           end
-        def maintenance_page_enabled_path() paths.enabled_maintenance_page.to_s         end
-        def repository_cache()              paths.repository_cache.to_s                 end
-        def bundled_gems_path()             paths.bundled_gems.to_s                     end
-        def ruby_version_file()             paths.ruby_version.to_s                     end
-        def system_version_file()           paths.system_version.to_s                   end
-        def binstubs_path()                 paths.binstubs.to_s                         end
-        def gemfile_path()                  paths.gemfile.to_s                          end
-        def active_revision()               paths.active_revision.read.strip            end
-        def latest_revision()               paths.latest_revision.read.strip            end
-        alias revision latest_revision
-        def ssh_identity_file()             paths.ssh_identity.to_s                     end
+        def self.legacy_path_helper(name, new_name)
+          define_method(name) do |*a|
+            EY::Serverside.deprecation_warning("config.#{name} is deprecated. Please use 'config.paths.#{new_name}' which returns a Pathname object.")
+            paths.send(new_name).to_s
+          end
+        end
+
+        legacy_path_helper :deploy_to,                       :deploy_root
+        legacy_path_helper :release_dir,                     :releases
+        legacy_path_helper :failed_release_dir,              :releases_failed
+        legacy_path_helper :release_path,                    :active_release
+        legacy_path_helper :previous_release,                :previous_release
+        legacy_path_helper :latest_release,                  :latest_release
+        legacy_path_helper :current_path,                    :current
+        legacy_path_helper :shared_path,                     :shared
+        legacy_path_helper :maintenance_page_enabled_path,   :enabled_maintenance_page
+        legacy_path_helper :repository_cache,                :repository_cache
+        legacy_path_helper :bundled_gems_path,               :bundled_gems
+        legacy_path_helper :ruby_version_file,               :ruby_version
+        legacy_path_helper :system_version_file,             :system_version
+        legacy_path_helper :binstubs_path,                   :binstubs
+        legacy_path_helper :gemfile_path,                    :gemfile
+        legacy_path_helper :ssh_identity_file,               :deploy_key
+
+        def all_releases
+          EY::Serverside.deprecation_warning("config.all_releases is deprecated. Please use 'config.paths.all_releases' which returns Pathname objects.")
+          paths.all_releases.map {|path| path.to_s }
+        end
       end
 
       # Maintenance page candidates in order of search preference.
@@ -50,6 +58,8 @@ module EY
 
       attr_reader :home, :deploy_root
 
+      def_path :internal_key,             [:home, '.ssh', 'internal']
+
       def_path :current,                  [:deploy_root,    'current']
       def_path :releases,                 [:deploy_root,    'releases']
       def_path :releases_failed,          [:deploy_root,    'releases_failed']
@@ -57,7 +67,9 @@ module EY
       def_path :shared_log,               [:shared,         'log']
       def_path :shared_config,            [:shared,         'config']
       def_path :shared_system,            [:shared,         'system']
+      def_path :default_repository_cache, [:shared,         'cached-copy']
       def_path :enabled_maintenance_page, [:shared_system,  'maintenance.html']
+      def_path :shared_assets,            [:shared,         'assets']
       def_path :bundled_gems,             [:shared,         'bundled_gems']
       def_path :ruby_version,             [:bundled_gems,   'RUBY_VERSION']
       def_path :system_version,           [:bundled_gems,   'SYSTEM_VERSION']
@@ -65,22 +77,37 @@ module EY
       def_path :active_revision,          [:active_release, 'REVISION']
       def_path :binstubs,                 [:active_release, 'ey_bundler_binstubs']
       def_path :gemfile,                  [:active_release, 'Gemfile']
+      def_path :gemfile_lock,             [:active_release, 'Gemfile.lock']
+      def_path :public,                   [:active_release, 'public']
+      def_path :public_assets,            [:public, 'assets']
+      def_path :public_system,            [:public, 'system']
+      def_path :package_json,             [:active_release, 'package.json']
+      def_path :active_release_config,    [:active_release, 'config']
+      def_path :active_log,               [:active_release, 'log']
 
       def initialize(opts)
         @opts             = opts
-        @home             = Pathname.new(@opts[:hame] || ENV['HOME'])
+        @home             = Pathname.new(@opts[:home] || ENV['HOME'])
         @app_name         = @opts[:app_name]
         @active_release   = Pathname.new(@opts[:active_release])   if @opts[:active_release]
         @repository_cache = Pathname.new(@opts[:repository_cache]) if @opts[:repository_cache]
         @deploy_root      = Pathname.new(@opts[:deploy_root] || "/data/#{@app_name}")
       end
 
-      def ssh_identity
+      def deploy_key
         path(:home, '.ssh', "#{@app_name}-deploy-key")
       end
 
+      def ssh_wrapper
+        path(:shared_config, "#{@app_name}-ssh-wrapper")
+      end
+
+      def deploy_hook(hook_name)
+        path(:active_release, 'deploy', "#{hook_name}.rb")
+      end
+
       def repository_cache
-        @repository_cache ||= path(:shared, 'cached-copy')
+        @repository_cache ||= default_repository_cache
       end
 
       def active_release
@@ -92,8 +119,8 @@ module EY
       end
 
       # deploy_root/releases/<release before argument release path>
-      def previous_release(current=latest_release)
-        index = all_releases.index(current)
+      def previous_release(from_release=latest_release)
+        index = all_releases.index(from_release)
         if index && index > 0
           all_releases[index-1]
         else

data/lib/engineyard-serverside/rails_asset_support.rb

@@ -6,22 +6,28 @@ module EY
         rails_version = bundled_rails_version
         roles :app_master, :app, :solo do
           keep_existing_assets
-          cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile"
-
-          if config.precompile_assets_inferred?
-            # If specifically requested, then we want to fail if compilation fails.
-            # If we are implicitly precompiling, we want to fail non-destructively
-            # because we don't know if the rake task exists or if the user
-            # actually intended for assets to be compiled.
-            cmd << %{ || (echo "Asset compilation failure ignored.\n Add 'precompile_assets: true' to ey.yml to abort deploy on failure." && true)}
-          end
+          cmd = "cd #{config.paths.active_release} && PATH=#{config.paths.binstubs}:$PATH #{config.framework_envs} rake assets:precompile"
 
           if rails_version
             shell.status "Precompiling assets for rails v#{rails_version}"
           else
             shell.warning "Precompiling assets even though Rails was not bundled."
           end
-          run(cmd)
+
+          begin
+            run(cmd)
+          rescue StandardError => e
+            if config.precompile_assets_inferred?
+              # If specifically requested, then we want to fail if compilation fails.
+              # If we are implicitly precompiling, we want to fail non-destructively
+              # because we don't know if the rake task exists or if the user
+              # actually intended for assets to be compiled.
+              shell.notice "Asset compilation failure ignored.\nAdd 'precompile_assets: true' to ey.yml to abort deploy on failure."
+              return
+            else
+              raise
+            end
+          end
         end
       end
 
@@ -30,39 +36,40 @@ module EY
           shell.status "Attempting Rails asset precompilation. (enabled in config)"
           return true
         elsif config.skip_precompile_assets?
-          shell.status "Skipping asset precompilation. (disabled in config)"
+          shell.status "Skipping asset precompilation. (disabled in ey.yml)"
           return false
         end
 
-        app_rb_path = File.join(c.release_path, 'config', 'application.rb')
-        unless File.readable?(app_rb_path) # Not a Rails app in the first place.
+        app_rb_path = config.paths.active_release_config.join('application.rb')
+        unless app_rb_path.readable? # Not a Rails app in the first place.
           shell.status "Skipping asset precompilation. (not a Rails application)"
           return false
         end
 
-        if FileTest.exist?(File.join(c.release_path, 'app', 'assets'))
+        if config.paths.active_release.join('app','assets').exist?
           shell.status "Attempting Rails asset precompilation. (found directory: 'app/assets')"
         else
           shell.status "Skipping asset precompilation. (directory not found: 'app/assets')"
           return false
         end
 
-        if app_builds_own_assets?
+        if config.paths.public_assets.exist?
           shell.status "Skipping asset compilation. Already compiled. (found directory: 'public/assets')"
           return false
         end
+
         if app_disables_assets?(app_rb_path)
           shell.status "Skipping asset compilation. (application.rb has disabled asset compilation)"
           return false
         end
-# This check is very expensive, and has been deemed not worth the time.
-# Leaving this here in case someone comes up with a faster way.
-=begin
-        unless app_has_asset_task?
-          shell.status "No 'assets:precompile' Rake task found. Skipping."
-          return
-        end
-=end
+
+        # This check is very expensive, and has been deemed not worth the time.
+        # Leaving this here in case someone comes up with a faster way.
+        #unless app_has_asset_task?
+        #  shell.status "No 'assets:precompile' Rake task found. Skipping."
+        #  return
+        #end
+
         true
       end
 
@@ -80,13 +87,13 @@ module EY
       def app_has_asset_task?
         # We just run this locally on the app master; everybody else should
         # have the same code anyway.
-        task_check = "PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake -T assets:precompile |grep 'assets:precompile'"
-        cmd = "cd #{c.release_path} && #{task_check}"
-        shell.logged_system("cd #{c.release_path} && #{task_check}").success?
+        task_check = "PATH=#{config.paths.binstubs}:$PATH #{config.framework_envs} rake -T assets:precompile |grep 'assets:precompile'"
+        cmd = "cd #{config.paths.active_release} && #{task_check}"
+        shell.logged_system("cd #{config.paths.active_release} && #{task_check}").success?
       end
 
       def app_builds_own_assets?
-        File.directory?(File.join(c.release_path, 'public', 'assets'))
+        config.paths.public_assets.exist?
       end
 
       # To support operations like Unicorn's hot reload, it is useful to have
@@ -94,8 +101,8 @@ module EY
       # clients may request stale assets that you just deleted.
       # Making use of this requires a properly-configured front-end HTTP server.
       def keep_existing_assets
-        current = File.join(c.shared_path, 'assets')
-        last_asset_path = File.join(c.shared_path, 'last_assets')
+        current = config.paths.shared_assets
+        last_asset_path = config.paths.shared.join('last_assets')
         # If there are current shared assets, move them under a 'last_assets' directory.
         run <<-COMMAND
 if [ -d #{current} ]; then
@@ -103,14 +110,13 @@ if [ -d #{current} ]; then
 else
   mkdir -p #{current} #{last_asset_path};
 fi;
-ln -nfs #{current} #{last_asset_path} #{c.release_path}/public
+ln -nfs #{current} #{last_asset_path} #{config.paths.public}
         COMMAND
        end
 
-      def bundled_rails_version(lockfile_path = nil)
-        lockfile_path ||= File.join(c.release_path, 'Gemfile.lock')
-        return unless File.exist?(lockfile_path)
-        lockfile = File.open(lockfile_path) {|f| f.read}
+      def bundled_rails_version(lockfile_path = config.paths.gemfile_lock)
+        return unless lockfile_path.exist?
+        lockfile = lockfile_path.read
         lockfile.each_line do |line|
           # scan for gemname (version) toplevel deps.
           # Likely doesn't handle ancient Bundler versions, but

data/lib/engineyard-serverside/task.rb

@@ -4,7 +4,12 @@ module EY
   module Serverside
     class Task
       attr_reader :servers, :config, :shell
-      alias :c :config
+
+      # deprecated, please don't use
+      def c
+        EY::Serverside.deprecation_warning("The method 'c' is deprecated in favor of 'config' for better clarity.")
+        config
+      end
 
       def initialize(servers, conf, shell)
         @servers = servers
@@ -15,14 +20,14 @@ module EY
 
       def require_custom_tasks
         deploy_file = ["config/eydeploy.rb", "eydeploy.rb"].map do |short_file|
-          File.join(c.repository_cache, short_file)
+          config.paths.repository_cache.join(short_file)
         end.detect do |file|
-          File.exist?(file)
+          file.exist?
         end
 
         if deploy_file
           shell.status "Loading deployment task overrides from #{deploy_file}"
-          instance_eval(File.read(deploy_file))
+          instance_eval(deploy_file.read)
           true
         else
           false
@@ -31,14 +36,14 @@ module EY
 
       def load_ey_yml
         ey_yml = ["config/ey.yml", "ey.yml"].map do |short_file|
-          File.join(c.repository_cache, short_file)
+          config.paths.repository_cache.join(short_file)
         end.detect do |file|
-          File.exist?(file)
+          file.exist?
         end
 
         if ey_yml
           shell.status "Loading deploy configuration in #{ey_yml}"
-          data = YAML.load_file(ey_yml)
+          data = YAML.load_file(ey_yml.to_s)
           config.load_ey_yml_data(data, shell)
         else
           false

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.0.0.pre5'
+    VERSION = '2.0.0.rc1'
   end
 end

data/spec/custom_deploy_spec.rb

@@ -58,9 +58,9 @@ describe "the EY::Serverside::Deploy API" do
       bundle
       setup_services
       symlink_configs
+      compile_assets
       enable_maintenance_page
       migrate
-      compile_assets
       symlink
       restart
       disable_maintenance_page

data/spec/deploy_hook_spec.rb

@@ -29,7 +29,7 @@ describe "deploy hooks" do
     end
 
     it "retains the failed release" do
-      release_name = File.basename(@config.release_path)
+      release_name = @config.paths.active_release.basename
       deploy_dir.join('releases_failed', release_name).should be_directory
     end
   end
@@ -254,7 +254,7 @@ describe "deploy hooks" do
           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|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

data/spec/ey_yml_customized_deploy_spec.rb

@@ -43,15 +43,16 @@ describe "Deploying an app with ey.yml" do
     end
 
     it "does not remove an existing maintenance page" do
+      maintenance = EY::Serverside::Maintenance.new(test_servers, @config, test_shell)
       deploy_dir.join('current','maintenance_disabled').delete
-      @deployer.enable_maintenance_page
+      maintenance.manually_enable
       deploy_dir.join('shared','system','maintenance.html').should exist
       redeploy_test_application
       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
+      maintenance.manually_disable
       deploy_dir.join('shared','system','maintenance.html').should_not exist
     end
 

data/spec/fixtures/repos/assets_in_hook/deploy/before_compile_assets.rb

@@ -0,0 +1,2 @@
+run 'touch custom_compiled && mkdir -p public/assets'
+$stderr.puts Dir.pwd

data/spec/fixtures/repos/ey_yml/deploy/before_migrate.rb

@@ -1,5 +1,5 @@
 run "echo '#{config.custom}' > custom_hook"
-if File.exist?(config.maintenance_page_enabled_path)
+if config.paths.enabled_maintenance_page.exist?
   run "echo 'maintenance page enabled' > maintenance_enabled"
 else
   run "echo 'no maintenance page' > maintenance_disabled"

data/spec/fixtures/repos/ey_yml_alt/deploy/before_migrate.rb

@@ -1,5 +1,5 @@
 run "echo '#{config.custom}' > custom_hook"
-if File.exist?(config.maintenance_page_enabled_path)
+if config.paths.enabled_maintenance_page.exist?
   run "echo 'maintenance page enabled' > maintenance_enabled"
 else
   run "echo 'no maintenance page' > maintenance_disabled"

data/spec/git_strategy_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "the git deploy strategy" do
   subject do
     fixtures_dir = Pathname.new(__FILE__).dirname.join("fixtures")
-    gitrepo_dir = Pathname.new(Dir.tmpdir).join("gitrepo-#{Time.now.to_i}-#{$$}")
+    gitrepo_dir = tmpdir.join("gitrepo-#{Time.now.to_i}-#{$$}")
     gitrepo_dir.mkdir
     system "tar xzf #{fixtures_dir.join('gitrepo.tar.gz')} --strip-components 1 -C #{gitrepo_dir}"
 

data/spec/services_deploy_spec.rb

@@ -5,7 +5,7 @@ describe "Deploying an application with services" do
     describe "with services" do
       before do
         deploy_test_application('no_ey_config') do |deployer|
-          @shared_services_file = deployer.shared_path.join('config', 'ey_services_config_deploy.yml')
+          @shared_services_file = deployer.config.paths.shared_config.join('ey_services_config_deploy.yml')
           @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
           deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")
         end
@@ -30,8 +30,8 @@ describe "Deploying an application with services" do
   describe "deploy with invalid yaml ey_services_config_deploy" do
     before do
       deploy_test_application do |deployer|
-        @shared_services_file    = deployer.shared_path.join('config', 'ey_services_config_deploy.yml')
-        @symlinked_services_file = deployer.release_path.join('config', 'ey_services_config_deploy.yml')
+        @shared_services_file    = deployer.config.paths.shared_config.join('ey_services_config_deploy.yml')
+        @symlinked_services_file = deployer.config.paths.active_release_config.join('ey_services_config_deploy.yml')
         @invalid_services_yml = "42"
         deployer.mock_services_setup!("echo '#{@invalid_services_yml}' > #{@shared_services_file}")
       end
@@ -53,8 +53,8 @@ describe "Deploying an application with services" do
   describe "a succesful deploy" do
     before do
       deploy_test_application do |deployer|
-        @shared_services_file    = deployer.shared_path.join('config', 'ey_services_config_deploy.yml')
-        @symlinked_services_file = deployer.release_path.join('config', 'ey_services_config_deploy.yml')
+        @shared_services_file    = deployer.config.paths.shared_config.join('ey_services_config_deploy.yml')
+        @symlinked_services_file = deployer.config.paths.active_release_config.join('ey_services_config_deploy.yml')
         @services_yml = {"servicio" => {"foo" => "bar"}}.to_yaml
 
         deployer.mock_services_setup!("echo '#{@services_yml}' > #{@shared_services_file}")

data/spec/shell_spec.rb

@@ -9,7 +9,7 @@ describe EY::Serverside::Shell do
     time3 = Time.local(2008, 9, 1, 12, 10, 25)
 
     @output = StringIO.new
-    @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => Pathname.new(Dir.tmpdir).join("engineyard-serverside-#{Time.now.to_i}-${$$}.log"), :start_time => time1)
+    @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => tmpdir.join("engineyard-serverside-#{Time.now.to_i}-#{$$}.log"), :start_time => time1)
 
     Timecop.freeze(time1) do
       @shell.debug('debug')

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ require 'engineyard-serverside'
 require File.expand_path('../support/integration', __FILE__)
 
 FIXTURES_DIR = Pathname.new(__FILE__).dirname.join("fixtures")
+TMPDIR = Pathname.new(__FILE__).dirname.parent.join('tmp')
 GROUP = `id -gn`.strip
 
 module EY
@@ -48,9 +49,14 @@ Spec::Runner.configure do |config|
   end
 
   config.before(:all) do
+    make_tmpdir
     EY::Serverside.dna_json = {}.to_json
   end
 
+  config.after(:all) do
+    delete_tmpdir
+  end
+
   class VerboseStringIO < StringIO
     def <<(str)
       if ENV['VERBOSE'] || ENV['DEBUG']
@@ -60,6 +66,18 @@ Spec::Runner.configure do |config|
     end
   end
 
+  def tmpdir
+    TMPDIR
+  end
+
+  def make_tmpdir
+    tmpdir.mkpath
+  end
+
+  def delete_tmpdir
+    tmpdir.exist? && tmpdir.rmtree
+  end
+
   def stdout
     @stdout ||= VerboseStringIO.new
   end
@@ -84,7 +102,7 @@ Spec::Runner.configure do |config|
 
   def test_shell
     @test_shell ||= begin
-                      log_path = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}.log")
+                      log_path = tmpdir.join("serverside-deploy-#{Time.now.to_i}-#{$$}.log")
                       EY::Serverside::Shell.new(:verbose => true, :log_path => log_path, :stdout => stdout, :stderr => stderr)
                     end
   end
@@ -94,7 +112,7 @@ Spec::Runner.configure do |config|
   end
 
   def deploy_dir
-    @deploy_dir ||= Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir ||= tmpdir.join("serverside-deploy-#{Time.now.to_i}-#{$$}")
   end
 
   # set up EY::Serverside::Server like we're on a solo

data/spec/sqlite3_deploy_spec.rb

@@ -7,8 +7,8 @@ describe "Deploying an application with sqlite3 as the only DB adapter in the Ge
     @framework_env = nil
 
     deploy_test_application('sqlite3') do |deployer|
-      @shared_path   = deployer.shared_path
-      @release_path  = deployer.release_path
+      @shared_path   = deployer.config.paths.shared
+      @release_path  = deployer.config.paths.active_release
       @framework_env = deployer.framework_env
     end
   end

data/spec/support/integration.rb

@@ -33,7 +33,7 @@ class FullTestDeploy < EY::Serverside::Deploy
   end
 
   def restart_command
-    Escape.shell_command(["echo", super]) + "> #{c.release_path}/restart"
+    Escape.shell_command(["echo", super]) + "> #{config.paths.active_release}/restart"
   end
 
   # we're probably running this spec under bundler, but a real
@@ -53,14 +53,6 @@ class FullTestDeploy < EY::Serverside::Deploy
     result
   end
 
-  def shared_path
-    Pathname.new(config.shared_path)
-  end
-
-  def release_path
-    Pathname.new(config.release_path)
-  end
-
   def framework_env
     config.framework_env
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 3919216497
+  hash: 2346291293
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
-  - pre
-  - 5
-  version: 2.0.0.pre5
+  - rc
+  - 1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -394,7 +394,7 @@ files:
 - spec/fixtures/repos/assets_enabled_in_ey_yml/README
 - spec/fixtures/repos/assets_in_hook/app/assets/empty
 - spec/fixtures/repos/assets_in_hook/config/application.rb
-- spec/fixtures/repos/assets_in_hook/deploy/before_migrate.rb
+- spec/fixtures/repos/assets_in_hook/deploy/before_compile_assets.rb
 - spec/fixtures/repos/assets_in_hook/Gemfile
 - spec/fixtures/repos/assets_in_hook/Gemfile.lock
 - spec/fixtures/repos/assets_in_hook/Rakefile
@@ -535,7 +535,7 @@ test_files:
 - spec/fixtures/repos/assets_enabled_in_ey_yml/README
 - spec/fixtures/repos/assets_in_hook/app/assets/empty
 - spec/fixtures/repos/assets_in_hook/config/application.rb
-- spec/fixtures/repos/assets_in_hook/deploy/before_migrate.rb
+- spec/fixtures/repos/assets_in_hook/deploy/before_compile_assets.rb
 - spec/fixtures/repos/assets_in_hook/Gemfile
 - spec/fixtures/repos/assets_in_hook/Gemfile.lock
 - spec/fixtures/repos/assets_in_hook/Rakefile

data/spec/fixtures/repos/assets_in_hook/deploy/before_migrate.rb

@@ -1 +0,0 @@
-run 'touch custom_compiled && mkdir public/assets'