timmy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 378e5c010407e6580faf572a2978188f53ec39f0
-  data.tar.gz: 8c3dd12f56e273ee41a833245624921798ef8c0d
+  metadata.gz: ab3e84bce8d95e5a76d488fb1abb5f8505c6c90a
+  data.tar.gz: 10ccacef3de073ba665185003850a0e83c4334e3
 SHA512:
-  metadata.gz: b2b47383177bbc8504e59536032cd2403dcf4c4677612017c9adecdb014d7bd9142e86bcd02e13cc308cac5356f9587301a9b0d5a426d44f59e8484991d6998a
-  data.tar.gz: 1fcdaff54247ee41a9fff01f76e27ec77f8fe7b34dd87a1b04204d316632bd0fa08fcfdfc0aca05656effc127b94fe79db47837dd491952e41f289997dad016a
+  metadata.gz: 26175e0bf819a6f13c5b9f29f28159c130865463837727ab23beb6d0d1e40f5101e5623025458719d3065a151a1f4f96c8f5c44b43ec53a686f1e2eb2d04550c
+  data.tar.gz: d0e2ee57f092eea87d35ea718cdc76704568cc09b89e443cfd79b3cfb5589d33816ae7099c913bf2da298bbe739a433c796b69a2145f386b520e82c3e673534d

data/bin/timmy

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'timmy'
+
+options = {
+  replay: nil,
+  profile: false
+}
+
+OptionParser.new do |parser|
+  parser.banner = "Usage: [COMMAND] | timmy"
+  parser.separator ""
+  parser.separator "Options:"
+  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
+end.parse!
+
+Timmy::ConfigLoader.load
+Timmy::Logger.clear
+
+if replay = options[:replay]
+  Timmy::Runner.replay_log(replay)
+else
+  Timmy::Runner.consume_stdin
+end
+
+if options[:profile]
+  Timmy::TargetedTimer.put_stopped_profiles
+end

data/lib/timmy/logger.rb

@@ -0,0 +1,59 @@
+module Timmy
+  class Logger
+    class << self
+      def clear
+        @output = ''
+      end
+
+      def set_output_directory(dir)
+        @output_directory = dir
+      end
+
+      def set_precision(precision)
+        @precision = precision
+      end
+
+      def put(line, internal: false, since: 0)
+        duration = format_duration(MasterTimer.get - since)
+        if internal
+          @output += "#{duration} > #{line}\n"
+          puts bold("#{duration} #{line}")
+        else
+          @output += "#{duration} | #{line}\n"
+          puts feint(duration) + " " + line
+        end
+      end
+
+      def finalize
+        suffix = "#{MasterTimer.start.to_i}+#{(MasterTimer.get).to_i}"
+        filename = File.join(output_directory, "timmy-#{suffix}.log")
+
+        put("EOF > #{filename}", internal: true)
+        File.write(filename, @output)
+      end
+
+      def format_duration(duration)
+        format = precision > 0 ? "%d:%0#{3 + precision}.#{precision}f" : "%d:%02d"
+        sprintf(format, duration / 60, duration % 60)
+      end
+
+      private
+
+      def bold(string)
+        "\e[0m\e[1m#{string}\e[0m"
+      end
+
+      def feint(string)
+        "\e[0m\e[2m#{string}\e[0m"
+      end
+
+      def output_directory
+        @output_directory ||= "/tmp"
+      end
+
+      def precision
+        @precision ||= 0
+      end
+    end
+  end
+end

data/lib/timmy/master_timer.rb

@@ -0,0 +1,20 @@
+module Timmy
+  class MasterTimer
+    class << self
+      def start(time = nil)
+        @start_time = time if time
+        @start_time ||= Time.now.to_f
+      end
+
+      def get
+        return @duration if @duration
+        Time.now.to_f - @start_time
+      end
+
+      def set(duration)
+        @duration = duration
+      end
+    end
+  end
+end
+

data/lib/timmy/runner.rb

@@ -0,0 +1,46 @@
+module Timmy
+  class Runner
+    class << self
+      def consume_stdin
+        MasterTimer.start
+
+        STDIN.each_line do |line|
+          run_line(line.rstrip)
+        end
+
+        TargetedTimer.stop_all
+        Logger.finalize
+      end
+
+      def replay_log(log)
+        basename = File.basename(log)
+        match = log.match(/timmy-(?<time>\d+)\+\d+.log/)
+        time = match[:time].to_i
+
+        MasterTimer.start(time)
+
+        lines = File.readlines(log)
+        lines.each do |line|
+          if match = line.match(/^(?<m>\d+):(?<s>\d+(\.\d+)?) \| (?<content>.*)/)
+            content = match[:content]
+            time = match[:m].to_i * 60 + match[:s].to_f
+
+            MasterTimer.set(time)
+            run_line(content)
+          end
+        end
+
+        TargetedTimer.stop_all
+        Logger.finalize
+      end
+
+      private
+
+      def run_line(line)
+        TargetedTimer.start_for_line(line)
+        Logger.put(line)
+        TargetedTimer.stop_for_line(line)
+      end
+    end
+  end
+end

data/lib/timmy/targeted_timer.rb

@@ -0,0 +1,85 @@
+module Timmy
+  class TargetedTimer
+    class << self
+      def start_for_line(line)
+        TargetedTimerDefinition.all.each do |definition|
+          if match = line.match(definition.start_regex)
+            stop_by_id(definition.id)
+            label = match.send(:[], :label) rescue nil
+            started.push(self.new(definition, label: label))
+          end
+        end
+      end
+
+      def stop_for_line(line)
+        started.each do |timer|
+          if (stop_regex = timer.definition.stop_regex) && line.match?(stop_regex)
+            stop(timer)
+          end
+        end
+      end
+
+      def stop(timer)
+        timer.stop
+        started.delete(timer)
+        stopped.push(timer)
+      end
+
+      def stop_by_id(id)
+        matches = started.select { |timer| timer.definition.id == id }
+        matches.each { |timer| stop(timer) }
+      end
+
+      def stop_all
+        started.each { |timer| stop(timer) }
+      end
+
+      def started
+        @started ||= []
+      end
+
+      def stopped
+        @stopped ||= []
+      end
+
+      def put_stopped_profiles
+        puts ""
+        puts "Slowest targeted timers:"
+        TargetedTimer.stopped.sort_by { |timer| -timer.duration }[0..9].each do |timer|
+          timer.put_profile
+        end
+      end
+    end
+
+    attr_reader :definition, :label, :duration
+
+    def initialize(definition, label: nil)
+      @definition = definition
+      @start_time = MasterTimer.get
+      @label = label
+    end
+
+    def stop
+      put
+      @duration = MasterTimer.get - @start_time
+    end
+
+    def put_profile
+      duration = Logger.format_duration(@duration)
+      puts " - #{duration} - #{formatted_id} - #{@label}"
+    end
+
+    private
+
+    def put
+      log_line = formatted_id
+      log_line += " #{@label}" if @label
+
+      Logger.put(log_line, since: @start_time, internal: true)
+    end
+
+    def formatted_id
+      @definition.id.to_s.split('_').collect(&:capitalize).join
+    end
+  end
+end

data/lib/timmy/targeted_timer_definition.rb

@@ -0,0 +1,26 @@
+module Timmy
+  class TargetedTimerDefinition
+    class << self
+      def add(id, start_regex:, stop_regex: nil)
+        all.push(self.new(id, start_regex: start_regex, stop_regex: stop_regex))
+      end
+
+      def all
+        @all ||= [
+          self.new(:docker_build,
+            start_regex: /Step \d+\/\d+ : (?<label>.*)$/,
+            stop_regex: / ---> [0-9a-f]{12}$/)
+        ]
+      end
+    end
+
+    attr_reader :id, :start_regex, :stop_regex
+
+    def initialize(id, start_regex:, stop_regex: nil)
+      @id = id
+
+      @start_regex = start_regex
+      @stop_regex = stop_regex
+    end
+  end
+end

data/lib/timmy/version.rb

@@ -1,3 +1,3 @@
 module Timmy
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/timmy.rb

@@ -1,4 +1,7 @@
 require "timmy/config_loader"
-require "timmy/meters"
-require "timmy/timer"
+require "timmy/logger"
+require "timmy/master_timer"
+require "timmy/runner"
+require "timmy/targeted_timer"
+require "timmy/targeted_timer_definition"
 require "timmy/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timmy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Karol Słuszniak
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: 
+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.
 email:
 - ksluszniak@gmail.com
 executables:
@@ -60,21 +62,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- LICENSE.md
-- README.md
-- Rakefile
-- bin/console
-- bin/setup
-- exe/timmy
+- bin/timmy
 - lib/timmy.rb
 - lib/timmy/config_loader.rb
-- lib/timmy/meters.rb
-- lib/timmy/timer.rb
+- lib/timmy/logger.rb
+- lib/timmy/master_timer.rb
+- lib/timmy/runner.rb
+- lib/timmy/targeted_timer.rb
+- lib/timmy/targeted_timer_definition.rb
 - lib/timmy/version.rb
-- timmy.gemspec
 homepage: https://github.com/karolsluszniak/timmy
 licenses:
 - MIT
@@ -98,5 +94,5 @@ rubyforge_project:
 rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: Time execution of command and its stages marked by console output
+summary: Time execution of commands and their stages based on console output
 test_files: []

data/.gitignore

@@ -1,8 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.16.5

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in timmy.gemspec
-gemspec

data/LICENSE.md

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Karol Słuszniak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/README.md

@@ -1,38 +0,0 @@
-# Timmy
-
-**Time execution of command and its stages marked by console output.**
-
-This tool allows to measure how much an arbitrary command line tool spends on each stage of its execution as long as it prints lines to standard output to indicate when these stages start and end.
-
-## Installation
-
-Install the gem globally:
-
-    gem install timmy
-
-## Usage
-
-Pipe the output from any command to it, e.g. from `docker build`:
-
-    docker build . | timmy
-
-As the most basic means for timing, each line of command output will be prefixed by total time elapsed since `timmy` has started.
-
-In addition, `timmy` is capable of capturing and timing specific stages of command execution by matching the output against its meter definitions. For example, there's a built-in support provided for `docker build` which means that:
-
-- meter is started every time Docker outputs something like `Step 16/22 : RUN bundle`
-- meter is stopped when Docker outputs something like ` ---> 8912f93fa8a5` and `timmy` prints the duration of a Docker build step that has just finished
-
-In the end, `timmy` will also write the entire output to a log file in `/tmp` in order to make it easier to run a series of benchmarks and refer back to their results.
-
-## Configuration
-
-You can add your own meters by creating `~/.timmy.rb` like below:
-
-```ruby
-Timmy::Meters.add(:docker_build_step,
-  start_regex: /Step \d+\/\d+ : (?<title>.*)$/,
-  end_regex: / ---> [0-9a-f]{12}$/)
-```
-
-Note that `end_regex` is optional - if absent, previous meter instance will be stopped every time a new is started.

data/Rakefile

@@ -1,10 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task :default => :test

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "timmy"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/exe/timmy

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'timmy'
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: [COMMAND] | timmy"
-end.parse!
-
-Timmy::ConfigLoader.load()
-Timmy::Timer.new().consume_stdin()

data/lib/timmy/meters.rb

@@ -1,24 +0,0 @@
-module Timmy
-  class Meters
-    BUILTIN = {
-      docker_build_step: {
-        begin_regex: /Step \d+\/\d+ : (?<title>.*)$/,
-        end_regex: / ---> [0-9a-f]{12}$/
-      }
-    }
-
-    class << self
-      def add(key, begin_regex:, end_regex: nil)
-        meters[key] = { begin_regex: begin_regex, end_regex: end_regex }
-      end
-
-      def clone_all
-        Marshal.load(Marshal.dump(meters))
-      end
-
-      def meters
-        @meters ||= BUILTIN
-      end
-    end
-  end
-end

data/lib/timmy/timer.rb

@@ -1,115 +0,0 @@
-module Timmy
-  class Timer
-    def initialize
-      @start_time = current_time()
-      @output = ""
-      @meters = Meters.clone_all
-    end
-
-    def consume_stdin
-      STDIN.each_line do |line|
-        line.rstrip!
-
-        try_start_meters(line)
-        put_line(line)
-        try_end_meters(line)
-      end
-
-      end_all_meters()
-      finalize()
-    end
-
-    private
-
-    def try_start_meters(line)
-      @meters.each do |key, meter|
-        begin_regex = meter.fetch(:begin_regex)
-
-        if meter_start = line.match(begin_regex)
-          end_meter(key) if meter.has_key?(:start_time)
-
-          title = begin
-            meter_start[:title]
-          rescue IndexError
-            nil
-          end
-
-          meter.merge!({
-            start_time: current_time(),
-            title: title
-          })
-        end
-      end
-    end
-
-    def try_end_meters(line)
-      started_meters.each do |key, meter|
-        if (end_regex = meter[:end_regex]) && line.match?(end_regex)
-          end_meter(key)
-        end
-      end
-    end
-
-    def end_all_meters
-      started_meters.each do |key, _|
-        end_meter(key)
-      end
-    end
-
-    def end_meter(key)
-      meter = @meters.fetch(key)
-
-      start_time = meter.fetch(:start_time)
-      title = meter.fetch(:title)
-
-      log_line = key.to_s.upcase
-      log_line += " #{title}" if title
-
-      put_line(log_line, since: start_time, internal: true)
-
-      meter.delete(:start_time)
-      meter.delete(:title)
-    end
-
-    def put_line(line, since: @start_time, internal: false)
-      current_time_cached = current_time()
-
-      if internal
-        @output += "#{format_duration(current_time_cached - since)} #{line}\n"
-        puts "#{bold(format_duration(current_time_cached - since))} #{bold(line)}"
-      else
-        @output += "#{format_duration(current_time_cached - since)} | #{line}\n"
-        puts "#{feint(format_duration(current_time_cached - since))} #{line}"
-      end
-    end
-
-    def finalize
-      total_duration = current_time() - @start_time
-      suffix = "#{@start_time}+#{total_duration.round}"
-      log_filename = "/tmp/timmy-#{suffix}.log"
-
-      put_line("EOF > #{log_filename}", internal: true)
-      File.write(log_filename, @output)
-    end
-
-    def format_duration(duration)
-      sprintf("%d:%02d", duration / 60, duration % 60)
-    end
-
-    def bold(string)
-      "\e[0m\e[1m#{string}\e[0m"
-    end
-
-    def feint(string)
-      "\e[0m\e[2m#{string}\e[0m"
-    end
-
-    def current_time
-      Time.now().to_i()
-    end
-
-    def started_meters
-      @meters.select { |_, meter| meter.has_key?(:start_time) }
-    end
-  end
-end

data/timmy.gemspec

@@ -1,25 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "timmy/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "timmy"
-  spec.version       = Timmy::VERSION
-  spec.authors       = ["Karol Słuszniak"]
-  spec.email         = ["ksluszniak@gmail.com"]
-
-  spec.summary       = "Time execution of command and its stages marked by console output"
-  spec.homepage      = "https://github.com/karolsluszniak/timmy"
-  spec.license       = "MIT"
-
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-end