djinni 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71ee1bc94a4982ddbece72b9a7095e0a5dbdf216
-  data.tar.gz: a706d2c5fb5adfb3140139ebf2d6bee1cfa2ec7a
+  metadata.gz: 91e0e374025777f899f2842312e3330505070933
+  data.tar.gz: 01b5498b5360fd208d5f6ccd64d0dc4741904704
 SHA512:
-  metadata.gz: b9eccaeb168de034599d6f3f0d058e1ce4b0c8d9e19c8eb0e1c953edac7c189d7f141a173d2b7b04d828dc052b28697ca25cb3d3ca69a43dfdebd4d3ef066e2c
-  data.tar.gz: 31610e7bd01dc4fb18b18a7bd07be78023cd2712aa1b3747a13facd2fd8d6faff6a3c6315c553a7f59ffed49c38a7b37f9e11dae554a213c9f9e7306f7fc647d
+  metadata.gz: d34084799f17961d09785517aa0f6311ae8d17e1216cdf566c9bb17ab22408fdd90c75aa172c71df98b94cc1140658fcb99ad8d084fb4fdaf9a2109495331584
+  data.tar.gz: 4a2cbea7d9b71be603d7d073531477f9c4e2bf608238e045e1176736b5e6fcb339a911c372c9687aeed578d85b1045a447026c5dffa35050c6305fb5700afd3c

data/lib/djinni.rb

@@ -30,6 +30,7 @@ class Djinni
                 wish = @wishes[name]
                 complete = ""
                 begin
+                    djinni_env["djinni_input"] = input
                     complete = wish.tab_complete(args, djinni_env)
                 rescue SystemExit => e
                     raise e
@@ -57,6 +58,7 @@ class Djinni
             @wishes.sort.map do |aliaz, wish|
                 if (aliaz == name)
                     begin
+                        djinni_env["djinni_input"] = input
                         wish.execute(args, djinni_env)
                     rescue SystemExit => e
                         raise e
@@ -142,14 +144,16 @@ class Djinni
         @interactive = true
 
         djinni_env["djinni_prompt"] = djinni_prompt
+        prev_len = 0
         buff = ""
         loop do
             djinni_prompt = djinni_env["djinni_prompt"]
             blank_line = Array.new(@width, " ").join
-            fill_len = @width - djinni_prompt.length - buff.length + 1
 
-            # Handle long line-wrapped prompts
-            lines = (djinni_prompt.length + buff.length) / @width
+            # Handle long lines that get wrapped
+            buff_len = remove_colors(djinni_prompt).length + prev_len
+            lines = buff_len / @width
+            lines -= 1 if ((buff_len % @width) == 0)
             lines.times do
                 print "\r#{blank_line}"
                 print "\e[F"
@@ -170,6 +174,7 @@ class Djinni
                 end
             end
             system("stty -raw echo")
+            prev_len = remove_colors(buff).length
             buff = grant_wish(buff + input, djinni_env)
 
             if (buff.nil?)
@@ -184,6 +189,11 @@ class Djinni
         end
     end
 
+    def remove_colors(str)
+        str.unpack("C*").pack("U*").gsub(/\e\[([0-9;]*m|K)/, "")
+    end
+    private :remove_colors
+
     def store_history(input)
         # Only keep newest wish if repeat
         # @history.delete(input)

data/lib/djinni/error/unknown_wish_error.rb

@@ -1,5 +1,3 @@
-require "djinni/error.rb"
-
 class Djinni::Error::UnknownWishError < Djinni::Error
     def initialize(clas = "")
         super("Unknown wish class #{clas}!")

data/lib/djinni/wish/help.rb

@@ -1,5 +1,3 @@
-require "djinni"
-
 class Djinni::Wish::Help < Djinni::Wish
     def aliases
         return [ "?", "help" ]

data/lib/djinni/wish/history.rb

@@ -1,5 +1,3 @@
-require "djinni"
-
 class Djinni::Wish::History < Djinni::Wish
     def aliases
         return [ "hist", "history" ]

data/lib/djinni/wish/quit.rb

@@ -1,5 +1,3 @@
-require "djinni"
-
 class Djinni::Wish::Quit < Djinni::Wish
     def aliases
         return [ "bye", "exit", "q", "quit" ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -59,7 +59,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
   requirement: !ruby/object:Gem::Requirement