timmy 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22d313c4caa316badf7f3aa3a2dd286ca7409290
-  data.tar.gz: 79ed29b958c3b909f6ee30710d04029eb6349f70
+  metadata.gz: 1dffd420c4f6701cdf73b18488939d50783a51a9
+  data.tar.gz: 57c3f635a25771abe102b10ae5739c0ccbd0ff2c
 SHA512:
-  metadata.gz: 86b21b72ed5bda63389081cf14a7bf185cc316ff85b564700c9df0d3470285726268f71e882ca0001994aa2da4dcc9dc513f5a6a7e5565a6307626429ae64852
-  data.tar.gz: c2a2ce42c84555784dbc00318e8a44a4da8082c4b85595e6b583ea5f845048f3a61c60c73b62a444348159e02b3f2a78a8450ccdb942ad746ea5e6c472c5e4ac
+  metadata.gz: 882a7604e4d4d90e293a88411c4fa9c8b2a85119bfaaf74ccb1ef49bfe17270cd9855e46aaf1a0bd52b706ad482f3934844d8a434732b2d0f421f8906283b64c
+  data.tar.gz: ea0f80623f0ef1173c4bf8e03399322e70ca0b4010e547e23193775eed20fc232fddefd03fea1a52763ab67831be1ba31a4a03b2a244bee2e3f0f308159a39b7

data/lib/timmy.rb

@@ -1,3 +1,4 @@
+require "timmy/command_streamer"
 require "timmy/config_loader"
 require "timmy/logger"
 require "timmy/master_timer"

data/lib/timmy/command_streamer.rb

@@ -0,0 +1,58 @@
+require 'open3'
+require 'thread'
+
+module Timmy
+  class CommandStreamer
+    class << self
+      def stream(command, &block)
+        self.new(command).stream(&block)
+      end
+    end
+
+    def initialize(command)
+      @command = command
+      @queue = Queue.new
+    end
+
+    def stream(&block)
+      Open3.popen3(*@command) do |stdin, stdout, stderr, wait_thr|
+        start_readers(stdout: stdout, stderr: stderr)
+        pop_lines_from_active_readers(block)
+        join_readers()
+      end
+    end
+
+    private
+
+    def start_readers(streams)
+      @readers = streams.map do |type, stream|
+        thread = Thread.new do
+          until (line = stream.gets).nil? do
+            @queue << [type, line]
+          end
+          @queue << [type, nil]
+        end
+
+        [type, thread]
+      end.to_h
+
+      @active_readers = @readers.keys
+    end
+
+    def pop_lines_from_active_readers(delegate)
+      while @active_readers.any? do
+        type, line = @queue.pop
+
+        if line
+          delegate.call(type, line)
+        else
+          @active_readers.delete(type)
+        end
+      end
+    end
+
+    def join_readers
+      @readers.values.each(&:join)
+    end
+  end
+end

data/lib/timmy/config_loader.rb

@@ -19,6 +19,10 @@ module Timmy
       TargetedTimerDefinition.delete(id)
     end
 
+    def set_quiet(quiet)
+      Logger.set_quiet(quiet)
+    end
+
     def set_precision(precision)
       Logger.set_precision(precision)
     end

data/lib/timmy/logger.rb

@@ -5,6 +5,10 @@ module Timmy
         @output_dir = File.expand_path(dir)
       end
 
+      def set_quiet(quiet)
+        @quiet = quiet
+      end
+
       def set_precision(precision)
         @precision = precision
       end
@@ -13,38 +17,61 @@ module Timmy
         @profile = profile
       end
 
-      def put_output(output)
+      def match_replay_header(line)
+        line.match(/^TIMMY-SESSION:v1:(?<s>\d+\.\d{9})$/)
+      end
+
+      def match_replay_line(line)
+        line.match(/^(?<s>\d+(\.\d+)?)(?<t>e)? (?<content>.*)/)
+      end
+
+      def put_output(output, error = false)
         duration = MasterTimer.get
-        formatted_duration = format_duration(duration)
 
-        puts feint(formatted_duration) + " " + output
+        if @quiet
+          puts output
+        else
+          formatted_duration = format_duration(duration)
+          formatted_duration = red(formatted_duration) if error
+          puts "\e[0m" + feint(formatted_duration) + " " + output
+        end
+        $stdout.flush
 
         @output ||= ''
