scout-gear 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3dbd13f983d86074eefff6b693c2d0ae45ae9f7c575201df0a43e6f67fdf21
-  data.tar.gz: 1a9c3aec79e50876d43953bac3a3b8b1b35ba158edf649466e6ceba9c7a8b5da
+  metadata.gz: 644f7b057adc20478b49952953a8e984d0e89190728e089a3775c2313248680a
+  data.tar.gz: 37c9350027e3d28e24700ebb25bd449fb7aa7a1466c9c663d7681ca29e69fb8c
 SHA512:
-  metadata.gz: 32672c88eb7fe8627b8d499d136cf5023fd3709e172731cbdb1b4fd2ca22fcdee45f36f0cf6522ab6907e085815458b422487a4afe9db22af43c6ba65e587227
-  data.tar.gz: '09452083132409f72b7509dad2db27d834b183017900223c9678ef900e1e69259f5af444454f38084cb848c21364d717a2364bdc90e380c4972e1029d306133c'
+  metadata.gz: 6060f31e07e7b7d76abd36760217814f385c73dad65e8d533e503eb5cdcaa5cbfc86257ad87e820ccf57395f3d0df6c3d4fa7d9c5dc77537b0582ea217d6be2c
+  data.tar.gz: cfb254eefc93331ef067043c1861337886f6749871bc5cdbf44e282238e84970f5bc1eb421833920968839c91bf0f3319f39c93a970af477e4bf194cfea88b11

data/.vimproject

@@ -5,6 +5,7 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
  lib=lib {
   scout-gear.rb
   scout=scout{
+   misc.rb
    exceptions.rb
    meta_extension.rb
    tmpfile.rb
@@ -27,6 +28,7 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
    path.rb
    path=path{
     find.rb
+    util.rb
    }
   }
  }
@@ -42,4 +44,3 @@ scout-gear=/$PWD filter="*.rb *.yaml" {
   }
  }
 }
-

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/scout/log/progress/report.rb

@@ -208,7 +208,7 @@ module Log
       done_msg << Log.color(:magenta, " · " << desc)
       print(io, Log.up_lines(@depth) << done_msg << Log.down_lines(@depth)) 
 
-      FileUtils.rm file if file and File.exists?(file)
+      FileUtils.rm file if file and File.exist?(file)
 
       @callback.call self if @callback
     end

data/lib/scout/log/progress/util.rb

@@ -81,7 +81,6 @@ module Log
 
     def self.with_bar(max, options = {})
       bar = new_bar(max, options)
-      res = nil
       begin
         error = false
         keep = false

data/lib/scout/log.rb

@@ -35,7 +35,7 @@ module Log
   def self.last_caller(stack)
     line = nil
     pos ||= 0
-    while line.nil? or line =~ /scout\/helper\/log\.rb/ and stack.any? 
+    while line.nil? or line =~ /scout\/log\.rb/ and stack.any? 
       line = stack.shift 
     end
     line ||= caller.first

data/lib/scout/meta_extension.rb

@@ -13,9 +13,23 @@ module MetaExtension
 
     meta.define_method(:setup) do |obj,*rest|
       obj.extend base
-      self.class_variable_get("@@extension_attrs").zip(rest).each do |name,value|
+      attrs = self.class_variable_get("@@extension_attrs")
+
+      return if attrs.nil? || attrs.empty?
+
+      if rest.length == 1 && Hash === (rlast = rest.last) && 
+          ! (rlkey = rlast.keys.first).nil? &&
+          attrs.include?(rlkey.to_sym)
+
+        pairs = rlast
+      else
+        pairs = attrs.zip(rest)
+      end
+
+      pairs.each do |name,value|
         obj.instance_variable_set("@#{name}", value)
       end
+
       obj
     end
 

data/lib/scout/misc.rb

@@ -0,0 +1,13 @@
+module Misc
+  def self.in_dir(dir)
+    old_pwd = FileUtils.pwd
+    begin
+      FileUtils.mkdir_p dir unless File.exist?(dir)
+      FileUtils.cd dir
+      yield
+    ensure
+      FileUtils.cd old_pwd
+    end
+  end
+
+end

data/lib/scout/path/find.rb

@@ -12,54 +12,103 @@ module Path
   end
 
   def self.follow(path, map)
-    map.sub('{PKGDIR}', path.pkgdir).
+    map.sub('{PKGDIR}', path.pkgdir || Path.default_pkgdir).
       sub('{RESOURCE}', path.to_s).
       sub('{PWD}', FileUtils.pwd).
       sub('{TOPLEVEL}', path._toplevel).
       sub('{SUBPATH}', path._subpath).
       sub('{BASENAME}', File.basename(path)).
       sub('{PATH}', path).
