alloader 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c819276f7b77e911ffba591188388c67c30f250
-  data.tar.gz: c3ef7bde396442b8f9b5c58d746566529a569669
+  metadata.gz: 58275a9343512a6d13789d14ca17d6e8cffcf635
+  data.tar.gz: 3c563045a4cce1d35f31b8e1cd136af4bf503e4f
 SHA512:
-  metadata.gz: 5327b3176507f3eec07b620910bcf3695bb5e6b0b0f55758b5d775f5c42c8687c17af30d79fcd30ab99fa79f8a12d39623e5945ecbf0d640b4c13dac28fc05aa
-  data.tar.gz: e0ac27dc2dea0ede45b0fc100690ca8b9ff1925d0336587b7951301a16b8360de99d2f2ab680fe94f6cacf92dfd6bf6e912104c68bbd5165979a8933e94df58c
+  metadata.gz: 5728c17564433f83d0d20f785636402af1864fa787c4dbecff83cfb2d824e0a9330af02c88dbefc820c28ec5f9c3a2381d40fa60c4c3ca8a44373f7b2494c455
+  data.tar.gz: 7d8509cba63e16c09e852786a21133cf375c54cefb5245879d87657a042c636f57816e24a64d7496ea33abab76a07994eaa0a09f247170349bf693ed033280ba

data/lib/alloader.rb

@@ -4,42 +4,54 @@ module Alloader
 
   class << self
 
-    def require_all(dirpath, mode = :require)
-      case mode
-      when :require
-        filelist_in(dirpath).each do |f|
-          require f
-        end
-      when :load
-        filelist_in(dirpath).each do |f|
-          load f
-        end
-      end
+    def load_dir(dirpath)
+      load_filepaths(filepaths_in_dir(dirpath))
     end
 
-    def r
-      load caller_head
+    def require_dir(dirpath)
+      require_filepaths(filepaths_in_dir(dirpath))
     end
 
     private
 
-    def caller_files
-      caller.map { |str| File::expand_path(str.split(":")[0]) }
+    # ----------------------------------------
+
+    def is_dir(path)
+      FileTest::directory?(path)
+    end
+
+    def filepaths_in_dir(dirpath)
+      filelist = (Dir::entries(dirpath) - [".", ".."]).map { |file|
+        File::expand_path(dirpath + "/" + file)
+      }
+      dirpaths = filter(method(:is_dir), filelist)
+      filepaths_in_dirpaths = dirpaths.inject([]) { |acc, dirpath|
+        acc + filepaths_in_dir(dirpath)
+      }
+
+      filelist - dirpaths + filepaths_in_dirpaths
     end
 
-    def caller_head
-      caller_files[-1]
+    def require_filepaths(filepaths)
+      result = {}
+      filepaths.each do |filepath|
+        result[filepath] = require filepath
+      end
+      result
+    end
+
+    def load_filepaths(filepaths)
+      result = {}
+      filepaths.each do |filepath|
+        result[filepath] = load filepath
+      end
+      result
     end
 
-    def filelist_in(dir_path)
-      list = (Dir::entries(dir_path) - [".", "..", $0]).map {|path|
-        File::expand_path(dir_path) + "/" + path
-	    } - caller_files
-      dirs = list.select { |x| FileTest::directory?(x) }
-      files = list - dirs
-      files_in_dirs = dirs.inject([]) { |acc, dir| acc + filelist_in(dir) }
+    # ----------------------------------------
 
-      files + files_in_dirs
+    def filter(pred, lst)
+      lst.select { |itm| pred.(itm) }
     end
 
   end

data/lib/alloader/version.rb

@@ -1,3 +1,3 @@
 module Alloader
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alloader
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - marg_do