-        @output += sprintf("%.9f %s\n", duration, output)
+        @output += sprintf("%.9f%s %s\n", duration, error ? 'e' : '', output)
       end
 
       def put_eof
-        put_output(feint("EOF"))
+        put_output(feint("EOF")) unless @quiet
       end
 
       def put_timer(timer)
-        puts format_timer(timer)
+        do_put_timer(timer) unless @quiet
       end
 
       def finalize
+        save
+        put_profile if profile?
+      end
+
+      private
+
+      def save
         suffix = "#{MasterTimer.start.to_i}+#{MasterTimer.get.to_i}"
         filename = File.join(output_dir, "timmy-#{suffix}.log")
-        header = sprintf("TIMMY-SESSION:v1:%.9f\n", MasterTimer.start)
 
-        File.write(filename, header + @output)
+        return if File.exists?(filename)
 
+        header = sprintf("TIMMY-SESSION:v1:%.9f\n", MasterTimer.start)
+        File.write(filename, header + @output)
         puts feint("Log written to #{filename}")
         puts
-
-        put_profile if profile?
       end
 
-      private
+      def do_put_timer(timer)
+        puts format_timer(timer)
+        $stdout.flush
+      end
 
       def put_profile
         slowest_timers = TargetedTimerManager
@@ -64,9 +91,14 @@ module Timmy
       end
 
       def format_timer(timer)
-        string = "#{bold(format_duration(timer.duration))} #{format_id(timer.definition.id)}"
-        string += " (#{timer.group})" if timer.group
-        string += ": #{green(timer.label)}" if timer.label
+        string = (
+          bold(format_duration(timer.duration)) +
+          " " +
+          bold(green(format_id(timer.definition.id)))
+        )
+
+        string += " " + green("(" + timer.group + ")") if timer.group
+        string += " #{timer.label}" if timer.label
 
         string
       end
@@ -80,16 +112,20 @@ module Timmy
         sprintf(format, duration / 60, duration % 60)
       end
 
-      def green(string)
-        "\e[0m\e[32m#{string}\e[0m"
-      end
-
       def bold(string)
-        "\e[0m\e[1m#{string}\e[0m"
+        "\e[1m#{string}\e[0m"
       end
 
       def feint(string)
-        "\e[0m\e[2m#{string}\e[0m"
+        "\e[2m#{string}\e[0m"
+      end
+
+      def green(string)
+        "\e[32m#{string}\e[0m"
+      end
+
+      def red(string)
+        "\e[31m#{string}\e[0m"
       end
 
       def output_dir

data/lib/timmy/option_parser.rb

@@ -2,6 +2,14 @@ module Timmy
   class OptionParser
     class << self
       def parse
+        if command_start_at = ARGV.find_index { |arg| arg == '--' }
+          command = ARGV.slice!(command_start_at, ARGV.length - command_start_at)[1..-1]
+        elsif ARGV[0] && !ARGV[0].start_with?('-')
+          command = ARGV.slice!(0, ARGV.length)
+        else
+          command = nil
+        end
+
         opts = {}
 
         ::OptionParser.new do |parser|
