djinni 1.3.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d6bdde61547d555da94f76c9d3bdb07673cb4e2
-  data.tar.gz: 5c911b3278fd04e20803e01f1bcdb9bfbd7809b9
+  metadata.gz: b0c26461a62d30afb00ae7a1cb72b76f0ef55b9e
+  data.tar.gz: 7dbdea06e28da92e6511031b88a3d286c7eb2481
 SHA512:
-  metadata.gz: c684bdacedecc922a6853c6624c8bd47ccf8da7daf3af9e76048ae8917f22129cfb3d15d5efe530d16f3a054e8b529eaf02fbb745413314650962a770282075c
-  data.tar.gz: b1709e68b1205931c8c254af7fe6bede4614062c832188ac322808a5592293016e91220e08d76e17c947e382d1716cc4d816303dbcfa3c55dead8faa16842c62
+  metadata.gz: fc6041f1be04c2b4644eb3efea8dd137d207a843ab10aa65aa98b8e3d4dfc2e13df984056eaa4a59d76a692907a0ca87928378128aaf219fb98214db6b9b23e4
+  data.tar.gz: dcc88eb053727c0f5e4b4a2d28b40c76a5bc3df4779fac764a7b9e1c606d916a9d3f306e2bf4ad1f19371aff71ab0101b0834c82e7dbda018a8cc6e6ce39df40

data/lib/djinni/wish/clear.rb

@@ -1,6 +1,6 @@
 class Djinni::Wish::Clear < Djinni::Wish
     def aliases
-        return [ "clear", "cls" ]
+        return ["clear", "cls"]
     end
 
     def description
@@ -8,15 +8,12 @@ class Djinni::Wish::Clear < Djinni::Wish
     end
 
     def execute(args, djinni_env = {})
-        if (args.nil? || args.empty?)
-            system("clear")
-        else
-            usage
-        end
+        system("clear") if (args.empty?)
+        usage if (!args.empty?)
     end
 
     def usage
         puts aliases.join(", ")
-        puts "\t#{description}."
+        puts "    #{description}."
     end
 end

data/lib/djinni/wish/help.rb

@@ -1,6 +1,6 @@
 class Djinni::Wish::Help < Djinni::Wish
     def aliases
-        return [ "?", "help" ]
+        return ["?", "help"]
     end
 
     def description
@@ -8,27 +8,22 @@ class Djinni::Wish::Help < Djinni::Wish
     end
 
     def execute(args, djinni_env = {})
-        wishes = djinni_env["djinni_wishes"].sort
-        if (args.nil? || args.empty?)
-            cmd_col_width = 0
-            wishes.map do |aliaz, wish|
-                if (aliaz.length > cmd_col_width)
-                    cmd_col_width = aliaz.length
-                end
-            end
-
-            filler = Array.new(cmd_col_width - 7 + 4, " ").join
-            puts "COMMAND#{filler}DESCRIPTION"
-            puts "-------#{filler}-----------"
-            wishes.map do |aliaz, wish|
-                filler = Array.new(
-                    cmd_col_width - aliaz.length + 4,
-                    " "
-                ).join
-                puts "#{aliaz}#{filler}#{wish.description}"
+        wishes = djinni_env["djinni_wishes"]
+        max = wishes.keys.max_by(&:length).length
+        if (args.empty?)
+            fill = Array.new(max - 7 + 4, " ").join
+            puts "COMMAND#{fill}DESCRIPTION"
+            puts "-------#{fill}-----------"
+            wishes.sort do |a, b|
+                a.first.downcase <=> b.first.downcase
+            end.each do |aliaz, wish|
+                fill = Array.new(max - aliaz.length + 4, " ").join
+                puts "#{aliaz}#{fill}#{wish.description}"
             end
         elsif (args.split(" ").length == 1)
-            wishes.map do |aliaz, wish|
+            wishes.sort do |a, b|
+                a.first.downcase <=> b.first.downcase
+            end.each do |aliaz, wish|
                 if (aliaz == args)
                     wish.usage
                     return
@@ -41,13 +36,23 @@ class Djinni::Wish::Help < Djinni::Wish
     end
 
     def tab_complete(input, djinni_env = {})
-        # TODO
-        return input
+        return [{}, "", " "] if (input.include?(" "))
+
+        completions = Hash.new
+        djinni_env["djinni_wishes"].select do |aliaz, wish|
+            aliaz.downcase.start_with?(input.downcase)
+        end.sort do |a, b|
+            a.first.downcase <=> b.first.downcase
+        end.each do |aliaz, wish|
+            completions[aliaz] = wish.description
+        end
+
+        return [completions, input, " "]
     end
 
     def usage
         puts "help [command]"
-        puts "\tPrint usage for specified command. If no command is"
-        puts "\tspecified, print description of all commands."
+        puts "    Print usage for specified command. If no command is"
+        puts "    specified, print description of all commands."
     end
 end

data/lib/djinni/wish/history.rb

@@ -1,6 +1,8 @@
+require "string"
+
 class Djinni::Wish::History < Djinni::Wish
     def aliases
-        return [ "hist", "history" ]
+        return ["hist", "history"]
     end
 
     def description
@@ -11,56 +13,69 @@ class Djinni::Wish::History < Djinni::Wish
         djinni = djinni_env["djinni"]
         history = djinni_env["djinni_history"]
 
-        case args
-        when nil, ""
-            history.each_index do |index|
-                puts "#{index}:\t#{history[index]}"
+        if (args.empty?)
+            history.each_with_index do |hist, index|
+                puts "#{index}:    #{hist}"
             end
-        when "clear"
-            history.clear
-        when %r{^[0-9]+( [0-9]+)*$}
-            args.split(" ").each do |arg|
+            return
+        end
+
+        args.split(" ").each do |arg|
+            case arg
+            when "clear"
+                # Do nothing
+            when /^[0-9]+$/
                 index = arg.to_i
-                if ((index >= 0) && (index < history.length))
-                    djinni.grant_wish(
-                        "#{history[index]}\n",
-                        djinni_env
-                    )
-                else
-                    puts "Index out of bounds"
+                if ((index < 0) || (index >= history.length))
+                    puts "Index out of bounds; #{index}"
                 end
+            else
+                usage
+                return
+            end
+        end
+
+        args.split(" ").each do |arg|
+            case arg
+            when "clear"
+                history.clear
+            when /^[0-9]+$/
+                index = arg.to_i
+                print "\e[F"
+                djinni.grant_wish("#{history[index]}\n", djinni_env)
             end
-        else
-            usage
         end
     end
 
     def tab_complete(input, djinni_env = {})
         history = djinni_env["djinni_history"]
-
+        input, last = input.rsplit(" ")
         included = input.split(" ")
-        completions = (0...history.length).to_a
 
-        included.each do |item|
-            completions.delete(item.to_i)
+        completions = Hash.new
+        (0...history.length).each do |i|
+            completions[i.to_s] = history[i]
+        end
+        completions["clear"] = "Clear history"
+
+        completions.keep_if do |item, desc|
+            !included.include?(item)
         end
 
-        if (input.empty? || input.end_with?(" "))
-            puts
-            completions.sort.each do |index|
-                puts "#{index}:\t#{history[index]}"
+        if (last && !last.empty?)
+            completions.keep_if do |item, desc|
+                item.downcase.start_with?(last.downcase)
             end
-            return input
         end
 
-        return "#{input} "
+        return [completions, last, " "]
     end
 
     def usage
         puts "history [option]"
-        puts "\t#{description}."
-        puts "\tOPTIONS"
-        puts "\t\t[0-9]+\tExecute command from history"
-        puts "\t\tclear\tClear history"
+        puts "    #{description}."
+        puts "    OPTIONS"
+        puts "        [0-9]+    Execute command from history"
+        puts "        clear     Clear history"
     end
 end

data/lib/djinni/wish/quit.rb

@@ -1,6 +1,6 @@
 class Djinni::Wish::Quit < Djinni::Wish
     def aliases
-        return [ "bye", "exit", "q", "quit" ]
+        return ["bye", "exit", "q", "quit"]
     end
 
     def description
@@ -13,6 +13,6 @@ class Djinni::Wish::Quit < Djinni::Wish
 
     def usage
         puts aliases.join(", ")
-        puts "\t#{description}."
+        puts "    #{description}."
     end
 end

data/lib/djinni/wish.rb

@@ -21,7 +21,7 @@ class Djinni::Wish
     end
 
     def tab_complete(input, djinni_env = {})
-        return input
+        return [{}, "", ""]
     end
 
     def usage

data/lib/djinni.rb

@@ -27,47 +27,120 @@ class Djinni
                 name, args = input.split(" ", 2)
                 return input if (!@wishes.has_key?(name))
 
-                wish = @wishes[name]
-                complete = ""
                 begin
-                    djinni_env["djinni_input"] = input
-                    complete = wish.tab_complete(args, djinni_env)
+                    wish = @wishes[name]
+                    djinni_env["djinni_input"] = name
+                    completions, replace, append = wish.tab_complete(
+                        args,
+                        djinni_env
+                    )
                 rescue SystemExit => e
                     raise e
                 rescue Exception => e
                     puts
                     puts e.message
+                ensure
+                    append ||= " "
+                    completions ||= Hash.new
+                    replace ||= ""
                 end
-                return "#{name} #{complete}"
+
+                return input if (completions.empty?)
+
+                if (completions.length == 1)
+                    return input.gsub(
+                        /#{replace}$/,
+                        "#{completions.first.first}#{append}"
+                    )
+                end
+
+                puts
+                max = completions.keys.max_by(&:length).length
+                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")
+
+                    if (lines.empty?)
+                        puts "#{item}"
+                    else
+                        start = lines.delete_at(0)
+                        puts "#{item}#{fill}#{start}"
+                        lines.each do |line|
+                            puts "#{nlfill}#{line}"
+                        end
+                    end
+                end
+
+                return input.gsub(
+                    /#{replace}$/,
+                    longest_common_substring(completions.keys)
+                )
             else
-                wishes = @wishes.keys
-                wishes.sort.each do |wish|
-                    if (wish.start_with?(input))
-                        return "#{wish} "
+                wishes = @wishes.select do |aliaz, w|
+                    aliaz.start_with?(input)
+                end
+
+                return input if (wishes.empty?)
+
+                if (wishes.length == 1)
+                    return "#{wishes.first.first} "
+                end
+
+                puts
+                max = wishes.keys.max_by(&:length).length
+                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
+                    lines = w.description.word_wrap(
+                        80 - (max + 4)
+                    ).split("\n")
+
+                    if (lines.empty?)
+                        puts "#{aliaz}"
+                    else
+                        start = lines.delete_at(0)
+                        puts "#{aliaz}#{fill}#{start}"
+                        lines.each do |line|
+                            puts "#{nlfill}#{line}"
+                        end
                     end
                 end
-                return input
+
+                return longest_common_substring(wishes.keys)
             end
         when /\r|\n/ # Enter
             input.strip!
             puts if (@interactive)
             return "" if (input.empty?)
 
+            # "".split(" ", 2) => [] aka [nil, nil]
+            # " ".split(" ", 2) => [""] aka ["", nil]
+            # The above 2 would return before getting here
+            # "string".split(" ", 2) => ["string"] aka ["string", nil]
+            # "string ".split(" ", 2) => ["string", ""]
             name, args = input.split(" ", 2)
+            args ||= ""
 
-            @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
-                    rescue Exception => e
-                        puts e.message
-                    end
+            @wishes.select do |aliaz, w|
+                aliaz == name
+            end.each do |aliaz, w|
+                begin
+                    djinni_env["djinni_input"] = name
+                    w.execute(args, djinni_env)
+                rescue SystemExit => e
+                    raise e
+                rescue Exception => e
+                    puts e.message
+                end
+
+                if (w.class.to_s != "Djinni::Wish::History")
                     store_history(input)
-                    return ""
                 end
+
+                return ""
             end
             store_history(input)
             return nil
@@ -140,6 +213,20 @@ class Djinni
         @loaded_from.push(dir)
     end
 
+    def longest_common_substring(array)
+        compare = array.min_by(&:length)
+        loop do
+            break if (compare.empty?)
+            all = array.all? do |item|
+                item.downcase.start_with?(compare.downcase)
+            end
+            compare = compare[0..-2] if (!all)
+            break if (all)
+        end
+        return compare
+    end
+    private :longest_common_substring
+
     def prompt(djinni_env = {}, djinni_prompt = "$ ")
         @interactive = true
 

data/lib/string.rb

@@ -0,0 +1,12 @@
+# 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -106,6 +106,7 @@ 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