rbbt-util 5.5.34 → 5.5.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzliNGFhOTdhZmJjMzhmZDJhNzU4ZDUwZWQzNjgxNjE3NzQ3MTkyZg==
+    ZjM2NWExYzgzODc2ZDUwYWI3N2NkZmRlYjY0MTE4MDkwOGY0ZWMyMQ==
   data.tar.gz: !binary |-
-    Y2M1ZTJmMjJkZjE4NGQxM2NhMGYyNDBlZjA0ODYxMWJhMGJjMWI3ZA==
+    YmFjOTY5NDgzMmE4ODI5NjE1NTdhZTVkZDFlN2Y0MTRjMTMxZjIxZA==
 SHA512:
   metadata.gz: !binary |-
-    ODQ1OWQ0NmUwOTM1MDRjNTk5MGY5MTUxZjcyNTJjNzQ1N2M4NzMxNmVmMmVm
-    ZGI3NzFmN2I1MzliYmM4ZTE0NjZhZjJlMWUyYTVhZDZhZGQxN2IxMTIxZjkx
-    MzUyOWQwNTg4MmIxMzQyYjIxNTJmYjhiNGNjZDZiNzc3Y2RjODc=
+    MGIyZmU0MzYyZmVkMzlhMzgyNGZhNzQ1OGRjOWZlMWJmYzgyMDhlZTg0OTk1
+    N2MwMTYzZDA1M2VjNjliMjUxMTQxMDdiNDM0OWNmOGNlYzI1OTJiZjMxZDIw
+    OTI1MmQ1ZjUyOTdlNGNlMjg3OWMyYmU0ZDgyMjNkYWEzOTM5ZmE=
   data.tar.gz: !binary |-
-    MjBiYWZiNmYyYThiY2Q0YTM4NmE4NWZlZDRmMzI2YTM4ZmIwMmI4MmY3ZmY0
-    NWJhNDI0OTQxYTM4Y2UzOGYwZjY1N2M3ODAwNTk4MzgxMGMxOTY3NmQ0NzVi
-    OWM2Y2I1YzU3MjUwNWFlMWUyZmMyZTEzMGIyODg1YTg3YzZmYzI=
+    MDgwOGEwYTMzZGY3NjkzN2JmZjE4ODhjZjdkMTM2NzljOGU2ZDNjYjIxMmUw
+    MGM1NDJmY2NkMjY2MDA3MWU5ZDRiNDYxNjVmZGM1ZWRjZWRjZDU2Y2U1NmQy
+    M2FmOGU0ZWE0ZTVmZGYwMGNkMDYzN2Q0NjQ2NmRhZTNmYjFhY2I=

data/lib/rbbt/resource/path.rb

@@ -2,22 +2,27 @@ require 'rbbt/resource/util'
 require 'yaml'
 
 module Path
-  attr_accessor :resource, :pkgdir
+  attr_accessor :resource, :pkgdir, :search_paths
 
-  def self.setup(string, pkgdir = nil, resource = nil)
+  def self.setup(string, pkgdir = nil, resource = nil, search_paths = nil)
     string.extend Path
     string.pkgdir = pkgdir || 'rbbt'
     string.resource = resource
+    string.search_paths = search_paths
     string
   end
 
+  def sub(*args)
+    self.annotate super(*args)
+  end
+
   def annotate(name)
-    Path.setup name.to_s, @pkgdir, @resource
+    Path.setup name.to_s, @pkgdir, @resource, @search_paths
   end
 
   def join(name)
     if self.empty?
-      self.annotate name.to_s
+      self.annotate name.to_s.dup
     else
       self.annotate File.join(self, name.to_s)
     end
@@ -77,9 +82,9 @@ module Path
     end
   end
 
-  def find(where = nil, caller_lib = nil, search_paths = nil)
-    where = search_paths[:default] if where == :default
-    search_paths ||= SEARCH_PATHS
+  def find(where = nil, caller_lib = nil, paths = nil)
+    paths = (self.search_paths || SEARCH_PATHS).merge(paths || {})
+    where = paths[:default] if where == :default
     return self if located?
     if self.match(/(.*?)\/(.*)/)
       toplevel, subpath = self.match(/(.*?)\/(.*)/).values_at 1, 2
@@ -91,22 +96,28 @@ module Path
     if where.nil?
       %w(current user local global lib).each do |w| 
         w = w.to_sym
-        next unless search_paths.include? w
-        path = find(w, caller_lib, search_paths)
+        next unless paths.include? w
+        path = find(w, caller_lib, paths)
         return path if File.exists? path
       end
-      if search_paths.include? :default
-        find((search_paths[:default] || :user), caller_lib, search_paths)
+      if paths.include? :default
+        find((paths[:default] || :user), caller_lib, paths)
       else
-        raise "Path '#{ path }' not found, and no default specified in search paths: #{search_paths.inspect}"
+        raise "Path '#{ path }' not found, and no default specified in search paths: #{paths.inspect}"
       end
     else
       where = where.to_sym
-      raise "Did not recognize the 'where' tag: #{where}. Options: #{search_paths.keys}" unless search_paths.include? where
+      raise "Did not recognize the 'where' tag: #{where}. Options: #{paths.keys}" unless paths.include? where
       libdir = where == :lib ? Path.caller_lib_dir(caller_lib) : ""
       libdir ||= ""
       pwd = FileUtils.pwd
-      Path.setup search_paths[where].sub('{PKGDIR}', pkgdir).sub('{PWD}', pwd).sub('{TOPLEVEL}', toplevel).sub('{SUBPATH}', subpath).sub('{LIBDIR}', libdir), @pkgdir, @resource
+      self.annotate paths[where].
+        sub('{PKGDIR}', pkgdir).
+        sub('{PWD}', pwd).
+        sub('{TOPLEVEL}', toplevel).
+        sub('{SUBPATH}', subpath).
+        sub('{PATH}', self).
+        sub('{LIBDIR}', libdir) #, @pkgdir, @resource, @search_paths
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.34
+  version: 5.5.35
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake