scout-essentials 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf37bb130a8c4d14dd4560df43a3e98f6ea43ea7ad38c9b44525cf113e84b7b4
-  data.tar.gz: 504f47bbf850cae9fa91b898b460ec632fe6a64df77a8ab89f9d7b6c1abc67b7
+  metadata.gz: 860143272938aa7cf5cea99f3c6b58206ed6670cf0c8638adcfe62774fcab925
+  data.tar.gz: 6c92e398a80f3d39c3cae9db84d947c9386d8a08cb0bfffab2239c0810d1ba6e
 SHA512:
-  metadata.gz: b977260d1670a0a391583c2f20cd5a0780fba2b6d5a8a6685370664fb8bf66e91a7cac5f9f77e01de3dffe89cf218581bf02df95a5ae4350789881adfbd11273
-  data.tar.gz: 124cd1a4e62ca11e516144e8e37c49808440d0e67904e7756eabc8c3f71da053bd3856b8f21e7ed2a8e5fb5372bd43e6510d17ae5a70b538d23cf0e9e0cab683
+  metadata.gz: aef77cc47e9de21fa0da8ddc9e0246afd91849aad07b3e7d8b33813098cde01a9971c6dcd58d8b07d2b9c372a580ce74aaa484258b5cf914c48e0eae28dc165e
+  data.tar.gz: 4638f2423e319274ff0ad0b5885b9669b156c519278e775e6ab33733faf0b1c2abeb561f7256c8ebada13c4faaaf2325897a39e0d85b0c49d19413dd0fc6c125

data/.vimproject

@@ -1,6 +1,8 @@
 scout-essentials=/$PWD filter="*.rb *.txt *.md *.conf *.yaml" {
  LICENSE.txt
  chats=chats filter="*"{
+  intro
+
   review
   document.rb
   docs=docs{

data/VERSION

@@ -1 +1 @@
-1.8.5
+1.8.6

data/lib/scout/annotation/annotated_object.rb

@@ -64,6 +64,11 @@ module Annotation
         new.remove_instance_variable(:@container_index)
       end
 
+      new.instance_variables.each do |var|
+        value = new.instance_variable_get(var)
+        new.instance_variable_set(var, Annotation.purge(value))
+      end
+
       new
     end
 

data/lib/scout/annotation.rb

@@ -26,7 +26,7 @@ module Annotation
   end
 
   def self.is_annotated?(obj)
-    obj.instance_variables.include?(:@annotation_types)
+    obj.instance_variables.include?(:@annotation_types) && obj.respond_to?(:purge)
   end
 
   def self.purge(obj)

data/lib/scout/log/fingerprint.rb

@@ -67,6 +67,8 @@ module Log
       else
         obj.inspect
       end
+    when Set
+      fingerprint(obj.to_a)
     else
       obj.to_s
     end

data/lib/scout/misc/digest.rb

@@ -80,6 +80,9 @@ module Misc
   def self.digest_file(file)
     file = file.find if Path === file
     file = File.expand_path(file)
+    if Open.exist? file + '.md5'
+      return Open.read(file + '.md5').strip
+    end
     if File.size(file) > 10_000_000
       fast_file_md5(file)
     else

data/lib/scout/misc/format.rb

@@ -36,7 +36,7 @@ module Misc
     end
   end
 
-  MAX_TTY_LINE_WIDTH = 160
+  MAX_TTY_LINE_WIDTH = 120
   def self.format_paragraph(text, size = nil, indent = nil, offset = nil)
     size ||= Log.tty_size || MAX_TTY_LINE_WIDTH
     size = MAX_TTY_LINE_WIDTH if size > MAX_TTY_LINE_WIDTH
@@ -45,8 +45,8 @@ module Misc
 
     i = 0
     #size = size + offset + indent
-    re = /((?:\n\s*\n\s*)|(?:\n\s*(?=\*)))/
-      text.split(re).collect do |paragraph|
+    re = /((?:\n\s*\n\s*)|(?:\n\s*(?=\*))|(?:\n\s\s+)|(?:\n\s*[-\*]))/
+    text.split(re).collect do |paragraph|
       i += 1
       str = if i % 2 == 1
               words = paragraph.gsub(/\s+/, "\s").split(" ")
@@ -75,11 +75,12 @@ module Misc
   def self.format_definition_list_item(dt, dd,  indent = nil, size = nil, color: :yellow)
     if size.nil?
       base_size = Log.tty_size || MAX_TTY_LINE_WIDTH
+      base_size = MAX_TTY_LINE_WIDTH if base_size > MAX_TTY_LINE_WIDTH
       base_indent = indent || (base_size / 3)
       size = base_size - base_indent
     end
 
-    indent ||= base_indent || size / 3
+    indent ||= base_indent || (size / 3)
 
     dd = "" if dd.nil?
     dt = Log.color color, dt if color
@@ -87,12 +88,12 @@ module Misc
     len = Log.uncolor(dt).length
 
     if indent < 0
-      text = format_paragraph(dd, size, indent.abs-1, 0)
+      text = format_paragraph(dd, base_size, indent.abs-1, 0)
       text = dt << "\n" << text
     else
       offset = len - indent
       offset = 0 if offset < 0
-      text = format_paragraph(dd, size, indent.abs+1, offset)
+      text = format_paragraph(dd, base_size, indent.abs+1, offset)
       text[0..len-1] = dt
     end
     text

data/lib/scout/misc/system.rb

@@ -48,17 +48,7 @@ module Misc
     end
   end
 
-  def self.with_env(var, value, &block)
-    old_value = ENV[var]
-    begin
-      ENV[var] = value
-      yield
-    ensure
-      ENV[var] = old_value
-    end
-  end
-
-  def self.with_envs(hash, &block)
+  def self.with_env_hash(hash, &block)
     old_value = {}
     begin
       hash.each do |var,value|
@@ -73,6 +63,24 @@ module Misc
     end
   end
 
+  def self.with_env(var, value = nil, &block)
+    if Hash === value
+      with_env_hash(var, &block)
+    else
+      old_value = ENV[var]
+      begin
+        ENV[var] = value
+        yield
+      ensure
+        ENV[var] = old_value
+      end
+    end
+  end
+
+  class << self
+    alias with_envs with_env_hash
+  end
+
 
   def self.update_git(gem_name = 'scout-essentials')
     gem_name = 'scout-essentials' if gem_name.nil?

data/lib/scout/open/final.rb

@@ -144,8 +144,11 @@ module Open
     file = file.find if Path === file
     begin
       if File.symlink?(file) || File.stat(file).nlink > 1
-        if File.exist?(file + '.info') && defined?(Step)
-          done = Persist.load(file + '.info', Step::SERIALIZER)[:done]
+        info_file = file + '.info'
+        if File.exist?(info_file) && defined?(Step)
+          done = Persist.memory([info_file, File.mtime(info_file)], persist: true ) do
+            Persist.load(info_file, Step::SERIALIZER)[:done]
+          end
           return done if done
         end
 

data/lib/scout/path/find.rb

@@ -203,7 +203,7 @@ module Path
   def annotate_found_where(found, where)
     self.annotate(found).tap{|p| 
       p.instance_variable_set("@where", where) 
-      p.instance_variable_set("@original", self.dup) 
+      p.instance_variable_set("@original", self.annotate(self.dup))
     }
   end
 

data/lib/scout/path/util.rb

@@ -23,6 +23,15 @@ module Path
     return true
   end
 
+  def self.can_write?(string)
+    return false if Open.remote?(string)
+    return false unless Path.is_filename?(string)
+    string = string.find if Path === string
+    return false if File.directory?(string)
+    return File.writable?(string) if File.exist?(string)
+    return File.writable?(File.dirname(string))
+  end
+
   def self.sanitize_filename(filename, length = 254)
     if filename.length > length
       if filename =~ /(\..{2,9})$/

data/lib/scout/path.rb

@@ -5,7 +5,7 @@ require_relative 'path/digest'
 
 module Path
   extend Annotation
-  annotation :pkgdir, :libdir, :path_maps, :map_order
+  annotation :pkgdir, :libdir, :path_maps, :map_order, :where, :original
 
   def self.default_pkgdir
     @@default_pkgdir ||= 'scout'

data/lib/scout/persist/serialize.rb

@@ -129,7 +129,7 @@ module Persist
     type = MEMORY if type == :memory
     return unless Hash === type || Open.exist?(file) 
 
-    Log.debug "Load #{Log.fingerprint type} on #{file}"
+    Log.debug "Load #{Log.fingerprint type} from #{file}"
     if load_drivers[type]
       return load_drivers[type].call(file)
     end

data/lib/scout/persist.rb

@@ -42,16 +42,18 @@ module Persist
     update = Open.mtime(update) if Path === update
 
     update = true if file.outdated?(check) if Path === file && check
-    file_mtime = Open.mtime(file)
-    update = file_mtime >= update ? false : true if file_mtime && Time === update
-    update = file_mtime >= (Time.now - update) ? false : true if file_mtime && Numeric === update
+    if update
+      file_mtime = Open.mtime(file)
+      update = file_mtime >= update ? false : true if file_mtime && Time === update
+      update = file_mtime >= (Time.now - update) ? false : true if file_mtime && Numeric === update
+    end
 
     if type == :memory
       repo = options[:memory] || options[:repo] || MEMORY_CACHE
       if update
         repo[file] = yield
       else
-        repo[file] ||= yield
+        repo[file] = yield unless repo.include? file
       end
       return repo[file]
     end

data/scout-essentials.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-essentials 1.8.5 ruby lib
+# stub: scout-essentials 1.8.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.8.5".freeze
+  s.version = "1.8.6".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -159,7 +159,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikisvaz/scout-essentials".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.7.0.dev".freeze
+  s.rubygems_version = "3.7.2".freeze
   s.summary = "Scout essential tools".freeze
 
   s.specification_version = 4

data/test/scout/path/test_util.rb

@@ -37,5 +37,26 @@ class TestPathUtil < Test::Unit::TestCase
       refute Path.newer? dir.f2.find, dir.f1.find
     end
   end
+
+  def test_can_read
+    TmpFile.with_path do |dir|
+      Open.write dir.f1, 'test1'
+      sleep 0.1
+      Open.write dir.f2, 'test2'
+      Open.write dir.f4, 'test4'
+
+      CMD.cmd("chmod -w #{dir.f4.find}")
+
+      assert Path.can_read? dir.f1
+      assert Path.can_read? dir.f3
+      assert Path.can_write? dir.f3
+
+      refute Path.can_write? dir.f4
+
+      CMD.cmd("chmod -w #{dir.find}")
+      refute Path.can_write? dir.f3
+      CMD.cmd("chmod +w #{dir.find}")
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Scout essential tools
 test_files: []