rbbt-util 5.37.6 → 5.37.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6099d98f98d577fdbd0905ff42af44894701583fafab809b35c163f9d3482cb8
-  data.tar.gz: 8b8ab79b18d6dc143b823afa52e8ab3833a2268cdaa9f22e1b9053d1ee84edcc
+  metadata.gz: b5c4e63f52c80871ada12e77c2c2cfe0d2cacb9d4bb3cf13fde88f814d30987b
+  data.tar.gz: e3859c1668e92be90edf4ca5637480e8d74aa26822c0f3181f8d9a1689e6dc0b
 SHA512:
-  metadata.gz: e64c7bd047bf9eb108c9e8176daf9aac8d2f198b65c365d55e628119435b5392299414ada948f7fece30572a26223b150bb2a6bc631f6f25f2225e59adc9ded4
-  data.tar.gz: 79edde0ca6ea40b5c178603f530605cc18a2f4ea44eed731393015fe16ae33a8579ce1254f761890d81fdc12e0e90664708a5c54d0bd10cbbf2a2a36a6ee8538
+  metadata.gz: 1f15f9954cf3f4ad93859d98155c6b34af5beeba3286367732a71c2e9093d97477ec405d300eded639e93470bf8b8f466014e79eaaddedb621c0df2862ac0e01
+  data.tar.gz: 80f82e5ca9262aad1ce8300de0a486234017c6a3a450ae9579bbbeeca1062dac4ab42d3c31276d5546d882a3efa32520658efec18847099c0ae5f8ee93daab7b

data/lib/rbbt/resource.rb

@@ -351,6 +351,7 @@ url='#{url}'
 
   def identify(path)
     path = File.expand_path(path)
+    path += "/" if File.directory?(path)
     resource ||= Rbbt
     locations = (Path::STANDARD_SEARCH + resource.search_order + resource.search_paths.keys)
     locations -= [:current, "current"]
@@ -363,7 +364,10 @@ url='#{url}'
 
       pattern = pattern.sub('{PWD}', Dir.pwd)
       if String ===  pattern and pattern.include?('{')
-        regexp = "^" + pattern.gsub(/{([^}]+)}/,'(?<\1>[^/]+)') + "(?:/(?<REST>.*))?/?$"
+        regexp = "^" + pattern
+          .gsub(/{(TOPLEVEL)}/,'(?<\1>[^/]+)')
+          .gsub(/{([^}]+)}/,'(?<\1>[^/]+)?') +
+        "(?:/(?<REST>.*))?/?$"
         if m = path.match(regexp) 
           if ! m.named_captures.include?("PKGDIR") || m["PKGDIR"] == resource.pkgdir
             return self[m["TOPLEVEL"]][m["SUBPATH"]][m["REST"]]

data/lib/rbbt/util/migrate.rb

@@ -17,13 +17,20 @@ puts path.glob_all.collect{|p| File.directory?(p) ? p + "/" : p } * "\n"
 
       [path, paths.collect{|p| [source, p] * ":"}, lpath]
     else
+      original_path = Path.setup(path)
       if File.exist?(path)
         path = resource.identify(path)
       else
         path = Path.setup(path)
       end
 
-      [path, (path.directory? ? path.glob_all : path.find_all), path]
+      if original_path.located?
+        paths = [original_path]
+      else
+        paths = (path.directory? ? path.glob_all : path.find_all)
+      end
+
+      [path, paths, path]
     end
   end
 
@@ -54,9 +61,9 @@ puts resource[path].find(search_path)
 
     real_paths.each do |source_path|
       Log.medium "Migrating #{source_path} #{options[:files].length} files to #{target} - #{Misc.fingerprint(options[:files])}}" if options[:files]
-      if File.directory?(source_path) || source_path =~ /\/$/
-        source_path += "/" unless source_path[-1] == "/"
-        target += "/" unless target[-1] == "/"
+      if File.directory?(source_path) || source_path.ends_with?("/")
+        source_path += "/" unless source_path.end_with? '/'
+        target += "/" unless target.end_with? '/'
       end
 
       next if source_path == target

data/lib/rbbt/util/named_array.rb

@@ -1,4 +1,3 @@
-#require 'rbbt/util/chain_methods'
 require 'rbbt/util/misc'
 
 module NamedArray

data/share/color/color_names

@@ -505,4 +505,3 @@ yellow2	#eeee00
 yellow3	#cdcd00
 yellow4	#8b8b00
 YellowGreen	#9acd32
-

data/test/rbbt/test_resource.rb

@@ -94,8 +94,12 @@ class TestTSV < Test::Unit::TestCase
   end
 
   def test_identify
+    assert_equal 'etc/', Rbbt.identify(File.join(ENV["HOME"], '.rbbt/etc/'))
+    assert_equal 'share/databases/', Rbbt.identify('/usr/local/share/rbbt/databases/')
+    assert_equal 'share/databases/DATABASE', Rbbt.identify('/usr/local/share/rbbt/databases/DATABASE')
     assert_equal 'share/databases/DATABASE/FILE', Rbbt.identify('/usr/local/share/rbbt/databases/DATABASE/FILE')
     assert_equal 'share/databases/DATABASE/FILE', Rbbt.identify(File.join(ENV["HOME"], '.rbbt/share/databases/DATABASE/FILE'))
+    assert_equal 'share/databases/DATABASE/FILE', Rbbt.identify('/usr/local/share/rbbt/databases/DATABASE/FILE')
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.37.6
+  version: 5.37.8
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake