ehbrs-tools 0.25.1 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd84e165d6c571aba1ae27995dd9a975089005db9590f6fadb5fccc9fbbc8525
-  data.tar.gz: 10c2d2ca5902c1e5952f56d8400a176c898f40519675dd740ecc20f9fe8f5197
+  metadata.gz: 558059e25d8a6a43c217fc0bee9124272d21dc2ff16412d55259d50be5cce94b
+  data.tar.gz: 5f636e17e8b5577e7ae65b72e56b82d9c28e34c34902c82afb83115d1d7a331e
 SHA512:
-  metadata.gz: 8c41cea11d8cf3f1a531b84efae67be1604bc4127323280bb6da2111b546f4580fa6856d330707588d610130d0d76454990c7acf3918d769d06271ad0fe9a412
-  data.tar.gz: 961078668e064e54dc30c3e93c53fe82bbfe4ef8b1a7c927f63381a12e56e880ef695948c7174c9fd7889c3f2d0df7c7b25c2f4edb75a94e9968e6dd87386d87
+  metadata.gz: 4f10bf9f2eecd95c38d19362315c126411addc52fdf972e2f1d7a3be1abe26fd58ee09f5159b9618ffe1533fd4b032a14d908fa3d9b6d37b4438206986a1fce0
+  data.tar.gz: 94f20bb40c888fc248f357634148a0c0b9bd907164381e95a0e60af58c1794021c525c076605d1c72fc4a2c58c0738cc391cf2045d68f7641afa7b25b90f4741

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.25.1)
+    ehbrs-tools (0.28.1)
       avm-tools (~> 0.82, >= 0.82.1)
       eac_cli (~> 0.12, >= 0.12.5)
       eac_ruby_utils (~> 0.71)
-      ehbrs_ruby_utils (~> 0.8.1, ~> 0.8)
+      ehbrs_ruby_utils (~> 0.8, >= 0.8.1)
       filesize
       inifile (~> 3.0)
       os
@@ -14,12 +14,13 @@ PATH
 PATH
   remote: vendor/aranha-parsers
   specs:
-    aranha-parsers (0.8.3)
+    aranha-parsers (0.8.5)
       activesupport (>= 4.0.0)
       addressable (~> 2.7)
       curb (~> 0.9.10)
       eac_ruby_utils (~> 0.74)
       httpclient (~> 2.8, >= 2.8.3)
+      nokogiri (~> 1.12, >= 1.12.4)
       ofx-parser (~> 1.1.0)
 
 PATH
@@ -32,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)
@@ -51,29 +52,63 @@ PATH
       eac_ruby_utils (~> 0.74)
       eac_templates (~> 0.1)
 
+PATH
+  remote: vendor/eac_fs
+  specs:
+    eac_fs (0.3.0)
+      content-type
+      eac_ruby_utils (~> 0.70)
+      ruby-filemagic
+
 PATH
   remote: vendor/eac_ruby_base0
   specs:
-    eac_ruby_base0 (0.10.1)
+    eac_ruby_base0 (0.11.0)
       eac_cli (~> 0.22, >= 0.22.2)
-      eac_ruby_gems_utils (~> 0.9.5, ~> 0.9)
+      eac_fs (~> 0.3)
+      eac_ruby_gems_utils (~> 0.9.6, ~> 0.9)
+      eac_ruby_utils (~> 0.70)
+
+PATH
+  remote: vendor/eac_ruby_gems_utils
+  specs:
+    eac_ruby_gems_utils (0.9.6)
+      bundler (~> 2.2, >= 2.2.17)
       eac_ruby_utils (~> 0.70)
 
 PATH
   remote: vendor/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.74.0)
+    eac_ruby_utils (0.76.0)
       activesupport (>= 4.0)
       addressable (~> 2.6)
       filesize
       net-ssh (~> 4.2)
 
+PATH
+  remote: vendor/eac_templates
+  specs:
+    eac_templates (0.2.0)
+      eac_config (~> 0.5)
+      eac_ruby_utils (~> 0.64)
+
 PATH
   remote: vendor/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.8.1)
+    ehbrs_ruby_utils (0.12.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)
+      ultimate_lyrics (~> 0.1)
+
+PATH
+  remote: vendor/ultimate_lyrics
+  specs:
+    ultimate_lyrics (0.1.2)
+      aranha-parsers (~> 0.8, >= 0.8.5)
+      eac_ruby_utils (~> 0.74)
 
 GEM
   remote: https://rubygems.org/
@@ -88,23 +123,23 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     asciidoctor (2.0.16)
     ast (2.4.2)
-    avm (0.3.0)
+    avm (0.3.2)
       eac_docker (~> 0.3)
       eac_git (~> 0.6)
       eac_ruby_utils (~> 0.68)
       eac_templates (~> 0.1, >= 0.1.1)
-    avm-apps (0.4.0)
+    avm-apps (0.4.1)
       eac_ruby_utils (~> 0.67)
-    avm-eac_asciidoctor_base0 (0.3.0)
+    avm-eac_asciidoctor_base0 (0.3.1)
       asciidoctor (~> 2.0, >= 2.0.12)
       avm-eac_webapp_base0 (~> 0.1)
       eac_ruby_utils (~> 0.63)
       os
       rouge (~> 3.26)
-    avm-eac_webapp_base0 (0.1.0)
+    avm-eac_webapp_base0 (0.1.1)
       avm (~> 0.1)
       eac_ruby_utils (~> 0.68)
-    avm-tools (0.104.0)
+    avm-tools (0.106.0)
       aranha-parsers (~> 0.4)
       asciidoctor (~> 2.0, >= 2.0.12)
       avm (~> 0.1)
@@ -150,13 +185,7 @@ GEM
       rubocop (~> 0.80.1)
       rubocop-rails (~> 2.4.2)
       rubocop-rspec (~> 1.38.1)
-    eac_ruby_gems_utils (0.9.5)
-      bundler (~> 2.2, >= 2.2.17)
-      eac_ruby_utils (~> 0.70)
-    eac_templates (0.1.1)
-      eac_config (~> 0.5)
-      eac_ruby_utils (~> 0.64)
-    faraday (1.7.0)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -190,20 +219,23 @@ GEM
     minitest (5.14.4)
     multipart-post (2.1.1)
     net-ssh (4.2.0)
+    nokogiri (1.12.4-x86_64-linux)
+      racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
     os (1.1.1)
-    parallel (1.20.1)
+    parallel (1.21.0)
     parseconfig (1.1.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rack (2.2.3)
     rainbow (3.0.0)
     rchardet (1.8.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (3.26.1)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -230,12 +262,14 @@ GEM
       rubocop (>= 0.72.0)
     rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
+    ruby-filemagic (0.7.2)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
+    taglib-ruby (1.1.0)
     telegram-bot-ruby (0.16.0)
       dry-inflector
       faraday
@@ -259,11 +293,15 @@ DEPENDENCIES
   eac_cli!
   eac_config!
   eac_docker!
+  eac_fs!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.3)
+  eac_ruby_gems_utils!
   eac_ruby_utils!
+  eac_templates!
   ehbrs-tools!
   ehbrs_ruby_utils!
+  ultimate_lyrics!
 
 BUNDLED WITH
    2.2.25

data/lib/ehbrs/tools/runner/finances/bb_browser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ehbrs/core_ext'
+require 'ehbrs/tools/core_ext'
 require 'ehbrs_ruby_utils/finances/bb_browser/docker_image'
 
 module Ehbrs

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

@@ -1,56 +1,51 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/envs'
-require 'eac_ruby_utils/fs/clearable_directory'
-require 'ehbrs/core_ext'
+
+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
 
           protected
 
-          def build_selected_directory(path)
-            path
-          end
-
           def directory_label(directory)
             directory.to_s
           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 +54,11 @@ module Ehbrs
 
           def selected_directories_uncached
             infom 'Searching selected directories...'
-            @selected = []
-            run_filesystem_traverser
-            @selected.sort
+            selected.found
+          end
+
+          def selected_uncached
+            ::EhbrsRubyUtils::Fs::Selected.new(parsed.root_path, filename: parsed.filename)
           end
 
           def show
@@ -70,10 +67,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/runner/music/lyrics.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'ehbrs/tools/core_ext'
+require 'ehbrs_ruby_utils/videos/container'
+require 'ultimate_lyrics/provider'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Lyrics
+          DEFAULT_PROVIDER = 'lyrics.com'
+
+          runner_with :help, :output do
+            arg_opt '-p', '--provider', 'Nome do provedor.', default: DEFAULT_PROVIDER
+            pos_arg :file
+          end
+
+          def run
+            start_banner
+            show_results
+          end
+
+          def show_results
+            if lyrics.found?
+              success 'Lyrics found'
+              run_output
+            else
+              fatal_error 'No lyric found'
+            end
+          end
+
+          def start_banner
+            infov 'File', file
+            %w[artist album track title year].each do |attr|
+              infov attr.humanize, container.tag_file.tag.send(attr)
+            end
+            infov 'Selected provider', provider
+          end
+
+          def container_uncached
+            ::EhbrsRubyUtils::Videos::Container.from_file(file)
+          end
+
+          def file
+            parsed.file.to_pathname
+          end
+
+          def lyrics_uncached
+            container.lyrics_by_provider(provider)
+          end
+
+          def output_content
+            lyrics.text
+          end
+
+          def provider_uncached
+            ::UltimateLyrics::Provider.by_name(provider_name)
+          end
+
+          def provider_name
+            parsed.provider
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/lyrics_book.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'ehbrs/tools/core_ext'
+require 'ehbrs_ruby_utils/music/lyrics_book'
+require 'ehbrs_ruby_utils/videos/container'
+require 'ultimate_lyrics/provider'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class LyricsBook
+          runner_with :help, :output do
+            arg_opt '-p', '--provider', 'Nome do provedor.',
+                    default: ::EhbrsRubyUtils::Music::LyricsBook::DEFAULT_PROVIDER_NAME
+            pos_arg :source_dir
+          end
+
+          def run
+            start_banner
+            run_output
+          end
+
+          def start_banner
+            infov 'Source directory', book.source_dir
+            infov 'Selected provider', book.provider
+          end
+
+          def book_uncached
+            ::EhbrsRubyUtils::Music::LyricsBook.new(parsed.source_dir,
+                                                    provider_name: parsed.provider)
+          end
+
+          def output_content
+            book.output
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,16 +10,16 @@ module Ehbrs
         class Selected < ::Ehbrs::Tools::Runner::Fs::Selected
           protected
 
-          def build_selected_directory(path)
-            ::Ehbrs::Music::Album.new(path)
-          end
-
           def directory_label(directory)
-            directory.to_label
+            path_to_album(directory).to_label
           end
 
           def directory_target_basename(directory)
-            directory.id
+            path_to_album(directory).id
+          end
+
+          def path_to_album(path)
+            ::Ehbrs::Music::Album.new(path)
           end
         end
       end

data/lib/ehbrs/tools/runner/web_utils/videos/upload.rb

@@ -32,7 +32,7 @@ module Ehbrs
                 '/videos/files/import',
                 method: :put,
                 body: {
-                  'videos_tableless_local_import_list[list_file]' => ::File.new(files_list_path)
+                  'videos_local_files_import_list[list_file]' => ::File.new(files_list_path)
                 },
                 header: {
                   'Accept' => 'application/json'

data/lib/ehbrs/tools/version.rb

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

data/lib/ehbrs/user_dirs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/filesystem_cache'
+require 'eac_fs/cache'
 require 'eac_ruby_utils/simple_cache'
 
 module Ehbrs
@@ -15,7 +15,7 @@ module Ehbrs
       private
 
       def user_home_dir_uncached
-        ::EacRubyUtils::FilesystemCache.new(ENV['HOME'])
+        ::EacFs::Cache.new(ENV['HOME'])
       end
 
       def cache_uncached

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/spec/lib/ehbrs/tools/runner/fs/used_space_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_fs/cache'
 require 'eac_ruby_utils/fs/temp'
 require 'ehbrs/tools/runner'
 require 'ehbrs/tools/runner/fs/used_space'
@@ -8,7 +9,7 @@ require 'ehbrs/observers/with_persistence'
 RSpec.describe ::Ehbrs::Tools::Runner::Fs::UsedSpace do
   let(:target) { ::EacRubyUtils::Fs::Temp.directory }
   let(:user_dir) { ::EacRubyUtils::Fs::Temp.directory }
-  let(:cached_user_dir) { ::EacRubyUtils::FilesystemCache.new(user_dir) }
+  let(:cached_user_dir) { ::EacFs::Cache.new(user_dir) }
   let(:observers_user_dir) { cached_user_dir.child('observers') }
   let(:observer_path) do
     observers_user_dir.child(target.to_s.parameterize).content_path.to_pathname

data/vendor/aranha-parsers/aranha-parsers.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'curb', '~> 0.9.10'
   s.add_dependency 'eac_ruby_utils', '~> 0.74'
   s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.3'
+  s.add_dependency 'nokogiri', '~> 1.12', '>= 1.12.4'
   s.add_dependency 'ofx-parser', '~> 1.1.0'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3', '>= 0.3.3'

data/vendor/aranha-parsers/lib/aranha/parsers/rspec/setup.rb

@@ -7,7 +7,7 @@ module Aranha
     module Rspec
       module Setup
         def self.extended(_setup_obj)
-          require 'aranha/parsers/rspec/source_target_fixtures_example'
+          require 'aranha/parsers/rspec/shared_examples/source_target_fixtures'
         end
       end
     end

data/vendor/aranha-parsers/lib/aranha/parsers/source_address/fetch_content_error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Aranha
+  module Parsers
+    class SourceAddress
+      class FetchContentError < ::RuntimeError
+      end
+    end
+  end
+end

data/vendor/aranha-parsers/lib/aranha/parsers/source_address/http_get.rb

@@ -2,6 +2,7 @@
 
 require 'addressable'
 require 'curb'
+require 'aranha/parsers/source_address/fetch_content_error'
 
 module Aranha
   module Parsers
@@ -34,15 +35,27 @@ module Aranha
         def content
           c = ::Curl::Easy.new(url)
           c.follow_location = true
-          raise "Curl perform failed (URL: #{url})" unless c.perform
+          curl_perform(c)
           return c.body_str if c.status.to_i == 200
 
-          raise "Get #{url} returned #{c.status.to_i}"
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError,
+                "Get #{url} returned #{c.status.to_i}"
         end
 
         def serialize
           url
         end
+
+        private
+
+        def curl_perform(curl)
+          unless curl.perform
+            raise(::Aranha::Parsers::SourceAddress::FetchContentError,
+                  "Curl perform failed (URL: #{url})")
+          end
+        rescue Curl::Err::CurlError => e
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError, "CURL error: #{e.class.name}"
+        end
       end
     end
   end

data/vendor/aranha-parsers/lib/aranha/parsers/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.8.3'
+    VERSION = '0.8.5'
   end
 end

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)