engineyard-serverside 1.5.29.pre.timestamps2 → 1.5.30

data/lib/engineyard-serverside.rb

@@ -26,8 +26,6 @@ require 'engineyard-serverside/cli'
 require 'engineyard-serverside/configuration'
 require 'engineyard-serverside/deprecation'
 require 'engineyard-serverside/future'
-require 'engineyard-serverside/shell'
-
 
 module EY
   module Serverside

data/lib/engineyard-serverside/cli.rb

@@ -51,12 +51,14 @@ module EY
       desc "deploy", "Deploy code from /data/<app>"
       def deploy(default_task=:deploy)
         config = EY::Serverside::Deploy::Configuration.new(options)
-        shell = init_shell(config.verbose, "#{config.app}-deploy")
         load_servers(config)
 
-        propagate(shell)
+        EY::Serverside::LoggedOutput.verbose = options[:verbose]
+        EY::Serverside::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-deploy.log")
 
-        EY::Serverside::Deploy.new(config, shell).send(default_task)
+        invoke :propagate
+
+        EY::Serverside::Deploy.new(config).send(default_task)
       end
 
       method_option :app,           :type     => :string,
@@ -118,6 +120,9 @@ module EY
                                       :aliases  => ["-v"]
       desc "integrate", "Integrate other instances into this cluster"
       def integrate
+        EY::Serverside::LoggedOutput.verbose = options[:verbose]
+        EY::Serverside::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-integrate.log")
+
         app_dir = Pathname.new "/data/#{options[:app]}"
         current_app_dir = app_dir + "current"
 
@@ -129,23 +134,22 @@ module EY
         integrate_options[:branch] = (current_app_dir + 'REVISION').read.strip
 
         config = EY::Serverside::Deploy::Configuration.new(integrate_options)
-        shell = init_shell(config.verbose, "#{config.app}-integrate")
 
         load_servers(config)
 
-        propagate(shell)
+        invoke :propagate
 
         EY::Serverside::Server.all.each do |server|
-          server.sync_directory(app_dir) { |cmd| shell.logged_system(cmd) }
+          server.sync_directory app_dir
           # we're just about to recreate this, so it has to be gone
           # first. otherwise, non-idempotent deploy hooks could screw
           # things up, and since we don't control deploy hooks, we must
           # assume the worst.
-          run_on_server(server,"rm -rf #{current_app_dir}")
+          server.run("rm -rf #{current_app_dir}")
         end
 
         # deploy local-ref to other instances into /data/$app/local-current
-        EY::Serverside::Deploy.new(config, shell).cached_deploy
+        EY::Serverside::Deploy.new(config).cached_deploy
       end
 
       method_option :app,             :type     => :string,
@@ -173,13 +177,15 @@ module EY
                                       :aliases  => ["-v"]
       desc "restart", "Restart app servers, conditionally enabling maintenance page"
       def restart
+        EY::Serverside::LoggedOutput.verbose = options[:verbose]
+        EY::Serverside::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-restart.log")
+
         config = EY::Serverside::Deploy::Configuration.new(options)
-        shell = init_shell(config.verbose, "#{config.app}-restart")
         load_servers(config)
 
-        propagate(shell)
+        invoke :propagate
 
-        EY::Serverside::Deploy.new(config, shell).restart_with_maintenance_page
+        EY::Serverside::Deploy.new(config).restart_with_maintenance_page
       end
 
       desc "install_bundler [VERSION]", "Make sure VERSION of bundler is installed (in system ruby)"
@@ -197,10 +203,8 @@ module EY
         end
       end
 
-      private
-
-      # Put the same engineyard-serverside on all the servers (Used to be public but is unused as an actual CLI command now)
-      def propagate(shell)
+      desc "propagate", "Propagate the engineyard-serverside gem to the other instances in the cluster. This will install exactly version #{EY::Serverside::VERSION}."
+      def propagate
         config          = EY::Serverside::Deploy::Configuration.new
         gem_filename    = "engineyard-serverside-#{EY::Serverside::VERSION}.gem"
         local_gem_file  = File.join(Gem.dir, 'cache', gem_filename)
@@ -215,37 +219,28 @@ module EY
           # 0.5.11, and mistakenly thinking 0.5.1 is there
           has_gem_cmd = "#{gem_binary} list engineyard-serverside | grep \"engineyard-serverside\" | egrep -q '#{egrep_escaped_version}[,)]'"
 
-          if !run_on_server(server,has_gem_cmd) # doesn't have this exact version
-            shell.status "Installing engineyard-serverside on #{server.hostname}"
+          if !server.run(has_gem_cmd)  # doesn't have this exact version
+            puts "~> Installing engineyard-serverside on #{server.hostname}"
 
-            shell.logged_system(Escape.shell_command([
+            system(Escape.shell_command([
               'scp', '-i', "#{ENV['HOME']}/.ssh/internal",
               "-o", "StrictHostKeyChecking=no",
               local_gem_file,
              "#{config.user}@#{server.hostname}:#{remote_gem_file}",
             ]))
-            run_on_server(server,"sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
+            server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
           end
         end
 
         EY::Serverside::Future.success?(futures)
       end
 
-      def init_shell(verbose, log_basename)
-        EY::Serverside::Shell.new(
-          :verbose  => verbose,
-          :log_path => File.join(ENV['HOME'], "#{log_basename}.log")
-        )
-      end
+      private
 
       def load_servers(config)
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
       end
 
-      def run_on_server(server, command)
-        server.run(command) { |cmd| shell.logged_system(cmd) }
-      end
-
       def assemble_instance_hashes(config)
         options[:instances].collect { |hostname|
           { :hostname => hostname,

data/lib/engineyard-serverside/configuration.rb

@@ -55,10 +55,6 @@ module EY
         EY::Serverside.node
       end
 
-      def verbose
-        configuration['verbose']
-      end
-
       def app
         configuration['app'].to_s
       end

data/lib/engineyard-serverside/deploy.rb

@@ -7,21 +7,22 @@ require 'engineyard-serverside/rails_asset_support'
 module EY
   module Serverside
     class DeployBase < Task
+      include LoggedOutput
       include ::EY::Serverside::RailsAssetSupport
 
       # default task
       def deploy
-        shell.status "Starting deploy at #{shell.start_time.asctime}"
+        debug "Starting deploy at #{Time.now.asctime}"
         update_repository_cache
         cached_deploy
       end
 
       def cached_deploy
-        shell.status "Deploying app from cached copy at #{Time.now.asctime}"
+        debug "Deploying app from cached copy at #{Time.now.asctime}"
         require_custom_tasks
         push_code
 
-        shell.status "Starting full deploy"
+        info "~> Starting full deploy"
         copy_repository_cache
         check_repository
 
@@ -46,9 +47,9 @@ module EY
         disable_maintenance_page
 
         cleanup_old_releases
-        shell.status "Finished deploy at #{Time.now.asctime}"
+        debug "Finished deploy at #{Time.now.asctime}"
       rescue Exception
-        shell.status "Finished failing to deploy at #{Time.now.asctime}"
+        debug "Finished failing to deploy at #{Time.now.asctime}"
         puts_deploy_failure
         raise
       end
@@ -72,9 +73,9 @@ module EY
 
       def check_repository
         if gemfile?
-          shell.status "Gemfile found."
+          info "~> Gemfile found."
           if lockfile
-            shell.status "Gemfile.lock found."
+            info "~> Gemfile.lock found."
             unless lockfile.any_database_adapter?
               warning <<-WARN
 Gemfile.lock does not contain a recognized database adapter.
@@ -96,7 +97,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
             WARN
           end
         else
-          shell.status "No Gemfile. Deploying without bundler support."
+          info "~> No Gemfile. Deploying without bundler support."
         end
       end
 
@@ -162,9 +163,9 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
 
       # task
       def push_code
-        shell.status "Pushing code to all servers"
+        info "~> Pushing code to all servers"
         futures = EY::Serverside::Future.call(EY::Serverside::Server.all) do |server|
-          server.sync_directory(config.repository_cache) { |cmd| shell.logged_system(cmd) }
+          server.sync_directory(config.repository_cache)
         end
         EY::Serverside::Future.success?(futures)
       end
@@ -172,7 +173,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       # task
       def restart
         @restart_failed = true
-        shell.status "Restarting app servers"
+        info "~> Restarting app servers"
         roles :app_master, :app, :solo do
           run(restart_command)
         end
@@ -242,7 +243,7 @@ WRAP
       def clean_release_directory(dir, count = 3)
         @cleanup_failed = true
         ordinal = count.succ.to_s
-        shell.status "Cleaning release directory: #{dir}"
+        info "~> Cleaning release directory: #{dir}"
         sudo "ls -r #{dir} | tail -n +#{ordinal} | xargs -I@ rm -rf #{dir}/@"
         @cleanup_failed = false
       end
@@ -254,15 +255,15 @@ WRAP
           c.release_path = c.previous_release(rolled_back_release)
 
           revision = File.read(File.join(c.release_path, 'REVISION')).strip
-          shell.status "Rolling back to previous release: #{short_log_message(revision)}"
+          info "~> Rolling back to previous release: #{short_log_message(revision)}"
 
           run_with_callbacks(:symlink)
           sudo "rm -rf #{rolled_back_release}"
           bundle
-          shell.status "Restarting with previous release."
+          info "~> Restarting with previous release."
           with_maintenance_page { run_with_callbacks(:restart) }
         else
-          shell.status "Already at oldest release, nothing to roll back to."
+          info "~> Already at oldest release, nothing to roll back to."
           exit(1)
         end
       end
@@ -273,17 +274,17 @@ WRAP
         @migrations_reached = true
         roles :app_master, :solo do
           cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} #{c.migration_command}"
-          shell.status "Migrating: #{cmd}"
+          info "~> Migrating: #{cmd}"
           run(cmd)
         end
       end
 
       # task
       def copy_repository_cache
-        shell.status "Copying to #{c.release_path}"
+        info "~> Copying to #{c.release_path}"
         run("mkdir -p #{c.release_path} #{c.failed_release_dir} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
 
-        shell.status "Ensuring proper ownership."
+        info "~> Ensuring proper ownership."
         sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
       end
 
@@ -299,12 +300,8 @@ WRAP
         "/usr/local/ey_resin/ruby/bin/ey-services-setup #{config.app}"
       end
 
-      def node_package_manager_command_check
-        "which npm"
-      end
-
       def setup_services
-        shell.status "Setting up external services."
+        info "~> Setting up external services."
         previously_configured_services = parse_configured_services
         begin
           sudo(services_command_check)
@@ -340,24 +337,24 @@ YML
 WRAP
            ["Symlink database.yml", "ln -nfs #{c.shared_path}/config/database.sqlite3.yml #{c.release_path}/config/database.yml"],
           ].each do |what, cmd|
-            shell.status "#{what}"
+            info "~> #{what}"
             run(cmd)
           end
 
           owner = [c.user, c.group].join(':')
-          shell.status "Setting ownership to #{owner}"
+          info "~> Setting ownership to #{owner}"
           sudo "chown -R #{owner} #{c.release_path}"
         end
       end
 
       def symlink_configs(release_to_link=c.release_path)
-        shell.status "Preparing shared resources for release."
+        info "~> Preparing shared resources for release."
         symlink_tasks(release_to_link).each do |what, cmd|
-          shell.status "#{what}"
+          info "~> #{what}"
           run(cmd)
         end
         owner = [c.user, c.group].join(':')
-        shell.status "Setting ownership to #{owner}"
+        info "~> Setting ownership to #{owner}"
         sudo "chown -R #{owner} #{release_to_link}"
       end
 
@@ -380,7 +377,7 @@ WRAP
 
       # task
       def symlink(release_to_link=c.release_path)
-        shell.status "Symlinking code."
+        info "~> Symlinking code."
         run "rm -f #{c.current_path} && ln -nfs #{release_to_link} #{c.current_path} && chown -R #{c.user}:#{c.group} #{c.current_path}"
         @symlink_changed = true
       rescue Exception
@@ -428,9 +425,9 @@ WRAP
 
       def puts_deploy_failure
         if @cleanup_failed
-          shell.status "[Relax] Your site is running new code, but clean up of old deploys failed."
+          info "~> [Relax] Your site is running new code, but clean up of old deploys failed."
         elsif @maintenance_up
-          shell.status "[Attention] Maintenance page still up, consider the following before removing:"
+          info "~> [Attention] Maintenance page still up, consider the following before removing:"
           info " * Deploy hooks ran. This might cause problems for reverting to old code." if @callbacks_reached
           info " * Migrations ran. This might cause problems for reverting to old code." if @migrations_reached
           if @symlink_changed
@@ -440,9 +437,9 @@ WRAP
           end
           info " * Application servers failed to restart." if @restart_failed
           info ""
-          shell.status "Need help? File a ticket for support."
+          info "~> Need help? File a ticket for support."
         else
-          shell.status "[Relax] Your site is still running old code and nothing destructive has occurred."
+          info "~> [Relax] Your site is still running old code and nothing destructive has occurred."
         end
       end
 
@@ -455,7 +452,7 @@ WRAP
       def with_failed_release_cleanup
         yield
       rescue Exception
-        shell.status "Release #{c.release_path} failed, saving release to #{c.failed_release_dir}."
+        info "~> Release #{c.release_path} failed, saving release to #{c.failed_release_dir}."
         sudo "mv #{c.release_path} #{c.failed_release_dir}"
         raise
       end
@@ -488,7 +485,7 @@ WRAP
 
       def check_ruby_bundler
         if gemfile?
-          shell.status "Bundling gems..."
+          info "~> Bundling gems..."
 
           clean_bundle_on_system_version_change
 
@@ -519,18 +516,14 @@ WRAP
 
       def check_node_npm
         if File.exist?("#{c.release_path}/package.json")
-          unless run(node_package_manager_command_check)
-            abort "*** [Error] package.json detected, but npm was not installed"
-          else
-            shell.status "package.json detected, installing npm packages"
-            run "cd #{c.release_path} && npm install"
-          end
+          info "~> package.json detected, installing npm packages"
+          run "cd #{c.release_path} && npm install"
         end
       end
     end   # DeployBase
 
     class Deploy < DeployBase
-      def self.new(config, shell=nil)
+      def self.new(config)
         # include the correct fetch strategy
         include EY::Serverside::Strategies.const_get(config.strategy)::Helpers
         super

data/lib/engineyard-serverside/deploy_hook.rb

@@ -1,8 +1,8 @@
 module EY
   module Serverside
     class DeployHook < Task
-      def initialize(options, shell = nil)
-        super(EY::Serverside::Deploy::Configuration.new(options), shell)
+      def initialize(options)
+        super(EY::Serverside::Deploy::Configuration.new(options))
       end
 
       def callback_context

data/lib/engineyard-serverside/deprecation.rb

@@ -3,14 +3,24 @@ module EY
     def self.deprecation_warning(msg)
       $stderr.puts "DEPRECATION WARNING: #{msg}"
     end
+  end
 
-    def self.const_missing(const)
-      if const == :LoggedOutput
-        EY::Serverside.deprecation_warning("EY::Serverside::LoggedOutput has been deprecated. Use EY::Serverside::Shell::Helpers instead.")
-        EY::Serverside::Shell::Helpers
-      else
-        super
-      end
+  def self.const_missing(const)
+    if EY::Serverside.const_defined?(const)
+      EY::Serverside.deprecation_warning("EY::#{const} has been deprecated. use EY::Serverside::#{const} instead")
+      EY::Serverside.class_eval(const.to_s)
+    else
+      super
     end
   end
+
+  def self.node
+    EY::Serverside.deprecation_warning("EY.node has been deprecated. use EY::Serverside.node instead")
+    EY::Serverside.node
+  end
+
+  def self.dna_json
+    EY::Serverside.deprecation_warning("EY.dna_json has been deprecated. use EY::Serverside.dna_json instead")
+    EY::Serverside.dna_json
+  end
 end

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -24,7 +24,7 @@ module EY
           @contents.index(/^\s+#{type}\s\([^\)]+\)$/)
         end
 
-        any_jruby_adapter = %w[mysql postgresql].any? do |type|
+        any_jruby_adapter = %w[mysql postgresql postgres].any? do |type|
           @contents.index(/^\s+jdbc-#{type}\s\([^\)]+\)$/) || @contents.index(/^\s+activerecord-jdbc#{type}-adapter\s\([^\)]+\)$/)
         end
 

data/lib/engineyard-serverside/logged_output.rb

@@ -0,0 +1,90 @@
+require 'open4'
+
+module EY
+  module Serverside
+    module LoggedOutput
+
+      class Tee
+        def initialize(*streams)
+          @streams = streams.flatten
+        end
+
+        def <<(output)
+          @streams.each do |s|
+            s << output
+            s.flush
+          end
+          self
+        end
+      end # Tee
+
+      @@logfile = File.join(ENV['HOME'], 'ey.log')
+      def self.logfile=(filename)
+        File.unlink filename if File.exist?(filename)  # start fresh
+        @@logfile = filename
+      end
+
+      def self.logfile
+        @@logfile
+      end
+
+      @@verbose = false
+      def self.verbose=(v)
+        @@verbose = !!v
+      end
+
+      def self.verbose?
+        @@verbose
+      end
+
+      def verbose?
+        EY::Serverside::LoggedOutput.verbose?
+      end
+
+      def warning(msg)
+        info "WARNING: #{msg}\n".gsub(/^/,'!> ')
+      end
+
+      def info(msg)
+        with_logfile do |log|
+          Tee.new($stdout, log) << ("#{with_timestamp(msg)}\n")
+        end
+      end
+
+      def debug(msg)
+        with_logfile do |log|
+          log << "#{with_timestamp(msg)}\n"
+        end
+      end
+
+      def logged_system(cmd)
+        with_logfile do |log|
+          out = verbose? ? Tee.new($stdout, log) : log
+          err = Tee.new($stderr, log)    # we always want to see errors
+
+          out <<  with_timestamp(":: running #{cmd}\n")
+
+          # :quiet means don't raise an error on nonzero exit status
+          status = Open4.spawn cmd, 0 => '', 1 => out, 2 => err, :quiet => true
+          status.exitstatus == 0
+        end
+      end
+
+      private
+      def with_logfile
+        File.open(logfile, 'a') {|f| yield f }
+      end
+
+      def logfile
+        EY::Serverside::LoggedOutput.logfile
+      end
+
+      def with_timestamp(msg)
+        return msg unless respond_to?(:starting_time)
+        time_passed = Time.now.to_i - starting_time.to_i
+        timestamp   = "+%2dm %02ds " % time_passed.divmod(60)
+        msg.gsub(/^/, timestamp)
+      end
+    end
+  end
+end