engineyard-serverside 2.5.0 → 2.6.0

data/lib/engineyard-serverside/cli.rb

@@ -181,10 +181,10 @@ module EY
         begin
           yield servers, config, shell
         rescue EY::Serverside::RemoteFailure => e
-          shell.exception "#{e.message}"
+          shell.fatal e.message
           raise
         rescue Exception => e
-          shell.exception "#{e.backtrace[0]}: #{e.message} (#{e.class})"
+          shell.fatal "#{e.backtrace[0]}: #{e.message} (#{e.class})"
           raise
         end
       end

data/lib/engineyard-serverside/configuration.rb

@@ -77,6 +77,7 @@ module EY
 
       def_option :precompile_assets,      'detect'
       def_option :precompile_assets_task, 'assets:precompile'
+      def_option(:precompile_assets_command) { "rake #{precompile_assets_task} RAILS_GROUPS=assets" }
       def_option :asset_strategy,         'shifting'
       def_option :asset_dependencies,     %w[app/assets lib/assets vendor/assets Gemfile.lock config/routes.rb config/application.rb]
       def_option :asset_roles,            [:app_master, :app, :solo]
@@ -101,8 +102,6 @@ module EY
       def_option :services_check_command, "which /usr/local/ey_resin/ruby/bin/ey-services-setup >/dev/null 2>&1"
       def_option(:services_setup_command) { "/usr/local/ey_resin/ruby/bin/ey-services-setup #{app}" }
 
-      def_option :restart_groups,         1
-
       DEFAULT_KEEP_RELEASES = 3
 
       def_option :keep_releases,          DEFAULT_KEEP_RELEASES
@@ -114,14 +113,20 @@ module EY
       def_boolean_option :precompile_unchanged_assets,     false
       def_boolean_option :ignore_database_adapter_warning, false
       def_boolean_option :ignore_gemfile_lock_warning,     false
+      def_boolean_option :shared_tmp,                      true
       def_boolean_option :eydeploy_rb,                     true
       def_boolean_option :maintenance_on_migrate,          true
       def_boolean_option(:maintenance_on_restart)          { required_downtime_stack? }
 
+      # experimental, need feedback from people using it, feature implementation subject to change or removal
+      def_option :restart_groups, 1
+      def_boolean_option :experimental_sync_assets, false
+
       alias app_name app
       alias environment framework_env # legacy because it would be nice to have less confusion around "environment"
       alias migration_command migrate
       alias repo git
+      alias ref branch # ref is used for input to cli, so it should work here.
 
       def initialize(options)
         opts = string_keys(options)
@@ -296,8 +301,8 @@ module EY
       # The nodatabase.yml file is dropped by server configuration when there is
       # no database in the cluster.
       def has_database?
-        paths.shared_config.join('database.yml').exist? &&
-          !paths.shared_config.join('nodatabase.yml').exist?
+        paths.path(:shared_config, 'database.yml').exist? &&
+          !paths.path(:shared_config, 'nodatabase.yml').exist?
       end
 
       def check_database_adapter?

data/lib/engineyard-serverside/deploy.rb

@@ -32,9 +32,10 @@ module EY
           create_revision_file
           run_with_callbacks(:bundle)
           setup_services
+          configure_platform
           symlink_configs
           setup_sqlite3_if_necessary
-          run_with_callbacks(:compile_assets) # defined in RailsAssetSupport
+          run_with_callbacks(:compile_assets)
           enable_maintenance_page
           run_with_callbacks(:migrate)
           callback(:before_symlink)
@@ -341,25 +342,78 @@ YML
         end
       end
 
+      def configure_platform
+        run configure_command
+      end
+
+      def configure_command
+        ENV['EY_SERVERSIDE_CONFIGURE_COMMAND'] || begin
+          configure_script = "/engineyard/bin/app_#{config.app}_configure"
+          return <<-CONFIGURE
+if [ -x "#{configure_script}" ] || which "#{configure_script}" >/dev/null 2>&1; then
+  EY_DEPLOY_APP='#{config.app}' EY_DEPLOY_RELEASE_PATH='#{paths.active_release.to_s}' #{configure_script};
+fi
+          CONFIGURE
+        end
+      end
+
       def symlink_configs
         shell.status "Preparing shared resources for release."
+
+        shell.substatus "Set group write permissions"
+        run "chmod -R g+w #{paths.active_release}"
+
+        setup_shared_tmp
+
         symlink_tasks.each do |what, cmd|
           shell.substatus what
           run(cmd)
         end
       end
 
+      def setup_shared_tmp
+        if config.shared_tmp?
+          shell.substatus "Creating and symlinking shared tmp directory if empty"
+          run <<-SETUP_TMP
+if [ -e "#{paths.active_tmp}" ] && [ ! "$(ls #{paths.active_tmp} 2>&1)" ]; then
+  rm -rf #{paths.active_tmp};
+fi;
+if [ ! -e "#{paths.active_tmp}" ]; then
+  mkdir -p #{paths.shared_tmp} && ln -nfs #{paths.shared_tmp} #{paths.active_tmp};
+fi
+          SETUP_TMP
+
+          unless paths.active_tmp.symlink?
+            note = "This application's repository has tmp/ with contents committed.\n"
+            if config.precompile_assets?
+              note << "Asset precompile speed can be increased by sharing tmp across releases.\n"
+            end
+            note << <<-NOTICE
+Enable shared tmp with the follow git command (if applicable):
+
+  $ git rm -r tmp/* && echo '*' > tmp/.gitignore
+
+Or, disable this feature via ey.yml configuration as follows:
+
+defaults:
+  shared_tmp: false
+            NOTICE
+            shell.notice note
+          end
+        else
+          shell.substatus "Prepare shared pids directory"
+          run "rm -rf #{paths.active_tmp}/pids"
+        end
+      end
+
       def symlink_tasks
         [
-          ["Set group write permissions",           "chmod -R g+w #{paths.active_release}"],
+          ["Symlink shared pids directory",         "ln -nfs #{paths.shared}/pids #{paths.active_tmp}/pids"],
+          ["Symlink shared log directory",          "rm -rf #{paths.active_log} && ln -nfs #{paths.shared_log} #{paths.active_log}"],
           ["Remove public/system if symlinked",     "if [ -L \"#{paths.public_system}\" ]; then rm -rf #{paths.public_system}; fi"],
-          ["Remove symlinked shared directories",   "rm -rf #{paths.active_log} #{paths.active_release}/tmp/pids"],
-          ["Create tmp directory",                  "mkdir -p #{paths.active_release}/tmp"],
           ["Create public directory",               "mkdir -p #{paths.public}"],
-          ["Create config directory",               "mkdir -p #{paths.active_release_config}"],
-          ["Symlink shared log directory",          "ln -nfs #{paths.shared_log} #{paths.active_log}"],
           ["Symlink public system directory",       "if [ ! -e \"#{paths.public_system}\" ]; then ln -ns #{paths.shared_system} #{paths.public_system}; fi"],
-          ["Symlink shared pids directory",         "ln -nfs #{paths.shared}/pids #{paths.active_release}/tmp/pids"],
+          ["Create config directory",               "mkdir -p #{paths.active_release_config}"],
           ["Symlink other shared config files",     "find #{paths.shared_config} -maxdepth 1 -type f -not -name 'database.yml' -exec ln -s {} #{paths.active_release_config} \\;"],
           ["Symlink database.yml if needed",        "if [ -f \"#{paths.shared_config}/database.yml\" ]; then ln -nfs #{paths.shared_config}/database.yml #{paths.active_release_config}/database.yml; fi"],
           ["Symlink newrelic.yml if needed",        "if [ -f \"#{paths.shared_config}/newrelic.yml\" ]; then ln -nfs #{paths.shared_config}/newrelic.yml #{paths.active_release_config}/newrelic.yml; fi"],

data/lib/engineyard-serverside/paths.rb

@@ -51,8 +51,10 @@ module EY
       end
 
       # Load a path given a root and more parts
+      # Pathname#join is extremely inefficient.
+      # This implementation uses much less memory and way fewer objects.
       def path(root, *parts)
-        send(root).join(*parts)
+        Pathname.new(File.join(send(root).to_s, *parts))
       end
 
       attr_reader :home, :deploy_root
@@ -64,6 +66,7 @@ module EY
       def_path :releases_failed,          [:deploy_root,    'releases_failed']
       def_path :shared,                   [:deploy_root,    'shared']
       def_path :shared_log,               [:shared,         'log']
+      def_path :shared_tmp,               [:shared,         'tmp']
       def_path :shared_config,            [:shared,         'config']
       def_path :shared_system,            [:shared,         'system']
       def_path :default_repository_cache, [:shared,         'cached-copy']
@@ -79,6 +82,7 @@ module EY
       def_path :gemfile,                  [:active_release, 'Gemfile']
       def_path :gemfile_lock,             [:active_release, 'Gemfile.lock']
       def_path :public,                   [:active_release, 'public']
+      def_path :deploy_hooks,             [:active_release, 'deploy']
       def_path :public_assets,            [:public, 'assets']
       def_path :public_system,            [:public, 'system']
       def_path :package_json,             [:active_release, 'package.json']
@@ -86,6 +90,7 @@ module EY
       def_path :composer_lock,            [:active_release, 'composer.lock']
       def_path :active_release_config,    [:active_release, 'config']
       def_path :active_log,               [:active_release, 'log']
+      def_path :active_tmp,               [:active_release, 'tmp']
 
       def initialize(opts)
         @opts             = opts
@@ -118,11 +123,11 @@ module EY
       end
 
       def deploy_hook(hook_name)
-        path(:active_release, 'deploy', "#{hook_name}.rb")
+        path(:deploy_hooks, "#{hook_name}.rb")
       end
 
       def executable_deploy_hook(hook_name)
-        path(:active_release, 'deploy', "#{hook_name}")
+        path(:deploy_hooks, "#{hook_name}")
       end
 
       def repository_cache
@@ -130,7 +135,7 @@ module EY
       end
 
       def all_releases
-        @all_releases ||= Pathname.glob(releases.join('*')).sort
+        @all_releases ||= Pathname.glob(path(:releases,'*')).sort
       end
 
       # deploy_root/releases/<release before argument release path>

data/lib/engineyard-serverside/rails_assets.rb

@@ -19,7 +19,8 @@ module EY
       def_delegators :config,
         :paths, :asset_dependencies, :asset_roles,
         :framework_envs, :precompile_assets?, :skip_precompile_assets?,
-        :precompile_unchanged_assets?, :precompile_assets_task
+        :precompile_unchanged_assets?, :precompile_assets_task,
+        :precompile_assets_command
 
       def detect_and_compile
         runner.roles asset_roles do
@@ -43,7 +44,7 @@ module EY
           elsif paths.public_assets.exist?
             shell.status "Skipping asset precompilation. ('public/assets' directory already exists.)"
           else
-            shell.status "Precompiling assets. ('#{app_assets}' exists, 'public/assets' not found, not disabled in config.)"
+            shell.status "Precompiling assets. ('app/assets' exists, 'public/assets' not found, not disabled in config.)"
             precompile_detected_assets
           end
         end
@@ -52,8 +53,20 @@ module EY
       def run_precompile_assets_task
         asset_strategy.prepare do
           cd   = "cd #{paths.active_release}"
-          task = "PATH=#{paths.binstubs}:$PATH #{framework_envs} rake #{precompile_assets_task} RAILS_GROUPS=assets"
-          runner.run "#{cd} && #{task}"
+          task = "PATH=#{paths.binstubs}:$PATH #{framework_envs} #{precompile_assets_command}"
+
+          # This is a hack right now, but I haven't iterated over it enough for a good solution yet.
+          if config.experimental_sync_assets?
+            shell.status "Compiling assets once on localhost (experimental_sync_assets: true)"
+            shell.logged_system("sh -l -c '#{cd} && #{task}'")
+
+            shell.status "Syncing assets to other remote servers (experimental_sync_assets: true)"
+            runner.servers.remote.run_for_each do |server|
+              server.sync_directory_command(paths.public_assets)
+            end
+          else
+            runner.run "#{cd} && #{task}"
+          end
         end
       end
 
@@ -139,15 +152,11 @@ ACTION REQUIRED: Add precompile_assets option to ey.yml.
       end
 
       def application_rb_path
-        paths.active_release.join('config','application.rb')
-      end
-
-      def app_assets
-        File.join('app','assets')
+        paths.path(:active_release,'config','application.rb')
       end
 
       def app_assets_path
-        paths.active_release.join(app_assets)
+        paths.path(:active_release,'app','assets')
       end
 
       def asset_strategy

data/lib/engineyard-serverside/rails_assets/strategy.rb

@@ -48,7 +48,7 @@ module EY
           #   deploy_root/current/public/last_assets/assets -> deploy_root/releases/<prev>/public/assets
           def prepare
             if previous_assets_path
-              last = paths.public.join('last_assets')
+              last = paths.path(:public,'last_assets')
               run "mkdir -p #{last} && ln -nfs #{previous_assets_path} #{last.join('assets')}"
             end
 

data/lib/engineyard-serverside/shell.rb

@@ -1,19 +1,27 @@
 require 'logger'
 require 'pathname'
-require 'open3'
 require 'engineyard-serverside/shell/formatter'
 require 'engineyard-serverside/shell/yieldio'
 
 module EY
   module Serverside
     class Shell
-      attr_reader :logger
+      STATUS_PREFIX    = '~> '.freeze
+      SUBSTATUS_PREFIX = ' ~ '.freeze
+      IMPORTANT_PREFIX = '!> '.freeze
+      CMD_PREFIX       = '   $ '.freeze
+      CMD_CONTINUE     = '   > '.freeze
+      CMD_INDENT       = '     '.freeze
+      BOL = /^/.freeze
+
+      include Logger::Severity
+
+      attr_reader :logger, :start_time
 
       def initialize(options)
-        @start_time = options[:start_time]
+        @start_time = options[:start_time] || Time.now
         @verbose    = options[:verbose]
 
-
         @stdout = options[:stdout] || $stdout
         @stderr = options[:stderr] || $stderr
 
@@ -28,39 +36,35 @@ module EY
         @verbose
       end
 
-      def start_time
-        @start_time ||= Time.now
-      end
-
       # a nice info outputter that prepends spermy operators for some reason.
       def status(msg)
         if msg.respond_to?(:force_encoding)
-          msg.force_encoding("UTF-8")
+          msg.force_encoding(Encoding::UTF_8)
         end
-        info msg.gsub(/^/, '~> ')
+        info msg.gsub(BOL, STATUS_PREFIX)
       end
 
       def substatus(msg)
-        debug msg.gsub(/^/, ' ~ ')
+        debug msg.gsub(BOL, SUBSTATUS_PREFIX)
       end
 
-      def fatal(msg)   logger.fatal   "FATAL: #{msg}"   end
-      def error(msg)   logger.error   "ERROR: #{msg}"   end
+      def fatal(msg)   logger.fatal   "FATAL: #{msg}" end
+      def error(msg)   logger.error   "ERROR: #{msg}" end
       def warning(msg) logger.warn    "WARNING: #{msg}" end
+      alias warn warning
       def notice(msg)  logger.warn    msg end
       def info(msg)    logger.info    msg end
       def debug(msg)   logger.debug   msg end
       def unknown(msg) logger.unknown msg end
 
-      def exception(msg) error msg end
       # a debug outputter that displays a command being run
       # Formatis like this:
       #   $ cmd blah do \
       #   > something more
       #   > end
-      def command_show(cmd) debug   cmd.gsub(/^/,'   > ').sub(/>/, '$') end
-      def command_out(msg)  debug   msg.gsub(/^/,'     ') end
-      def command_err(msg)  unknown msg.gsub(/^/,'     ') end
+      def command_show(cmd) debug   cmd.gsub(BOL,CMD_CONTINUE).sub(CMD_CONTINUE, CMD_PREFIX) end
+      def command_out(msg)  debug   msg.gsub(BOL,CMD_INDENT) end
+      def command_err(msg)  unknown msg.gsub(BOL,CMD_INDENT) end
 
       def logged_system(cmd, server = nil)
         EY::Serverside::Spawner.run(cmd, self, server)

data/lib/engineyard-serverside/shell/formatter.rb

@@ -2,6 +2,22 @@ module EY
   module Serverside
     class Shell
       class Formatter
+        FATAL = 'ERROR'.freeze
+        ERROR = 'ERROR'.freeze
+        WARN  = 'WARN'.freeze
+        INFO  = 'INFO'.freeze
+        DEBUG = 'DEBUG'.freeze
+        IMPORTANT = [WARN, ERROR, FATAL].freeze
+
+        SECONDS_FORMAT = '+    %02ds  '.freeze
+        MINUTES_FORMAT = '+%2dm %02ds  '.freeze
+
+        STATUS_PREFIX    = '~> '.freeze
+        SUBSTATUS_PREFIX = ' ~ '.freeze
+        IMPORTANT_PREFIX = '!> '.freeze
+
+        NL = "\n".freeze
+
         def initialize(stdout, stderr, start_time, verbose)
           @stdout, @stderr = stdout, stderr
           @start = start_time.to_i
@@ -15,35 +31,42 @@ module EY
         end
 
         def build_message(severity, stamp, message)
-          if %w[WARN ERROR FATAL].include?(severity)
-            prepend("#{stamp}!> ", "#{message}")
-          elsif severity == "INFO"
+          if IMPORTANT.include?(severity)
+            prepend("#{stamp}#{IMPORTANT_PREFIX}", message)
+          elsif INFO == severity
             prepend(stamp, message)
           else
-            prepend(' ' * stamp.size, message)
+            prepend(stamp, message)
           end
         end
 
         def prepend(pre, str)
-          str.gsub(/^/, pre).sub(/\n?\z/m,"\n")
+          str.gsub(/^/, pre).sub(/\n?\z/m,NL)
         end
 
         def put_to_io(severity, msg)
           case severity
-          when "DEBUG"
+          when DEBUG
             if @verbose
               @stdout << msg
               @stdout.flush
             end
-          when "INFO"
+          when INFO
             # Need to differentiate info messages more when we're running in verbose mode
-            @stdout << (@verbose && msg.index('~>') ? "\n#{thor_shell.set_color(msg, :white, true)}" : msg)
+            if @verbose && msg.index(STATUS_PREFIX)
+              @stdout.puts
+              @stdout << thor_shell.set_color(msg, :white, true)
+            else
+              @stdout << msg
+            end
             @stdout.flush
-          when "WARN"
-            @stderr << "\n" << thor_shell.set_color(msg, :yellow, true)
+          when WARN
+            @stderr.puts
+            @stderr << thor_shell.set_color(msg, :yellow, true)
             @stderr.flush
-          when "ERROR"
-            @stderr << "\n" << thor_shell.set_color(msg, :red, true)
+          when ERROR
+            @stderr.puts
+            @stderr << thor_shell.set_color(msg, :red, true)
             @stderr.flush
           else
             @stderr << msg
@@ -56,9 +79,9 @@ module EY
           diff = 0 if diff < 0
           div, mod = diff.divmod(60)
           if div.zero?
-            "+    %02ds  " % mod
+            SECONDS_FORMAT % mod
           else
-            "+%2dm %02ds  " % [div,mod]
+            MINUTES_FORMAT % [div,mod]
           end
         end
 

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.5.0'
+    VERSION = '2.6.0'
   end
 end

data/spec/archive_deploy_spec.rb

@@ -20,7 +20,7 @@ describe "Deploying a simple application" do
       args.instances = [{ :hostname => "localhost", :roles => ["solo"], :name => "single" }]
       args.serverside_version = Gem::Version.create(EY::Serverside::VERSION.dup).release
       args.config = {
-        "deploy_to" => deploy_dir,
+        "deploy_to" => deploy_dir.to_s,
         "group"            => GROUP
       }
     end

data/spec/bundler_deploy_spec.rb

@@ -40,9 +40,8 @@ describe "Deploying an application that uses Bundler" do
     end
 
     it "generates bundler binstubs" do
-      pending "doesn't work with mocked bundler" do
-        expect(deploy_dir.join('current', 'ey_bundler_binstubs', 'rake')).to exist
-      end
+      pending "doesn't work with mocked bundler"
+      expect(deploy_dir.join('current', 'ey_bundler_binstubs', 'rake')).to exist
     end
   end
 
@@ -111,7 +110,7 @@ describe "Deploying an application that uses Bundler" do
   context "without a Gemfile.lock and ignoring the warning" do
     before(:all) do
       deploy_test_application('no_gemfile_lock', 'config' => {'ignore_gemfile_lock_warning' => true})
-      expect(@config.ignore_gemfile_lock_warning).to be_true
+      expect(@config.ignore_gemfile_lock_warning).to be_truthy
       @install_bundler_command = @deployer.commands.grep(/gem install bundler/).first
       @bundle_install_command  = @deployer.commands.grep(/bundle _#{VERSION_PATTERN}_ install/).first
     end

data/spec/configuration_spec.rb

@@ -15,6 +15,7 @@ describe EY::Serverside::Deploy::Configuration do
       expect(@config.migrate).to eq(nil)
       expect(@config.migrate?).to eq(false)
       expect(@config.branch).to eq("master")
+      expect(@config.ref).to eq("master")
       expect(@config.maintenance_on_migrate).to eq(true)
       expect(@config.maintenance_on_restart).to eq(true)
       expect(@config.required_downtime_stack?).to eq(true)

data/spec/deploy_hook_spec.rb

@@ -49,7 +49,7 @@ describe "deploy hooks" do
     end
 
     it 'runs the hook' do
-      deploy_dir.join('current', 'before_restart.ran').should exist
+      expect(deploy_dir.join('current', 'before_restart.ran')).to exist
     end
   end
 
@@ -59,7 +59,7 @@ describe "deploy hooks" do
     end
 
     it 'does not run the hook' do
-      deploy_dir.join('current', 'before_restart.ran').should_not exist
+      expect(deploy_dir.join('current', 'before_restart.ran')).not_to exist
     end
 
     it 'outputs a message about the hook not being executable' do
@@ -83,7 +83,7 @@ describe "deploy hooks" do
 
     context "#run" do
       it "is available" do
-        expect(deploy_hook.eval_hook('respond_to?(:run)')).to be_true
+        expect(deploy_hook.eval_hook('respond_to?(:run)')).to be_truthy
       end
 
       it "runs commands like the shell does" do
@@ -96,8 +96,8 @@ describe "deploy hooks" do
       end
 
       it "returns true/false to indicate the command's success" do
-        expect(deploy_hook.eval_hook('run("true")')).to be_true
-        expect(deploy_hook.eval_hook('run("false")')).to be_false
+        expect(deploy_hook.eval_hook('run("true")')).to be_truthy
+        expect(deploy_hook.eval_hook('run("false")')).to be_falsey
       end
 
       it "raises when the bang method alternative is used" do
@@ -113,7 +113,7 @@ describe "deploy hooks" do
 
     context "#sudo" do
       it "is available" do
-        expect(deploy_hook.eval_hook('respond_to?(:sudo)')).to be_true
+        expect(deploy_hook.eval_hook('respond_to?(:sudo)')).to be_truthy
       end
 
       it "runs things with sudo" do
@@ -139,18 +139,18 @@ describe "deploy hooks" do
 
     context "capistrano-ish methods" do
       it "has them" do
-        expect(deploy_hook.eval_hook('respond_to?(:latest_release)    ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:previous_release)  ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:all_releases)      ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:current_path)      ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:shared_path)       ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:release_dir)       ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:failed_release_dir)')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:release_path)      ')).to be_true
+        expect(deploy_hook.eval_hook('respond_to?(:latest_release)    ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:previous_release)  ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:all_releases)      ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:current_path)      ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:shared_path)       ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:release_dir)       ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:failed_release_dir)')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:release_path)      ')).to be_truthy
       end
 
       it "shows a deprecation warning that asks you to use config to access these variables" do
-        expect(deploy_hook.eval_hook('shared_path.nil?')).to be_false
+        expect(deploy_hook.eval_hook('shared_path.nil?')).to be_falsey
         out = read_output
         expect(out).to include("Use of `shared_path` (via method_missing) is deprecated in favor of `config.shared_path` for improved error messages and compatibility.")
         expect(out).to match(%r|in .*/deploy/fake_test_hook.rb|)
@@ -189,7 +189,7 @@ describe "deploy hooks" do
       end
 
       it "is deprecated through the @node ivar" do
-        expect(deploy_hook.eval_hook('@node.nil?')).to be_false
+        expect(deploy_hook.eval_hook('@node.nil?')).to be_falsey
         out = read_output
         expect(out).to match(%r|Use of `@node` in deploy hooks is deprecated.|)
         expect(out).to match(%r|Please use `config.node`, which provides access to the same object.|)
@@ -197,7 +197,7 @@ describe "deploy hooks" do
       end
 
       it "is available" do
-        expect(deploy_hook.eval_hook('config.node.nil?')).to be_false
+        expect(deploy_hook.eval_hook('config.node.nil?')).to be_falsey
       end
 
       it "has indifferent access" do
@@ -214,11 +214,11 @@ describe "deploy hooks" do
 
     context "config" do
       it "is available" do
-        expect(deploy_hook.eval_hook('config.nil?')).to be_false
+        expect(deploy_hook.eval_hook('config.nil?')).to be_falsey
       end
 
       it "is deprecated through the @configuration ivar" do
-        expect(deploy_hook.eval_hook('@configuration.nil?')).to be_false
+        expect(deploy_hook.eval_hook('@configuration.nil?')).to be_falsey
         out = read_output
         expect(out).to match(%r|Use of `@configuration` in deploy hooks is deprecated.|)
         expect(out).to match(%r|Please use `config`, which provides access to the same object.|)