-      sub('{LIBDIR}', path.libdir).
+      sub('{LIBDIR}', path.libdir || Path.caller_lib_dir).
       sub('{REMOVE}/', '').
       sub('{REMOVE}', '').gsub(/\/+/,'/')
   end
 
-  PATH_MAPS = IndiferentHash.setup({
-    :current => File.join("{PWD}", "{TOPLEVEL}", "{SUBPATH}"),
-    :user    => File.join(ENV['HOME'], ".{PKGDIR}", "{TOPLEVEL}", "{SUBPATH}"),
-    :global  => File.join('/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :usr   => File.join('/usr/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :local   => File.join('/usr/local', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :fast   => File.join('/fast', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :cache   => File.join('/cache', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :bulk   => File.join('/bulk', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :lib     => File.join('{LIBDIR}', "{TOPLEVEL}", "{SUBPATH}"),
-    :base   => File.join(Path.caller_lib_dir(__FILE__), "{TOPLEVEL}", "{SUBPATH}"),
-    :default => :user
-  })
-
-  MAP_SEARCH = %w(current workflow user local global lib fast cache bulk)
-
-  def _follow(map_name)
-    map = PATH_MAPS[map_name]
+  def self.path_maps
+    @@path_maps ||= IndiferentHash.setup({
+      :current => File.join("{PWD}", "{TOPLEVEL}", "{SUBPATH}"),
+      :user    => File.join(ENV['HOME'], ".{PKGDIR}", "{TOPLEVEL}", "{SUBPATH}"),
+      :global  => File.join('/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+      :usr     => File.join('/usr/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+      :local   => File.join('/usr/local', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+      :fast    => File.join('/fast', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+      :cache   => File.join('/cache', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+      :bulk    => File.join('/bulk', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+      :lib     => File.join('{LIBDIR}', "{TOPLEVEL}", "{SUBPATH}"),
+      :base    => File.join(Path.caller_lib_dir(__FILE__), "{TOPLEVEL}", "{SUBPATH}"),
+      :default => :user
+    })
+  end
+
+  def self.map_search
+    @@map_search ||= %w(current workflow user local global lib fast cache bulk)
+  end
+
+  def self.search_order
+    @@search_order ||= (path_maps.keys & map_search) + (path_maps.keys - map_search)
+  end
+
+  SLASH = "/"[0]
+  DOT = "."[0]
+  def located?
+    # OPEN RESOURCE
+    self.slice(0,1) == SLASH || (self.char(0,1) == DOT && self.char(1,2) == SLASH) # || (resource != Rbbt && (Open.remote?(self) || Open.ssh?(self)))
+  end
+
+  def annotate_found_where(found, where)
+    self.annotate(found).tap{|p| 
+      p.instance_variable_set("@where", where) 
+      p.instance_variable_set("@original", self.dup) 
+    }
+  end
+
+  def where
+    @where
+  end
+
+  def original
+    @original
+  end
+
+  def follow(map_name = :default, annotate = true)
+    map = Path.path_maps[map_name]
     while Symbol === map
-      map = PATH_MAPS[map]
+      map_name = map
+      map = Path.path_maps[map_name]
     end
-    Path.follow(self, map)
+    found = Path.follow(self, map)
+
+    annotate_found_where(found, map_name)  if annotate
+
+    found
   end
 
   def find(where = nil)
-    return _follow(where) if where
+    return self if located?
+    return follow(where) if where
+
 
-    all_maps = PATH_MAPS.keys
-    search_order = MAP_SEARCH & all_maps + (all_maps - MAP_SEARCH)
+    Path.search_order.each do |map_name|
+      found = follow(map_name, false)
 
-    search_order.each do |name|
-      map = PATH_MAPS[name]
-      real_path = _follow(map)
-      return real_path if File.exists?(real_path)
+      return annotate_found_where(found, map_name) if File.exist?(found) || File.directory?(real_path)
     end
 
-    return _follow(:default)
+    return follow(:default)
   end
+
+  def exist?
+    # OPEN
+    found = self.find
+    File.exist?(found) || File.directory?(found)
+  end
+
+  alias exists? exist?
+
+  def find_all(caller_lib = nil, search_paths = nil)
+    Path.search_order
+      .collect{|where| find(where) }
+      .select{|file| file.exist? }.uniq
+  end
+
 end

data/lib/scout/path/util.rb

@@ -0,0 +1,52 @@
+module Path
+  def directory?
+    return nil unless self.exist?
+    File.directory?(self.find)
+  end
+
+  def dirname
+    self.annotate(File.dirname(self))
+  end
+
+  def basename
+    self.annotate(File.basename(self))
+  end
+
+
+  def glob(pattern = '*')
+    if self.include? "*"
+      self.glob_all
+    else
+      return [] unless self.exist? 
+      found = self.find
+      exp = File.join(found, pattern)
+      paths = Dir.glob(exp).collect{|f| self.annotate(f) }
+
+      paths.each do |p|
+        p.original = File.join(found.original, p.sub(/^#{found}/, ''))
+      end if found.original
+
+      paths
+    end
+  end
+
+  def glob_all(pattern = nil, caller_lib = nil, search_paths = nil)
+    search_paths ||= Path.search_paths
+    search_paths = search_paths.dup
+
+    location_paths = {}
+    search_paths.keys.collect do |where| 
+      found = find(where, Path.caller_lib_dir, search_paths)
+      paths = pattern ? Dir.glob(File.join(found, pattern)) : Dir.glob(found) 
+
+      paths = paths.collect{|p| self.annotate p }
+
+      paths = paths.each do |p|
+        p.original = File.join(found.original, p.sub(/^#{found}/, ''))
+        p.where = where
+      end if found.original and pattern
+
+      location_paths[where] = paths
+    end
+  end
+end

data/lib/scout/path.rb

@@ -1,4 +1,6 @@
 require_relative 'meta_extension'
+require_relative 'path/find'
+require_relative 'path/util'
 
 module Path
   extend MetaExtension
@@ -31,11 +33,16 @@ module Path
     return nil
   end
 
-  def self.setup(path, pkgdir = 'scout', libdir = nil)
-    path.extend Path
-    path.pkgdir = pkgdir
-    path.libdir = libdir || Path.caller_lib_dir
-    path
+  def self.default_pkgdir
+    @@default_pkgdir = 'scout'
+  end
+
+  def pkgdir
+    @pkgdir ||= Path.default_pkgdir
+  end
+
+  def libdir
+    @libdir ||= Path.caller_lib_dir
   end
 
   def join(subpath, prevpath = nil)

data/lib/scout/tmpfile.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require_relative 'misc'
 
 module TmpFile
   def self.user_tmp(subdir = nil)
@@ -83,13 +84,8 @@ module TmpFile
 
   def self.in_dir(*args)
     with_dir(*args) do |dir|
-      old_pwd = FileUtils.pwd
-      begin
-        FileUtils.mkdir_p dir unless File.exist?(dir)
-        FileUtils.cd dir
+      Misc.in_dir dir do
         yield dir
-      ensure
-        FileUtils.cd old_pwd
       end
     end
   end

data/lib/scout-gear.rb

@@ -1,3 +1,4 @@
 require_relative 'scout/indiferent_hash'
 require_relative 'scout/tmpfile'
 require_relative 'scout/log'
+require_relative 'scout/path'

data/scout-gear.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-gear 1.1.1 ruby lib
+# stub: scout-gear 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-gear".freeze
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -40,16 +40,20 @@ Gem::Specification.new do |s|
     "lib/scout/log/progress/report.rb",
     "lib/scout/log/progress/util.rb",
     "lib/scout/meta_extension.rb",
+    "lib/scout/misc.rb",
     "lib/scout/path.rb",
     "lib/scout/path/find.rb",
+    "lib/scout/path/util.rb",
     "lib/scout/tmpfile.rb",
     "scout-gear.gemspec",
     "test/scout/indiferent_hash/test_options.rb",
     "test/scout/log/test_progress.rb",
     "test/scout/path/test_find.rb",
+    "test/scout/path/test_util.rb",
     "test/scout/test_indiferent_hash.rb",
     "test/scout/test_log.rb",
     "test/scout/test_meta_extension.rb",
+    "test/scout/test_misc.rb",
     "test/scout/test_path.rb",
     "test/scout/test_tmpfile.rb",
     "test/test_helper.rb"

data/test/scout/path/test_find.rb

@@ -1,6 +1,8 @@
 require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
 require 'scout/path'
+require 'scout/misc'
 require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
 class TestPathFind < Test::Unit::TestCase
   def test_parts
     path = Path.setup("share/data/some_file", 'scout')
@@ -30,5 +32,36 @@ class TestPathFind < Test::Unit::TestCase
       assert_equal File.join(tmpdir,"share/data/some_file"),  path.find(:current)
     end
   end
+
+  def test_current_find
+    path = Path.setup("share/data/some_file", 'scout')
+    TmpFile.in_dir do |tmpdir|
+      FileUtils.mkdir_p(File.dirname(File.join(tmpdir, path)))
+      File.write(File.join(tmpdir, path), 'string')
+      assert_equal File.join(tmpdir,"share/data/some_file"),  path.find
+      assert_equal :current,  path.find.where
+      assert_equal "share/data/some_file",  path.find.original
+    end
+  end
+
+  def test_current_find_all
+    path = Path.setup("share/data/some_file", 'scout')
+    TmpFile.with_dir do |tmpdir|
+      Path.setup tmpdir
+
+      FileUtils.mkdir_p(tmpdir.lib)
+      FileUtils.mkdir_p(tmpdir.share.data)
+      File.write(tmpdir.share.data.some_file, 'string')
+
+      FileUtils.mkdir_p(tmpdir.subdir.share.data)
+      File.write(tmpdir.subdir.share.data.some_file, 'string')
+
+      path.libdir = tmpdir
+      Misc.in_dir tmpdir.subdir do
+        assert_equal 2, path.find_all.length
+      end
+    end
+  end
+
 end
 

data/test/scout/path/test_util.rb

@@ -0,0 +1,22 @@
+require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
+require 'scout/path'
+require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
+class TestPathUtil < Test::Unit::TestCase
+  def test_dirname
+    p = Path.setup("/usr/share/scout/data")
+
+    assert_equal "/usr/share/scout", p.dirname
+  end
+
+  def test_glob
+    TmpFile.in_dir :erase => false do |tmpdir|
+      Path.setup tmpdir
+      File.write(tmpdir.foo, 'foo')
+      File.write(tmpdir.bar, 'bar')
+      assert_equal 2, tmpdir.glob.length
+      assert_equal %w(foo bar).sort, tmpdir.glob.collect{|p| p.basename }.sort
+    end
+  end
+end
+

data/test/scout/test_meta_extension.rb

@@ -5,10 +5,10 @@ class TestMetaExtension < Test::Unit::TestCase
   module ExtensionClass
     extend MetaExtension
 
-    extension_attr :code
+    extension_attr :code, :code2
   end
 
-  def test_setup
+  def test_setup_annotate
     str = "String"
     ExtensionClass.setup(str, :code)
     assert ExtensionClass === str
@@ -18,5 +18,19 @@ class TestMetaExtension < Test::Unit::TestCase
     str.annotate(str2)
     assert_equal :code, str2.code
   end
+
+  def test_setup_alternatives
+    str = "String"
+
+    ExtensionClass.setup(str, :code2 => :code)
+    assert_equal :code, str.code2
+
+    ExtensionClass.setup(str, code2: :code)
+    assert_equal :code, str.code2
+
+    ExtensionClass.setup(str, "code2" => :code)
+    assert_equal :code, str.code2
+
+  end
 end
 

data/test/scout/test_misc.rb

@@ -0,0 +1,13 @@
+require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
+require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
+
+class TestMisc < Test::Unit::TestCase
+  def test_in_dir
+    TmpFile.with_file do |tmpdir|
+      Misc.in_dir tmpdir do
+        assert_equal tmpdir, FileUtils.pwd
+      end
+    end
+  end
+end
+

data/test/scout/test_path.rb

@@ -32,5 +32,21 @@ class TestPath < Test::Unit::TestCase
     assert_equal 'scout', path.pkgdir
     assert path.libdir.end_with?("scout-gear")
   end
+
+  def test_lib_dir
+    TmpFile.with_file do |tmpdir|
+      Path.setup tmpdir
+      FileUtils.mkdir_p tmpdir.lib
+      File.write tmpdir.lib.file, <<-EOR 
+require '#{File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')}'
+a = "1"
+Path.setup(a)
+print a.libdir
+      EOR
+      Misc.in_dir tmpdir.tmp do
+        assert_equal tmpdir, `ruby #{tmpdir.lib.file}`
+      end
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-gear
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Miguel Vazquez
@@ -109,16 +109,20 @@ files:
 - lib/scout/log/progress/report.rb
 - lib/scout/log/progress/util.rb
 - lib/scout/meta_extension.rb
+- lib/scout/misc.rb
 - lib/scout/path.rb
 - lib/scout/path/find.rb
+- lib/scout/path/util.rb
 - lib/scout/tmpfile.rb
 - scout-gear.gemspec
 - test/scout/indiferent_hash/test_options.rb
 - test/scout/log/test_progress.rb
 - test/scout/path/test_find.rb
+- test/scout/path/test_util.rb
 - test/scout/test_indiferent_hash.rb
 - test/scout/test_log.rb
 - test/scout/test_meta_extension.rb
+- test/scout/test_misc.rb
 - test/scout/test_path.rb
 - test/scout/test_tmpfile.rb
 - test/test_helper.rb