@@ -10,19 +18,25 @@ module Timmy
 
 \e[33mUsage:\e[0m
 
-Pipe output from arbitrary command:
+Pipe output from command:
+
+    \e[36mCOMMAND | timmy [OPTIONS]\e[0m
 
-    \e[36m[COMMAND] | timmy [OPTIONS]\e[0m
+Pass command as argument (records STDERR, gives more precise results):
+
+    \e[36mtimmy [OPTIONS --] COMMAND\e[0m
 
 Replay previous session:
 
-    \e[36mcat [LOGFILE] | timmy [OPTIONS]\e[0m
+    \e[36mcat LOGFILE | timmy [OPTIONS]\e[0m
 EOS
 
           parser.separator ""
           parser.separator "\e[33mOptions:\e[0m"
           parser.separator ""
 
+          parser.on("-q", "--quiet",
+            "Don't print times and targeted timers (default: false)")
           parser.on("-p", "--precision NUM", Integer,
             "Set precision used when printing time (default: 0)")
           parser.on("-r", "--[no-]profile",
@@ -33,7 +47,10 @@ EOS
           parser.separator ""
         end.parse!(into: opts)
 
-        opts.map { |key, value| [key.to_s.gsub('-', '_').to_sym, value] }.to_h
+        opts = opts.map { |key, value| [key.to_s.gsub('-', '_').to_sym, value] }.to_h
+        opts[:command] = command if command
+
+        opts
       end
     end
   end

data/lib/timmy/runner.rb

@@ -10,10 +10,17 @@ module Timmy
 
         options = OptionParser.parse
         replay_speed = options[:replay_speed] || @replay_speed
+        Logger.set_quiet(options[:quiet]) if options.key?(:quiet)
         Logger.set_precision(options[:precision]) if options.key?(:precision)
         Logger.set_profile(options[:profile]) if options.key?(:profile)
 
-        self.new(replay_speed: replay_speed).consume_stdin
+        instance = self.new(replay_speed: replay_speed)
+
+        if command = options[:command]
+          instance.stream_command(command)
+        else
+          instance.consume_stdin()
+        end
       end
     end
 
@@ -22,6 +29,14 @@ module Timmy
       @last_replay_time = 0
     end
 
+    def stream_command(command)
+      around_run_lines do
+        CommandStreamer.stream(command) do |type, line|
+          run_line(line.rstrip, type)
+        end
+      end
+    end
+
     def consume_stdin
       around_run_lines do
         STDIN.each_line do |line|
@@ -33,8 +48,6 @@ module Timmy
             run_line(line.rstrip)
           end
         end
-
-        Logger.put_eof unless @replay_mode
       end
     end
 
@@ -42,7 +55,7 @@ module Timmy
 
     def init_replay_mode(line)
       if @replay_mode == nil
-        if (match = line.match(/^TIMMY-SESSION:v1:(?<s>\d+\.\d{9})$/))
+        if (match = Logger.match_replay_header(line))
           MasterTimer.start(match[:s].to_f)
           @replay_mode = true
         else
@@ -56,13 +69,16 @@ module Timmy
 
       yield
 
+      Logger.put_eof unless @replay_mode
       TargetedTimerManager.stop_all
       Logger.finalize
     end
 
     def replay_line(line)
-      line_match = line.match(/^(?<s>\d+(\.\d+)?) (?<content>.*)/)
+      line_match = Logger.match_replay_line(line)
+      line_content = line_match[:content]
       line_time = line_match[:s].to_f
+      line_type = (line_match.send(:[], :t) rescue nil) == 'e' ? :stderr : :stdout
 
       duration = line_time - @last_replay_time
       sleep duration / @replay_speed if @replay_speed
@@ -70,12 +86,12 @@ module Timmy
 
       MasterTimer.set(line_time)
 
-      run_line(line_match[:content])
+      run_line(line_content, line_type)
     end
 
-    def run_line(line)
+    def run_line(line, type = :stdout)
       TargetedTimerManager.start_for_line(line)
-      Logger.put_output(line)
+      Logger.put_output(line, type == :stderr)
       TargetedTimerManager.stop_for_line(line)
     end
   end

data/lib/timmy/targeted_timer_manager.rb

@@ -3,7 +3,7 @@ module Timmy
     class << self
       def start_for_line(line)
         TargetedTimerDefinition.all.each do |definition|
-          if match = line.match(definition.start_regex)
+          if match = match_line(line, definition.start_regex)
             label = get_capture(match, :label)
             group = get_capture(match, :group)
 
@@ -16,7 +16,7 @@ module Timmy
       def stop_for_line(line)
         started.each do |timer|
           if (stop_regex = timer.definition.stop_regex) &&
-             (match = line.match(stop_regex)) &&
+             (match = match_line(line, stop_regex)) &&
              get_capture(match, :group) == timer.group
             stop(timer)
           end
@@ -53,6 +53,10 @@ module Timmy
 
       private
 
+      def match_line(line, regex)
+        line.gsub(/(\x1b\[[0-9;]*m)/, '').match(regex)
+      end
+
       def get_capture(match, name)
         match[name]
       rescue IndexError

data/lib/timmy/version.rb

@@ -1,3 +1,3 @@
 module Timmy
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timmy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Karol Słuszniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - bin/timmy
 - lib/timmy.rb
+- lib/timmy/command_streamer.rb
 - lib/timmy/config_loader.rb
 - lib/timmy/logger.rb
 - lib/timmy/master_timer.rb