ehbrs-tools 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2fcd84889771b212325a7f4315bb2e03a9584ffd36dfa13184efa56fe0294c7
-  data.tar.gz: e4fba78ac97dfd0628bb7f1f4efc0c8fc2f46b6b598b74cb50c71bf5e3785156
+  metadata.gz: d120fac3799ba8b11dea2134287103606747746071469112c2fd8b78232666c4
+  data.tar.gz: bd700b8bfef75819deffd9e0894cb1956517f417643e975915764a77dff5423e
 SHA512:
-  metadata.gz: b28bbf0f2abcf8cf7c4ff92f27b96a0f9d3761316cfa5796750606cc3249f00df80187410156b93caae02a649945b7bc2bc87afe656521b5fb6394828a566ee8
-  data.tar.gz: f6e325bb6fd61d6ee7eca4cae4de5c0a057b2c1954df5e693cb28143be82c411804771071dcffdbee482ac6aee53412889fbb6eeab4bb21d45c8074abb49d6d6
+  metadata.gz: ee15c9a092934a7ee3d760f327919efa619da486bf615fc67c0c46fe02b49968b5523206303851694b6c4a4089c154818225e5bcc5d3eebc1ca78a22726aa6ac
+  data.tar.gz: 94c0648afebd291856a80a2f2214ba5ccab7e2d5a979373f0a72104f2b60b5b5053d1b7086db17ee95f688a4ed818799b6b6192116f3576c1cb31c99a1e03663

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.27.0)
+    ehbrs-tools (0.28.0)
       avm-tools (~> 0.82, >= 0.82.1)
       eac_cli (~> 0.12, >= 0.12.5)
       eac_ruby_utils (~> 0.71)
@@ -52,27 +52,50 @@ 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.75.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.11.0)
+    ehbrs_ruby_utils (0.12.0)
       aranha-parsers (~> 0.8, >= 0.8.5)
       avm (~> 0.3, >= 0.3.2)
       eac_ruby_utils (~> 0.70)
@@ -83,7 +106,7 @@ PATH
 PATH
   remote: vendor/ultimate_lyrics
   specs:
-    ultimate_lyrics (0.1.1)
+    ultimate_lyrics (0.1.2)
       aranha-parsers (~> 0.8, >= 0.8.5)
       eac_ruby_utils (~> 0.74)
 
@@ -116,7 +139,7 @@ GEM
     avm-eac_webapp_base0 (0.1.1)
       avm (~> 0.1)
       eac_ruby_utils (~> 0.68)
-    avm-tools (0.105.0)
+    avm-tools (0.106.0)
       aranha-parsers (~> 0.4)
       asciidoctor (~> 2.0, >= 2.0.12)
       avm (~> 0.1)
@@ -162,12 +185,6 @@ 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.2)
-      eac_config (~> 0.5)
-      eac_ruby_utils (~> 0.64)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -245,6 +262,7 @@ 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)
@@ -275,9 +293,12 @@ 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!

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

@@ -29,10 +29,6 @@ module Ehbrs
 
           protected
 
-          def build_selected_directory(path)
-            path
-          end
-
           def directory_label(directory)
             directory.to_s
           end
@@ -58,7 +54,7 @@ module Ehbrs
 
           def selected_directories_uncached
             infom 'Searching selected directories...'
-            selected.found.map { |path| build_selected_directory(path) }
+            selected.found
           end
 
           def selected_uncached

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

@@ -1,6 +1,5 @@
 # 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'
@@ -13,7 +12,7 @@ module Ehbrs
           DEFAULT_PROVIDER = 'lyrics.com'
 
           runner_with :help, :output do
-            arg_opt '-p', '--provider', "Nome do provedor [Nome do #{DEFAULT_PROVIDER}]"
+            arg_opt '-p', '--provider', 'Nome do provedor.', default: DEFAULT_PROVIDER
             pos_arg :file
           end
 
@@ -33,7 +32,7 @@ module Ehbrs
 
           def start_banner
             infov 'File', file
-            %w[artist album track title].each do |attr|
+            %w[artist album track title year].each do |attr|
               infov attr.humanize, container.tag_file.tag.send(attr)
             end
             infov 'Selected provider', provider
@@ -60,7 +59,7 @@ module Ehbrs
           end
 
           def provider_name
-            parsed.provider.if_present(DEFAULT_PROVIDER)
+            parsed.provider
           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/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.27.0'
+    VERSION = '0.28.0'
   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/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/eac_fs/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/vendor/eac_fs/eac_fs.gemspec

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'eac_fs/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'eac_fs'
+  s.version     = EacFs::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.files = Dir['{lib}/**/*']
+
+  s.add_dependency 'content-type'
+  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+  s.add_dependency 'ruby-filemagic'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+end

data/vendor/{eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb → eac_fs/lib/eac_fs/cache.rb}

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-module EacRubyUtils
-  class FilesystemCache
+require 'eac_ruby_utils/core_ext'
+require 'fileutils'
+
+module EacFs
+  class Cache
+    enable_context
+
     CONTENT_FILE_NAME = '__content__'
 
     attr_reader :path

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'content-type'
+require 'filemagic'
+
+module EacFs
+  class FileInfo
+    enable_simple_cache
+    attr_reader :magic_string
+
+    def initialize(path)
+      @magic_string = ::FileMagic.new(FileMagic::MAGIC_MIME).file(path.to_pathname.to_path)
+    end
+
+    delegate :charset, :mime_type, :subtype, :type, to: :content_type
+
+    private
+
+    def content_type_uncached
+      ::ContentType.parse(magic_string)
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_fs/cache'
+
+class Module
+  # @return [EacFs::Cache]
+  def fs_cache
+    ::EacFs::Cache.context.current.child('fs_cache', *name.split('::'))
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/module.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'eac_fs/patches/module/fs_cache'
+
+class Object
+  # @return [EacFs::Cache]
+  def fs_cache
+    self.class.fs_cache
+  end
+end

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

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_fs/lib/eac_fs/patches/pathname/info.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+require 'pathname'
+
+class Pathname
+  # Shortcut for `EacFs::FileInfo.new(self)`.
+  # @return [EacFs::FileInfo]
+  def info
+    ::EacFs::FileInfo.new(self)
+  end
+end

data/vendor/eac_fs/lib/eac_fs/patches/pathname.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

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

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

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

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

data/vendor/eac_fs/lib/eac_fs.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacFs
+  require_sub __FILE__
+end

data/vendor/{eac_ruby_utils/spec/lib/eac_ruby_utils/filesystem_cache_spec.rb → eac_fs/spec/lib/eac_fs/cache_spec.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/object/blank'
-require 'eac_ruby_utils/filesystem_cache'
+require 'eac_fs/cache'
 
-RSpec.describe ::EacRubyUtils::FilesystemCache do
+RSpec.describe ::EacFs::Cache do
   let(:tmpdir) { ::Dir.mktmpdir }
   let(:instance) { described_class.new(tmpdir, 'instance') }
 

data/vendor/eac_fs/spec/rubocop_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/vendor/eac_fs/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -13,7 +13,8 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*']
 
   s.add_dependency 'eac_cli', '~> 0.22', '>= 0.22.2'
-  s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '~> 0.9.5'
+  s.add_dependency 'eac_fs', '~> 0.3'
+  s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '~> 0.9.6'
   s.add_dependency 'eac_ruby_utils', '~> 0.70'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'

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

@@ -3,10 +3,10 @@
 require 'eac_cli/config'
 require 'eac_config/envvars_node'
 require 'eac_config/yaml_file_node'
+require 'eac_fs/cache'
 require 'eac_ruby_base0/application_xdg'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/filesystem_cache'
 
 module EacRubyBase0
   class Application
@@ -44,8 +44,8 @@ module EacRubyBase0
     end
 
     def fs_cache
-      @fs_cache ||= ::EacRubyUtils::FilesystemCache.new(
-        cache_dir.join(::EacRubyUtils::FilesystemCache.name.parameterize)
+      @fs_cache ||= ::EacFs::Cache.new(
+        cache_dir.join(::EacFs::Cache.name.parameterize)
       )
     end
 

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/core_ext.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
+require 'eac_fs/patches'
 require 'eac_ruby_base0/patches'

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

@@ -3,6 +3,7 @@
 require 'eac_cli/core_ext'
 require 'eac_cli/speaker'
 require 'eac_config/node'
+require 'eac_fs/cache'
 require 'eac_ruby_utils/speaker'
 
 module EacRubyBase0
@@ -23,13 +24,11 @@ module EacRubyBase0
     end
 
     def run
-      ::EacRubyUtils::Speaker.context.on(build_speaker) do
-        ::EacConfig::Node.context.on(runner_context.call(:application).build_config) do
-          if parsed.version?
-            show_version
-          else
-            run_with_subcommand
-          end
+      on_context do
+        if parsed.version?
+          show_version
+        else
+          run_with_subcommand
         end
       end
     end
@@ -38,6 +37,16 @@ module EacRubyBase0
       runner_context.call(:application).version.to_s
     end
 
+    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
+            yield
+          end
+        end
+      end
+    end
+
     def show_version
       out("#{application_version}\n")
     end

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

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

data/vendor/eac_ruby_gems_utils/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/vendor/eac_ruby_gems_utils/LICENCE

@@ -0,0 +1,16 @@
+Copyright (c) 2020 Eduardo Henrique Bogoni
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next paragraph) shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/eac_ruby_gems_utils/README.rdoc

@@ -0,0 +1,3 @@
+= E.A.C.'s Ruby Gems Utils.
+
+Utilities for Ruby\'s gems development.

data/vendor/eac_ruby_gems_utils/eac_ruby_gems_utils.gemspec

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+# Maintain your gem's version:
+require 'eac_ruby_gems_utils/version'
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = 'eac_ruby_gems_utils'
+  s.version     = ::EacRubyGemsUtils::VERSION
+  s.authors     = ['Esquilo Azul Company']
+  s.summary     = 'Utilities for Ruby gems development.'
+  s.license     = 'MIT'
+  s.homepage    = 'https://github.com/esquilo-azul/eac_ruby_gems_utils'
+  s.metadata    = { 'source_code_uri' => s.homepage }
+
+  s.extra_rdoc_files = ['README.rdoc']
+  s.rdoc_options = ['--charset=UTF-8']
+
+  s.require_paths = ['lib']
+  s.files = Dir['{lib}/**/*', 'Gemfile']
+  s.test_files = Dir['{spec}/**/*', '.rspec']
+
+  s.add_dependency 'bundler', '~> 2.2', '>= 2.2.17'
+  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+
+  # Tests
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3'
+end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/command.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/ruby/command'
+require 'delegate'
+
+module EacRubyGemsUtils
+  class Gem
+    class Command < ::EacRubyUtils::Ruby::Command
+      attr_reader :gem
+
+      def initialize(gem, command_args, extra_options = {})
+        @gem = gem
+        super(command_args, extra_options.merge(host_env: gem.host_env))
+      end
+
+      # Changes current directory to the gem's directory.
+      def chdir_root
+        chdir(gem.root.to_path)
+      end
+
+      def envvar_gemfile
+        envvar('BUNDLE_GEMFILE', gem.gemfile_path.to_path)
+      end
+
+      protected
+
+      def duplicate(command, extra_options)
+        self.class.new(gem, command, extra_options)
+      end
+    end
+  end
+end