engineyard-serverside 1.6.5 → 1.7.0.pre2

data/lib/engineyard-serverside/logged_output.rb

@@ -1,91 +0,0 @@
-require 'systemu'
-
-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
-
-          cmd = "sh -l -c #{Escape.shell_command([cmd])}"
-          puts "running #{cmd}" if ENV['DEBUG']
-          out <<  with_timestamp(":: running #{cmd}\n")
-          status = systemu cmd, 'stdout' => out, 'stderr' => err
-          puts "exit status= #{status.exitstatus}" if ENV['DEBUG']
-          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

data/spec/logged_output_spec.rb

@@ -1,55 +0,0 @@
-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