ehbrs-tools 0.25.1 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd84e165d6c571aba1ae27995dd9a975089005db9590f6fadb5fccc9fbbc8525
-  data.tar.gz: 10c2d2ca5902c1e5952f56d8400a176c898f40519675dd740ecc20f9fe8f5197
+  metadata.gz: ed1aa5f7815ed7b0d48dafd1adbe15fefc1d9b65c1f88b573b11c4f0f83dcb9a
+  data.tar.gz: 1410d0c2c225cb81a266c96c6e835169db6f05407f474fad319e23a2ac0be0cf
 SHA512:
-  metadata.gz: 8c41cea11d8cf3f1a531b84efae67be1604bc4127323280bb6da2111b546f4580fa6856d330707588d610130d0d76454990c7acf3918d769d06271ad0fe9a412
-  data.tar.gz: 961078668e064e54dc30c3e93c53fe82bbfe4ef8b1a7c927f63381a12e56e880ef695948c7174c9fd7889c3f2d0df7c7b25c2f4edb75a94e9968e6dd87386d87
+  metadata.gz: d5a5e0d55099bad71f3100b9ce17cc0fff3d6962543da41e43919536ded40e9a6d01ab1cb85514c1e73660e78065fc9f02cf7d0bafc0959f204b7fda1ba45ede
+  data.tar.gz: 8c37bccb70f1f5e2190b4102914b28fac6658f96ec7cbb56e2db606e3675bddddb149986eb300703539e754dbbe5d85be08f94723066799efad4a418f4ca5bd2

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.25.1)
+    ehbrs-tools (0.26.0)
       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
@@ -62,7 +63,7 @@ PATH
 PATH
   remote: vendor/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.74.0)
+    eac_ruby_utils (0.75.0)
       activesupport (>= 4.0)
       addressable (~> 2.6)
       filesize
@@ -71,9 +72,19 @@ PATH
 PATH
   remote: vendor/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.8.1)
+    ehbrs_ruby_utils (0.10.0)
+      aranha-parsers (~> 0.8, >= 0.8.5)
       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.0)
+      aranha-parsers (~> 0.8, >= 0.8.5)
+      eac_ruby_utils (~> 0.74)
 
 GEM
   remote: https://rubygems.org/
@@ -88,23 +99,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.105.0)
       aranha-parsers (~> 0.4)
       asciidoctor (~> 2.0, >= 2.0.12)
       avm (~> 0.1)
@@ -153,10 +164,10 @@ GEM
     eac_ruby_gems_utils (0.9.5)
       bundler (~> 2.2, >= 2.2.17)
       eac_ruby_utils (~> 0.70)
-    eac_templates (0.1.1)
+    eac_templates (0.1.2)
       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 +201,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)
@@ -236,6 +250,7 @@ GEM
     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
@@ -264,6 +279,7 @@ DEPENDENCIES
   eac_ruby_utils!
   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

@@ -2,7 +2,7 @@
 
 require 'eac_ruby_utils/envs'
 require 'eac_ruby_utils/fs/clearable_directory'
-require 'ehbrs/core_ext'
+require 'ehbrs/tools/core_ext'
 
 module Ehbrs
   module Tools

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/fs_cache'
+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 [Nome do #{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].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.if_present(DEFAULT_PROVIDER)
+          end
+        end
+      end
+    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.26.0'
   end
 end

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_ruby_utils/lib/eac_ruby_utils/compact.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class Compact
+    attr_reader :object, :attributes
+
+    def initialize(object, attributes)
+      @object = object
+      @attributes = attributes
+    end
+
+    # @return [Array]
+    def to_a
+      attributes.map { |attr| object.send(attr) }
+    end
+
+    # @return [Hash]
+    def to_h
+      attributes.map { |attr| [attr.to_sym, object.send(attr)] }.to_h
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs_cache.rb

@@ -6,7 +6,7 @@ require 'tmpdir'
 module EacRubyUtils
   class << self
     def fs_cache
-      @fs_cache ||= ::EacRubyUtils::FilesystemCache.new(::Dir.tmpdir, 'eac_ruby_utils', '.cache')
+      @fs_cache ||= ::EacRubyUtils::FilesystemCache.new(::Dir.tmpdir, 'eac_ruby_utils_fs_cache')
     end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/compact.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/compact'
+
+class Object
+  # @return [EacRubyUtils::Compact]
+  def compact(*attributes)
+    ::EacRubyUtils::Compact.new(self, attributes)
+  end
+
+  # @return [Array]
+  def compact_to_a(*attributes)
+    compact(*attributes).to_a
+  end
+
+  # @return [Hash]
+  def compact_to_h(*attributes)
+    compact(*attributes).to_h
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/delimited.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/string_delimited'
+
+class String
+  # @return [EacRubyUtils::StringDelimited]
+  def delimited(begin_delimiter, end_delimiter)
+    ::EacRubyUtils::StringDelimited.new(self, begin_delimiter, end_delimiter)
+  end
+
+  %w[inner outer without_inner without_outer].each do |method_suffix|
+    define_method "delimited_#{method_suffix}" do |begin_delimiter, end_delimiter|
+      delimited(begin_delimiter, end_delimiter).send(method_suffix)
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/string_delimited.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class StringDelimited
+    attr_reader :string, :begin_delimiter, :end_delimiter
+
+    def initialize(string, begin_delimiter, end_delimiter)
+      @string = string
+      @begin_delimiter = begin_delimiter
+      @end_delimiter = end_delimiter
+    end
+
+    def inner
+      between_indexes(content_index, end_index).to_s
+    end
+
+    def outer
+      between_indexes(begin_index, after_end_index).to_s
+    end
+
+    def without_inner
+      without_join(
+        between_indexes(sos_index, content_index), between_indexes(end_index, eos_index)
+      )
+    end
+
+    def without_outer
+      without_join(
+        between_indexes(sos_index, begin_index),
+        between_indexes(after_end_index, eos_index)
+      )
+    end
+
+    private
+
+    def after_end_index
+      end_index.if_present { |v| v + end_delimiter.length }
+    end
+
+    def begin_index
+      string.index(begin_delimiter)
+    end
+
+    def between_indexes(a_begin_index, a_end_index)
+      a_begin_index && a_end_index ? string[a_begin_index, a_end_index - a_begin_index] : nil
+    end
+
+    def content_index
+      begin_index.if_present { |v| v + begin_delimiter.length }
+    end
+
+    def without_join(*strings)
+      return string if strings.any?(&:nil?)
+
+      strings.join('')
+    end
+
+    def end_index
+      content_index.if_present { |_v| string.index(end_delimiter, content_index) }
+    end
+
+    def sos_index
+      0
+    end
+
+    def eos_index
+      string.length
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.74.0'
+  VERSION = '0.75.0'
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/compact_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/compact'
+
+::RSpec.describe ::EacRubyUtils::Compact do
+  let(:object) { ::OpenStruct.new(a_attr: 'a_value', b_attr: 'b_value') }
+  let(:instance) { described_class.new(object, %w[a_attr b_attr]) }
+
+  describe '#to_a' do
+    it do
+      expect(instance.to_a).to eq(%w[a_value b_value])
+    end
+  end
+
+  describe '#to_h' do
+    it do
+      expect(instance.to_h).to eq(a_attr: 'a_value', b_attr: 'b_value')
+    end
+  end
+end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/compact_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/object/compact'
+
+::RSpec.describe ::Object do
+  let(:instance) { ::OpenStruct.new(a_attr: 'a_value', b_attr: 'b_value') }
+  let(:attributes) { %w[a_attr b_attr] }
+
+  describe '#compact' do
+    it do
+      expect(instance.compact_to_a(*attributes)).to eq(%w[a_value b_value])
+    end
+  end
+
+  describe '#to_h' do
+    it do
+      expect(instance.compact_to_h(*attributes)).to eq(a_attr: 'a_value', b_attr: 'b_value')
+    end
+  end
+end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/string/delimited_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/string/delimited'
+
+::RSpec.describe ::String do
+  let(:instance) { 'A text with <b>content between</b> tags.' }
+
+  {
+    ['<b>', '</b>'] => {
+      'inner' => 'content between',
+      'without_inner' => 'A text with <b></b> tags.',
+      'outer' => '<b>content between</b>',
+      'without_outer' => 'A text with  tags.'
+    },
+    ['<b>', '</br>'] => {
+      'inner' => '',
+      'without_inner' => 'A text with <b>content between</b> tags.',
+      'outer' => '',
+      'without_outer' => 'A text with <b>content between</b> tags.'
+    }
+  }.each do |delimiters, expected_values|
+    context "when delimiters are #{delimiters}" do
+      let(:bdel) { delimiters[0] }
+      let(:edel) { delimiters[1] }
+
+      expected_values.each do |method_suffix, expected_value|
+        method_name = "delimited_#{method_suffix}"
+        it "#{method_name} should return \"#{expected_value}\"" do
+          expect(instance.send(method_name, bdel, edel)).to eq(expected_value)
+        end
+      end
+    end
+  end
+end

data/vendor/ehbrs_ruby_utils/ehbrs_ruby_utils.gemspec

@@ -15,8 +15,11 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,template}/**/*']
   s.test_files = Dir['{spec}/**/*', '.rubocop.yml', '.rspec']
 
+  s.add_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.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'
+  s.add_dependency 'ultimate_lyrics', '~> 0.1'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'

data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/music.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EhbrsRubyUtils
+  module Music
+    require_sub __FILE__
+  end
+end

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

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

data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/videos/container.rb

@@ -4,23 +4,49 @@ require 'eac_ruby_utils/core_ext'
 require 'ehbrs_ruby_utils/executables'
 require 'ehbrs_ruby_utils/videos/stream'
 require 'json'
+require 'taglib'
+require 'ultimate_lyrics/provider_search'
+require 'ultimate_lyrics/song_metadata'
 
 module EhbrsRubyUtils
   module Videos
     class Container
+      class << self
+        def from_file(path)
+          new(path)
+        end
+      end
+
       enable_simple_cache
       common_constructor :path do
         self.path = path.to_pathname
       end
 
+      delegate :tag, to: :tag_file
+      delegate :to_s, to: :path
+
       ::EhbrsRubyUtils::Videos::Stream.lists.codec_type.each_value do |stream_type|
         define_method stream_type.to_s.pluralize do
           streams.select { |stream| stream.codec_type == stream_type }
         end
       end
 
+      # @param provider [UltimateLyrics::Provider]
+      # @return [UltimateLyrics::Lyrics]
+      def lyrics_by_provider(provider)
+        ::UltimateLyrics::ProviderSearch.new(provider, song_metadata).lyrics
+      end
+
       private
 
+      # @return [UltimateLyrics::SongMetadata]
+      def song_metadata_uncached
+        ::UltimateLyrics::SongMetadata.new(
+          ::UltimateLyrics::SongMetadata::Field.lists.sources.values
+          .map { |source| [source, tag.send(source)] }.to_h
+        )
+      end
+
       def probe_data_uncached
         ::JSON.parse(
           ::EhbrsRubyUtils::Executables.ffprobe.command(
@@ -34,6 +60,11 @@ module EhbrsRubyUtils
           ::EhbrsRubyUtils::Videos::Stream.new(stream_ffprobe_data)
         end
       end
+
+      # @return [TagLib::FileRef]
+      def tag_file_uncached
+        ::TagLib::FileRef.new(path.to_path)
+      end
     end
   end
 end

data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/videos/stream.rb

@@ -35,7 +35,7 @@ module EhbrsRubyUtils
         end
       end
 
-      %i[codec_name codec_long_name].each do |method_name|
+      %i[codec_name codec_long_name height width].each do |method_name|
         define_method method_name do
           ffprobe_data[method_name]
         end