djinni 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88936cae4a96cccca6820c6f830a3f5e28f79b9b
-  data.tar.gz: 90159372fe2bd970e47af1525f271bbc531f0c58
+  metadata.gz: 1ea5e8f1cef093a7500f760b453448830ad92b0b
+  data.tar.gz: a85a0322e73454913e284b02181e35bd0171fc93
 SHA512:
-  metadata.gz: 7626993bc93def45acd243b738854f2b308d7f3268f94adea3e1edcc2d3a6c9b719ca2062f5db7df3f696312163344d6d8f6e1a79e672c0e0645575af9adfcbd
-  data.tar.gz: 41144d92295dd23b38c9b22fcdc92e6fb7fa29f8e723af59eeb6ab22f8d81756ef68cda2299db2a51063d0d70c9e1d7f6f7d688b5d94972bdb422f9620676f42
+  metadata.gz: ad6db4b68eb697e3132cf9e558a367c30cd4155816282ab591921be7fcd98079ddb7277ae42904bd1cc5481c0758994cd2af70221daaca2d04e18890b92b049e
+  data.tar.gz: 71bd1a4c5d022f289d36ca805544ffe553f12f79180c2dd2cd72cd7b6bd9712b4fb72c4d6df6761576a3161e7e5feb64541b7ab0970d33086b94da7eaa5d3dd6

data/lib/djinni.rb

@@ -1,5 +1,5 @@
+require "fagin"
 require "io/console"
-require "pathname"
 require "terminfo"
 
 class Djinni
@@ -123,39 +123,13 @@ class Djinni
         load_wishes("#{File.dirname(__FILE__)}/djinni/wish")
     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
-            raise Error::UnknownWishError.new(clas)
-        end
-
-        return if (wish.nil?)
-
-        wish.aliases.each do |aliaz|
-            @wishes[aliaz] = wish
-        end
-    end
-    private :load_wish
-
     def load_wishes(dir)
         return if @loaded_from.include?(dir)
 
-        path = Pathname.new(dir).expand_path
-
-        Dir["#{path}/*.rb"].each do |file|
-            require_relative file
-
-            %x(
-                \grep -E "^ *class .+ \< Djinni::Wish" #{file} | \
-                    awk '{print $2}'
-            ).each_line do |clas|
-                load_wish(clas)
+        classes = Fagin.find_children("Djinni::Wish", dir)
+        classes.each do |clas, wish|
+            wish.aliases.each do |aliaz|
+                @wishes[aliaz] = wish
             end
         end
 

data/lib/djinni/wish.rb

@@ -31,6 +31,6 @@ class Djinni::Wish
     end
 end
 
-require "djinni/wish/djinni_help_wish"
-require "djinni/wish/djinni_history_wish"
-require "djinni/wish/djinni_quit_wish"
+require "djinni/wish/help"
+require "djinni/wish/history"
+require "djinni/wish/quit"

data/lib/djinni/wish/{djinni_help_wish.rb → help.rb}

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

data/lib/djinni/wish/{djinni_history_wish.rb → history.rb}

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

data/lib/djinni/wish/{djinni_quit_wish.rb → quit.rb}

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Miles Whittaker
@@ -50,6 +50,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.2
+- !ruby/object:Gem::Dependency
+  name: fagin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
   requirement: !ruby/object:Gem::Requirement
@@ -82,9 +102,9 @@ files:
 - lib/djinni/error.rb
 - lib/djinni/error/unknown_wish_error.rb
 - lib/djinni/wish.rb
-- lib/djinni/wish/djinni_help_wish.rb
-- lib/djinni/wish/djinni_history_wish.rb
-- lib/djinni/wish/djinni_quit_wish.rb
+- lib/djinni/wish/help.rb
+- lib/djinni/wish/history.rb
+- lib/djinni/wish/quit.rb
 homepage: http://mjwhitta.github.io/djinni
 licenses:
 - GPL-3.0