scout-essentials 1.6.9 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c6a3bfa03c83171a83558fa73b4a23c5bffffb02fa036c36f4ad6417abbee9
-  data.tar.gz: 605d88dc63abe624432c9ece462ac19c33e243252667d5aa8b27a541e38582f6
+  metadata.gz: 0744ff3212ce233d71a90debd83ef37b8bbe6e7b59e1e96fc5a11410a2cdd9f7
+  data.tar.gz: 2a6dcc56bb12d626bb83b04adf4c4a333cb75affa5b7bd82dcd52232c7c9aec4
 SHA512:
-  metadata.gz: 9528eea7eccc93c0640f1530ecba2eeb874fd3f4bb211789f8bd830e127ff52c880cee2fb4621f92db7f855fb0d4f7d12098ace50726f76f14f27c5cd8ffb8f7
-  data.tar.gz: beaf0a93070745d6102d766931557369a74d5ada67182c7b13cde60eb5d14a8d8e71f29e8f80356910bac97fef1022e9bb21028d2a687515a04bb781dd7d61fb
+  metadata.gz: bffec594af7e3b20eba03d717eb3ca2a1efdf4f3e51d3e4fd581aecf0b343a6f6e792e4faaf33b93a3087327d36b4bacbed5264e2c816545ceb936ca0dfb2f71
+  data.tar.gz: decc1173a098ffa0c459ebee50efb3b8a37c222d43fa669f6df82b34d04c2a773dc91a72c1d446320df015343ed8cef9cc548f65fa265289234fcc8ee7d0ecac

data/VERSION

@@ -1 +1 @@
-1.6.9
+1.6.10

data/lib/scout/open/final.rb

@@ -140,4 +140,56 @@ module Open
       nil
     end
   end
+
+  def self.ln_s(source, target, options = {})
+    source = source.find if Path === source
+    target = target.find if Path === target
+
+    target = File.join(target, File.basename(source)) if File.directory? target
+    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
+    FileUtils.rm target if File.exist?(target)
+    FileUtils.rm target if File.symlink?(target)
+    FileUtils.ln_s source, target
+  end
+
+  def self.ln(source, target, options = {})
+    source = source.find if Path === source
+    target = target.find if Path === target
+    source = File.realpath(source) if File.symlink?(source)
+
+    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
+    FileUtils.rm target if File.exist?(target)
+    FileUtils.rm target if File.symlink?(target)
+    FileUtils.ln source, target
+  end
+
+  def self.ln_h(source, target, options = {})
+    source = source.find if Path === source
+    target = target.find if Path === target
+
+    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
+    FileUtils.rm target if File.exist?(target)
+    begin
+      CMD.cmd("ln -L '#{ source }' '#{ target }'")
+    rescue ProcessFailed
+      Log.debug "Could not hard link #{source} and #{target}: #{$!.message.gsub("\n", '. ')}"
+      CMD.cmd("cp -L '#{ source }' '#{ target }'")
+    end
+  end
+
+  def self.link(source, target, options = {})
+    begin
+      Open.ln(source, target, options)
+    rescue
+      Log.debug "Could not make regular link, trying symbolic: #{Misc.fingerprint(source)} -> #{Misc.fingerprint(target)}"
+      Open.ln_s(source, target, options)
+    end
+    nil
+  end
+
+  def self.link_dir(source, target)
+    Log.debug "Copy with hard-links #{Log.fingerprint source}->#{Log.fingerprint target}"
+    FileUtils.cp_lr(source, target)
+  end
+
 end

data/lib/scout/open/util.rb

@@ -125,57 +125,6 @@ module Open
     Pathname.new(File.expand_path(file)).realpath.to_s 
   end
 
-  def self.ln_s(source, target, options = {})
-    source = source.find if Path === source
-    target = target.find if Path === target
-
-    target = File.join(target, File.basename(source)) if File.directory? target
-    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
-    FileUtils.rm target if File.exist?(target)
-    FileUtils.rm target if File.symlink?(target)
-    FileUtils.ln_s source, target
-  end
-
-  def self.ln(source, target, options = {})
-    source = source.find if Path === source
-    target = target.find if Path === target
-    source = File.realpath(source) if File.symlink?(source)
-
-    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
-    FileUtils.rm target if File.exist?(target)
-    FileUtils.rm target if File.symlink?(target)
-    FileUtils.ln source, target
-  end
-
-  def self.ln_h(source, target, options = {})
-    source = source.find if Path === source
-    target = target.find if Path === target
-
-    FileUtils.mkdir_p File.dirname(target) unless File.exist?(File.dirname(target))
-    FileUtils.rm target if File.exist?(target)
-    begin
-      CMD.cmd("ln -L '#{ source }' '#{ target }'")
-    rescue ProcessFailed
-      Log.debug "Could not hard link #{source} and #{target}: #{$!.message.gsub("\n", '. ')}"
-      CMD.cmd("cp -L '#{ source }' '#{ target }'")
-    end
-  end
-
-  def self.link(source, target, options = {})
-    begin
-      Open.ln(source, target, options)
-    rescue
-      Log.debug "Could not make regular link, trying symbolic: #{Misc.fingerprint(source)} -> #{Misc.fingerprint(target)}"
-      Open.ln_s(source, target, options)
-    end
-    nil
-  end
-
-  def self.link_dir(source, target)
-    Log.debug "Copy with hard-links #{Log.fingerprint source}->#{Log.fingerprint target}"
-    FileUtils.cp_lr(source, target)
-  end
-
   def self.list(file)
     file = file.produce_and_find if Path === file
     Open.read(file).split("\n")

data/lib/scout/resource/util.rb

@@ -1,9 +1,9 @@
 module Resource
   def identify(path)
-    return path unless path.start_with?("/")
+    return path unless path.located?
     path_maps = path.path_maps if Path === path
     path_maps ||= self.path_maps || Path.path_maps
-    path = File.expand_path(path)
+    path = File.expand_path(path) if path.start_with?("/")
     path += "/" if File.directory?(path)
 
     map_order ||= (path_maps.keys & Path.basic_map_order) + (path_maps.keys - Path.basic_map_order)
@@ -30,7 +30,7 @@ module Resource
               m.named_captures.include?(c) ? m[c] : nil
             }.compact * "/"
 
-            unlocated.gsub!(/\/+/,'/')
+            #unlocated.gsub!(/\/+/,'/')
 
             if self.subdir && ! self.subdir.empty?
               subdir = self.subdir

data/scout-essentials.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-essentials 1.6.9 ruby lib
+# stub: scout-essentials 1.6.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.9".freeze
+  s.version = "1.6.10".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Miguel Vazquez".freeze]
-  s.date = "2025-03-25"
+  s.date = "2025-04-08"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [

data/test/scout/resource/test_util.rb

@@ -35,5 +35,14 @@ class TestResourceUtil < Test::Unit::TestCase
       assert_equal path2, Resource.relocate(path1)
     end
   end
+
+  def ___test_s3
+    require 'scout-camp'
+    require 'scout/aws/s3'
+    p = Path.setup("s3://bucket/var/jobs/workflow/task/job.txt")
+    p.path_maps = {:bucket => 's3://bucket/{TOPLEVEL}/{SUBPATH}'}
+
+    assert_equal 'var/jobs/workflow/task/job.txt', Resource.identify(p)
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10
 platform: ruby
 authors:
 - Miguel Vazquez
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda