scout-essentials 1.6.7 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 800981da332ab6cceb17244d49454560c59cdc86df7122b012c2b26b7ab7d427
-  data.tar.gz: 02c265335fd31c11f9b0161708c670d4dfdf1a989cfb6254d5f11c08118e6e98
+  metadata.gz: a3c6a3bfa03c83171a83558fa73b4a23c5bffffb02fa036c36f4ad6417abbee9
+  data.tar.gz: 605d88dc63abe624432c9ece462ac19c33e243252667d5aa8b27a541e38582f6
 SHA512:
-  metadata.gz: eff7851e6e63bf645d366c38e1cac85a3a6d4b0d34a00091d4c0cbb683361aab9b60a5da0e21fae5318d332bf559275b4748362520e66cc509f125988d7969a9
-  data.tar.gz: 74c799cbfdbf5458bc7e4e59a6e966a280cf39bc0af9bf4691ef8b4390303c78b360b56c81fafbf6465e5932af3eba43d08fba56723a13c32840254358bb658f
+  metadata.gz: 9528eea7eccc93c0640f1530ecba2eeb874fd3f4bb211789f8bd830e127ff52c880cee2fb4621f92db7f855fb0d4f7d12098ace50726f76f14f27c5cd8ffb8f7
+  data.tar.gz: beaf0a93070745d6102d766931557369a74d5ada67182c7b13cde60eb5d14a8d8e71f29e8f80356910bac97fef1022e9bb21028d2a687515a04bb781dd7d61fb

data/VERSION

@@ -1 +1 @@
-1.6.7
+1.6.9

data/lib/scout/misc/hook.rb

@@ -12,14 +12,14 @@ module Hook
       orig_name = ("orig_" + method_name.to_s).to_sym
       if not base_class.singleton_methods.include?(orig_name)
         base_class.singleton_class.alias_method orig_name, method_name
-        base_class.define_singleton_method method_name do |*args|
+        base_class.define_singleton_method method_name do |*args,&block|
           base_class.class_variable_get(:@@hooks).each do |hook|
             next if hook.respond_to?(:claim) and not hook.claim(*args)
             if hook.respond_to?(method_name)
-              return hook.send(method_name, *args)
+              return hook.send(method_name, *args, &block)
             end
           end
-          return base_class.send(orig_name, *args)
+          return base_class.send(orig_name, *args, &block)
         end
       end
     end
@@ -29,15 +29,14 @@ module Hook
       orig_name = ("orig_" + method_name.to_s).to_sym
       if not base_class.instance_methods.include?(orig_name)
         base_class.alias_method orig_name, method_name
-        base_class.define_method method_name do |*args|
+        base_class.define_method method_name do |*args,&block|
           base_class.class_variable_get(:@@hooks).each do |hook|
             next if hook.respond_to?(:claim) and not hook.claim(self, *args)
             if hook.instance_methods.include?(method_name)
-              return hook.instance_method(method_name).bind(self).call *args
-              #return self.instance_exec *args, &hook.instance_method(method_name)
+              return hook.instance_method(method_name).bind(self).call *args, &block
             end
           end
-          return self.send(orig_name, *args)
+          return self.send(orig_name, *args, &block)
         end
       end
     end

data/lib/scout/misc/system.rb

@@ -2,7 +2,7 @@ module Misc
 
   def self.hostname
     @@hostname ||= begin
-                     `hostname`.strip
+                     (ENV["HOSTNAME"] || `hostname`).strip
                    end
   end
 

data/lib/scout/path/find.rb

@@ -50,7 +50,7 @@ module Path
       sub('{LIBDIR}'){ path.libdir || (path.pkgdir.respond_to?(:libdir) && path.pkgdir.libdir) || Path.caller_lib_dir || "NOLIBDIR" }.
       sub('{MAPNAME}', map_name.to_s).
       sub('{REMOVE}/', '').
-      sub('{REMOVE}', '').gsub(/\/+/,'/')
+      sub('{REMOVE}', '')
 
     while true
       file.gsub!(/\{(.+)(?<!\\)\/(.+)(?<!\\)\/(.+)\}/) do |m|

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.7 ruby lib
+# stub: scout-essentials 1.6.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.6.7".freeze
+  s.version = "1.6.9".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-19"
+  s.date = "2025-03-25"
   s.description = "Things a scout can use anywhere".freeze
   s.email = "mikisvaz@gmail.com".freeze
   s.extra_rdoc_files = [

metadata

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