djinni 0.1.16 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b1c387133f6e9dfd95e9962b6c86bf8b98621e
-  data.tar.gz: 5a25d94354038b51f29eedcadbccc003c6a11dbb
+  metadata.gz: a53f002bb38f59690b1ed3e575b06e13f0b42a9b
+  data.tar.gz: 4a533cbd15ff289034611f7960600460af34d94e
 SHA512:
-  metadata.gz: 1d72fed5eff6de074a270f8cfd628d25bfa37d17055b2f01f8931cc14de95174af1c7a004504806f99520b9fa260afd11bb2ec57cb74260041ab07f6a8056c61
-  data.tar.gz: 6a8d0549883ee0a32c3fb1508886c75229e70cd8cf095ecd7619f0169fb854088b33e4737a7b173b42ab5c34963bd7f0898b615a066de733eb274c79b1be87d8
+  metadata.gz: 458243eef2e17c6f8fccfa41cf3ae550dc51147666f5c57964d1fd014ee9a6fdd945a97fe13d536e93ad07a242490716d040e496111418a1c69eb472817516d5
+  data.tar.gz: 1764fc8162dcc10e5fbd5fc42117c5376557b6343c1e4cac62e916e3e9f5a8b41fc3f7d0352cf488ac348428e7ee0879f9a85ae5a647a6d2b38cae5101860ed4

data/lib/builtin/djinni_help_wish.rb

@@ -1,6 +1,6 @@
 require "djinni"
 
-class DjinniHelpWish < DjinniWish
+class DjinniHelpWish < Djinni::Wish
     def aliases
         return [ "?", "help" ]
     end

data/lib/builtin/djinni_history_wish.rb

@@ -1,6 +1,6 @@
 require "djinni"
 
-class DjinniHistoryWish < DjinniWish
+class DjinniHistoryWish < Djinni::Wish
     def aliases
         return [ "hist", "history" ]
     end

data/lib/builtin/djinni_quit_wish.rb

@@ -1,6 +1,6 @@
 require "djinni"
 
-class DjinniQuitWish < DjinniWish
+class DjinniQuitWish < Djinni::Wish
     def aliases
         return [ "bye", "exit", "q", "quit" ]
     end

data/lib/djinni/error.rb

@@ -0,0 +1,2 @@
+class Djinni::Error < RuntimeError
+end

data/lib/djinni/unknwon_wish_error.rb

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

data/lib/{djinni_wish.rb → djinni/wish.rb}

@@ -1,4 +1,4 @@
-class DjinniWish
+class Djinni::Wish
     class InterfaceNotImplementedError < NoMethodError
     end
 

data/lib/djinni.rb

@@ -1,12 +1,8 @@
-require "djinni_error"
-require "djinni_wish"
 require "io/console"
 require "pathname"
 require "terminfo"
 
 class Djinni
-    include DjinniError
-
     def grant_wish(input, djinni_env = {})
         return "" if (input.nil? || input.empty?)
 
@@ -136,7 +132,7 @@ class Djinni
         begin
             wish = Object::const_get(clas).new
         rescue NameError => e
-            raise DjinniError::UnknownWish.new(clas)
+            raise Djinni::UnknownWishError.new(clas)
         end
 
         return if (wish.nil?)
@@ -156,7 +152,7 @@ class Djinni
             require_relative file
 
             %x(
-                \grep -E "^ *class .+ \< DjinniWish" #{file} | \
+                \grep -E "^ *class .+ \< Djinni::Wish" #{file} | \
                     awk '{print $2}'
             ).each_line do |clas|
                 load_wish(clas)
@@ -211,3 +207,6 @@ class Djinni
     end
     private :store_history
 end
+
+require "djinni/error"
+require "djinni/wish"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 1.0.0
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -62,8 +62,9 @@ files:
 - lib/builtin/djinni_history_wish.rb
 - lib/builtin/djinni_quit_wish.rb
 - lib/djinni.rb
-- lib/djinni_error.rb
-- lib/djinni_wish.rb
+- lib/djinni/error.rb
+- lib/djinni/unknwon_wish_error.rb
+- lib/djinni/wish.rb
 homepage: http://mjwhitta.github.io/djinni
 licenses:
 - GPL-3.0

data/lib/djinni_error.rb

@@ -1,10 +0,0 @@
-module DjinniError
-    class Error < RuntimeError
-    end
-
-    class UnknownWish < Error
-        def initialize(clas = "")
-            super("Unknown wish class #{clas}!")
-        end
-    end
-end