timmy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d197122524ccb2e1140f5cce09773a107679bfe
-  data.tar.gz: 463efa752c2bb2d56b33aa2886e792e9156f2ffd
+  metadata.gz: 22d313c4caa316badf7f3aa3a2dd286ca7409290
+  data.tar.gz: 79ed29b958c3b909f6ee30710d04029eb6349f70
 SHA512:
-  metadata.gz: b036c9c0a24faedfbf0407cb51b6353e60413115cc191922aa76f6cfeb3edb36727fee3be628920fd2124f970baf307c3f3b0dc575d12a113a239e9c8f59ce82
-  data.tar.gz: 96a35e620a984c902c18c317baca1890db96a6aa76bd53524aa8fbc7d3c44a590c016d42c27aa118974abed18033b5a783bc03fcb419ae673992d59c08edd473
+  metadata.gz: 86b21b72ed5bda63389081cf14a7bf185cc316ff85b564700c9df0d3470285726268f71e882ca0001994aa2da4dcc9dc513f5a6a7e5565a6307626429ae64852
+  data.tar.gz: c2a2ce42c84555784dbc00318e8a44a4da8082c4b85595e6b583ea5f845048f3a61c60c73b62a444348159e02b3f2a78a8450ccdb942ad746ea5e6c472c5e4ac

data/lib/timmy/config_loader.rb

@@ -10,5 +10,29 @@ module Timmy
         end
       end
     end
+
+    def add_timer(id, start_regex:, stop_regex: nil)
+      TargetedTimerDefinition.add(id, start_regex: start_regex, stop_regex: stop_regex)
+    end
+
+    def delete_timer(id)
+      TargetedTimerDefinition.delete(id)
+    end
+
+    def set_precision(precision)
+      Logger.set_precision(precision)
+    end
+
+    def set_logger_output_dir(dir)
+      Logger.set_output_dir(dir)
+    end
+
+    def set_profile(profile)
+      Logger.set_profile(profile)
+    end
+
+    def set_replay_speed(speed)
+      Runner.set_replay_speed(speed)
+    end
   end
 end

data/lib/timmy/logger.rb

@@ -1,14 +1,18 @@
 module Timmy
   class Logger
     class << self
-      def set_output_directory(dir)
-        @output_directory = dir
+      def set_output_dir(dir)
+        @output_dir = File.expand_path(dir)
       end
 
       def set_precision(precision)
         @precision = precision
       end
 
+      def set_profile(profile)
+        @profile = profile
+      end
+
       def put_output(output)
         duration = MasterTimer.get
         formatted_duration = format_duration(duration)
@@ -19,18 +23,39 @@ module Timmy
         @output += sprintf("%.9f %s\n", duration, output)
       end
 
+      def put_eof
+        put_output(feint("EOF"))
+      end
+
       def put_timer(timer)
         puts format_timer(timer)
       end
 
-      def put_stopped_profiles
-        puts "Slowest targeted timers:"
+      def finalize
+        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)
+
+        puts feint("Log written to #{filename}")
+        puts
+
+        put_profile if profile?
+      end
+
+      private
 
+      def put_profile
         slowest_timers = TargetedTimerManager
           .stopped
           .sort_by { |timer| -timer.duration }
           .slice(0, 10)
 
+        return unless slowest_timers.any?
+
+        puts "Slowest targeted timers:"
+
         slowest_timers.each do |timer|
           put_timer(timer)
         end
@@ -38,18 +63,6 @@ module Timmy
         puts
       end
 
-      def finalize
-        suffix = "#{MasterTimer.start.to_i}+#{MasterTimer.get.to_i}"
-        filename = File.join(output_directory, "timmy-#{suffix}.log")
-
-        File.write(filename, @output)
-
-        puts feint("Log written to #{filename}")
-        puts
-      end
-
-      private
-
       def format_timer(timer)
         string = "#{bold(format_duration(timer.duration))} #{format_id(timer.definition.id)}"
         string += " (#{timer.group})" if timer.group
@@ -79,13 +92,18 @@ module Timmy
         "\e[0m\e[2m#{string}\e[0m"
       end
 
-      def output_directory
-        @output_directory ||= "/tmp"
+      def output_dir
+        @output_dir ||= "/tmp"
       end
 
       def precision
         @precision ||= 0
       end
+
+      def profile?
+        @profile = false if @profile == nil
+        @profile
+      end
     end
   end
 end

data/lib/timmy/option_parser.rb

@@ -2,12 +2,7 @@ module Timmy
   class OptionParser
     class << self
       def parse
-        options = {
-          replay: nil,
-          profile: false,
-          logger_output_directory: nil,
-          logger_precision: nil
-        }
+        opts = {}
 
         ::OptionParser.new do |parser|
           parser.banner = <<-EOS
@@ -19,35 +14,26 @@ Pipe output from arbitrary command:
 
     \e[36m[COMMAND] | timmy [OPTIONS]\e[0m
 
-Run without a pipe (usually with --replay):
+Replay previous session:
 
-    \e[36mtimmy [OPTIONS]\e[0m
+    \e[36mcat [LOGFILE] | timmy [OPTIONS]\e[0m
 EOS
 
           parser.separator ""
           parser.separator "\e[33mOptions:\e[0m"
           parser.separator ""
 
-          parser.on("-r LOG", "--replay LOG", "Replay specific log file") do |replay|
-            options[:replay] = replay
-          end
-
-          parser.on("-p", "--profile", "Profile targeted timers") do |profile|
-            options[:profile] = profile
-          end
-
-          parser.on("--logger-output-dir DIR", "Save logs to different directory (default: \"/tmp\")") do |logger_output_directory|
-            options[:logger_output_directory] = logger_output_directory
-          end
-
-          parser.on("--logger-precision NUM", Integer, "Set precision used when printing time (default: 0)") do |logger_precision|
-            options[:logger_precision] = logger_precision
-          end
+          parser.on("-p", "--precision NUM", Integer,
+            "Set precision used when printing time (default: 0)")
+          parser.on("-r", "--[no-]profile",
+            "Profile slowest targeted timers (default: false)")
+          parser.on("-x", "--replay-speed NUM", Float,
+            "Replay with given speed (default: instant)")
 
           parser.separator ""
-        end.parse!
+        end.parse!(into: opts)
 
-        options
+        opts.map { |key, value| [key.to_s.gsub('-', '_').to_sym, value] }.to_h
       end
     end
   end

data/lib/timmy/runner.rb

@@ -1,74 +1,82 @@
 module Timmy
   class Runner
     class << self
+      def set_replay_speed(speed)
+        @replay_speed = speed
+      end
+
       def run
         ConfigLoader.load
 
         options = OptionParser.parse
+        replay_speed = options[:replay_speed] || @replay_speed
+        Logger.set_precision(options[:precision]) if options.key?(:precision)
+        Logger.set_profile(options[:profile]) if options.key?(:profile)
 
-        if value = options[:logger_output_directory]
-          Logger.set_output_directory(value)
-        end
-
-        if value = options[:logger_precision]
-          Logger.set_precision(value)
-        end
+        self.new(replay_speed: replay_speed).consume_stdin
+      end
+    end
 
-        if replay = options[:replay]
-          replay_log(replay)
-        else
-          consume_stdin
-        end
+    def initialize(replay_speed:)
+      @replay_speed = replay_speed
+      @last_replay_time = 0
+    end
 
-        if options[:profile]
-          Logger.put_stopped_profiles
-        end
-      end
+    def consume_stdin
+      around_run_lines do
+        STDIN.each_line do |line|
+          next if init_replay_mode(line)
 
-      def consume_stdin
-        around_run_lines do
-          STDIN.each_line do |line|
+          if @replay_mode
+            replay_line(line)
+          else
             run_line(line.rstrip)
           end
-          Logger.put_output("EOF")
         end
+
+        Logger.put_eof unless @replay_mode
       end
+    end
 
-      def replay_log(log)
-        around_run_lines do
-          start_time = File.basename(log).match(/timmy-(?<time>\d+)\+\d+.log/)[:time].to_i
-          MasterTimer.start(start_time)
-
-          File.readlines(log).each do |line|
-            if match = line.match(/^(?<m>\d+):(?<s>\d+(\.\d+)?) \| (?<content>.*)/)
-              line_time = match[:m].to_i * 60 + match[:s].to_f
-              MasterTimer.set(line_time)
-              run_line(match[:content])
-            elsif match = line.match(/^(?<s>\d+(\.\d+)?) (?<content>.*)/)
-              line_time = match[:s].to_f
-              MasterTimer.set(line_time)
-              run_line(match[:content])
-            end
-          end
+    private
+
+    def init_replay_mode(line)
+      if @replay_mode == nil
+        if (match = line.match(/^TIMMY-SESSION:v1:(?<s>\d+\.\d{9})$/))
+          MasterTimer.start(match[:s].to_f)
+          @replay_mode = true
+        else
+          @replay_mode = false
         end
       end
+    end
+
+    def around_run_lines
+      MasterTimer.start
 
-      private
+      yield
 
-      def around_run_lines
-        MasterTimer.start
+      TargetedTimerManager.stop_all
+      Logger.finalize
+    end
 
-        yield
+    def replay_line(line)
+      line_match = line.match(/^(?<s>\d+(\.\d+)?) (?<content>.*)/)
+      line_time = line_match[:s].to_f
 
-        TargetedTimerManager.stop_all
-        Logger.finalize
-      end
+      duration = line_time - @last_replay_time
+      sleep duration / @replay_speed if @replay_speed
+      @last_replay_time = line_time
 
-      def run_line(line)
-        TargetedTimerManager.start_for_line(line)
-        Logger.put_output(line)
-        TargetedTimerManager.stop_for_line(line)
-      end
+      MasterTimer.set(line_time)
+
+      run_line(line_match[:content])
+    end
+
+    def run_line(line)
+      TargetedTimerManager.start_for_line(line)
+      Logger.put_output(line)
+      TargetedTimerManager.stop_for_line(line)
     end
   end
 end

data/lib/timmy/version.rb

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

data/lib/timmy.rb

@@ -7,3 +7,11 @@ require "timmy/targeted_timer"
 require "timmy/targeted_timer_definition"
 require "timmy/targeted_timer_manager"
 require "timmy/version"
+
+module Timmy
+  module_function
+
+  def configure
+    yield(ConfigLoader.new)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timmy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Karol Słuszniak
@@ -52,9 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: A simple command line tool that allows to measure how much time an arbitrary
-  command spends on each stage of execution by annotating the command output with
-  timestamps as well as running command-specific targeted timers.
+description: 
 email:
 - ksluszniak@gmail.com
 executables: