djinni 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c26461a62d30afb00ae7a1cb72b76f0ef55b9e
-  data.tar.gz: 7dbdea06e28da92e6511031b88a3d286c7eb2481
+  metadata.gz: 9e662c2bb1aff1c1aac6c4a445e14a37084347cd
+  data.tar.gz: 8403c6d023b124f228c48d853dbf58e398a9876e
 SHA512:
-  metadata.gz: fc6041f1be04c2b4644eb3efea8dd137d207a843ab10aa65aa98b8e3d4dfc2e13df984056eaa4a59d76a692907a0ca87928378128aaf219fb98214db6b9b23e4
-  data.tar.gz: dcc88eb053727c0f5e4b4a2d28b40c76a5bc3df4779fac764a7b9e1c606d916a9d3f306e2bf4ad1f19371aff71ab0101b0834c82e7dbda018a8cc6e6ce39df40
+  metadata.gz: 762e97138d90e73b69249a24cdbe4daca17e7aaa76facaecaffef7d49f8ca0edc39c637b924ca6feaebb697598c2dd602b1e7aadc0526926c3640076b1f43563
+  data.tar.gz: 1ea3b7384cc98aac18c8539149615e8a448d82c6ad32bcd9d14a840caa9844e5b3e1255c0ec49741b131b4e5963061f9356992df6b1b56b4e19cf1b1f1bbf5f7

data/lib/djinni/wish/history.rb

@@ -1,5 +1,3 @@
-require "string"
-
 class Djinni::Wish::History < Djinni::Wish
     def aliases
         return ["hist", "history"]
@@ -49,7 +47,7 @@ class Djinni::Wish::History < Djinni::Wish
 
     def tab_complete(input, djinni_env = {})
         history = djinni_env["djinni_history"]
-        input, last = input.rsplit(" ")
+        input, found, last = input.rpartition(" ")
         included = input.split(" ")
 
         completions = Hash.new
@@ -62,7 +60,7 @@ class Djinni::Wish::History < Djinni::Wish
             !included.include?(item)
         end
 
-        if (last && !last.empty?)
+        if (!last.empty?)
             completions.keep_if do |item, desc|
                 item.downcase.start_with?(last.downcase)
             end

data/lib/djinni.rb

@@ -59,7 +59,9 @@ class Djinni
                 completions.each do |item, desc|
                     fill = Array.new(max + 4 - item.length, " ").join
                     nlfill = Array.new(max + 4, " ").join
-                    lines = desc.word_wrap(80 - (max + 4)).split("\n")
+                    lines = desc.scan(
+                        /\S.{0,#{80 - (max + 4)}}\S(?=\s|$)|\S+/
+                    )
 
                     if (lines.empty?)
                         puts "#{item}"
@@ -94,9 +96,9 @@ class Djinni
                 end.each do |aliaz, w|
                     fill = Array.new(max + 4 - aliaz.length, " ").join
                     nlfill = Array.new(max + 4, " ").join
-                    lines = w.description.word_wrap(
-                        80 - (max + 4)
-                    ).split("\n")
+                    lines = w.description.scan(
+                        /\S.{0,#{80 - (max + 4)}}\S(?=\s|$)|\S+/
+                    )
 
                     if (lines.empty?)
                         puts "#{aliaz}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -106,7 +106,6 @@ files:
 - lib/djinni/wish/help.rb
 - lib/djinni/wish/history.rb
 - lib/djinni/wish/quit.rb
-- lib/string.rb
 homepage: https://mjwhitta.github.io/djinni
 licenses:
 - GPL-3.0

data/lib/string.rb

@@ -1,12 +0,0 @@
-# Modify String class to allow for rsplit and word wrap
-class String
-    def rsplit(pattern)
-        ret = rpartition(pattern)
-        ret.delete_at(1)
-        return ret
-    end
-
-    def word_wrap(width = 80)
-        return scan(/\S.{0,#{width}}\S(?=\s|$)|\S+/).join("\n")
-    end
-end