engineyard-serverside 1.5.29.pre.timestamps2 → 1.5.30

data/lib/engineyard-serverside/rails_asset_support.rb

@@ -9,7 +9,7 @@ module EY
           keep_existing_assets
           cmd = "cd #{c.release_path} && PATH=#{c.binstubs_path}:$PATH #{c.framework_envs} rake assets:precompile || true"
           if rails_version
-            shell.status "Precompiling assets for rails v#{rails_version}"
+            info "~> Precompiling assets for rails v#{rails_version}"
           else
             warning "Precompiling assets even though Rails was not bundled."
           end
@@ -22,24 +22,24 @@ module EY
         return unless File.readable?(app_rb_path) # Not a Rails app in the first place.
 
         if File.directory?(File.join(c.release_path, 'app', 'assets'))
-          shell.status "app/assets/ found. Attempting Rails asset pre-compilation."
+          info "~> app/assets/ found. Attempting Rails asset pre-compilation."
         else
           return false
         end
 
         if app_builds_own_assets?
-          shell.status "public/assets already exists, skipping pre-compilation."
+          info "~> public/assets already exists, skipping pre-compilation."
           return
         end
         if app_disables_assets?(app_rb_path)
-          shell.status "application.rb has disabled asset compilation. Skipping."
+          info "~> application.rb has disabled asset compilation. Skipping."
           return
         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."
+          info "~> No 'assets:precompile' Rake task found. Skipping."
           return
         end
 =end

data/lib/engineyard-serverside/server.rb

@@ -1,8 +1,11 @@
 require 'open-uri'
+require 'engineyard-serverside/logged_output'
 
 module EY
   module Serverside
     class Server < Struct.new(:hostname, :roles, :name, :user)
+      include LoggedOutput
+
       class DuplicateHostname < StandardError
         def initialize(hostname)
           super "There is already an EY::Serverside::Server with hostname '#{hostname}'"
@@ -72,20 +75,20 @@ module EY
 
       def sync_directory(directory)
         return if local?
-        yield remote_command("mkdir -p #{directory}")
-        yield Escap.shell_command(%w[rsync --delete -aq -e] + [ssh_command, "#{directory}/", "#{user}@#{hostname}:#{directory}"])
+        run "mkdir -p #{directory}"
+        logged_system(%|rsync --delete -aq -e "#{ssh_command}" #{directory}/ #{user}@#{hostname}:#{directory}|)
       end
 
       def run(command)
-        yield local? ? command : remote_command(command)
-      end
-
-      def remote_command(command)
-        ssh_command + Escape.shell_command(["#{user}@#{hostname}", command])
+        if local?
+          logged_system(command)
+        else
+          logged_system(ssh_command + " " + Escape.shell_command(["#{user}@#{hostname}", command]))
+        end
       end
 
       def ssh_command
-        "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no "
+        "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
       end
 
     end

data/lib/engineyard-serverside/strategies/git.rb

@@ -1,3 +1,5 @@
+require 'engineyard-serverside/logged_output'
+
 module EY
   module Serverside
     module Strategies
@@ -26,7 +28,7 @@ module EY
             #
             # Rollback doesn't know about the repository location (nor
             # should it need to), but it would like to use #short_log_message.
-            klass.new(shell,
+            klass.new(
               :repository_cache => c[:repository_cache],
               :app => c[:app],
               :repo => c[:repo],
@@ -35,10 +37,11 @@ module EY
           end
         end
 
-        attr_reader :shell, :opts
+        include LoggedOutput
+
+        attr_reader :opts
 
-        def initialize(shell, opts)
-          @shell = shell
+        def initialize(opts)
           @opts = opts
         end
 
@@ -48,21 +51,21 @@ module EY
 
         def fetch
           if usable_repository?
-            shell.logged_system("#{git} fetch -q origin 2>&1")
+            logged_system("#{git} fetch -q origin 2>&1")
           else
             FileUtils.rm_rf(opts[:repository_cache])
-            shell.logged_system("git clone -q #{opts[:repo]} #{opts[:repository_cache]} 2>&1")
+            logged_system("git clone -q #{opts[:repo]} #{opts[:repository_cache]} 2>&1")
           end
         end
 
         def checkout
-          shell.status "Deploying revision #{short_log_message(to_checkout)}"
+          info "~> Deploying revision #{short_log_message(to_checkout)}"
           in_git_work_tree do
-            (shell.logged_system("git checkout -q '#{to_checkout}'") ||
-              shell.logged_system("git reset -q --hard '#{to_checkout}'")) &&
-              shell.logged_system("git submodule sync") &&
-              shell.logged_system("git submodule update --init") &&
-              shell.logged_system("git clean -dfq")
+            (logged_system("git checkout -q '#{to_checkout}'") ||
+              logged_system("git reset -q --hard '#{to_checkout}'")) &&
+              logged_system("git submodule sync") &&
+              logged_system("git submodule update --init") &&
+              logged_system("git clean -dfq")
           end
         end
 

data/lib/engineyard-serverside/task.rb

@@ -1,16 +1,12 @@
-require 'engineyard-serverside/shell'
-
 module EY
   module Serverside
     class Task
-      include EY::Serverside::Shell::Helpers
 
-      attr_reader :config, :shell
+      attr_reader :config
       alias :c :config
 
-      def initialize(conf, shell = nil)
+      def initialize(conf)
         @config = conf
-        @shell = shell
         @roles = :all
       end
 
@@ -22,7 +18,7 @@ module EY
         end
 
         if deploy_file
-          shell.status "Loading deployment task overrides from #{deploy_file}"
+          puts "~> Loading deployment task overrides from #{deploy_file}"
           instance_eval(File.read(deploy_file))
           true
         else
@@ -58,7 +54,7 @@ module EY
         servers = EY::Serverside::Server.from_roles(@roles)
         futures = EY::Serverside::Future.call(servers, block_given?) do |server, exec_block|
           to_run = exec_block ? block.call(server, cmd.dup) : cmd
-          server.run(Escape.shell_command(wrapper + [to_run])) { |cmd| shell.logged_system(cmd) }
+          server.run(Escape.shell_command(wrapper + [to_run]))
         end
 
         unless EY::Serverside::Future.success?(futures)

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.29.pre.timestamps2'
+    VERSION = '1.5.30'
   end
 end

data/spec/basic_deploy_spec.rb

@@ -12,17 +12,17 @@ describe "Deploying an application without Bundler" do
 
     # run a deploy
     config = EY::Serverside::Deploy::Configuration.new({
-      "strategy"      => "IntegrationSpec",
-      "deploy_to"     => @deploy_dir.to_s,
-      "group"         => `id -gn`.strip,
-      "stack"         => 'nginx_passenger',
-      "migrate"       => nil,
-      'app'           => 'foo',
-      'framework_env' => 'staging'
-    })
+        "strategy"      => "IntegrationSpec",
+        "deploy_to"     => @deploy_dir.to_s,
+        "group"         => `id -gn`.strip,
+        "stack"         => 'nginx_passenger',
+        "migrate"       => nil,
+        'app'           => 'foo',
+        'framework_env' => 'staging'
+      })
 
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(config, test_shell)
+    @deployer = FullTestDeploy.new(config)
     @deployer.deploy
   end
 

data/spec/bundler_deploy_spec.rb

@@ -32,7 +32,7 @@ describe "Deploying an application that uses Bundler" do
     end
 
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(config, test_shell)
+    @deployer = FullTestDeploy.new(config)
     @deployer.deploy
   end
 

data/spec/custom_deploy_spec.rb

@@ -34,7 +34,7 @@ describe "the EY::Serverside::Deploy API" do
       def disable_maintenance_page()               @call_order << 'disable_maintenance_page'               end
     end
 
-    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new, test_shell)
+    td = TestDeploy.new(EY::Serverside::Deploy::Configuration.new)
     td.deploy
     td.call_order.should == %w(
       push_code
@@ -60,7 +60,7 @@ describe "the EY::Serverside::Deploy API" do
     before(:each) do
       @tempdir = `mktemp -d -t custom_deploy_spec.XXXXX`.strip
       @config = EY::Serverside::Deploy::Configuration.new('repository_cache' => @tempdir)
-      @deploy = TestQuietDeploy.new(@config, test_shell)
+      @deploy = TestQuietDeploy.new(@config)
     end
 
     def write_eydeploy(relative_path, contents = "def got_new_methods() 'from the file on disk' end")
@@ -92,7 +92,7 @@ describe "the EY::Serverside::Deploy API" do
         def value() 'base' end
       end
 
-      deploy = TestDeploySuper.new(@config, test_shell)
+      deploy = TestDeploySuper.new(@config)
       deploy.require_custom_tasks.should be_true
       deploy.value.should == "base + derived"
     end

data/spec/deprecation_spec.rb

@@ -12,12 +12,34 @@ describe EY::Serverside do
     $stderr = @original_stderr
   end
 
-  it "deprecates EY::Serverside::LoggedOutput for EY::Serverside::Shell::Helpers" do
-    EY::Serverside::LoggedOutput.should == EY::Serverside::Shell::Helpers
-    @warnings.string.should include("EY::Serverside::LoggedOutput")
+  def check_deprecation(new_const, prints_warning = true)
+    old_name = new_const.to_s.gsub('EY::Serverside::', 'EY::')
+    eval(old_name).should == new_const
+    @warnings.string.should include(old_name) if prints_warning
+  end
+
+  it "preserves the old constants" do
+    names = %w[CLI Deploy DeployBase Deploy::Configuration
+               DeployHook LockfileParser LoggedOutput Server Task
+               Strategies Strategies::Git]
+
+    names.map do |name|
+      const = eval("::EY::Serverside::#{name}")
+      # The way deprecations are implemented currently, we don't print
+      # warning messages for constants that aren't directly under EY::
+      prints_warning = name.include?('::') ? false : true
+      check_deprecation(const, prints_warning)
+    end
+  end
+
+  it "deprecates EY.dna_json and EY.node" do
+    EY.dna_json.should == EY::Serverside.dna_json
+    @warnings.string.should include("EY.dna_json")
+    EY.node.should == EY::Serverside.node
+    @warnings.string.should include("EY.node")
   end
 
   it "doesn't interfere with unrelated constants" do
-    lambda{ EY::Serverside::WTFNotDefined }.should raise_error(NameError, /uninitialized constant.*WTFNotDefined/)
+    lambda{ EY::WTFNotDefined }.should raise_error(NameError, /uninitialized constant.*EY::WTFNotDefined/)
   end
 end

data/spec/git_strategy_spec.rb

@@ -2,12 +2,8 @@ require 'spec_helper'
 
 describe "the git deploy strategy" do
   subject do
-    EY::Serverside::Strategies::Git.new(
-      test_shell,
-      :repo => File.join(GITREPO_DIR, 'git'),
-      :repository_cache => GITREPO_DIR,
-      :ref => "master"
-    )
+    EY::Serverside::Strategies::Git.new(:repo => File.join(GITREPO_DIR, 'git'),
+                                        :repository_cache => GITREPO_DIR, :ref => "master")
   end
 
   before { subject.checkout }

data/spec/logged_output_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'tempfile'
+require 'timecop'
+
+class SampleLogUser
+  include EY::Serverside::LoggedOutput
+  def initialize
+    EY::Serverside::LoggedOutput.logfile = tempfile.path
+    EY::Serverside::LoggedOutput.verbose = true
+  end
+
+  def starting_time
+    @starting_time ||= Time.now
+  end
+
+  def tempfile
+    @tempfile ||= Tempfile.new('logged_output')
+  end
+end
+
+describe EY::Serverside::LoggedOutput do
+  before do
+    EY::Serverside::LoggedOutput.enable_actual_info!
+    @log_user = SampleLogUser.new
+  end
+
+  after do
+    EY::Serverside::LoggedOutput.disable_actual_info!
+  end
+
+  it "has a timestamp before each line" do
+    time1 = Time.local(2008, 9, 1, 12, 0, 0)
+    time2 = Time.local(2008, 9, 1, 12, 3, 5)
+    time3 = Time.local(2008, 9, 1, 12, 10, 25)
+
+    Timecop.freeze(time1) do
+      @log_user.debug('test1')
+      @log_user.warning('test2')
+    end
+    Timecop.freeze(time2) do
+      @log_user.info('test3')
+
+      @log_user.debug("test11\ntest12\ntest13")
+      @log_user.warning("test21\ntest22\ntest23")
+    end
+    Timecop.freeze(time3) do
+      @log_user.info("test31\ntest32\ntest33")
+    end
+
+    timestamp_1 = "+ 0m 00s "
+    timestamp_2 = "+ 3m 05s "
+    timestamp_3 = "+10m 25s "
+    File.read(@log_user.tempfile.path).should == "#{timestamp_1}test1\n#{timestamp_1}!> WARNING: test2\n\n#{timestamp_2}test3\n#{timestamp_2}test11\n#{timestamp_2}test12\n#{timestamp_2}test13\n#{timestamp_2}!> WARNING: test21\n#{timestamp_2}!> test22\n#{timestamp_2}!> test23\n\n#{timestamp_3}test31\n#{timestamp_3}test32\n#{timestamp_3}test33\n"
+  end
+end

data/spec/nodejs_deploy_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Deploying an application that uses Node.js and NPM" do
   def deploy_test_application
-    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset
@@ -19,7 +19,7 @@ describe "Deploying an application that uses Node.js and NPM" do
       })
 
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    @deployer = FullTestDeploy.new(config, test_shell)
+    @deployer = FullTestDeploy.new(config)
     @deployer.deploy do
       FileUtils.mkdir_p(config.repository_cache) # block runs before deploy
       @deployer.generate_package_json_in(config.repository_cache)

data/spec/services_deploy_spec.rb

@@ -23,8 +23,9 @@ describe "Deploying an application with services" do
         'framework_env' => 'staging'
       })
 
+    EY::Serverside::LoggedOutput.verbose = true
     @binpath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
-    FullTestDeploy.new(config, test_shell)
+    FullTestDeploy.new(config)
   end
 
   def exist
@@ -64,7 +65,7 @@ DEPENDENCIES
       end
 
       it "warns about missing ey_config" do
-        read_stderr.should include("WARNING: Gemfile.lock does not contain ey_config")
+        @deployer.infos.should be_any { |info| info =~ /WARNING: Gemfile.lock does not contain ey_config/ }
       end
 
     end
@@ -74,7 +75,7 @@ DEPENDENCIES
       end
 
       it "works without warnings" do
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end
@@ -100,7 +101,7 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@invalid_services_yml}\n"
 
-      read_output.should_not =~ /WARNING/
+      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
     end
   end
 
@@ -124,7 +125,7 @@ DEPENDENCIES
       @symlinked_services_file.should be_symlink
       @shared_services_file.read.should == "#{@services_yml}\n"
 
-      read_output.should_not =~ /WARNING/
+      @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
     end
 
     describe "followed by a deploy that can't find the command" do
@@ -143,7 +144,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end
@@ -165,7 +166,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        read_stderr.should include('WARNING: External services configuration not updated')
+        @deployer.infos.should be_any { |info| info =~ /WARNING: External services configuration not updated/ }
       end
 
       it "does not log a warning or symlink a config file when there is no existing services file" do
@@ -175,7 +176,7 @@ DEPENDENCIES
         @shared_services_file.should_not exist
         @symlinked_services_file.should_not exist
 
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end
@@ -198,7 +199,7 @@ DEPENDENCIES
         @symlinked_services_file.should be_symlink
         @shared_services_file.read.should == "#{@services_yml}\n"
 
-        read_output.should_not =~ /WARNING/
+        @deployer.infos.should_not be_any { |info| info =~ /WARNING/ }
       end
 
     end