scout-essentials 1.3.1 → 1.4.0

data/test/scout/annotation/test_array.rb

@@ -0,0 +1,119 @@
+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 TestAnnotationArray < Test::Unit::TestCase
+  module AnnotationClass
+    extend Annotation
+
+    annotation :code, :code2
+  end
+
+  module AnnotationClass2
+    extend Annotation
+
+    annotation :code3, :code4
+  end
+
+  def test_array
+    ary = ["string"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+    assert_equal [AnnotationClass], ary.annotation_types
+    assert_equal code, ary.code
+    assert_equal code, ary[0].code
+
+    assert_equal code, ary.first.code
+    assert_equal code, ary.last.code
+  end
+
+  def test_array_first_last
+    %w(first last).each do |method|
+      ary = ["string"]
+      code = "Annotation String"
+      AnnotationClass.setup(ary, code)
+      ary.extend AnnotatedArray
+      assert_equal [AnnotationClass], ary.annotation_types
+
+      assert_equal code, ary.send(method).code
+    end
+  end
+
+  def test_array_each
+    ary = ["string"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+
+    codes = []
+    ary.each{|v| codes << v.code }
+    assert_equal [code], codes
+  end
+
+  def test_array_inject
+    ary = ["string"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+
+    codes = []
+    codes = ary.inject(codes){|acc,v| acc.push(v.code) }
+    assert_equal [code], codes
+  end
+
+  def test_array_collect
+    ary = ["string"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+
+    codes = ary.collect{|v| v.code }
+    assert_equal [code], codes
+  end
+
+  def test_array_collect_no_block
+    ary = ["string"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+
+    codes = ary.collect
+    assert_equal ["string"], codes
+  end
+
+  def test_compact
+    ary = [nil,"string"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+
+    assert_equal code, ary.compact.first.code
+  end
+
+  def test_reverse
+    ary = ["string2", "string1"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+
+    assert_equal code, ary.reverse.first.code
+    assert_equal "string1", ary.reverse.first
+  end
+
+  def test_purge
+    ary = ["string2", "string1"]
+    code = "Annotation String"
+    AnnotationClass.setup(ary, code)
+    ary.extend AnnotatedArray
+
+    assert Annotation.is_annotated?(ary)
+    assert Annotation.is_annotated?(ary.first)
+
+    ary = Annotation.purge(ary)
+
+    refute Annotation.is_annotated?(ary)
+    refute Annotation.is_annotated?(ary.first)
+
+  end
+end
+

data/test/scout/misc/test_digest.rb

@@ -26,5 +26,59 @@ class TestMiscDigest < Test::Unit::TestCase
       end
     end
   end
+
+  def test_file_digest
+    content1 =<<-EOF
+This is one file
+    EOF
+
+    content2 =<<-EOF
+This is another file
+    EOF
+
+    TmpFile.with_file(content1) do |file1|
+      TmpFile.with_file(content2) do |file2|
+        digest1 = Misc.digest_file(file1)
+        digest2 = Misc.digest_file(file2)
+        refute_equal digest1, digest2
+      end
+    end
+  end
+
+  def test_file_digest_fast
+    content1 =<<-EOF
+This is one file
+    EOF
+
+    content2 =<<-EOF
+This is another file
+    EOF
+
+    TmpFile.with_file(content1) do |file1|
+      TmpFile.with_file(content2) do |file2|
+        digest1 = Misc.fast_file_md5(file1, 5)
+        digest2 = Misc.fast_file_md5(file2, 5)
+        refute_equal digest1, digest2
+      end
+    end
+  end
+
+  def test_file_digest_fast_2
+    content1 =<<-EOF
+This is file 2
+    EOF
+
+    content2 =<<-EOF
+This is file 1
+    EOF
+
+    TmpFile.with_file(content1) do |file1|
+      TmpFile.with_file(content2) do |file2|
+        digest1 = Misc.fast_file_md5(file1, 5)
+        digest2 = Misc.fast_file_md5(file2, 5)
+        refute_equal digest1, digest2
+      end
+    end
+  end
 end
 

data/test/scout/misc/test_filesystem.rb

@@ -26,5 +26,33 @@ class TestFilesystem < Test::Unit::TestCase
       assert Misc.path_relative_to(File.dirname(tmpdir), File.join(tmpdir, "foo"))
     end
   end
+
+  def test_tarize
+    TmpFile.with_path do |source|
+      Open.write(source.data.file1, 'test1')
+      Open.write(source.data.file2, 'test2')
+      TmpFile.with_path extension: 'tar.gz' do |tarball|
+        Misc.tarize(source, tarball)
+        TmpFile.with_path do |dest|
+          Misc.untar(tarball, dest)
+          assert dest.data.file1.exists?
+          assert_equal 'test2', Open.read(dest.data.file2)
+        end
+      end
+    end
+  end
+
+  def test_tarize_stream
+    TmpFile.with_path do |source|
+      Open.write(source.data.file1, 'test1')
+      Open.write(source.data.file2, 'test2')
+      stream = Misc.tarize(source)
+      TmpFile.with_path do |dest|
+        Misc.untar(stream, dest)
+        assert dest.data.file1.exists?
+        assert_equal 'test2', Open.read(dest.data.file2)
+      end
+    end
+  end
 end
 

data/test/scout/misc/test_helper.rb

@@ -0,0 +1,14 @@
+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 TestMiscHelper < Test::Unit::TestCase
+  def test_divide
+    assert_equal 2, Misc.divide(%w(1 2 3 4 5 6 7 8 9),2).length
+  end
+
+  def test_ordered_divide
+    assert_equal 5, Misc.ordered_divide(%w(1 2 3 4 5 6 7 8 9),2).length
+  end
+
+end
+

data/test/scout/misc/test_math.rb

@@ -0,0 +1,9 @@
+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 TestMiscMath < Test::Unit::TestCase
+  def test_mean
+    assert_equal 4, Misc.mean([6,2])
+  end
+end
+

data/test/scout/path/test_find.rb

@@ -106,5 +106,37 @@ class TestPathFind < Test::Unit::TestCase
     end
   end
 
+  def test_plain_map
+    path = Path.setup("somefile")
+    TmpFile.with_path do |tmpdir|
+      Open.write(tmpdir.somefile, 'test')
+      path.path_maps["tmpdir"] = tmpdir
+      assert path.exists?
+    end
+  end
+
+  def test_add_path
+    TmpFile.with_path do |dir1|
+      TmpFile.with_path do |dir2|
+        TmpFile.with_path do |dir3|
+          TmpFile.with_path do |dir4|
+            Open.write(dir1.foo, "FOO1")
+            Open.write(dir2.foo, "FOO2")
+            Open.write(dir3.foo, "FOO3")
+            Open.write(dir4.foo, "FOO4")
+            file = Path.setup('foo')
+            file.append_path 'dir1', dir1
+            assert_equal "FOO1", Open.read(file)
+            file.prepend_path 'dir2', dir2
+            assert_equal "FOO2", Open.read(file)
+            file.prepend_path 'dir3', dir3
+            assert_equal "FOO3", Open.read(file)
+            file.append_path 'dir4', dir4
+            assert_equal "FOO3", Open.read(file)
+          end
+        end
+      end
+    end
+  end
 end
 

data/test/scout/test_annotation.rb

@@ -0,0 +1,169 @@
+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 TestAnnotation < Test::Unit::TestCase
+
+  module EmptyAnnotationClass
+    extend Annotation
+  end
+
+  module AnnotationClass
+    extend Annotation
+
+    annotation :code, :code2
+  end
+
+  module AnnotationClass2
+    extend Annotation
+
+    annotation :code3, :code4
+  end
+
+  module AnnotationClassInherit
+    extend Annotation
+
+    annotation :code_pre
+
+    include AnnotationClass
+    include AnnotationClass2
+
+    annotation :code5
+  end
+
+  def test_setup_annotate
+    str = "String"
+    refute Annotation.is_annotated?(str)
+    AnnotationClass.setup(str, :code)
+    assert AnnotationClass === str
+    assert Annotation.is_annotated?(str)
+    assert_equal :code, str.code
+
+    str2 = "String2"
+    str.annotate(str2)
+    assert_equal :code, str2.code
+  end
+
+  def test_inheritance
+    str = "String"
+    AnnotationClass.setup(str, :c, :c2)
+    assert_equal :c, str.code
+
+    str = "String"
+    AnnotationClassInherit.setup(str, :c_pre, :c, :c2, :c3, :c4, :c5)
+    assert_equal :c_pre, str.code_pre
+    assert_equal :c, str.code
+    assert_equal :c4, str.code4
+    assert_equal :c5, str.code5
+  end
+
+  def test_setup_annotate_double
+    str = "String"
+    AnnotationClass.setup(str, :c, :c2)
+    AnnotationClass2.setup(str, :c3, :c4)
+    assert Annotation.is_annotated?(str)
+    assert AnnotationClass === str
+    assert AnnotationClass2 === str
+    assert_equal :c, str.code
+    assert_equal :c2, str.code2
+    assert_equal :c3, str.code3
+    assert_equal :c4, str.code4
+
+    str2 = "String2"
+    str.annotate(str2)
+    assert Annotation.is_annotated?(str2)
+    assert AnnotationClass === str2
+    assert AnnotationClass2 === str2
+    assert_equal :c, str2.code
+    assert_equal :c2, str2.code2
+    assert_equal :c3, str2.code3
+    assert_equal :c4, str2.code4
+  end
+
+  def test_marshal
+    str = "String"
+    AnnotationClass.setup(str, :code)
+    assert AnnotationClass === str
+    assert_equal :code, str.code
+
+    str2 = Marshal.load(Marshal.dump(str))
+    assert_equal :code, str2.code
+  end
+
+  def test_setup_alternatives
+    str = "String"
+
+    AnnotationClass.setup(str, nil, :code)
+    assert_equal nil, str.code
+    assert_equal :code, str.code2
+
+    AnnotationClass.setup(str, :code2 => :code)
+    assert_equal :code, str.code2
+
+    AnnotationClass.setup(str, code2: :code)
+    assert_equal :code, str.code2
+
+    AnnotationClass.setup(str, "code2" => :code)
+    assert_equal :code, str.code2
+  end
+
+  def test_setup_block
+    o = AnnotationClass.setup nil, :code => :c, :code2 => :c2 do
+      puts 1
+    end
+
+    assert o.annotation_hash.include?(:code)
+    assert o.annotation_hash.include?(:code2)
+  end
+
+  def test_twice
+    str = "String"
+
+    AnnotationClass.setup(str, :code2 => :code)
+    assert_equal :code, str.code2
+    assert_include str.instance_variable_get(:@annotations), :code
+
+    str.extend AnnotationClass2
+    str.code3 = :code_alt
+    assert_equal :code, str.code2
+    assert_equal :code_alt, str.code3
+    assert_include str.instance_variable_get(:@annotations), :code
+    assert_include str.instance_variable_get(:@annotations), :code3
+
+    assert_include str.annotation_hash, :code
+    assert_include str.annotation_hash, :code3
+  end
+
+  def test_annotation_types
+    str = "String"
+    AnnotationClass.setup(str, :code)
+    assert AnnotationClass === str
+    assert_include str.annotation_types, AnnotationClass
+  end
+
+  def test_meta_setup
+    str = "String"
+    Annotation.setup(str, [AnnotationClass], code: 'Some code')
+
+    assert_equal 'Some code', str.code
+  end
+
+  def test_empty
+    refute EmptyAnnotationClass.setup("foo").nil?
+  end
+
+  def test_dump
+    a = AnnotationClass.setup("a", code: 'test1', code2: 'test2')
+    d = Marshal.dump(a)
+    a2 = Marshal.load(d)
+    assert_equal 'test1', a2.code
+  end
+
+  def test_dump_array
+    a = AnnotationClass.setup(["a"], code: 'test1', code2: 'test2')
+    a.extend AnnotatedArray
+    d = Marshal.dump(a)
+    a2 = Marshal.load(d)
+    assert_equal 'test1', a2.first.code
+  end
+end
+

data/test/scout/test_persist.rb

@@ -158,11 +158,27 @@ class TestPersist < Test::Unit::TestCase
   end
 
   def test_path_prefix
-    Persist.persist('foo', :tsv, :prefix => "TSV") do |filename|
+    Persist.persist('foo', :marshal, :prefix => "TSV") do |filename|
       assert File.basename(filename).start_with? "TSV"
     end
   end
 
+  def test_persist_with_data
+    res = Persist.persist('foo', :marshal, :prefix => "TSV", :data => {3 => 4}) do |data|
+      data[1] = 2
+    end
+    assert_equal 2, res[1]
+    assert_equal 4, res[3]
+    res2 = nil
+    assert_nothing_raised do
+      res2 = Persist.persist('foo', :marshal, :prefix => "TSV", :data => {}) do |data|
+        raise
+      end
+    end
+    assert_equal 2, res2[1]
+    assert_equal 4, res2[3]
+  end
+
   def __test_speed
     times = 100_000
     TmpFile.with_file do |tmpfile|

data/test/scout/test_resource.rb

@@ -1,6 +1,7 @@
 require File.expand_path(__FILE__).sub(%r(/test/.*), '/test/test_helper.rb')
 require File.expand_path(__FILE__).sub(%r(.*/test/), '').sub(/test_(.*)\.rb/,'\1')
 
+require 'scout/resource/scout'
 class TestResourceUnit < Test::Unit::TestCase
   module TestResource
     extend Resource
@@ -8,19 +9,18 @@ class TestResourceUnit < Test::Unit::TestCase
     self.subdir = Path.setup('tmp/test-resource')
   end
 
-
   def test_root
 
     p = TestResource.root.some_file
     assert p.find(:user).include?(ENV["HOME"])
   end
 
-  def __test_identify
-    assert_equal 'etc/', Rbbt.identify(File.join(ENV["HOME"], '.rbbt/etc/'))
-    assert_equal 'share/databases/', Rbbt.identify('/usr/local/share/rbbt/databases/')
-    assert_equal 'share/databases/DATABASE', Rbbt.identify('/usr/local/share/rbbt/databases/DATABASE')
-    assert_equal 'share/databases/DATABASE/FILE', Rbbt.identify('/usr/local/share/rbbt/databases/DATABASE/FILE')
-    assert_equal 'share/databases/DATABASE/FILE', Rbbt.identify(File.join(ENV["HOME"], '.rbbt/share/databases/DATABASE/FILE'))
-    assert_equal 'share/databases/DATABASE/FILE', Rbbt.identify('/usr/local/share/rbbt/databases/DATABASE/FILE')
+  def test_identify
+    assert_equal 'etc', Scout.identify(File.join(ENV["HOME"], '.scout/etc'))
+    assert_equal 'share/databases', Resource.identify('/usr/local/share/scout/databases/')
+    assert_equal 'share/databases/DATABASE', Resource.identify('/usr/local/share/scout/databases/DATABASE')
+    assert_equal 'share/databases/DATABASE/FILE', Resource.identify('/usr/local/share/scout/databases/DATABASE/FILE')
+    assert_equal 'share/databases/DATABASE/FILE', Resource.identify(File.join(ENV["HOME"], '.scout/share/databases/DATABASE/FILE'))
+    assert_equal 'share/databases/DATABASE/FILE', Resource.identify('/usr/local/share/scout/databases/DATABASE/FILE')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-07 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -124,6 +124,10 @@ files:
 - Rakefile
 - VERSION
 - lib/scout-essentials.rb
+- lib/scout/annotation.rb
+- lib/scout/annotation/annotated_object.rb
+- lib/scout/annotation/annotation_module.rb
+- lib/scout/annotation/array.rb
 - lib/scout/cmd.rb
 - lib/scout/concurrent_stream.rb
 - lib/scout/config.rb
@@ -139,13 +143,13 @@ files:
 - lib/scout/log/progress/report.rb
 - lib/scout/log/progress/util.rb
 - lib/scout/log/trap.rb
-- lib/scout/meta_extension.rb
 - lib/scout/misc.rb
 - lib/scout/misc/digest.rb
 - lib/scout/misc/filesystem.rb
 - lib/scout/misc/format.rb
 - lib/scout/misc/helper.rb
 - lib/scout/misc/insist.rb
+- lib/scout/misc/math.rb
 - lib/scout/misc/monitor.rb
 - lib/scout/misc/system.rb
 - lib/scout/named_array.rb
@@ -182,6 +186,8 @@ files:
 - share/color/color_names
 - share/color/diverging_colors.hex
 - share/software/install_helpers
+- test/scout/annotation/test_annotated_object.rb
+- test/scout/annotation/test_array.rb
 - test/scout/indiferent_hash/test_case_insensitive.rb
 - test/scout/indiferent_hash/test_options.rb
 - test/scout/log/test_color.rb
@@ -189,7 +195,9 @@ files:
 - test/scout/log/test_progress.rb
 - test/scout/misc/test_digest.rb
 - test/scout/misc/test_filesystem.rb
+- test/scout/misc/test_helper.rb
 - test/scout/misc/test_insist.rb
+- test/scout/misc/test_math.rb
 - test/scout/misc/test_system.rb
 - test/scout/open/test_lock.rb
 - test/scout/open/test_remote.rb
@@ -208,12 +216,12 @@ files:
 - test/scout/simple_opt/test_get.rb
 - test/scout/simple_opt/test_parse.rb
 - test/scout/simple_opt/test_setup.rb
+- test/scout/test_annotation.rb
 - test/scout/test_cmd.rb
 - test/scout/test_concurrent_stream.rb
 - test/scout/test_config.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_named_array.rb
 - test/scout/test_open.rb
@@ -241,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.5.10
 signing_key: 
 specification_version: 4
 summary: Scout essential tools

data/lib/scout/meta_extension.rb

@@ -1,101 +0,0 @@
-module MetaExtension
-  def self.extended(base)
-    meta = class << base; self; end
-
-    base.class_variable_set("@@extension_attrs", []) unless base.class_variables.include?("@@extension_attrs")
-
-    meta.define_method(:extension_attr) do |*attrs|
-      self.class_variable_get("@@extension_attrs").concat attrs
-      attrs.each do |a|
-        self.attr_accessor a
-      end
-    end
-
-    meta.define_method(:extended) do |obj|
-      attrs = self.class_variable_get("@@extension_attrs")
-
-      obj.instance_variable_set(:@extension_attrs, []) unless obj.instance_variables.include?(:@extension_attrs)
-      extension_attrs = obj.instance_variable_get(:@extension_attrs)
-      extension_attrs.concat attrs
-    end
-
-    meta.define_method(:setup) do |*args,&block|
-      if block_given?
-        obj, rest = block, args
-      else
-        obj, *rest = args
-      end
-      obj = block if obj.nil?
-      obj.extend base unless base === obj
-
-      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)) ||
-           (! attrs.length != 1 ))
-
-        pairs = rlast
-      else
-        pairs = attrs.zip(rest)
-      end
-
-      pairs.each do |name,value|
-        obj.instance_variable_set("@#{name}", value)
-      end
-
-      obj
-    end
-
-    base.define_method(:extension_attr_hash) do 
-      attr_hash = {}
-      @extension_attrs.each do |name|
-        attr_hash[name] = self.instance_variable_get("@#{name}")
-      end
-      attr_hash
-    end
-
-    base.define_method(:annotate) do |other|
-      attr_values = @extension_attrs.collect do |a|
-        self.instance_variable_get("@#{a}")
-      end
-      base.setup(other, *attr_values)
-    end
-
-    base.define_method(:purge) do
-      new = self.dup
-
-      if new.instance_variables.include?(:@extension_attrs)
-        new.instance_variable_get(:@extension_attrs).each do |a|
-          var_name = "@#{a}".to_sym
-          new.remove_instance_variable(var_name) if new.instance_variables.include? var_name
-        end
-        new.remove_instance_variable("@extension_attrs")
-      end
-
-      new
-    end
-  end
-
-  def self.is_extended?(obj)
-    obj.respond_to?(:extension_attr_hash)
-  end
-
-  def self.purge(obj)
-    case obj
-    when nil
-      nil
-    when Array
-      obj.collect{|e| purge(e) }
-    when Hash
-      new = {}
-      obj.each do |k,v|
-        new[k] = purge(v)
-      end
-      new
-    else
-      is_extended?(obj) ? obj.purge : obj
-    end
-  end
-end