djinni 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef936a21ffbf86d2e3066aa05597c6a5f968f357
-  data.tar.gz: 0c3a346b04c8e7413dcb8984ef0e26554f12ad94
+  metadata.gz: 054d09c1a59329243cc68fd838539f7886a73099
+  data.tar.gz: 90bed7d10befe6e76a61c495d2837ea6b93eb2c8
 SHA512:
-  metadata.gz: 9b897ad86168a31364fdd9bf91810198798f3bc9200f488500dcd3f95c1530fd7ee271f7ce6ba0a77141501a1d7af4b40eea375f97d5d569b8651d2c1bcb1b1a
-  data.tar.gz: 8c091c11e1e68181d39cb188f58000b2322f5e216f19c00587ed6ad52f973a298b1a8027f8ecf2b50fc902369a732ab7eb575ecd5f64a7e9ad59084b68942fca
+  metadata.gz: dc21126e3e26610d8988c05ea07f22ccadeaab6f6f1f2567b2ae9b9bf7ff899d04ae7095d10dc8761c49b6ede2f3062c1ec8220cc767dedc7c1687eafb290820
+  data.tar.gz: a98be004548eb6bf5d48915b66d2a49c9df10b47c952d3193298eb1ff7025328cce4ee99675edc8f11d3456314917769717b7d1cd26865c9e31210956e57461e

data/lib/builtin/help.rb

@@ -9,13 +9,14 @@ class DjinniHelpWish < DjinniWish
         return "Show helpful information for a wish or wishes"
     end
 
-    def execute(args, env = {})
+    def execute(args, djinni_env = {})
+        wishes = djinni_env["djinni_wishes"].sort
         if (args.nil? || args.empty?)
-            env["djinni_wishes"].sort.map do |aliaz, wish|
+            wishes.map do |aliaz, wish|
                 puts "#{aliaz}\t#{wish.description}"
             end
         elsif (args.split(" ").length == 1)
-            env["djinni_wishes"].sort.map do |aliaz, wish|
+            wishes.map do |aliaz, wish|
                 if (aliaz == args)
                     wish.usage
                     return
@@ -27,7 +28,7 @@ class DjinniHelpWish < DjinniWish
         end
     end
 
-    def tab_complete(input, env = {})
+    def tab_complete(input, djinni_env = {})
         return input
     end
 

data/lib/builtin/history.rb

@@ -9,9 +9,9 @@ class DjinniHistoryWish < DjinniWish
         return "Show history or execute commands from history"
     end
 
-    def execute(args, env = {})
-        djinni = env["djinni"]
-        history = env["djinni_history"]
+    def execute(args, djinni_env = {})
+        djinni = djinni_env["djinni"]
+        history = djinni_env["djinni_history"]
 
         case args
         when nil, ""
@@ -34,8 +34,8 @@ class DjinniHistoryWish < DjinniWish
         end
     end
 
-    def tab_complete(input, env = {})
-        history = env["djinni_history"]
+    def tab_complete(input, djinni_env = {})
+        history = djinni_env["djinni_history"]
 
         included = input.split(" ")
         completions = (0...history.length).to_a

data/lib/builtin/quit.rb

@@ -9,11 +9,11 @@ class DjinniQuitWish < DjinniWish
         return "Quit"
     end
 
-    def execute(args, env = {})
+    def execute(args, djinni_env = {})
         exit 0
     end
 
-    def tab_complete(input, env = {})
+    def tab_complete(input, djinni_env = {})
         return input
     end
 

data/lib/djinni.rb

@@ -7,12 +7,12 @@ require "terminfo"
 class Djinni
     include DjinniError
 
-    def grant_wish(input, env = {})
+    def grant_wish(input, djinni_env = {})
         return "" if (input.nil? || input.empty?)
 
-        env["djinni"] = self
-        env["djinni_history"] = @history
-        env["djinni_wishes"] = @wishes
+        djinni_env["djinni"] = self
+        djinni_env["djinni_history"] = @history
+        djinni_env["djinni_wishes"] = @wishes
 
         case input[-1]
         when "\x03" # ^C
@@ -30,8 +30,10 @@ class Djinni
             if (input.include?(" "))
                 name, args = input.split(" ", 2)
                 return input if (!@wishes.has_key?(name))
+
                 wish = @wishes[name]
-                return "#{name} #{wish.tab_complete(args, env)}"
+                complete = wish.tab_complete(args, djinni_env)
+                return "#{name} #{complete}"
             else
                 wishes = @wishes.keys
                 wishes.sort.each do |wish|
@@ -50,7 +52,7 @@ class Djinni
 
             @wishes.sort.map do |aliaz, wish|
                 if (aliaz == name)
-                    wish.execute(args, env)
+                    wish.execute(args, djinni_env)
                     store_history(input)
                     return ""
                 end
@@ -107,10 +109,6 @@ class Djinni
             end
         )
 
-        load_builtins
-    end
-
-    def load_builtins
         load_wishes("#{File.dirname(__FILE__)}/builtin")
     end
 
@@ -132,6 +130,7 @@ class Djinni
             @wishes[aliaz] = wish
         end
     end
+    private :load_wish
 
     def load_wishes(dir)
         return if @loaded_from.include?(dir)
@@ -152,11 +151,13 @@ class Djinni
         @loaded_from.push(dir)
     end
 
-    def prompt(prompt_sym = "$ ")
+    def prompt(djinni_env = {}, prompt_sym = "$ ")
         @interactive = true
 
+        djinni_env["prompt_sym"] = prompt_sym
         buffer = ""
         loop do
+            prompt_sym = djinni_env["prompt_sym"]
             blank_line = Array.new(@width, " ").join
             fill_len = @width - prompt_sym.length - buffer.length + 1
 
@@ -172,7 +173,7 @@ class Djinni
             print "\r#{prompt_sym}#{buffer}"
 
             # Process input
-            buffer = grant_wish(buffer + STDIN.getch)
+            buffer = grant_wish(buffer + STDIN.getch, djinni_env)
 
             if (buffer.nil?)
                 puts "Wish not found!"
@@ -193,4 +194,5 @@ class Djinni
         @history.push(input)
         @hist_index = nil
     end
+    private :store_history
 end

data/lib/djinni_wish.rb

@@ -14,13 +14,13 @@ class DjinniWish
         )
     end
 
-    def execute(args, env = {})
+    def execute(args, djinni_env = {})
         raise InterfaceNotImplementedError.new(
             "execute() not implemented!"
         )
     end
 
-    def tab_complete(input, env = {})
+    def tab_complete(input, djinni_env = {})
         raise InterfaceNotImplementedError.new(
             "tab_complete() not implemented!"
         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest