fagin 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26beff62045a06ff5b1e59d879fe414dbb9df099a54d0126474e97c1fa54aef3
-  data.tar.gz: 785b94eebc7d224438cf6692f7cc10f627e8f68f4ac6cafc959de66a0ac32931
+  metadata.gz: 4ec627f1c90e140159c4542b062be31ab8a8830cd717d8779713dec262232190
+  data.tar.gz: ab6c12883739989c0be041efd35140aa9762d3bf1773414efee64a4299e7d16d
 SHA512:
-  metadata.gz: b9890956cd578cbe58f29f4bc3a96f6690fe2239795cd75456da9b3667ff2206769a0a580c1c7bce00e44713396a8cd0d5abc4aab4ac1e5aaf1f7b61180b67e3
-  data.tar.gz: 49eb85eca76538c1142d1d44809a5ef6cd590c9370b26e233251f1f8f2996cbeb577b0245287f1f39c50275965751be28ac82f28072247974bb798585e52d61d
+  metadata.gz: c8a714340c867111b18a04c7afc2ee8eef242f9a5d673d1ffc9c447e2922cec61355c74ddb5b56bcba612d1f09ea31b1f72d00e1331f1c5d1698e7445cc88881
+  data.tar.gz: 30e35bf695755e4971778d285577ab7820787196d69d190907c916cdf02e37a08741e75bc0154d59981623d38f9ff90c13eb423e8b41647edffae171281538e1

data/lib/fagin.rb

@@ -1,14 +1,16 @@
 require "pathname"
 
 class Fagin
-    def self.find_children(parent, dir)
+    def self.find_children(parent, dir, recursive = false)
         children = Hash.new
         path = Pathname.new(dir).expand_path
         return children if (!path.exist?)
 
-        %x(
-            \grep -EHos "^class +.+ *< *#{parent}" #{path}/*.rb
-        ).each_line do |line|
+        pattern = "\"^class +[^ ]+ *< *#{parent}\""
+        cmd = "grep -EHors #{pattern} #{path}"
+        cmd += "/*.rb" if (!recursive)
+
+        %x(#{cmd}).each_line do |line|
             line.match(/^([^:]+\.rb).+class\s+(\S+)\s*</) do |match|
                 file = match[1]
                 next if (file.nil? || file.empty?)
@@ -30,31 +32,7 @@ class Fagin
     end
 
     def self.find_children_recursively(parent, dir)
-        children = Hash.new
-        path = Pathname.new(dir).expand_path
-        return children if (!path.exist?)
-
-        %x(
-            \grep -EHors "^class +.+ *< *#{parent}" #{path}
-        ).each_line do |line|
-            line.match(/^([^:]+\.rb).+class\s+(\S+)\s*</) do |match|
-                file = match[1]
-                next if (file.nil? || file.empty?)
-                clas = match[2]
-                next if (clas.nil? || clas.empty?)
-                begin
-                    require_relative file
-                    child = clas.split("::").inject(Object) do |m, c|
-                        m.const_get(c)
-                    end
-                    children[clas] = child
-                rescue NameError
-                    raise Error::UnknownChildClass.new(clas)
-                end
-            end
-        end
-
-        return children
+        return find_children(parent, dir, true)
     end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fagin
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dynamically load children classes