engineyard-serverside 1.5.25 → 1.5.26

data/lib/engineyard-serverside/deploy.rb

@@ -377,6 +377,10 @@ Deploy again if your services configuration appears incomplete or out of date.
 
       protected
 
+      def starting_time
+        @starting_time ||= Time.now
+      end
+
       def gemfile?
         File.exist?("#{c.release_path}/Gemfile")
       end

data/lib/engineyard-serverside/logged_output.rb

@@ -42,18 +42,18 @@ module EY
       end
 
       def warning(msg)
-        info "\nWARNING: #{msg}\n".gsub(/^/,'!> ')
+        info "WARNING: #{msg}\n".gsub(/^/,'!> ')
       end
 
       def info(msg)
         with_logfile do |log|
-          Tee.new($stdout, log) << (msg + "\n")
+          Tee.new($stdout, log) << ("#{with_timestamp(msg)}\n")
         end
       end
 
       def debug(msg)
         with_logfile do |log|
-          log << "#{msg}\n"
+          log << "#{with_timestamp(msg)}\n"
         end
       end
 
@@ -62,7 +62,7 @@ module EY
           out = verbose? ? Tee.new($stdout, log) : log
           err = Tee.new($stderr, log)    # we always want to see errors
 
-          out <<  ":: running #{cmd}\n"
+          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
@@ -79,6 +79,12 @@ module EY
         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

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.25'
+    VERSION = '1.5.26'
   end
 end

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/spec_helper.rb

@@ -18,7 +18,24 @@ module EY
     end
 
     module LoggedOutput
-      def info(_) end
+      def self.enable_actual_info!
+        @use_actual_info = true
+      end
+
+      def self.disable_actual_info!
+        @use_actual_info = false
+      end
+
+      def self.use_actual_info?
+        @use_actual_info
+      end
+
+      alias old_info info
+      def info(*args)
+        if EY::Serverside::LoggedOutput.use_actual_info?
+          old_info(*args)
+        end
+      end
 
       def logged_system(cmd)
         output = `#{cmd} 2>&1`

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 1
   - 5
-  - 25
-  version: 1.5.25
+  - 26
+  version: 1.5.26
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -64,6 +64,20 @@ dependencies:
   type: :development
   prerelease: false
   name: rdoc
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  type: :development
+  prerelease: false
+  name: timecop
 description: 
 email: cloud@engineyard.com
 executables: 
@@ -284,7 +298,6 @@ files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -304,6 +317,7 @@ files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/logged_output_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb
@@ -352,7 +366,6 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
-- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -372,6 +385,7 @@ test_files:
 - spec/fixtures/valid_hook.rb
 - spec/git_strategy_spec.rb
 - spec/lockfile_parser_spec.rb
+- spec/logged_output_spec.rb
 - spec/nodejs_deploy_spec.rb
 - spec/rails31_deploy_spec.rb
 - spec/restart_spec.rb