hackmac 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52eecabaaacf4b30bdfd2c2d49ca2521d45dd81da1c75f1b3a02af4b94a0d01c
-  data.tar.gz: d84925f226ff82966a7a42f21143ee273715f013ed7907ab3f28273797b241f6
+  metadata.gz: '0919dce412f314296c00fc6f8bf87bf142b90cef6a437c1a25839fffd58bfee2'
+  data.tar.gz: cb3447775d1e0bc7da5e9f3bf0792dbd0428cba875124a3ae9da8c0006daa0f3
 SHA512:
-  metadata.gz: 0b13786a08e87c4f162d3ce6090115c286f3feaa476aedf354d94e6a74f4e4fb225769d4fb2a3c304eec4fa77423b96e19b5f401ee0631604e4fda816d1c51b8
-  data.tar.gz: b6bb795279266902645e82382f253c050d2eb0d74c0f2c3ad91f7cf02334f28767727baa86b49d99d9c46081f987c3f12034330b87a7e6a4dd6a5581ef1f57fd
+  metadata.gz: f45f0701f57c0f7ff66c2d221275291645236d0f5591cfb569f37be457d3da85de796c0a75d4dfd23b76fbc5f3c3d707dcdc8d9ff6b5a008a06c3353aa590043
+  data.tar.gz: c343b4b6a791cfa69718a717a41b84c9fdd48e4c31d1562187511b0a450c6a4e41a3320a55e9adf16514a5f8e1ed8afd7df2753b732bf7b4fcbfc46d28bcc152

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/hackmac.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.4.1 ruby lib
+# stub: hackmac 1.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.4.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/hackmac/config.rb

@@ -2,22 +2,24 @@ require 'complex_config/shortcuts'
 require 'tins/xt/secure_write'
 require 'fileutils'
 require 'pathname'
+require 'term/ansicolor'
 
 module Hackmac
   module Config
     extend FileUtils
     extend ComplexConfig::Provider::Shortcuts
+    extend Term::ANSIColor
 
     DEFAULT = File.read(File.join(File.dirname(__FILE__), 'hackmac.yml'))
 
-    def self.load(path: ENV.fetch('CONFIG_PATH', '~/.config/hackmac/hackmac.yml'))
+    def self.load(path: ENV.fetch('HACKMAC_CONFIG', '~/.config/hackmac/hackmac.yml'))
       path = Pathname.new(path).expand_path
       mkdir_p path.dirname
       ComplexConfig::Provider.config_dir = path.dirname
       unless path.exist?
         File.secure_write(path.to_s, DEFAULT)
       end
-      puts "Loading config from #{path.to_s.inspect}."
+      puts "Loading config from #{color(33) { path.to_s.inspect} }."
       ComplexConfig::Provider[path.basename.to_s.sub(/\..*?\z/, '')]
     end
   end

data/lib/hackmac/graph/display.rb

@@ -8,13 +8,12 @@ class Hackmac::Graph
       end
 
       def to_s
-        ANSI.color(color) {
-          ANSI.on_color(on_color) {
-            styles.inject(char) { |c, s|
-              ANSI.send(s) { c }
-            }
-          }
-        }
+        result = ''
+        result << ANSI.color(color)
+        result << ANSI.on_color(on_color)
+        styles.each { |s| result << ANSI.send(s) }
+        result << char
+        result << ANSI.reset
       end
     end
 

data/lib/hackmac/graph.rb

@@ -64,13 +64,14 @@ class Hackmac::Graph
     full_reset
     color       = pick_color
     color_light = color.to_rgb_triple.to_hsl_triple.lighten(15) rescue color
-    i           = 0
+    @counter    = -1
     @continue = true
     while @continue
+      @start = Time.now
       @full_reset and full_reset
       perform hide_cursor
 
-      @data << @value.(i)
+      @data << @value.(@counter += 1)
       @data = data.last(columns)
 
       y_width = (data.max - data.min).to_f
@@ -103,6 +104,7 @@ class Hackmac::Graph
       perform_display_diff
       sleep_now
     end
+  rescue Interrupt
   ensure
     stop
   end
@@ -154,7 +156,12 @@ class Hackmac::Graph
   end
 
   def sleep_now
-    sleep @sleep
+    duration = if @start
+                 [ @sleep - (Time.now - @start).to_f, 0 ].max
+               else
+                 @sleep
+               end
+    sleep duration
   end
 
   def perform_display_diff
@@ -162,7 +169,16 @@ class Hackmac::Graph
       unless @old_display && @old_display.dimensions == @display.dimensions
         @old_display = @display.dup.clear
       end
-      perform @display - @old_display
+      diff = @display - @old_display
+      if ENV['DEBUG_BYTESIZE']
+        unless @last
+          STDERR.puts %w[ size duration ] * ?\t
+        else
+          STDERR.puts [ diff.size, (Time.now - @last).to_f ] * ?\t
+        end
+        @last = Time.now
+      end
+      perform diff
       @display, @old_display = @old_display.clear, @display
       perform move_to(lines, columns)
     end

data/lib/hackmac/utils.rb

@@ -20,6 +20,7 @@ module Hackmac
         puts "✅ Command succeded!".green
       else
         puts "⚠️  Command #{cmd.inspect} failed with exit status #{$?.exitstatus}".on_red.white
+        exit $?.exitstatus
       end
       if verbose
         puts output.italic

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '1.4.1'
+  VERSION         = '1.5.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Florian Frank