djinni 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fcd7ceeb81b894886dcca48088eea5012cef7a750f3df0ffe39beb1baf012aa
-  data.tar.gz: d3d8ea9414e871314a41d1d2fd3ee07ee6d5433d188eac3caf55b699a44f6bd8
+  metadata.gz: 65fbf5d61e83c40690ef71ba3ac5e50a765bed3484538c259bb552be8510873b
+  data.tar.gz: 41b1874ab97cf60ef517676c0900ddd1b829b83888b54905128b2b9b07c9a30b
 SHA512:
-  metadata.gz: b6f740be301aebd532a4799db0ff56e2fc1527e7d77c1b02310153ac45a5b1585dabbfb574d9e095861bfe8cc1c7a8a7fb47a69a231f6a0e008f1fc7d2b49bef
-  data.tar.gz: 2078235c6392ea62d2b2011a6689f3960dcff358977b60d848c1224dcdafa22a88a344e38d6382a695e733b529130c051e0d59534cc3495009e1bb89565ed2aa
+  metadata.gz: 86f50f88bfc700809dcbb9ef428a4ec54dfdfabd886d51c78408cb1ab4d841ec4d22e6c4d0542680e7e05d616ecaece0b8cb1cfddd266eecb2559c593c8aa7ce
+  data.tar.gz: 5c2b77fdfd136f203f89f1b68b573cec8d5e49a29bf1a48854641ae237d3fccb234bc26ab4891fd64381ebfb39347333b263eaed095412f5339fe46588fafb91

data/lib/djinni.rb

@@ -57,21 +57,23 @@ class Djinni
                 end
 
                 max = completions.keys.max_by(&:length).length
+                nlfill = ""
+                nlfill = " " * (max + space) if ((max + space) > 0)
                 width = @width - (max + space) - 2
 
                 puts
                 completions.each do |item, desc|
-                    fill = " " * (max + space - item.length)
-                    lines = ""
-                    nlfill = " " * (max + space)
-                    if (desc)
-                        lines = desc.scan(
-                            /\S.{0,#{width}}\S(?=\s|$)|\S+/
-                        )
+                    desc ||= ""
+                    fill = ""
+                    if ((max + space - item.length) > 0)
+                        fill = " " * (max + space - item.length)
                     end
+                    lines = desc.scan(
+                        /\S.{0,#{width}}\S(?=\s|$)|\S+/
+                    )
 
                     if (lines.empty?)
-                        puts "#{item}"
+                        puts item
                     else
                         start = lines.delete_at(0)
                         puts "#{item}#{fill}#{start}"
@@ -81,10 +83,9 @@ class Djinni
                     end
                 end
 
-                return input.gsub(
-                    /#{replace}$/,
-                    longest_common_substring(completions.keys)
-                )
+                longest = longest_common_substring(completions.keys)
+                return input if (longest.empty?)
+                return input.gsub(/#{replace}$/, longest)
             else
                 wishes = @wishes.select do |aliaz, w|
                     aliaz.start_with?(input)
@@ -97,20 +98,24 @@ class Djinni
                 end
 
                 max = wishes.keys.max_by(&:length).length
+                nlfill = ""
+                nlfill = " " * (max + space) if ((max + space) > 0)
                 width = @width - (max + space) - 2
 
                 puts
                 wishes.sort do |a, b|
                     a.first.downcase <=> b.first.downcase
                 end.each do |aliaz, w|
-                    fill = " " * (max + space - aliaz.length)
+                    fill = ""
+                    if ((max + space - aliaz.length) > 0)
+                        fill = " " * (max + space - aliaz.length)
+                    end
                     lines = w.description.scan(
                         /\S.{0,#{width}}\S(?=\s|$)|\S+/
                     )
-                    nlfill = " " * (max + space)
 
                     if (lines.empty?)
-                        puts "#{aliaz}"
+                        puts aliaz
                     else
                         start = lines.delete_at(0)
                         puts "#{aliaz}#{fill}#{start}"
@@ -228,6 +233,7 @@ class Djinni
 
     def longest_common_substring(array)
         compare = array.min_by(&:length)
+        compare ||= ""
         loop do
             break if (compare.empty?)
             all = array.all? do |item|
@@ -248,7 +254,8 @@ class Djinni
         buff = ""
         loop do
             djinni_prompt = djinni_env["djinni_prompt"]
-            blank_line = " " * @width
+            blank_line = ""
+            blank_line = " " * @width if (@width > 0)
 
             # Handle long lines that get wrapped
             buff_len = remove_colors(djinni_prompt).length + prev_len

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest