ehbrs-tools 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558059e25d8a6a43c217fc0bee9124272d21dc2ff16412d55259d50be5cce94b
-  data.tar.gz: 5f636e17e8b5577e7ae65b72e56b82d9c28e34c34902c82afb83115d1d7a331e
+  metadata.gz: 27cfd6fd70b80a51d74091e516bcd784cafe2ed0150de7424e865213ef2a6397
+  data.tar.gz: '099eae7fd47b2b34f11417228a16f838033b4dfa3b725bc16363c2a23ccc6ce6'
 SHA512:
-  metadata.gz: 4f10bf9f2eecd95c38d19362315c126411addc52fdf972e2f1d7a3be1abe26fd58ee09f5159b9618ffe1533fd4b032a14d908fa3d9b6d37b4438206986a1fce0
-  data.tar.gz: 94f20bb40c888fc248f357634148a0c0b9bd907164381e95a0e60af58c1794021c525c076605d1c72fc4a2c58c0738cc391cf2045d68f7641afa7b25b90f4741
+  metadata.gz: caf38bb6c3ae4c907aa20761ef390b8ef3371e150ad512758813c8c411c7d24d10c33abf2a263904875c96cd90dc00987ba6127d0b5ef5452f9581594b96e878
+  data.tar.gz: 14096bf6312bde96792b427a71b5eddc03bc044b8fbd11a56e7513b6a72fb517641a0b53a2ce8f01ada21433bb376871af1aa8f6c3bb2cec30bd4ea734cd9ec0

data/Gemfile

@@ -11,3 +11,5 @@ Dir["#{gems_subdir}/*"].each do |dir|
   basename = ::File.basename(dir)
   gem basename, path: "#{gems_subdir}/#{basename}"
 end
+
+gem 'httpclient', git: 'https://github.com/livelink/httpclient.git'

data/Gemfile.lock

@@ -1,7 +1,13 @@
+GIT
+  remote: https://github.com/livelink/httpclient.git
+  revision: 40f7e88078c95f9a6909fb56f9e313632637cd72
+  specs:
+    httpclient (2.8.4)
+
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.28.1)
+    ehbrs-tools (0.28.2)
       avm-tools (~> 0.82, >= 0.82.1)
       eac_cli (~> 0.12, >= 0.12.5)
       eac_ruby_utils (~> 0.71)
@@ -33,7 +39,7 @@ PATH
 PATH
   remote: vendor/eac_cli
   specs:
-    eac_cli (0.23.0)
+    eac_cli (0.23.1)
       colorize (~> 0.8.1)
       eac_config (~> 0.5, >= 0.5.1)
       eac_ruby_utils (~> 0.70)
@@ -55,7 +61,7 @@ PATH
 PATH
   remote: vendor/eac_fs
   specs:
-    eac_fs (0.3.0)
+    eac_fs (0.5.0)
       content-type
       eac_ruby_utils (~> 0.70)
       ruby-filemagic
@@ -63,7 +69,7 @@ PATH
 PATH
   remote: vendor/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.11.0)
+    eac_ruby_base0 (0.12.0)
       eac_cli (~> 0.22, >= 0.22.2)
       eac_fs (~> 0.3)
       eac_ruby_gems_utils (~> 0.9.6, ~> 0.9)
@@ -95,9 +101,10 @@ PATH
 PATH
   remote: vendor/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.12.0)
+    ehbrs_ruby_utils (0.12.1)
       aranha-parsers (~> 0.8, >= 0.8.5)
       avm (~> 0.3, >= 0.3.2)
+      eac_fs (~> 0.5)
       eac_ruby_utils (~> 0.70)
       eac_templates (~> 0.1, >= 0.1.1)
       taglib-ruby (~> 1.1)
@@ -123,13 +130,14 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     asciidoctor (2.0.16)
     ast (2.4.2)
-    avm (0.3.2)
+    avm (0.5.0)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
       eac_ruby_utils (~> 0.68)
       eac_templates (~> 0.1, >= 0.1.1)
-    avm-apps (0.4.1)
-      eac_ruby_utils (~> 0.67)
+      filesize (~> 0.2)
+      htmlbeautifier (~> 1.3, >= 1.3.1)
+      minitar (~> 0.9)
     avm-eac_asciidoctor_base0 (0.3.1)
       asciidoctor (~> 2.0, >= 2.0.12)
       avm-eac_webapp_base0 (~> 0.1)
@@ -139,25 +147,15 @@ GEM
     avm-eac_webapp_base0 (0.1.1)
       avm (~> 0.1)
       eac_ruby_utils (~> 0.68)
-    avm-tools (0.106.0)
+    avm-tools (0.108.0)
       aranha-parsers (~> 0.4)
-      asciidoctor (~> 2.0, >= 2.0.12)
       avm (~> 0.1)
-      avm-apps (~> 0.2)
       avm-eac_asciidoctor_base0
       clipboard (~> 1.3, >= 1.3.3)
-      content-type (~> 0.0.1)
       curb (~> 0.9.10)
-      eac_docker (~> 0.2)
-      eac_git (~> 0.2)
       eac_ruby_base0 (~> 0.7, >= 0.7.2)
       eac_ruby_gems_utils (~> 0.6, >= 0.6.1)
-      eac_templates (~> 0.1)
-      filesize
       git (~> 1.7)
-      htmlbeautifier (~> 1.3, >= 1.3.1)
-      minitar
-      os
       ruby-progressbar (~> 1.10, >= 1.10.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -176,7 +174,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
     dry-inflector (0.2.1)
-    eac_git (0.7.3)
+    eac_git (0.8.0)
       eac_ruby_utils (~> 0.74)
       parseconfig (~> 1.0, >= 1.0.8)
     eac_ruby_gem_support (0.4.0)
@@ -209,7 +207,6 @@ GEM
       rchardet (~> 1.8)
     hpricot (0.8.6)
     htmlbeautifier (1.3.1)
-    httpclient (2.8.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -219,13 +216,13 @@ GEM
     minitest (5.14.4)
     multipart-post (2.1.1)
     net-ssh (4.2.0)
-    nokogiri (1.12.4-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
     os (1.1.1)
     parallel (1.21.0)
-    parseconfig (1.1.0)
+    parseconfig (1.1.2)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
@@ -301,6 +298,7 @@ DEPENDENCIES
   eac_templates!
   ehbrs-tools!
   ehbrs_ruby_utils!
+  httpclient!
   ultimate_lyrics!
 
 BUNDLED WITH

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.28.1'
+    VERSION = '0.28.2'
   end
 end

data/vendor/eac_cli/lib/eac_cli/config.rb

@@ -3,16 +3,19 @@
 require 'eac_ruby_utils/core_ext'
 
 module EacCli
-  class Config
+  class Config < ::SimpleDelegator
     require_sub __FILE__
-    attr_reader :sub
 
     def initialize(sub_node)
-      @sub = sub_node
+      super(sub_node)
     end
 
     def entry(path, options = {})
       ::EacCli::Config::Entry.new(self, path, options)
     end
+
+    def sub
+      __getobj__
+    end
   end
 end

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.23.0'
+  VERSION = '0.23.1'
 end

data/vendor/eac_fs/lib/eac_fs/cached_download.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_fs/patches'
+require 'eac_ruby_utils/fs/temp'
+
+module Avm
+  class CachedDownload
+    attr_reader :url, :fs_cache
+
+    def initialize(url, parent_fs_cache = nil)
+      @url = url
+      @fs_cache = (parent_fs_cache || fs_cache).child(url.parameterize)
+    end
+
+    def assert
+      download unless fs_cache.cached?
+    end
+
+    def download
+      ::EacRubyUtils::Fs::Temp.on_file do |temp|
+        download_to(temp)
+        fs_cache.content_path.to_pathname.dirname.mkpath
+        ::FileUtils.mv(temp.to_path, fs_cache.content_path)
+      end
+    end
+
+    def path
+      fs_cache.content_path.to_pathname
+    end
+
+    private
+
+    def download_to(local_file)
+      ::URI.parse(url).open do |remote|
+        local_file.open('wb') { |handle| handle.write(remote.read) }
+      end
+    end
+  end
+end

data/vendor/eac_fs/lib/eac_fs/file_info.rb

@@ -6,6 +6,9 @@ require 'filemagic'
 
 module EacFs
   class FileInfo
+    UNKNOWN_CONTENT_TYPE_STRING = 'application/octet-stream'
+    UNKNOWN_CONTENT_TYPE = ::ContentType.parse(UNKNOWN_CONTENT_TYPE_STRING)
+
     enable_simple_cache
     attr_reader :magic_string
 
@@ -19,6 +22,8 @@ module EacFs
 
     def content_type_uncached
       ::ContentType.parse(magic_string)
+    rescue ::Parslet::ParseFailed
+      UNKNOWN_CONTENT_TYPE
     end
   end
 end

data/vendor/eac_fs/lib/eac_fs/patches/object/fs_cache.rb

@@ -5,6 +5,11 @@ require 'eac_fs/patches/module/fs_cache'
 class Object
   # @return [EacFs::Cache]
   def fs_cache
-    self.class.fs_cache
+    self.class.fs_cache.child(fs_cache_object_id)
+  end
+
+  # @return [String]
+  def fs_cache_object_id
+    raise 'Abstract method hit'
   end
 end

data/vendor/eac_fs/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.3.0'
+  VERSION = '0.5.0'
 end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb

@@ -43,8 +43,8 @@ module EacRubyBase0
       delegate "#{item}_xdg_env", "#{item}_dir", to: :app_xdg
     end
 
-    def fs_cache
-      @fs_cache ||= ::EacFs::Cache.new(
+    def self_fs_cache
+      @self_fs_cache ||= ::EacFs::Cache.new(
         cache_dir.join(::EacFs::Cache.name.parameterize)
       )
     end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb

@@ -40,7 +40,7 @@ module EacRubyBase0
     def on_context
       ::EacRubyUtils::Speaker.context.on(build_speaker) do
         ::EacConfig::Node.context.on(runner_context.call(:application).build_config) do
-          ::EacFs::Cache.context.on(application.fs_cache) do
+          ::EacFs::Cache.context.on(application.self_fs_cache) do
             yield
           end
         end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/vendor/ehbrs_ruby_utils/ehbrs_ruby_utils.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
   s.add_dependency 'avm', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'eac_fs', '~> 0.5'
   s.add_dependency 'eac_ruby_utils', '~> 0.70'
   s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
   s.add_dependency 'taglib-ruby', '~> 1.1'

data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs/compressed_package.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/files/info'
+require 'eac_fs/file_info'
 require 'eac_ruby_utils/core_ext'
 
 module EhbrsRubyUtils
   module Fs
-    class CompressedPackage < ::Avm::Files::Info
+    class CompressedPackage < ::EacFs::FileInfo
       MIME_TYPES = {
         'application/zip' => :zip,
         'application/x-7z-compressed' => :sevenzip,

data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhbrsRubyUtils
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -482,6 +482,7 @@ files:
 - vendor/eac_fs/eac_fs.gemspec
 - vendor/eac_fs/lib/eac_fs.rb
 - vendor/eac_fs/lib/eac_fs/cache.rb
+- vendor/eac_fs/lib/eac_fs/cached_download.rb
 - vendor/eac_fs/lib/eac_fs/file_info.rb
 - vendor/eac_fs/lib/eac_fs/patches.rb
 - vendor/eac_fs/lib/eac_fs/patches/module.rb