loader 1.2.6 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2437076db69c76c793a5420f7b6e29e2ee1981e0
-  data.tar.gz: 2a83311b0593eb2c31941bf275cf074500355dc2
+  metadata.gz: baa86c000a57bb154c384914994c745e77644ab0
+  data.tar.gz: 24193f8d91aae65f61f442d31af73d2c76dd0c46
 SHA512:
-  metadata.gz: c27ed6f273f0bd3e909c63e0fc4ff312089c1ffb8257714ba0e009ce52c6acf043e437ff8005a9388c83c9f01c86ab961cd40b1a646b891fab87a335f7d23c49
-  data.tar.gz: f5d7645769cce9783b88044d015899025ba4e1e52c4dc63c0f77591b35c9b581bf64511abb115fe4e45a11215375d6ce515b27ffa652628b39ef3e3da24249e3
+  metadata.gz: f8b8356364117953e9d8df97118aac1f00ae004d9ee5e6037370e7bbc5058f3538fb55f376abc5b07dc54334e4e1fe7cb7c143f367fbd188df3131768eaa901d
+  data.tar.gz: bf5f3705405f2c3f5807128cd410e8f89ff9fd8094c9fa4aaa13e81dce3355c57527289bafe3f2e706fa8606430f67a849ed10f0ebbe1343dc420f17cbbe8718

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source :rubygems
 gemspec

data/LICENSE

@@ -1,20 +1,20 @@
-The MIT License (MIT)
+Copyright (c) 2013 Adam Luzsi
 
-Copyright (c) 2014 Adam Luzsi
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -20,7 +20,8 @@ The end goal is to make an easy ruby file loader for gems. So Dir.pwd do not aff
 
 ### Examples
 
-load relative directory (not based on Dir.pwd)
+load relative directory (not based on Dir.pwd but the caller files position)
+if you pass multiple string as argument it will be joined by file separator that the OS use
 
 ```ruby
 
@@ -32,12 +33,16 @@ load relative directory (not based on Dir.pwd)
 
     # for recursive use try the following
     require_relative_directory "lib", :r
-    ## or
+
+    # or
     require_relative_directory_r "lib"
 
+    # or
+    require_relative_directory "lib",r: true
+
 ```
 