@@ -244,7 +244,7 @@ describe "deploy hooks" do
         :revision,
         :environment].each do |attribute|
         it "has the #{attribute.inspect} attribute for compatibility with chef-deploy" do
-          expect(deploy_hook.eval_hook("config.has_key?(#{attribute.inspect})")).to be_true
+          expect(deploy_hook.eval_hook("config.has_key?(#{attribute.inspect})")).to be_truthy
         end
       end
     end
@@ -351,11 +351,11 @@ describe "deploy hooks" do
       end
 
       it "has info, warning, debug, logged_system, and access to shell" do
-        expect(deploy_hook.eval_hook('respond_to?(:info)         ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:warning)      ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:debug)        ')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:logged_system)')).to be_true
-        expect(deploy_hook.eval_hook('respond_to?(:shell)        ')).to be_true
+        expect(deploy_hook.eval_hook('respond_to?(:info)         ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:warning)      ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:debug)        ')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:logged_system)')).to be_truthy
+        expect(deploy_hook.eval_hook('respond_to?(:shell)        ')).to be_truthy
       end
     end
   end

data/spec/fixtures/repos/assets_enabled_all/config/ey.yml

@@ -2,4 +2,5 @@ environments:
   env:
     precompile_assets: true
     asset_roles: :all
+    precompile_assets_command: script/assets
     ignore_database_adapter_warning: true

data/spec/fixtures/repos/assets_enabled_all/script/assets

@@ -0,0 +1,5 @@
+#!/bin/sh
+touch public/assets/custom_compiled_asset
+touch custom_compiled
+# mirror the behavior of compiling using asset caches in tmp
+[ -e tmp/cache ] && touch cache_compiled || touch tmp/cache

data/spec/fixtures/repos/assets_enabled_all/tmp/obstruction

@@ -0,0 +1 @@
+This file obstructs the sharing of the tmp dir.

data/spec/fixtures/repos/assets_enabled_in_ey_yml/Rakefile

@@ -3,5 +3,6 @@ task 'assets:precompile' do
   sh "mkdir -p #{File.expand_path('../public/assets', __FILE__)}"
   sh "touch #{File.expand_path('../public/assets/compiled_asset', __FILE__)}"
   sh 'touch precompiled'
+  sh '[ -e tmp/cache ] && touch cache_compiled || touch tmp/cache' # mirror the behavior of compiling using asset caches in tmp
 end
 

data/spec/lockfile_parser_spec.rb

@@ -59,27 +59,27 @@ describe "the bundler version retrieved from the lockfile" do
 
   context "checking for gems in the dependencies" do
     it "does not have any database adapters in a gemfile lock without them" do
-      expect(get_parser('1.0.6-no-bundler').any_database_adapter?).to be_false
+      expect(get_parser('1.0.6-no-bundler').any_database_adapter?).to be_falsey
     end
 
     it "has a database adapter in a Gemfile.lock with do_mysql" do
-      expect(get_parser('1.0.18-do_mysql').any_database_adapter?).to be_true
+      expect(get_parser('1.0.18-do_mysql').any_database_adapter?).to be_truthy
     end
 
     it "has a database adapter in a Gemfile.lock with mysql" do
-      expect(get_parser('1.0.18-mysql').any_database_adapter?).to be_true
+      expect(get_parser('1.0.18-mysql').any_database_adapter?).to be_truthy
     end
 
     it "has a database adapter in a Gemfile.lock with mysql2" do
-      expect(get_parser('1.0.18-mysql2').any_database_adapter?).to be_true
+      expect(get_parser('1.0.18-mysql2').any_database_adapter?).to be_truthy
     end
 
     it "has a database adapter in a Gemfile.lock with pg" do
-      expect(get_parser('1.0.18-pg').any_database_adapter?).to be_true
+      expect(get_parser('1.0.18-pg').any_database_adapter?).to be_truthy
     end
 
     it "has a database adapter in a Gemfile.lock with do_postgres" do
-      expect(get_parser('1.0.18-do_postgres').any_database_adapter?).to be_true
+      expect(get_parser('1.0.18-do_postgres').any_database_adapter?).to be_truthy
     end
   end
 

data/spec/maintenance_spec.rb

@@ -23,22 +23,22 @@ describe EY::Serverside::Maintenance do
     it "lets you know if the app is in maintenance mode" do
       maintenance_status
       maintenance_output = read_output.split("\n").select{|l| l.match("Maintenance")}
-      maintenance_output.count.should == 1
-      maintenance_output.first.should match(/Maintenance page: down$/)
+      expect(maintenance_output.count).to eq(1)
+      expect(maintenance_output.first).to match(/Maintenance page: down$/)
 
       enable_maintenance
 
       maintenance_status
       maintenance_output = read_output.split("\n").select{|l| l.match("Maintenance")}
-      maintenance_output.count.should == 1
-      maintenance_output.first.should match(/Maintenance page: up$/)
+      expect(maintenance_output.count).to eq(1)
+      expect(maintenance_output.first).to match(/Maintenance page: up$/)
 
       disable_maintenance
 
       maintenance_status
       maintenance_output = read_output.split("\n").select{|l| l.match("Maintenance")}
-      maintenance_output.count.should == 1
-      maintenance_output.first.should match(/Maintenance page: down$/)
+      expect(maintenance_output.count).to eq(1)
+      expect(maintenance_output.first).to match(/Maintenance page: down$/)
     end
   end
 end

data/spec/platform_configure_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe "Deploying an application with platform configure command" do
+  describe "configure script does not exist" do
+    before do
+      @releases_failed = deploy_dir.join('releases_failed')
+      deploy_test_application('default')
+    end
+
+    it "works without warning" do
+      expect(read_output).not_to match(/WARNING/)
+
+      expect(@releases_failed).not_to exist
+    end
+  end
+
+  describe "a succesful deploy" do
+    before do
+      @releases_failed = deploy_dir.join('releases_failed')
+      ENV['EY_SERVERSIDE_CONFIGURE_COMMAND'] = "echo platform_configure_command_ran >&2"
+      deploy_test_application('default')
+    end
+
+    after do
+      ENV.delete('EY_SERVERSIDE_CONFIGURE_COMMAND')
+    end
+
+    it "runs the configure_command during deploy and finishes successfully" do
+      expect(read_output).to match(/platform_configure_command_ran/)
+
+      expect(@releases_failed).not_to exist
+
+      restart = deploy_dir.join('current', 'restart')
+      expect(restart).to exist
+    end
+  end
+
+  describe "a failed configure command" do
+
+    before do
+      ENV['EY_SERVERSIDE_CONFIGURE_COMMAND'] = "echo platform_configure_command_failed >&2 && false"
+    end
+
+    after do
+      ENV.delete('EY_SERVERSIDE_CONFIGURE_COMMAND')
+    end
+
+    it "aborts the deplo when it fails, preventing the app from being restarted" do
+      @releases_failed = deploy_dir.join('releases_failed')
+      expect(@releases_failed).not_to exist
+
+      begin
+        deploy_test_application('default')
+      rescue
+      end
+      expect(read_output).to match(/platform_configure_command_failed/)
+
+      expect(@releases_failed.entries).not_to be_empty
+    end
+  end
+end

data/spec/rails31_deploy_spec.rb

@@ -34,6 +34,9 @@ describe "Deploying a Rails 3.1 application" do
       expect(deploy_dir.join('current', 'precompiled')).to exist
       expect(deploy_dir.join('current', 'public', 'assets')).to exist
       expect(deploy_dir.join('current', 'public', 'assets', 'compiled_asset')).to exist
+      expect(deploy_dir.join('current', 'tmp', 'cache')).to exist
+      expect(deploy_dir.join('current', 'tmp')).to be_a_symlink
+      expect(deploy_dir.join('current', 'cache_compiled')).not_to exist
       expect(read_output).to include("Precompiling assets. (precompile_assets: true)")
 
       # changing the ref stands in for actually having assets change (see Strategies::IntegrationSpec#same?)
@@ -41,6 +44,9 @@ describe "Deploying a Rails 3.1 application" do
       expect(deploy_dir.join('current', 'precompiled')).to exist # it does runs the task
       expect(deploy_dir.join('current', 'public', 'assets')).to exist
       expect(deploy_dir.join('current', 'public', 'assets', 'compiled_asset')).to exist
+      expect(deploy_dir.join('current', 'tmp')).to be_a_symlink
+      expect(deploy_dir.join('current', 'tmp', 'cache')).to exist # preserves tmp dir
+      expect(deploy_dir.join('current', 'cache_compiled')).to exist # uses tmp/cache to compile assets faster
       expect(read_output).not_to match(%r#Reusing existing assets#)
     end
 
@@ -97,14 +103,22 @@ describe "Deploying a Rails 3.1 application" do
     end
   end
 
-  context "with asset compilation enabled in ey.yml, and asset_roles is set to :all" do
+  context "with asset compilation enabled in ey.yml, and asset_roles is set to :all, and a custom compile command" do
     before(:all) do
       deploy_test_application('assets_enabled_all')
     end
 
-    it "precompiles assets" do
-      expect(deploy_dir.join('current', 'precompiled')).to exist
+    it "precompiles assets but never shares the tmp cache because the repository has a committed tmp dir with contents" do
+      expect(deploy_dir.join('current', 'custom_compiled')).to exist
+      expect(deploy_dir.join('current', 'cache_compiled')).not_to exist
+      expect(deploy_dir.join('current', 'tmp', 'cache')).to exist
+      expect(deploy_dir.join('current', 'tmp')).not_to be_a_symlink
       expect(read_output).to include("Precompiling assets. (precompile_assets: true)")
+
+      redeploy_test_application('config' => {'precompile_unchanged_assets' => 'true'})
+      expect(deploy_dir.join('current', 'tmp', 'cache')).to exist
+      expect(deploy_dir.join('current', 'cache_compiled')).not_to exist
+      expect(deploy_dir.join('current', 'tmp')).not_to be_a_symlink
     end
   end
 

data/spec/shell_spec.rb

@@ -35,24 +35,23 @@ describe EY::Serverside::Shell do
     tstp_1 = "+    00s "
     tstp_2 = "+ 3m 05s "
     tstp_3 = "+10m 25s "
-    notstp = "         "
     output.rewind
     expect(output.read).to eq <<-OUTPUT
-#{notstp} debug
+#{tstp_1} debug
 
 \e[1m\e[33m#{tstp_1} !> notice
 \e[0m
 \e[1m\e[37m#{tstp_2} ~> STATUS
-\e[0m#{notstp} multi
-#{notstp} line
-#{notstp} debug
+\e[0m#{tstp_2} multi
+#{tstp_2} line
+#{tstp_2} debug
 
 \e[1m\e[33m#{tstp_2} !> WARNING: multi
 #{tstp_2} !> line
 #{tstp_2} !> warning
-\e[0m#{notstp}  ~ multi
-#{notstp}  ~ line
-#{notstp}  ~ substatus
+\e[0m#{tstp_3}  ~ multi
+#{tstp_3}  ~ line
+#{tstp_3}  ~ substatus
     OUTPUT
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -341,8 +341,9 @@ files:
 - spec/fixtures/repos/assets_enabled_all/config/ey.yml
 - spec/fixtures/repos/assets_enabled_all/Gemfile
 - spec/fixtures/repos/assets_enabled_all/Gemfile.lock
-- spec/fixtures/repos/assets_enabled_all/Rakefile
 - spec/fixtures/repos/assets_enabled_all/README
+- spec/fixtures/repos/assets_enabled_all/script/assets
+- spec/fixtures/repos/assets_enabled_all/tmp/obstruction
 - spec/fixtures/repos/assets_enabled_in_ey_yml/config/ey.yml
 - spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile
 - spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile.lock
@@ -451,6 +452,7 @@ files:
 - spec/multi_dependency_manager_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/php_deploy_spec.rb
+- spec/platform_configure_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/rollback_spec.rb
@@ -480,7 +482,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1515425711168251653
+      hash: 696469692367855217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -553,8 +555,9 @@ test_files:
 - spec/fixtures/repos/assets_enabled_all/config/ey.yml
 - spec/fixtures/repos/assets_enabled_all/Gemfile
 - spec/fixtures/repos/assets_enabled_all/Gemfile.lock
-- spec/fixtures/repos/assets_enabled_all/Rakefile
 - spec/fixtures/repos/assets_enabled_all/README
+- spec/fixtures/repos/assets_enabled_all/script/assets
+- spec/fixtures/repos/assets_enabled_all/tmp/obstruction
 - spec/fixtures/repos/assets_enabled_in_ey_yml/config/ey.yml
 - spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile
 - spec/fixtures/repos/assets_enabled_in_ey_yml/Gemfile.lock
@@ -663,6 +666,7 @@ test_files:
 - spec/multi_dependency_manager_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/php_deploy_spec.rb
+- spec/platform_configure_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
 - spec/rollback_spec.rb

data/spec/fixtures/repos/assets_enabled_all/Rakefile

@@ -1,6 +0,0 @@
-desc 'Precompile yar assetz'
-task 'assets:precompile' do
-  sh "touch #{File.expand_path('../public/assets/compiled_asset', __FILE__)}"
-  sh 'touch precompiled'
-end
-