engineyard-serverside 1.5.28.pre.timestamps4 → 1.5.28

data/lib/engineyard-serverside/shell.rb

@@ -1,150 +0,0 @@
-require 'logger'
-
-module EY
-  module Serverside
-    # FileIO
-
-    class Shell
-      # Compatibility with old LoggedOutput where the module was included into the class.
-      module Helpers
-        def verbose?
-          shell.verbose?
-        end
-
-        def warning(*a)
-          shell.warning(*a)
-        end
-
-        def info(*a)
-          shell.info(*a)
-        end
-
-        def debug(*a)
-          shell.debug(*a)
-        end
-
-        def logged_system(*a)
-          shell.logged_system(*a)
-        end
-      end
-
-      class Formatter
-
-        def initialize(stdout, stderr, start_time, verbose)
-          @stdout, @stderr = stdout, stderr
-          @start = start_time.to_i
-          @verbose = verbose
-        end
-
-        def call(severity, time, _, message)
-          if %w[WARN ERROR FATAL].include?(severity)
-            msg = prepend("#{timestamp(time)}!> ", "#{severity_name(severity)}#{message}")
-          else
-            msg = prepend(timestamp(time), message)
-          end
-
-          put_to_io(severity, msg)
-          msg
-        end
-
-        def prepend(pre, str)
-          str.gsub(/^/, pre).sub(/\n?\z/m,"\n")
-        end
-
-        def put_to_io(severity, msg)
-          if severity == "DEBUG" && !@verbose
-            # quiet
-          elsif severity == "INFO"
-            #@stdout << msg
-            #@stdout.flush
-          else
-            #@stderr << msg
-            #@stderr.flush
-          end
-        end
-
-        def timestamp(datetime)
-          diff = datetime.to_i - @start
-          diff = 0 if diff < 0
-          "+%2dm %02ds " % diff.divmod(60)
-        end
-
-        def severity_name(severity)
-          if %w[INFO DEBUG ANY].include?(severity)
-            ""
-          elsif severity =='WARN'
-            "WARNING: "
-          else
-            "#{severity}: "
-          end
-        end
-      end
-
-      class YieldIO
-        def initialize(&block)
-          @block = block
-        end
-
-        def <<(str)
-          @block.call str
-        end
-      end
-
-      attr_reader :logger
-
-      def initialize(options)
-        @start_time = options[:start_time]
-        @verbose    = options[:verbose]
-
-        @log_pathname = Pathname.new(options[:log_path])
-        @log_pathname.unlink if @log_pathname.exist? # start fresh
-
-        @stdout = options[:stdout] || $stdout
-        @stderr = options[:stderr] || $stderr
-
-        @logger = Logger.new(@log_pathname.to_s)
-        @logger.level = Logger::DEBUG # Always log to the file at debug, formatter hides debug for non-verbose
-        @logger.formatter = Formatter.new(@stdout, @stderr, start_time, @verbose)
-      end
-
-      def start_time
-        @start_time ||= Time.now
-      end
-
-      # a nice info outputter that prepends spermy operators for some reason.
-      def status(msg)
-        info msg.gsub(/^/, '~> ')
-      end
-
-      # a debug outputter that displays a command being run
-      def running(cmd)
-        debug ":: running #{cmd}"
-      end
-
-      def fatal(msg)   logger.fatal msg end
-      def error(msg)   logger.error msg end
-      def warning(msg) logger.warn  msg end
-      def info(msg)    logger.info  msg end
-      def debug(msg)   logger.debug msg end
-
-      def logged_system(cmd)
-        running(cmd)
-        # :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
-
-      # Return an IO that outputs to stdout or not according to the verbosity settings
-      # debug is hidden in non-verbose mode
-      def out
-        YieldIO.new { |msg| logger.debug(msg) }
-      end
-
-      # Return an IO that outputs to stderr
-      # unknown always shows, but without a severity title
-      def err
-        YieldIO.new { |msg| logger.unknown(msg) }
-      end
-    end
-  end
-end

data/spec/shell_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-require 'tempfile'
-require 'timecop'
-
-describe EY::Serverside::Shell do
-  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)
-
-    @output = StringIO.new
-    @shell = EY::Serverside::Shell.new(:verbose => true, :stdout => @output, :stderr => @output, :log_path => Pathname.new(Dir.tmpdir).join("engineyard-serverside-#{Time.now.to_i}-${$$}.log"), :start_time => time1)
-
-    Timecop.freeze(time1) do
-      @shell.debug('test1')
-      @shell.warning('test2')
-    end
-    Timecop.freeze(time2) do
-      @shell.info('test3')
-      @shell.debug("test11\ntest12\ntest13")
-      @shell.warning("test21\ntest22\ntest23")
-    end
-    Timecop.freeze(time3) do
-      @shell.info("test31\ntest32\ntest33")
-    end
-
-    timestamp_1 = "+ 0m 00s "
-    timestamp_2 = "+ 3m 05s "
-    timestamp_3 = "+10m 25s "
-    @output.rewind
-    @output.read.should == <<-OUTPUT
-#{timestamp_1}test1
-#{timestamp_1}!> WARNING: test2
-#{timestamp_2}test3
-#{timestamp_2}test11
-#{timestamp_2}test12
-#{timestamp_2}test13
-#{timestamp_2}!> WARNING: test21
-#{timestamp_2}!> test22
-#{timestamp_2}!> test23
-#{timestamp_3}test31
-#{timestamp_3}test32
-#{timestamp_3}test33
-    OUTPUT
-  end
-end