djinni 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5248368310688ab43b4da1b8666e400f128bc2a1
-  data.tar.gz: 6e32bcd778d9be2aa748965343ff13c346659050
+  metadata.gz: ef936a21ffbf86d2e3066aa05597c6a5f968f357
+  data.tar.gz: 0c3a346b04c8e7413dcb8984ef0e26554f12ad94
 SHA512:
-  metadata.gz: 48fc4efc19668aef5ecf4046c74eb031c88cc89bd2f1ce7f9cbedd0b5297dc4d7a3cdd3a366da255cdcfbb818272a9ca6f6c1e695663aad5f4dea207d7f80977
-  data.tar.gz: 95a37a0f190eecf33346f20d63d1f995ecd94b996e3d5149b96e1ab6f410151253d1a536dc16ce2b235d2e2b8bafdc0198d7cc2df6f4559c41b7a06e1ab8bb50
+  metadata.gz: 9b897ad86168a31364fdd9bf91810198798f3bc9200f488500dcd3f95c1530fd7ee271f7ce6ba0a77141501a1d7af4b40eea375f97d5d569b8651d2c1bcb1b1a
+  data.tar.gz: 8c091c11e1e68181d39cb188f58000b2322f5e216f19c00587ed6ad52f973a298b1a8027f8ecf2b50fc902369a732ab7eb575ecd5f64a7e9ad59084b68942fca

data/lib/djinni.rb

@@ -1,11 +1,12 @@
+require "djinni_error"
+require "djinni_wish"
 require "io/console"
 require "pathname"
 require "terminfo"
 
-require_relative "djinni_exit"
-require_relative "djinni_wish"
-
 class Djinni
+    include DjinniError
+
     def grant_wish(input, env = {})
         return "" if (input.nil? || input.empty?)
 
@@ -122,8 +123,7 @@ class Djinni
         begin
             wish = Object::const_get(clas).new
         rescue NameError => e
-            puts "Unknown wish class #{clas}!"
-            exit DjinniExit::UNKNOWN_WISH
+            raise DjinniError::UnknownWish.new(clas)
         end
 
         return if (wish.nil?)
@@ -138,13 +138,11 @@ class Djinni
 
         path = Pathname.new(dir).expand_path
 
-        # puts "Loading wishes from #{path}"
         Dir["#{path}/*.rb"].each do |file|
-            # puts "Loading #{clas}"
             require_relative file
 
             %x(
-                \grep -E "class .* \< DjinniWish" #{file} | \
+                \grep -E "^ *class .+ \< DjinniWish" #{file} | \
                     awk '{print $2}'
             ).each_line do |clas|
                 load_wish(clas)

data/lib/djinni_error.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djinni
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Miles Whittaker
@@ -62,7 +62,7 @@ files:
 - lib/builtin/history.rb
 - lib/builtin/quit.rb
 - lib/djinni.rb
-- lib/djinni_exit.rb
+- lib/djinni_error.rb
 - lib/djinni_wish.rb
 homepage: http://mjwhitta.github.io/djinni
 licenses:

data/lib/djinni_exit.rb

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