djinni 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c386d8b47f5eec2592bcc5342db3473670ac7352ee054e80a03902c44441f07
-  data.tar.gz: 5ec0cdfbac77e7cfdb4511910fb85c068ede75cd8e89138887406a2d7b8c11bc
+  metadata.gz: 1fcd7ceeb81b894886dcca48088eea5012cef7a750f3df0ffe39beb1baf012aa
+  data.tar.gz: d3d8ea9414e871314a41d1d2fd3ee07ee6d5433d188eac3caf55b699a44f6bd8
 SHA512:
-  metadata.gz: a32b22a30c61c183d45ab8bdb435205d15d6c41c0e7dc841a26738f7ba138c608f7fa45559175f11bc5a361611d5f272a6dcaafa1c81f6c133a7c19c67963535
-  data.tar.gz: d641057292ca3cfdc16275bec110f4990c1d1cd0be995e016b7104ac489803138c8f9dc5199caff8f730247f7a02742dc813ca41bbba0c7b5d0f4d3b4883cb1e
+  metadata.gz: b6f740be301aebd532a4799db0ff56e2fc1527e7d77c1b02310153ac45a5b1585dabbfb574d9e095861bfe8cc1c7a8a7fb47a69a231f6a0e008f1fc7d2b49bef
+  data.tar.gz: 2078235c6392ea62d2b2011a6689f3960dcff358977b60d848c1224dcdafa22a88a344e38d6382a695e733b529130c051e0d59534cc3495009e1bb89565ed2aa

data/lib/djinni.rb

@@ -10,6 +10,7 @@ class Djinni
         djinni_env["djinni"] = self
         djinni_env["djinni_history"] = @history
         djinni_env["djinni_wishes"] = @wishes
+        space = 4
 
         case input[-1]
         when "\x03" # ^C
@@ -55,15 +56,17 @@ class Djinni
                     )
                 end
 
-                puts
                 max = completions.keys.max_by(&:length).length
+                width = @width - (max + space) - 2
+
+                puts
                 completions.each do |item, desc|
-                    fill = Array.new(max + 4 - item.length, " ").join
-                    nlfill = Array.new(max + 4, " ").join
+                    fill = " " * (max + space - item.length)
                     lines = ""
+                    nlfill = " " * (max + space)
                     if (desc)
                         lines = desc.scan(
-                            /\S.{0,#{80 - (max + 4)}}\S(?=\s|$)|\S+/
+                            /\S.{0,#{width}}\S(?=\s|$)|\S+/
                         )
                     end
 
@@ -93,16 +96,18 @@ class Djinni
                     return "#{wishes.first.first} "
                 end
 
-                puts
                 max = wishes.keys.max_by(&:length).length
+                width = @width - (max + space) - 2
+
+                puts
                 wishes.sort do |a, b|
                     a.first.downcase <=> b.first.downcase
                 end.each do |aliaz, w|
-                    fill = Array.new(max + 4 - aliaz.length, " ").join
-                    nlfill = Array.new(max + 4, " ").join
+                    fill = " " * (max + space - aliaz.length)
                     lines = w.description.scan(
-                        /\S.{0,#{80 - (max + 4)}}\S(?=\s|$)|\S+/
+                        /\S.{0,#{width}}\S(?=\s|$)|\S+/
                     )
+                    nlfill = " " * (max + space)
 
                     if (lines.empty?)
                         puts "#{aliaz}"
@@ -198,7 +203,7 @@ class Djinni
         @wishes = Hash.new
 
         Signal.trap(
-            "SIGWINCH",
+            "WINCH",
             proc do
                 @width = %x(tput cols).to_i
             end
@@ -243,7 +248,7 @@ class Djinni
         buff = ""
         loop do
             djinni_prompt = djinni_env["djinni_prompt"]
-            blank_line = Array.new(@width, " ").join
+            blank_line = " " * @width
 
             # 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.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest