ehbrs-tools 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1aa5f7815ed7b0d48dafd1adbe15fefc1d9b65c1f88b573b11c4f0f83dcb9a
-  data.tar.gz: 1410d0c2c225cb81a266c96c6e835169db6f05407f474fad319e23a2ac0be0cf
+  metadata.gz: e2fcd84889771b212325a7f4315bb2e03a9584ffd36dfa13184efa56fe0294c7
+  data.tar.gz: e4fba78ac97dfd0628bb7f1f4efc0c8fc2f46b6b598b74cb50c71bf5e3785156
 SHA512:
-  metadata.gz: d5a5e0d55099bad71f3100b9ce17cc0fff3d6962543da41e43919536ded40e9a6d01ab1cb85514c1e73660e78065fc9f02cf7d0bafc0959f204b7fda1ba45ede
-  data.tar.gz: 8c37bccb70f1f5e2190b4102914b28fac6658f96ec7cbb56e2db606e3675bddddb149986eb300703539e754dbbe5d85be08f94723066799efad4a418f4ca5bd2
+  metadata.gz: b28bbf0f2abcf8cf7c4ff92f27b96a0f9d3761316cfa5796750606cc3249f00df80187410156b93caae02a649945b7bc2bc87afe656521b5fb6394828a566ee8
+  data.tar.gz: f6e325bb6fd61d6ee7eca4cae4de5c0a057b2c1954df5e693cb28143be82c411804771071dcffdbee482ac6aee53412889fbb6eeab4bb21d45c8074abb49d6d6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.26.0)
+    ehbrs-tools (0.27.0)
       avm-tools (~> 0.82, >= 0.82.1)
       eac_cli (~> 0.12, >= 0.12.5)
       eac_ruby_utils (~> 0.71)
@@ -33,7 +33,7 @@ PATH
 PATH
   remote: vendor/eac_cli
   specs:
-    eac_cli (0.22.2)
+    eac_cli (0.23.0)
       colorize (~> 0.8.1)
       eac_config (~> 0.5, >= 0.5.1)
       eac_ruby_utils (~> 0.70)
@@ -72,8 +72,9 @@ PATH
 PATH
   remote: vendor/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.10.0)
+    ehbrs_ruby_utils (0.11.0)
       aranha-parsers (~> 0.8, >= 0.8.5)
+      avm (~> 0.3, >= 0.3.2)
       eac_ruby_utils (~> 0.70)
       eac_templates (~> 0.1, >= 0.1.1)
       taglib-ruby (~> 1.1)
@@ -82,7 +83,7 @@ PATH
 PATH
   remote: vendor/ultimate_lyrics
   specs:
-    ultimate_lyrics (0.1.0)
+    ultimate_lyrics (0.1.1)
       aranha-parsers (~> 0.8, >= 0.8.5)
       eac_ruby_utils (~> 0.74)
 

data/lib/ehbrs/tools/runner/fs/selected.rb

@@ -1,24 +1,29 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/envs'
-require 'eac_ruby_utils/fs/clearable_directory'
+
 require 'ehbrs/tools/core_ext'
+require 'ehbrs_ruby_utils/fs/selected'
 
 module Ehbrs
   module Tools
     class Runner
       class Fs
         class Selected
-          DEFAULT_TRAVERSER_RECURSIVE = true
-
           enable_jobs_runner
-          runner_with :confirmation, :help, :filesystem_traverser do
+          runner_with :confirmation, :help do
             desc 'Seleciona diretórios.'
             arg_opt '-b', '--build-dir', 'Constrói diretório alvo.'
+            arg_opt '-f', '--filename', 'Nome do arquivo que anota o diretório como selecionado.',
+                    default: ::EhbrsRubyUtils::Fs::Selected::DEFAULT_FILENAME
+
+            pos_arg :root_path
           end
 
           def run
-            infov 'Recursive', traverser_recursive
+            infov 'Root path', selected.root_path
+            infov 'Filename', selected.filename
+            infov 'Build directory', build_dir.if_present('-')
             run_jobs :show, :build
           end
 
@@ -33,24 +38,18 @@ module Ehbrs
           end
 
           def directory_target_basename(directory)
-            directory.basename.to_path
+            ::EhbrsRubyUtils::Fs::Selected::Build::DEFAULT_TARGET_BASENAME_PROC.call(directory)
           end
 
           private
 
           def build
             infom "Building directory \"#{build_dir}\" with selected..."
-            build_dir.clear
-            selected_directories.each do |directory|
-              ::EacRubyUtils::Envs.local.command(
-                'ln', '-s', directory.to_path,
-                build_dir.join(directory_target_basename(directory))
-              ).system!
-            end
+            selected.build(build_dir, &method(:directory_target_basename)).perform
           end
 
           def build_dir_uncached
-            parsed.build_dir.if_present { |v| ::EacRubyUtils::Fs::ClearableDirectory.new(v) }
+            parsed.build_dir.if_present(&:to_pathname)
           end
 
           def run_build?
@@ -59,9 +58,11 @@ module Ehbrs
 
           def selected_directories_uncached
             infom 'Searching selected directories...'
-            @selected = []
-            run_filesystem_traverser
-            @selected.sort
+            selected.found.map { |path| build_selected_directory(path) }
+          end
+
+          def selected_uncached
+            ::EhbrsRubyUtils::Fs::Selected.new(parsed.root_path, filename: parsed.filename)
           end
 
           def show
@@ -70,10 +71,6 @@ module Ehbrs
               puts directory_label(directory)
             end
           end
-
-          def traverser_check_directory(path)
-            @selected << build_selected_directory(path) if path.join('.selected').exist?
-          end
         end
       end
     end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.26.0'
+    VERSION = '0.27.0'
   end
 end

data/lib/ehbrs/videos/extract/package.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'ehbrs/fs/compressed_package'
+require 'ehbrs_ruby_utils/fs/compressed_package'
 require 'ehbrs/videos/extract/package_file'
 
 module Ehbrs
@@ -37,7 +37,7 @@ module Ehbrs
           raise "Extract directory \"#{r}\" is a file" if r.file?
 
           r.rmtree if r.directory?
-          ::Ehbrs::Fs::CompressedPackage.new(path).extract_to(r)
+          ::EhbrsRubyUtils::Fs::CompressedPackage.new(path).extract_to(r)
           r
         end
 

data/lib/ehbrs/videos/extract/package_file.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'ehbrs/fs/compressed_package'
 
 module Ehbrs
   module Videos

data/vendor/eac_cli/lib/eac_cli/definition/argument_option.rb

@@ -13,7 +13,7 @@ module EacCli
         repeat? ? previous_value + [new_value] : new_value
       end
 
-      def default_value
+      def default_default_value
         repeat? ? [] : nil
       end
     end

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -18,7 +18,7 @@ module EacCli
 
       enable_listable
       enable_abstract_methods :build_value, :default_value
-      lists.add_symbol :option, :optional, :usage, :repeat, :required
+      lists.add_symbol :option, :default, :optional, :usage, :repeat, :required
       common_constructor :short, :long, :description, :options, default: [{}] do
         raise 'Nor short neither long selector was set' if short.blank? && long.blank?
 
@@ -27,6 +27,14 @@ module EacCli
         )
       end
 
+      def default_value
+        default_value? ? options[OPTION_DEFAULT] : default_default_value
+      end
+
+      def default_value?
+        options.key?(OPTION_DEFAULT)
+      end
+
       def identifier
         [long, short].each do |v|
           v.to_s.if_present { |vv| return vv.variableize.to_sym }

data/vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb

@@ -14,6 +14,12 @@ module EacCli
       end
 
       def default_value
+        return super unless default_value?
+
+        raise "Unallowed default value for boolean options (Option: #{self})"
+      end
+
+      def default_default_value
         repeat? ? 0 : false
       end
     end

data/vendor/eac_cli/lib/eac_cli/runner_with/help/builder.rb

@@ -36,9 +36,9 @@ module EacCli
         end
 
         def option_definition(option)
-          self.class.option_usage_full(option) + option.description.if_present('') do |v|
-            OPTION_DESC_SEP + v
-          end
+          [self.class.option_usage_full(option), option.description,
+           option.default_value? ? "[Default: \"#{option.default_value}\"]" : nil]
+            .reject(&:blank?).join(OPTION_DESC_SEP)
         end
 
         def section(header, include_header = true)

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

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

data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb

@@ -13,6 +13,7 @@ RSpec.describe ::EacCli::Runner do
         bool_opt '-p', '--opt2', 'A boolean option'
         arg_opt '-q', '--opt4', 'A repeatable argument option.', repeat: true
         bool_opt '-r', '--opt5', 'A repeatable boolean option', repeat: true
+        arg_opt '-s', '--opt6', 'A argument option with default value', default: 'DEFAULT'
         pos_arg :pos1
         pos_arg :pos2, repeat: true, optional: true
         alt do
@@ -28,9 +29,9 @@ RSpec.describe ::EacCli::Runner do
   let(:parsed_actual) { instance.parsed.to_h.symbolize_keys }
 
   context 'when all args are supplied' do
-    let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd] }
+    let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd --opt6 6] }
     let(:parsed_expected) do
-      { opt1: 'aaa', opt2: true, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
+      { opt1: 'aaa', opt2: true, opt3: false, opt4: [], opt5: 0, opt6: '6', pos1: 'bbb',
         pos2: %w[ccc ddd] }
     end
 
@@ -65,7 +66,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
     let(:parsed_expected) do
-      { opt1: nil, opt2: false, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
+      { opt1: nil, opt2: false, opt3: false, opt4: [], opt5: 0, opt6: 'DEFAULT', pos1: 'bbb',
         pos2: [] }
     end
 
@@ -87,7 +88,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when alternative args are supplied' do
     let(:argv) { %w[--opt3] }
     let(:parsed_expected) do
-      { opt1: nil, opt2: false, opt3: true, opt4: [], opt5: 0, pos1: nil,
+      { opt1: nil, opt2: false, opt3: true, opt4: [], opt5: 0, opt6: 'DEFAULT', pos1: nil,
         pos2: [] }
     end
 
@@ -98,7 +99,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when repeated options are supplied' do
     let(:argv) { %w[--opt5 -rrr --opt4=A -q B --opt4 C AAA] }
     let(:parsed_expected) do
-      { opt1: nil, opt2: false, opt3: false, opt4: %w[A B C], opt5: 4, pos1: 'AAA',
+      { opt1: nil, opt2: false, opt3: false, opt4: %w[A B C], opt5: 4, opt6: 'DEFAULT', pos1: 'AAA',
         pos2: [] }
     end
 

data/vendor/ehbrs_ruby_utils/ehbrs_ruby_utils.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir['{spec}/**/*', '.rubocop.yml', '.rspec']
 
   s.add_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'
+  s.add_dependency 'avm', '~> 0.3', '>= 0.3.2'
   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/{lib/ehbrs → vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils}/fs/compressed_package.rb

@@ -3,7 +3,7 @@
 require 'avm/files/info'
 require 'eac_ruby_utils/core_ext'
 
-module Ehbrs
+module EhbrsRubyUtils
   module Fs
     class CompressedPackage < ::Avm::Files::Info
       MIME_TYPES = {

data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs/selected/build.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/fs/selected/build_file'
+
+module EhbrsRubyUtils
+  module Fs
+    class Selected
+      class Build
+        DEFAULT_TARGET_BASENAME_PROC = ::Proc.new { |basename| basename }
+
+        attr_reader :selected, :target_dir, :target_basename_proc
+
+        def initialize(selected, target_dir, &target_basename_proc)
+          @selected = selected
+          @target_dir = target_dir.to_pathname
+          @target_basename_proc = target_basename_proc.presence || DEFAULT_TARGET_BASENAME_PROC
+        end
+
+        def perform
+          clear_target_dir
+          link_selected_found
+        end
+
+        private
+
+        def clear_target_dir
+          target_dir.children.each do |c|
+            c.unlink if c.symlink? && c.directory?
+          end
+        end
+
+        def link_selected_found
+          selected.found.each do |found|
+            ::EhbrsRubyUtils::Fs::Selected::BuildFile.new(self, found).perform
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs/selected/build_file.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Fs
+    class Selected
+      class BuildFile
+        common_constructor :build, :path do
+          self.path = path.to_pathname
+        end
+
+        def perform
+          target_path.make_symlink(path)
+        end
+
+        def target_path
+          build.target_dir.join(target_basename)
+        end
+
+        def target_basename
+          build.target_basename_proc.call(path.basename.to_path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Fs
+    class Selected
+      require_sub __FILE__
+      DEFAULT_FILENAME = '.selected'
+
+      enable_listable
+      enable_simple_cache
+      lists.add_symbol :option, :filename, :target_name_builder
+      common_constructor :root_path, :options, default: [{}] do
+        self.root_path = root_path.to_pathname
+        self.options = self.class.lists.option.hash_keys_validate!(options)
+      end
+
+      def build(target_dir)
+        ::EhbrsRubyUtils::Fs::Selected::Build.new(self, target_dir)
+      end
+
+      def filename
+        options[OPTION_FILENAME].if_present(DEFAULT_FILENAME)
+      end
+
+      private
+
+      # @return [Pathname]
+      def found_uncached
+        root_path.glob("**/#{filename}").map(&:parent).sort
+      end
+    end
+  end
+end

data/{lib/ehbrs → vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils}/fs.rb

@@ -2,7 +2,8 @@
 
 require 'eac_ruby_utils/core_ext'
 
-module Ehbrs
+module EhbrsRubyUtils
+  # Filesystem utilities.
   module Fs
     require_sub __FILE__
   end

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

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

data/vendor/ultimate_lyrics/lib/ultimate_lyrics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UltimateLyrics
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/vendor/ultimate_lyrics/ultimate_lyrics.gemspec

@@ -7,8 +7,10 @@ require 'ultimate_lyrics/version'
 Gem::Specification.new do |s|
   s.name        = 'ultimate_lyrics'
   s.version     = UltimateLyrics::VERSION
-  s.authors     = ['Put here the authors']
-  s.summary     = 'Put here de description.'
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     = 'Fetch song lyrics from popular websites.'
+  s.homepage    = 'https://rubygems.org/gems/ultimate_lyrics'
+  s.metadata    = { 'source_code_uri' => 'https://github.com/esquilo-azul/ultimate_lyrics' }
 
   s.files = Dir['{lib}/**/*']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -179,8 +179,6 @@ files:
 - lib/ehbrs/cooking_book/recipe/measure.rb
 - lib/ehbrs/cooking_book/recipe/part.rb
 - lib/ehbrs/executables.rb
-- lib/ehbrs/fs.rb
-- lib/ehbrs/fs/compressed_package.rb
 - lib/ehbrs/gems.rb
 - lib/ehbrs/google.rb
 - lib/ehbrs/google/translate.rb
@@ -690,6 +688,11 @@ files:
 - vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils.rb
 - vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/executables.rb
 - vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/finances/bb_browser/docker_image.rb
+- vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs.rb
+- vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs/compressed_package.rb
+- vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs/selected.rb
+- vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs/selected/build.rb
+- vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/fs/selected/build_file.rb
 - vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/music.rb
 - vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/patches/object/template.rb
 - vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/version.rb