thicket 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a742bf5e45b011a1a3d4441df3f4697e2f0b7b1fa8682a9ae9a75aaba49a83f7
-  data.tar.gz: d4b5d04c35d18b686fc85b48410f02531a61720d02516d5df780e9cd09c1f17c
+  metadata.gz: 78d11e58027823d2bc19891269bdcf93c6b8d5ed8396cef5fe275f75282e27c9
+  data.tar.gz: 99e6feb765c64cb6359b8014d26014812620d76185424695fa07103cf480c57f
 SHA512:
-  metadata.gz: e60e346a1be1cbb45e1357b4c0a9f878e17c860f9011bb2e60f1026fe0ca6cec80194bcf5560dc72955e1dd34b29212c7ef1acfaadc80d040c2b32235004a9db
-  data.tar.gz: 99b51417d4452422a9dcd529f54bebd6a5d191f54c424d4105736bcc8b288da43d33a7a5338c67f16243862c13dd66d28c870d204254212f46894429978d1e73
+  metadata.gz: 99a311df3ab8cddbc14ac9d9d52f16a51762c9505f9eca6aae22a069eb486b351e6cdc45bc935a53e806bc83111f9daf8579ff8d4bad7561b3bd359529117143
+  data.tar.gz: 4130465a692a997d098b30f776c7bfe46ed04bf1c53c93f927fb6c7066dd9569ce1eea4e32668f183570dd24d65627643f2883f900ba8b8ee3f9ba2848cfddae

data/lib/thicket/log.rb

@@ -5,7 +5,7 @@ require "time"
 
 module Thicket
   class Log
-    LOG_PARSE_REGEX = /[a-f0-9]{7}.+?m(.+?) .+?m\{([\w ]+)\}.+?m (?:\((.+?)\))?.+?m(.+$)/.freeze
+    LOG_PARSE_REGEX = /[a-f0-9]{7}.+?m(.+?) .+?m\{(.+?)\}.+?m (?:\((.+?)\))?.+?m(.+$)/.freeze
 
     def initialize(options)
       @options = options
@@ -40,9 +40,9 @@ module Thicket
       @padding_char = @padding_char == " " ? "-" : " "
 
       line.match(LOG_PARSE_REGEX) do |matcher|
-        process_date_time(matcher[1], line, matcher[3])
-        process_message_prefix(matcher[4], line) if @options[:color_prefixes]
-        process_author_name(matcher[2], line)
+        line = process_date_time(matcher[1], line, matcher[3])
+        line = process_message_prefix(matcher[4], line) if @options[:color_prefixes]
+        line = process_author_name(matcher[2], line)
         @count_parsed += 1
       end
 
@@ -57,7 +57,8 @@ module Thicket
       quantity = (seconds_ago / measure.length).floor
       to_sub = +"#{quantity}#{measure.abbreviation}".rjust(3)
       to_sub << "\e[31m" if have_refs # add color if we have refs in this line
-      line.sub!(time_string, to_sub)
+
+      line.sub(time_string, to_sub)
     end
 
     # Takes an input log string and commit message, finds commit messages
@@ -66,8 +67,10 @@ module Thicket
       prefix_regex = %r{^(?=.*[0-9])([A-Z\d-]+?[: \/])}
       message.match(prefix_regex) do |matcher|
         prefix = matcher[1]
-        line.sub!(/([^\/])#{prefix}/, "\\1\e[30m#{prefix}\e[m")
+        return line.sub(/([^\/])#{prefix}/, "\\1\e[30m#{prefix}\e[m")
       end
+
+      line
     end
 
     # Takes an input log string and commit author, and moves it from the normal
@@ -81,7 +84,7 @@ module Thicket
       total_length = strip_color(line).length
       spaces_needed = terminal_width - total_length - author.length - 2
       if spaces_needed < 0
-        line = +"#{line[0...-spaces_needed - 5]}... "
+        line = +"#{line[0...-spaces_needed - 5]}...  "
       else
         line << " \e[30m"
         line << @padding_char * spaces_needed

data/lib/thicket/version.rb

@@ -2,5 +2,5 @@
 
 module Thicket
   #:nodoc:
-  VERSION ||= "0.1.3"
+  VERSION ||= "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thicket
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Taylor Thurlow