logue 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd805ca22e710868ac6d67ff0bfbd6bed12ae0d
-  data.tar.gz: 02bcbe756cb396977e02ebf1c4a0332718b38418
+  metadata.gz: 385cb8613ee04140fab6eacde15fa7ed4cb67ba1
+  data.tar.gz: e1e1649d69e92e3440dd02e43605debf063c72be
 SHA512:
-  metadata.gz: e93458d58f660b7ebf5b0c424570c83715dd834a30699bf2c7c7ad2ea742487840b8e1fcd6ad5ee8c5a6cfae3040b0d56d93c2fffcfd9698a5dc200aa115178e
-  data.tar.gz: e2fedbfd3769b43416dcfd59d9b9a0dc02873a3c275226b543e3dba3fab83d03017d6ff03a0c39894b5713f75ae76994c1b88526473d46e0d541bc3717fa7c8d
+  metadata.gz: 2c8ba5bd3f9f039a49eba59cb4d41cb929adfa6aa886d93044039abc8824bc03d73e4be0cbc053432dfe915d867ce19eebbc8474bc0dc11aa61984984450c853
+  data.tar.gz: 07d5016f53177fe85a744bc6c588d10da300856bdc43db0d2c1183a41ee01fa0b7a058e25a5fbcddace3565d948aff3c14fe0c55f6247e5d728dde429e3633d4

data/lib/logue/format.rb

@@ -11,30 +11,33 @@ module Logue
     def trim_right str, maxlen
       mxln = maxlen.abs
 
-      # magic number 3 for the ellipses ...
-
       if str.length > mxln
-        path = str.split('/')
-        newstr = "..."
-        path.reverse.each do |element|
-          if newstr.length + element.length > mxln
-            while newstr.length < mxln
-              newstr.insert 0, " "
-            end
-            return newstr
-          else
-            if newstr.length > 3
-              newstr.insert 3, "/"
-            end
-            newstr.insert 3, element
-          end
-        end
-        newstr
+        trim_path_right str, maxlen
       else
         str
       end
     end
 
+    def trim_path_right path, maxlen
+      mxln = maxlen.abs
+      
+      comps = path.split "/"
+      str = comps.pop
+      comps.reverse.each do |comp|
+        newstr = comp + "/" + str
+        if newstr.length + 4 <= mxln
+          str = newstr
+        else
+          newstr = "..." + "/" + str
+          if newstr.length <= mxln
+            str = newstr
+          end
+          break
+        end
+      end
+      str
+    end    
+
     def print_formatted file, line, func, msg, lvl, &blk
       if trim
         file = trim_right file, @file_width

data/lib/logue.rb

@@ -13,5 +13,5 @@ Pathname.glob(loguelibdir + '/logue/**/*.rb').each do |file|
 end
 
 module Logue
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/test/logue/format_test.rb

@@ -11,6 +11,8 @@ module Logue
   class FormatTestCase < Test::Unit::TestCase
     include Logue::Loggable
 
+    # trim_left
+
     def run_trim_left_test expected, length, str = "something"
       trimmed = Format.new.trim_left(str, length)
       assert_equal expected, trimmed
@@ -28,21 +30,51 @@ module Logue
       run_trim_left_test "some", -4
     end
 
-    def run_trim_right_test expected, length, str = "something"
-      trimmed = Format.new.trim_right(str, length)
-      assert_equal expected, trimmed
+    # trim_right
+
+    def assert_trim_right expected, length, str
+      trimmed = Format.new.trim_right str, length
+      assert_equal expected, trimmed, "length: #{length}"
+    end
+
+    def test_trim_right_path_excess
+      assert_trim_right "ab/cd/ef.t", 11, "ab/cd/ef.t"
+    end
+
+    def test_trim_right_path_at_length
+      assert_trim_right "ab/cd/ef.t", 10, "ab/cd/ef.t"
+    end
+
+    def test_trim_right_path_one_less
+      assert_trim_right ".../ef.t", 9, "ab/cd/ef.t"
+    end
+
+    def test_trim_right_path_two_less
+      assert_trim_right ".../ef.t", 8, "ab/cd/ef.t"
+    end
+
+    def test_trim_right_path_three_less
+      assert_trim_right "ef.t", 7, "ab/cd/ef.t"
+    end
+
+    def test_trim_right_path_four_less
+      assert_trim_right "ef.t", 6, "ab/cd/ef.t"
+    end
+
+    def test_trim_right_path_five_less
+      assert_trim_right "ef.t", 5, "ab/cd/ef.t"
     end
 
-    def test_trim_right_short_positive_number
-      run_trim_right_test "  ...", 5
+    def test_trim_right_path_six_less
+      assert_trim_right "ef.t", 4, "ab/cd/ef.t"
     end
 
-    def test_trim_right_long
-      run_trim_right_test "something", 10
+    def test_trim_right_path_seven_less
+      assert_trim_right "ef.t", 3, "ab/cd/ef.t"
     end
 
-    def test_trim_right_short_negative_number
-      run_trim_right_test "  ...", -5
+    def test_trim_right_path_eight_less
+      assert_trim_right "ef.t", 2, "ab/cd/ef.t"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logue
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow