scout-essentials 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c16f695461037137552a5dc43c5135eae7873176ae2bc9495e9c0ed7fdbf0b
-  data.tar.gz: 6bea89686ff4be00f385757cf2d4e96aa15c973253432244eb7c0412c7977365
+  metadata.gz: 49e4171f1423c14ce88fa83062e7a90febad44c979596dd3e185d296ec37d9bc
+  data.tar.gz: 174e9b8798c3d2541d1b1ee72233adb98152406dc95611a4e2022938442ce373
 SHA512:
-  metadata.gz: 10864ea7dc1d73802a5c4bdc4f48f48434f3d610c4efef5df281f0d34b38eae366329673daff86756242ca43cee792ba76c8c8f590d0ed030c0c77c645eb4a58
-  data.tar.gz: 6d2d19fa54ee2ab3c3130310f54feb080713a53f41a69a99debed28e69f127e7e1596eb99a0e715f4a6af5f89af78c86d8c189cc94afef6427c5802962c12c1f
+  metadata.gz: 5826fb333507b38743aa46232391eec8208062539d72263794747b8b67b79d642c22146866d207fb69fcc1b35bcba07da4ce9deabf936783aff75e2b6c6ce598
+  data.tar.gz: 381d4453ac80ee4ac6258da44cd0818f5df046744995620d8fc957e873b874360dfb4915f0e30e2ea3c69faddedff0307db6ecd7429ab96c1f3f5e3696e752b6

data/Rakefile

@@ -19,6 +19,7 @@ Juwelier::Tasks.new do |gem|
   
   gem.add_runtime_dependency 'term-ansicolor'
   gem.add_runtime_dependency 'yaml'
+  gem.add_runtime_dependency 'rake'
 end
 Juwelier::RubygemsDotOrgTasks.new
 require 'rake/testtask'

data/VERSION

@@ -1 +1 @@
-1.6.5
+1.6.6

data/lib/scout/config.rb

@@ -89,7 +89,19 @@ module Scout::Config
   # For equal priorities the matching prioritizes tokens ealier in the list
   def self.get(key, *tokens)
     options = tokens.pop if Hash === tokens.last
+    options = IndiferentHash.setup options if options
+
     default = options.nil? ? nil : options[:default]
+    env = options.nil? ? nil : options[:env]
+
+    if env
+      env.split(/,\s*/).each do |variable|
+        if ENV[variable]
+          default = ENV[variable]
+          break
+        end
+      end
+    end
 
     tokens = ["key:" + key] if tokens.empty?
 
@@ -120,12 +132,16 @@ module Scout::Config
     value = priorities.empty? ? default : priorities.collect{|p| p }.sort_by{|p,v| p}.first.last.first
     value = false if value == 'false'
 
-    Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}"
+    Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}" + (env ? " env:#{env}" : '')
     GOT_KEYS << [key, value, tokens]
 
     if String === value && m = value.match(/^env:(.*)/)
-      variable = m.captures.first
-      ENV[variable]
+      variables = m.captures.first
+      variables.split(/,\s*/).each do |variable|
+        value = ENV[variable]
+        return value if value
+      end
+      nil
     elsif value == 'nil'
       nil
     else

data/lib/scout/misc/helper.rb

@@ -34,17 +34,18 @@ module Misc
   def self.chunk(array, size)
     total = array.length
     current = 0
-    res = [] unless block_given?
+    res = []
     while current < total
       last = current + size - 1
       if block_given?
-        yield array[current..last]
+        r = yield array[current..last]
+        res.concat r if Array === r
       else
         res << array[current..last]
       end
       current = last + 1
     end
-    block_given? ? nil : res
+    res
   end
 
   # Divides the array into +num+ chunks of the same size by placing one

data/lib/scout/misc/math.rb

@@ -52,7 +52,7 @@ module Misc
   end
 
   def self.variance(list)
-    return nil if list.length < 3
+    return nil if list.length < 2
     mean = mean(list)
     list = list.compact
     list_length = list.length
@@ -66,9 +66,8 @@ module Misc
     total_square_distance / (list_length - 1)
   end
 
-
   def self.sd(list)
-    return nil if list.length < 3
+    return nil if list.length < 2
     variance = self.variance(list)
     Math.sqrt(variance)
   end

data/lib/scout/misc/system.rb

@@ -52,7 +52,23 @@ module Misc
       ENV[var] = old_value
     end
   end
-  
+
+  def self.with_envs(hash, &block)
+    old_value = {}
+    begin
+      hash.each do |var,value|
+        old_value[var] = ENV[var]
+        ENV[var] = value
+      end
+      yield
+    ensure
+      old_value.each do |var,value|
+        ENV[var] = value
+      end
+    end
+  end
+
+
   def self.update_git(gem_name = 'scout-essentials')
     gem_name = 'scout-essentials' if gem_name.nil?
     dir = File.join(__dir__, '../../../../', gem_name)

data/lib/scout/open/remote.rb

@@ -30,6 +30,17 @@ module Open
     end
   end
 
+  LAST_TIME = {}
+  def self.wait(lag, key = nil)
+    time = Time.now
+
+    if LAST_TIME[key] != nil && (time < LAST_TIME[key] + lag)
+      sleep (LAST_TIME[key] + lag) - time
+    end
+
+    LAST_TIME[key] = Time.now
+  end
+
   def self.wget(url, options = {})
     options = options[:wget_options] if options.include?(:wget_options)
     if ! (options[:force] || options[:nocache]) && cache_file = in_cache(url, options)

data/lib/scout/path/util.rb

@@ -98,7 +98,12 @@ module Path
   end
 
   def unset_extension
-    self.annotate(self.split(".")[0..-2] * ".")
+    parts = self.split("/")
+    basename = parts.pop
+    return self unless basename.include?(".")
+    basename = basename.split(".")[0..-2] * "."
+    parts.push basename
+    self.annotate(parts * "/")
   end
 
   def remove_extension(extension = nil)

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.5 ruby lib
+# stub: scout-essentials 1.6.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.5".freeze
+  s.version = "1.6.6".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-01-17"
+  s.date = "2025-03-10"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -139,7 +139,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-essentials".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.5.23".freeze
+  s.rubygems_version = "3.6.5".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4
@@ -151,5 +151,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<yaml>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<rake>.freeze, [">= 0".freeze])
 end
 

data/test/scout/path/test_util.rb

@@ -18,5 +18,13 @@ class TestPathUtil < Test::Unit::TestCase
       assert_equal %w(foo bar).sort, tmpdir.glob.collect{|p| p.basename }.sort
     end
   end
+
+  def test_unset_extension
+    path = Path.setup("/home/.scout/dir/file.txt")
+    assert_equal "/home/.scout/dir/file", path.unset_extension
+
+    path = Path.setup("/home/.scout/dir/file")
+    assert_equal "/home/.scout/dir/file", path.unset_extension
+  end
 end
 

data/test/scout/test_config.rb

@@ -63,4 +63,20 @@ class TestConfig < Test::Unit::TestCase
     Scout::Config.add_entry 'key', 'V1', 'token1'
     assert_equal "V3", Scout::Config.get('key', 'token2', :default => 'V3')
   end
+
+  def test_env
+    Misc.with_env "TEST_VAR", "TEST" do
+      assert_equal "TEST", Scout::Config.get("value", :key, :env => "TEST_VAR")
+      Scout::Config.set "value", 'env:TEST_VAR', 'key'
+      assert_equal "TEST", Scout::Config.get(:value, :key)
+    end
+  end
+
+  def test_env_multiple
+    Misc.with_env "TEST_VAR", "TEST" do
+      assert_equal "TEST", Scout::Config.get("value", :key, :env => "TEST_VAR,TESTVAR")
+      Scout::Config.set "value", 'env:TEST_VAR,TESTVAR', 'key'
+      assert_equal "TEST", Scout::Config.get(:value, :key)
+    end
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Miguel Vazquez
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -108,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Things a scout can use anywhere
 email: mikisvaz@gmail.com
 executables: []
@@ -237,7 +250,6 @@ homepage: http://github.com/mikisvaz/scout-essentials
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -252,8 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key: 
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Scout essential tools
 test_files: []