-Additional Syntax for caller magic
+Additional Syntax for caller magics
 
 ```ruby
 

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.3.1

data/examples/lib/asdf/level2.rb

@@ -0,0 +1 @@
+puts __FILE__

data/examples/lib/asdf/meta/level3.rb

@@ -0,0 +1 @@
+puts __FILE__

data/examples/lib/level1_1.rb

@@ -0,0 +1 @@
+puts __FILE__

data/examples/lib/level1_2.rb

@@ -0,0 +1 @@
+puts __FILE__

data/examples/meta.rb

@@ -0,0 +1,18 @@
+require_relative "../lib/loader"
+
+puts Loader.meta "examples","lib","**","meta"
+#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
+
+puts Loader.meta root: File.expand_path(File.dirname(__FILE__))
+#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
+
+
+puts Loader.meta  "lib","**","meta",
+                  root: File.expand_path(File.dirname(__FILE__))
+#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
+
+puts Loader.meta absolute: File.expand_path(File.join(File.dirname(__FILE__),"lib","**","meta"))
+#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
+
+puts Loader.metaloader_framework root: File.expand_path(File.dirname(__FILE__))
+#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}

data/examples/simple_require.rb

@@ -1,24 +1,7 @@
 require_relative "../lib/loader"
 
+#> require the ruby files from lib
 require_directory "lib"
-# one of the file has a "puts \"hello world!\"" that will run on load
-#> hello world!
 
-puts Loader.meta "examples","lib","**","meta"
-#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
-
-puts Loader.meta root: File.expand_path(File.dirname(__FILE__))
-#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
-
-puts Loader.meta  "lib","**","meta",
-                  root: File.expand_path(File.dirname(__FILE__))
-#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
-
-puts Loader.meta absolute: File.expand_path(File.join(File.dirname(__FILE__),"lib","**","meta"))
-#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
-
-puts Loader.metaloader_framework root: File.expand_path(File.dirname(__FILE__))
-#> {"asdf"=>{"else"=>{"world"=>"hello"}, "stuff"=>{"hello"=>"world"}}}
-
-require_directory "lib", :r #> recursive
-#> hello world! from stuff.rb
+#> require the ruby files from and under to lib (recursive)
+require_directory_r "lib"

data/lib/loader.rb

@@ -3,7 +3,6 @@ module Loader
 
   require "yaml"
 
-  require File.join(File.dirname(__FILE__),"loader","array")
   require File.join(File.dirname(__FILE__),"loader","hash")
   require File.join(File.dirname(__FILE__),"loader","meta")
   require File.join(File.dirname(__FILE__),"loader","require")

data/lib/loader/hash.rb

@@ -1,29 +1,19 @@
 module Loader
   module HashEXT
+    class << self
 
-    # Returns a new hash with +self+ and +other_hash+ merged recursively.
-    #
-    #   h1 = {:x => {:y => [4,5,6]}, :z => [7,8,9]}
-    #   h2 = {:x => {:y => [7,8,9]}, :z => "xyz"}
-    #
-    #   h1.deep_merge(h2) #=> { :x => {:y => [7, 8, 9]}, :z => "xyz" }
-    #   h2.deep_merge(h1) #=> { :x => {:y => [4, 5, 6]}, :z => [7, 8, 9] }
-    def deep_merge(other_hash)
-      dup.deep_merge!(other_hash)
-    end
-
-    alias :+ :deep_merge unless method_defined? :deep_merge
+      def deep_merge(self_hash,other_hash)
+        deep_merge!(self_hash.dup,other_hash)
+      end
 
-    # Same as +deep_merge+, but modifies +self+.
-    def deep_merge!(other_hash)
-      other_hash.each_pair do |k,v|
-        tv = self[k]
-        self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+      def deep_merge!(self_hash,other_hash)
+        other_hash.each_pair do |k,v|
+          tv = self_hash[k]
+          self_hash[k] = tv.is_a?(::Hash) && v.is_a?(::Hash) ? deep_merge(tv,v) : v
+        end
+        self_hash
       end
-      self
-    end
 
+    end
   end
-end
-
-Hash.__send__ :include, Loader::HashEXT
+end

data/lib/loader/meta.rb

@@ -108,7 +108,7 @@ module Loader
 
       end
 
-      target_config_hash.deep_merge! Loader.meta( absolute: lib_folder )
+      HashEXT.deep_merge! target_config_hash, Loader.meta( absolute: lib_folder )
 
       # update by config
       begin
@@ -157,7 +157,7 @@ module Loader
           config_yaml_paths.each do |one_yaml_file_path|
             begin
               yaml_data= YAML.load(File.open(one_yaml_file_path))
-              target_config_hash.deep_merge!(yaml_data)
+              HashEXT.deep_merge!(target_config_hash,yaml_data)
 
               unless environment.nil?
                 if one_yaml_file_path.include?(environment.to_s)
@@ -197,7 +197,10 @@ module Loader
     # yaml file name as key and the folder as the category
     def meta( *args )
 
-      options= args.extract_class!(Hash)[0]
+      options= args.select{|e|(e.class <= ::Hash)}
+      args -= options
+      options= Hash[*options]
+
       options ||= {}
 
       if options[:absolute].nil?

data/lib/loader/require.rb

@@ -2,51 +2,42 @@ module Loader
 
   module ObjectRequireEXT
 
-    # Offline repo activate
-    #def mount_modules(target_folder= File.join(Dir.pwd,"{module,modules}","{gem,gems}") )
-    #  Dir.glob(File.join(target_folder,"**","lib")).select{|f| File.directory?(f)}.each do |one_path|
-    #    $LOAD_PATH.unshift one_path
-    #  end
-    #end
-
     # require sender relative directory's files
     # return the directory and the sub directories file names (rb/ru)
-    def require_relative_directory( folder, *args )
+    def require_relative_directory *args
+
+      folder= args.select{|e|(e.class <= ::String)}.join(File::Separator)
+      opts=   Hash[*args.select{|e|(e.class <= ::Hash)}]
+      args=   args.select{|e|(e.class <= ::Symbol)}
 
-      recursive= nil
-      [:recursive,:r, :R, 'r', 'R', '-r', '-R'].each{|e| args.include?(e) ? recursive ||= true : nil }
+      opts[:recursive]      ||= opts.delete(:r) || opts.delete(:R) || !([:recursive,:r, :R,].select{|e| args.include?(e)}.empty?)
+      opts[:recursive]        = !!opts[:recursive]
 
-      # opts[:extension] ||= opts[:extensions] || opts[:ex] || opts[:e] || []
-      # raise(ArgumentError,"invalid extension object, must be array like") unless opts[:extension].class <= Array
+      opts[:caller_folder]  ||= opts.delete(:f) || opts.delete(:folder) || Loader.caller_folder
 
       unless folder.to_s[0] == File::Separator
-        folder= [Loader.caller_folder,folder]
+        folder= [opts[:caller_folder],folder]
       end
 
-      path_parts= [*folder]
-      if recursive
-        path_parts.push("**")
+      #> recursive option
+      begin
+        path_parts= [*folder]
+        if opts[:recursive]
+          path_parts.push("**")
+        end
+        path_parts.push("*.{rb,ru}")
       end
-      path_parts.push("*.{rb,ru}")
 
-      return_value= false
-      Dir.glob(File.join(*path_parts)).each do |one_path|
-        require(one_path) ? return_value=( true ) : nil
-      end
+      return Dir.glob(File.join(*path_parts)).sort_by{|e| e.split(File::Separator).size }.map { |one_path|
+        require(one_path)
+      }.include?(true)
 
-      return return_value
     end
 
     alias :require_directory :require_relative_directory
 
-    def require_relative_directory_r folder
-
-      unless folder.to_s[0] == File::Separator
-        folder= File.join(Loader.caller_folder,folder)
-      end
-
-      require_relative_directory folder,:r
-
+    def require_relative_directory_r *args
+      require_relative_directory *args, r: true, f: Loader.caller_folder
     end
     alias :require_directory_r :require_relative_directory_r
 

data/loader.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |spec|
   spec.description   = %q{ dsl for gem helper calls such like relative folder calls that independ on the Dir.pwd or File.expand tricks and config loader stuffs, Check out the GIT! }
   spec.summary       = %q{DSL for helping make file require easy just like build configuration objects }
   spec.homepage      = "https://github.com/adamluzsi/loader"
-  spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loader
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.1
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies: []
 description: " dsl for gem helper calls such like relative folder calls that independ
   on the Dir.pwd or File.expand tricks and config loader stuffs, Check out the GIT! "
@@ -24,13 +24,16 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- examples/lib/asdf/level2.rb
 - examples/lib/asdf/meta/else.yml
+- examples/lib/asdf/meta/level3.rb
 - examples/lib/asdf/meta/stuff.yml
-- examples/lib/asdf/stuff.rb
+- examples/lib/level1_1.rb
+- examples/lib/level1_2.rb
+- examples/meta.rb
 - examples/simple_require.rb
 - files.rb
 - lib/loader.rb
-- lib/loader/array.rb
 - lib/loader/hash.rb
 - lib/loader/meta.rb
 - lib/loader/require.rb
@@ -38,8 +41,7 @@ files:
 - test/sub/test2.rb
 - test/test.rb
 homepage: https://github.com/adamluzsi/loader
-licenses:
-- MIT
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/examples/lib/asdf/stuff.rb

@@ -1 +0,0 @@
-puts "hello world!"

data/lib/loader/array.rb

@@ -1,26 +0,0 @@
-module Loader
-  module  ArrayEXT
-
-  # generate params structure from array
-  # return_array
-  def extract_class! class_name
-
-    if class_name.class != Class
-      raise ArgumentError, "parameter must be a class name"
-    end
-
-    return_value= self.map { |element|
-      if element.class == class_name
-        element
-      end
-    }.uniq - [ nil ]
-    return_value.each{|e| self.delete(e) }
-
-    return return_value
-
-  end unless method_defined? :extract_class!
-
-  end
-end
-
-Array.__send__ :include, Loader::ArrayEXT