djinni 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b1341fff2b9dd3479fb8b3afadad006838a1015
-  data.tar.gz: 4af280ccacdfb71cbbb1f512c126ec96614fde37
+  metadata.gz: a224fb2b8ea422604880f3b74da2707faa48e851
+  data.tar.gz: ec43fdee763e00f9f3dc7a8bab358deca75c7e3e
 SHA512:
-  metadata.gz: c9d81c0316e853e3424e531dfa1876e2b497c125fe9e9e36c066d5584513f1c77033cfeb40bc37e8d1569287217e5749a90e6ed9030fb88f5f03c9c8391b187c
-  data.tar.gz: fc60962b1c36d8b5ebe09a19b5c052f55bda9d00d094afdb03b5a7ac4cf29166584d28a85bcb54e8d7b7c045f7d06f0750b80d6893e18125236ace99fd22f87e
+  metadata.gz: e90df809fa48da8d9fcf31c6aab30f293a6608e442ab157411b648323be4549adfb3e2e7f5c804a3070d2a5e166a9cfe34c874b979b982f51fb925a4c6a750a3
+  data.tar.gz: 0b6da65ffe237038e73398aa68c2fc1f471f001fba8cfb2325c076ae271b1071f9e809a6eaa04a5e11b397d26d4b4397df49d3a16dd23e334293b71aa0bbb61e

data/lib/builtin/help.rb

@@ -0,0 +1,39 @@
+require "djinni"
+
+class DjinniHelpWish < DjinniWish
+    def aliases
+        return [ "?", "help" ]
+    end
+
+    def description
+        return "Show helpful information for a wish or wishes"
+    end
+
+    def execute(args, env = {})
+        if (args.nil? || args.empty?)
+            env["djinni_wishes"].sort.map do |aliaz, wish|
+                puts "#{aliaz}\t#{wish.description}"
+            end
+        elsif (args.split(" ").length == 1)
+            env["djinni_wishes"].sort.map do |aliaz, wish|
+                if (aliaz == args)
+                    wish.usage
+                    return
+                end
+            end
+            puts "Wish #{args} not found!"
+        else
+            usage
+        end
+    end
+
+    def tab_complete(input, env = {})
+        return input
+    end
+
+    def usage
+        puts "help [wish]"
+        puts "\tPrint usage for specified wish. If no wish is"
+        puts "\tspecified, print description of all wishes."
+    end
+end

data/lib/builtin/history.rb

@@ -0,0 +1,65 @@
+require "djinni"
+
+class DjinniHistoryWish < DjinniWish
+    def aliases
+        return [ "hist", "history" ]
+    end
+
+    def description
+        return "Show history or execute commands from history"
+    end
+
+    def execute(args, env = {})
+        djinni = env["djinni"]
+        history = env["djinni_history"]
+
+        case args
+        when nil, ""
+            history.each_index do |index|
+                puts "#{index}:\t#{history[index]}"
+            end
+        when "clear"
+            history.clear
+        when %r{^[0-9]+( [0-9]+)*$}
+            args.split(" ").each do |arg|
+                index = arg.to_i
+                if ((index >= 0) && (index < history.length))
+                    djinni.grant_wish("#{history[index]}\n")
+                else
+                    puts "Index out of bounds"
+                end
+            end
+        else
+            usage
+        end
+    end
+
+    def tab_complete(input, env = {})
+        history = env["djinni_history"]
+
+        included = input.split(" ")
+        completions = (0...history.length).to_a
+
+        included.each do |item|
+            completions.delete(item.to_i)
+        end
+
+        if (input.empty? || input.end_with?(" "))
+            puts
+            completions.sort.each do |index|
+                puts "#{index}:\t#{history[index]}"
+            end
+            return input
+        end
+
+        return "#{input} "
+    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"
+    end
+end

data/lib/builtin/quit.rb

@@ -0,0 +1,24 @@
+require "djinni"
+
+class DjinniQuitWish < DjinniWish
+    def aliases
+        return [ "bye", "exit", "q", "quit" ]
+    end
+
+    def description
+        return "Quit"
+    end
+
+    def execute(args, env = {})
+        exit 0
+    end
+
+    def tab_complete(input, env = {})
+        return input
+    end
+
+    def usage
+        puts aliases.join(", ")
+        puts "\t#{description}."
+    end
+end

data/lib/djinni.rb

@@ -2,17 +2,17 @@ require "io/console"
 require "pathname"
 require "terminfo"
 
+require_relative "djinni_exit"
 require_relative "djinni_wish"
 
-class Exit
-    GOOD = 0
-    UNKNOWN_WISH = 1
-end
-
 class Djinni
     def grant_wish(input, env = {})
         return "" if (input.nil? || input.empty?)
 
+        env["djinni"] = self
+        env["djinni_history"] = @history
+        env["djinni_wishes"] = @wishes
+
         case input[-1]
         when "\x03" # ^C
             puts if (@interactive)
@@ -33,8 +33,6 @@ class Djinni
                 return "#{name} #{wish.tab_complete(args, env)}"
             else
                 wishes = @wishes.keys
-                wishes.push("help")
-                wishes.push("history")
                 wishes.sort.each do |wish|
                     if (wish.start_with?(input))
                         return wish
@@ -47,29 +45,16 @@ class Djinni
             puts if (@interactive)
             return "" if (input.empty?)
 
-            # Only keep newest wish if repeat
-            @history.delete(input)
-            @history.push(input)
-            @hist_index = nil
-
             name, args = input.split(" ", 2)
 
-            if ((name == "help") || (name == "?"))
-                print_help(args)
-                return ""
-            end
-
-            if ((name == "history") || (name == "hist"))
-                print_history
-                return ""
-            end
-
             @wishes.sort.map do |aliaz, wish|
                 if (aliaz == name)
                     wish.execute(args, env)
+                    store_history(input)
                     return ""
                 end
             end
+            store_history(input)
             return nil
         when "\e" # Arrow keys
             code = "\e"
@@ -93,10 +78,10 @@ class Djinni
                     return ""
                 end
             when "\e[C" # Right arrow
-                # TODO maybe
+                # TODO maybe implement right arrow
                 return input[0..-2]
             when "\e[D" # Left arrow
-                # TODO maybe
+                # TODO maybe implement left arrow
                 return input[0..-2]
             else
                 return input[0..-2]
@@ -120,6 +105,41 @@ class Djinni
                 @width = TermInfo.screen_size[1]
             end
         )
+
+        load_builtins
+    end
+
+    def load_builtins
+        builtins = {
+            "help": "DjinniHelpWish",
+            "history": "DjinniHistoryWish",
+            "quit": "DjinniQuitWish"
+        }
+
+        builtins.each do |file, wish|
+            require_relative "builtin/#{file}"
+            load_wish(wish)
+        end
+    end
+
+    def load_wish(clas)
+        return if (clas.nil?)
+        clas.strip!
+        return if (clas.empty?)
+
+        wish = nil
+        begin
+            wish = Object::const_get(clas).new
+        rescue NameError => e
+            puts "Unknown wish class #{clas}!"
+            exit DjinniExit::UNKNOWN_WISH
+        end
+
+        return if (wish.nil?)
+
+        wish.aliases.each do |aliaz|
+            @wishes[aliaz] = wish
+        end
     end
 
     def load_wishes(dir)
@@ -136,55 +156,13 @@ class Djinni
                 \grep -E "class .* \< DjinniWish" #{file} | \
                     awk '{print $2}'
             ).each_line do |clas|
-                next if (clas.nil?)
-                clas.strip!
-                next if (clas.empty?)
-
-                wish = nil
-                begin
-                    wish = Object::const_get(clas).new
-                rescue NameError => e
-                    puts "Unknown wish class #{clas}!"
-                    exit Exit::UNKNOWN_WISH
-                end
-
-                next if (wish.nil?)
-
-                wish.aliases.each do |aliaz|
-                    @wishes[aliaz] = wish
-                end
+                load_wish(clas)
             end
         end
 
         @loaded_from.push(dir)
     end
 
-    def print_help(name = nil)
-        if (name.nil?)
-            @wishes.sort.map do |aliaz, wish|
-                puts "#{aliaz}\t#{wish.description}"
-            end
-        elsif (name.split(" ").length > 1)
-            puts "help [wish]"
-            puts "\tPrint usage for specified wish. If no wish is"
-            puts "\tspecified, print description of all wishes."
-        else
-            @wishes.sort.map do |aliaz, wish|
-                if (aliaz == name)
-                    wish.usage
-                    return
-                end
-            end
-            puts "Wish #{name} not found!"
-        end
-    end
-
-    def print_history
-        @history.each do |wish|
-            puts wish
-        end
-    end
-
     def prompt(prompt_sym = "$ ")
         @interactive = true
 
@@ -218,4 +196,12 @@ class Djinni
             end
         end
     end
+
+    def store_history(input)
+        # Only keep newest wish if repeat
+        # @history.delete(input)
+
+        @history.push(input)
+        @hist_index = nil
+    end
 end

data/lib/djinni_exit.rb

@@ -0,0 +1,4 @@
+class DjinniExit
+    GOOD = 0
+    UNKNOWN_WISH = 1
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -58,7 +58,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/builtin/help.rb
+- lib/builtin/history.rb
+- lib/builtin/quit.rb
 - lib/djinni.rb
+- lib/djinni_exit.rb
 - lib/djinni_wish.rb
 homepage: http://mjwhitta.github.io/djinni
 licenses: