scout-essentials 1.6.11 → 1.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca46feecfdca0f796ad76e9e0e8f3dcf33eb169e41605708cf2042507c968207
-  data.tar.gz: 93b589d483250fdca27ed5e888887d2135b81f253b7ad30afb97adcb8a3382f2
+  metadata.gz: 9b0d08853e8b5dc5179a61969c0778068d5aa613df3ea03b63ec8c0501ebbbce
+  data.tar.gz: 48a325008838d43f3007184fe278cc68f10a3e7d694f09b97146797f4a69b150
 SHA512:
-  metadata.gz: 95d450e003292a7507116cd39bc74822e12820119cea0ddfeabd8aa5a86979f17d4a8aefdf76db5f526026c7795422b8bf7a91c5ae2833a75feb48cf08c5a17b
-  data.tar.gz: 2bdaa762c5899135b5d5aadc054017b597244bf000bb5525894da4b9f9e893053221d3049c5df821726cb999cb5c3fc53e486535395b7fb54513b6a9a339d21c
+  metadata.gz: db7058cfb59b79eb0cc0b0b1524190562e08e0588ae2a00ff8ef5a5442c75799158de0279141da16815b3c1e5e417583137756be3eb63c6fd4d562d8aee4510f
+  data.tar.gz: def4814942f6325cb8ea0d059bc5b935a32989ca6b373aea8b8345747a7b9c500f89df58b524e40e440883f0b2946a3d40a10dd204de2042a08c9d15b76d1f59

data/VERSION

@@ -1 +1 @@
-1.6.11
+1.6.13

data/lib/scout/log/color.rb

@@ -155,6 +155,8 @@ module Log
     :time => cyan,
     :task => yellow,
     :workflow => yellow,
+    :present => green,
+    :missing => cyan,
   })
   HIGHLIGHT = "\033[1m"
 

data/lib/scout/misc/filesystem.rb

@@ -23,7 +23,7 @@ module Misc
     end
   end
 
-  def self.tarize(path, dest = nil)
+  def self.tarize_cmd(path, dest = nil)
     Misc.in_dir(path) do
       if dest
         CMD.cmd("tar cvfz '#{dest}' '.'")
@@ -33,6 +33,37 @@ module Misc
     end
   end
 
+  def self.tarize(source_dir, archive_path)
+    require 'rubygems/package'
+    require 'zlib'
+    require 'stringio'
+    require 'fileutils'
+
+    tar_io = StringIO.new("")
+
+    Gem::Package::TarWriter.new(tar_io) do |tar|
+      Dir[File.join(source_dir, '**', '*')].each do |file|
+        relative_path = file.sub(/^#{Regexp.escape(source_dir)}\/?/, '')
+
+        if File.directory?(file)
+          tar.mkdir(relative_path, File.stat(file).mode)
+        else
+          tar.add_file(relative_path, File.stat(file).mode) do |tf|
+            File.open(file, 'rb') { |f| tf.write(f.read) }
+          end
+        end
+      end
+    end
+
+    tar_io.rewind
+
+    File.open(archive_path, 'wb') do |f|
+      gz = Zlib::GzipWriter.new(f)
+      gz.write(tar_io.string)
+      gz.close
+    end
+  end
+
   def self.untar(file, target = '.')
     target = target.find if Path === target
     file = file.find if Path === file

data/lib/scout/open/sync.rb

@@ -36,7 +36,6 @@ module Open
       Open.mkdir File.dirname(target)
     end
 
-
     Log.low "Migrating #{source} #{files.length} files to #{target} - #{Misc.fingerprint(files)}}" if files
 
 

data/lib/scout/path/find.rb

@@ -117,13 +117,17 @@ module Path
   def self.load_path_maps(filename)
     Path.setup(filename) unless Path === filename
     if filename.exist?
+      filename = filename.find
       begin
+        Log.debug "Loading search_paths from #{filename}"
         YAML.load(filename.read).each do |where, location|
-          @@path_maps[where.to_sym] = location
+          add_path where.to_sym, location
         end
       rescue
         Log.error "Error loading search_paths from #{filename}: " << $!.message
       end
+    else
+      Log.debug "Could not find search_paths file #{filename}"
     end
   end
 
@@ -132,11 +136,11 @@ module Path
   end
 
   def _subpath
-    @subpath ||= _parts.length > 1 ? _parts[1..-1] * "/" : _parts[0] || ""
+    @subpath ||= _parts.length > 1 ? _parts[1..-1] * "/" : nil
   end
 
   def _toplevel
-    @toplevel ||= _parts.length > 1 ? _parts[0] : ""
+    @toplevel ||= _parts[0]
   end
 
   SLASH = "/"[0]
@@ -184,10 +188,11 @@ module Path
   end
 
   def self.exists_file_or_alternatives(file)
-    return file if File.exist?(file) or File.directory?(file)
+    file = file.dup if Path === file
+    return file if Open.exist?(file) or Open.directory?(file)
     %w(gz bgz zip).each do |extension|
       alt_file = file + '.' + extension
-      return alt_file if File.exist?(alt_file) or File.directory?(alt_file)
+      return alt_file if Open.exist?(alt_file) or Open.directory?(alt_file)
     end
     nil
   end

data/lib/scout/resource/util.rb

@@ -1,6 +1,7 @@
 module Resource
   def identify(path)
-    return path unless Path.located?(path)
+    path = Path.setup path unless Path === path
+    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) if path.start_with?("/")
@@ -30,8 +31,6 @@ module Resource
               m.named_captures.include?(c) ? m[c] : nil
             }.compact * "/"
 
-            #unlocated.gsub!(/\/+/,'/')
-
             if self.subdir && ! self.subdir.empty?
               subdir = self.subdir
               subdir += "/" unless subdir.end_with?("/")

data/lib/scout/simple_opt/get.rb

@@ -39,9 +39,11 @@ module SOPT
     end
 
     IndiferentHash.setup @@current_options
+    @@current_options.keys_to_sym!
+
     GOT_OPTIONS.merge! @@current_options
 
-    @@current_options.keys_to_sym
+    @@current_options
   end
   
   def self.get(opt_str)

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.11 ruby lib
+# stub: scout-essentials 1.6.13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.11".freeze
+  s.version = "1.6.13".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-04-10"
+  s.date = "1980-01-02"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -146,7 +146,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-essentials".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.6.5".freeze
+  s.rubygems_version = "3.6.7".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4

data/test/scout/path/test_find.rb

@@ -10,8 +10,8 @@ class TestPathFind < Test::Unit::TestCase
     assert_equal "data/some_file", path._subpath
 
     path = Path.setup("data", 'scout')
-    assert_equal "", path._toplevel
-    assert_equal "data", path._subpath
+    assert_equal "data", path._toplevel
+    assert_equal nil, path._subpath
   end
 
   def test_find_local
@@ -138,5 +138,12 @@ class TestPathFind < Test::Unit::TestCase
       end
     end
   end
+
+  def test_single
+    file = Path.setup('foo')
+    assert_equal 'foo', file._toplevel
+    assert_equal nil, file._subpath
+    assert_equal '/usr/local/foo/scout/', file.find(:local)
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 1.6.13
 platform: ruby
 authors:
 - Miguel Vazquez
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Scout essential tools
 test_files: []