ehbrs-tools 0.39.1 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37d5bc6d09fd99c2b19fac22bbebd6c6817d88f1542d9eea927f7d40189be1b6
-  data.tar.gz: ae180d116b7de37be4e2f9a38aa9b06daa0ac6ef31631ed9c151ee46a140ee5e
+  metadata.gz: 4d7f1950bd86260645e7a5bb92ec7fcb41c59c8331385f2a277c685be0ca470d
+  data.tar.gz: 9d8ddf77d0b5d447a6d223f30e3c9206ba97a84674219512b76cf844010f6051
 SHA512:
-  metadata.gz: f1294ab961b7a4ef0193cb25a582eea593930bdd9afb51850e2956c775de0094ad768a40b70e9f029285ee6880ee219294207f57a52156458e31c403000102c6
-  data.tar.gz: cdc973943f214f78198c8f8d31052b21a03c1c6b3dd51c9758b43fc55049063f691ac6181249f45688484f90bde0b177fd91c5d1f3b08d623861582b38736560
+  metadata.gz: b962d14dc1c1c7dd202c8c21a9686238679f29c12b160f9e4bfe4c38650f73309e16011909105f7daf7fe4daa0eaa198eea8163b25aae7c3e6009fdfdf156b73
+  data.tar.gz: 64741c4c119942a6f8373de136308c3b6b04b3d150f92b2665f97376b1bc1d21f5aaefce6f7ea01ebe65098a32b7f475e3870b83726fe855aa73f1a9f622f4e3

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    ehbrs-tools (0.39.1)
-      avm-tools (~> 0.159)
-      eac_cli (~> 0.40)
-      eac_ruby_utils (~> 0.120)
-      ehbrs_ruby_utils (~> 0.41)
+    ehbrs-tools (0.41.0)
+      avm-files (~> 0.7)
+      eac_cli (~> 0.41)
+      eac_ruby_base0 (~> 0.19)
+      eac_ruby_utils (~> 0.121)
+      ehbrs_ruby_utils (~> 0.43)
       filesize (~> 0.2)
       os (~> 1.1, >= 1.1.4)
       telegram-bot-ruby (~> 0.23)
@@ -13,25 +14,25 @@ PATH
 PATH
   remote: sub/eac_cli
   specs:
-    eac_cli (0.40.0)
+    eac_cli (0.41.0)
       colorize (~> 0.8, >= 0.8.1)
-      eac_config (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.120)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_ruby_utils (~> 0.121)
       tty-table (~> 0.12)
 
 PATH
   remote: sub/ehbrs_ruby_utils
   specs:
-    ehbrs_ruby_utils (0.41.0)
+    ehbrs_ruby_utils (0.43.0)
       aranha (~> 0.19, >= 0.19.2)
       aranha-parsers (~> 0.22)
-      aranha-selenium (~> 0.8)
-      avm (~> 0.84, >= 0.84.2)
+      aranha-selenium (~> 0.10, >= 0.10.1)
+      avm (~> 0.91)
       dentaku (~> 3.5, >= 3.5.2)
       eac_fs (~> 0.17)
       eac_rest (~> 0.12)
-      eac_ruby_utils (~> 0.120)
-      eac_templates (~> 0.5)
+      eac_ruby_utils (~> 0.121)
+      eac_templates (~> 0.5, >= 0.5.1)
       inifile (~> 3.0)
       srt (~> 0.1, >= 0.1.5)
       taglib-ruby (~> 1.1, >= 1.1.3)
@@ -40,7 +41,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.6)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -59,85 +60,57 @@ GEM
       eac_ruby_utils (~> 0.119, >= 0.119.2)
       nokogiri (~> 1.15, >= 1.15.4)
       ofx-parser (~> 1.1)
-    aranha-selenium (0.8.0)
+    aranha-selenium (0.10.1)
       eac_fs (~> 0.17)
-      eac_ruby_utils (~> 0.120)
+      eac_ruby_utils (~> 0.121)
+      eac_templates (~> 0.5, >= 0.5.1)
       selenium-webdriver (~> 3.142, >= 3.142.7)
     ast (2.4.2)
-    avm (0.84.2)
-      aranha-parsers (~> 0.22)
-      eac_cli (~> 0.39)
-      eac_config (~> 0.14, >= 0.14.1)
+    avm (0.91.0)
+      eac_cli (~> 0.40, >= 0.40.1)
+      eac_config (~> 0.14, >= 0.14.2)
       eac_docker (~> 0.7)
-      eac_fs (~> 0.16)
-      eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.120)
-      eac_templates (~> 0.5)
-      filesize (~> 0.2)
-      htmlbeautifier (~> 1.4, >= 1.4.2)
+      eac_fs (~> 0.17)
+      eac_ruby_utils (~> 0.121)
+      eac_templates (~> 0.5, >= 0.5.1)
       minitar (~> 0.9)
-    avm-eac_generic_base0 (0.12.2)
-      avm (~> 0.84, >= 0.84.2)
-      eac_ruby_utils (~> 0.120)
+      ruby-progressbar (~> 1.13)
+    avm-eac_generic_base0 (0.13.0)
+      avm (~> 0.90)
+      eac_ruby_utils (~> 0.121)
     avm-eac_ruby_base1 (0.33.1)
       aranha-parsers (~> 0.22)
       avm (~> 0.84)
       avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
       eac_envs-http (~> 0.4, >= 0.4.1)
       eac_ruby_utils (~> 0.119, >= 0.119.2)
-    avm-eac_ubuntu_base0 (0.5.0)
-      avm (~> 0.77)
-      eac_ruby_utils (~> 0.117, >= 0.117.1)
-      eac_templates (~> 0.5)
-    avm-files (0.6.2)
-      avm (~> 0.67, >= 0.67.1)
-      eac_cli (~> 0.30, >= 0.30.1)
-      eac_fs (~> 0.16)
-      eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.5)
-    avm-git (0.14.0)
-      avm (~> 0.82)
-      avm-files (~> 0.6, >= 0.6.2)
-      eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.119, >= 0.119.2)
-      git (~> 1.18)
-    avm-tools (0.159.0)
-      aranha-parsers (~> 0.21)
-      avm (~> 0.83)
-      avm-eac_ruby_base1 (~> 0.33)
-      avm-eac_ubuntu_base0 (~> 0.5)
-      avm-files (~> 0.6, >= 0.6.2)
-      avm-git (~> 0.14)
-      clipboard (~> 1.3, >= 1.3.6)
-      curb (~> 0.9, >= 0.9.11)
-      eac_git (~> 0.14, >= 0.14.1)
-      eac_ruby_base0 (~> 0.19)
-      eac_templates (~> 0.5)
-      git (~> 1.18)
-      ruby-progressbar (~> 1.13)
+    avm-files (0.7.0)
+      avm (~> 0.84, >= 0.84.2)
+      eac_cli (~> 0.40)
+      eac_fs (~> 0.17)
+      eac_ruby_utils (~> 0.121)
+      eac_templates (~> 0.5, >= 0.5.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.2.0)
     childprocess (3.0.0)
-    clipboard (1.3.6)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colorize (0.8.1)
     concurrent-ruby (1.2.3)
     content-type (0.0.2)
       parslet (~> 2.0)
-    curb (0.9.11)
     dentaku (3.5.2)
       concurrent-ruby
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     dry-inflector (1.0.0)
-    eac_config (0.14.1)
-      addressable (~> 2.8, >= 2.8.5)
-      eac_ruby_utils (~> 0.119, >= 0.119.2)
+    eac_config (0.14.2)
+      addressable (~> 2.8, >= 2.8.6)
+      eac_ruby_utils (~> 0.121)
     eac_docker (0.7.0)
       eac_ruby_utils (~> 0.112)
       eac_templates (~> 0.3, >= 0.3.2)
@@ -153,9 +126,6 @@ GEM
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.120)
       ruby-filemagic (~> 0.7, >= 0.7.3)
-    eac_git (0.15.0)
-      eac_ruby_utils (~> 0.120)
-      parseconfig (~> 1.1, >= 1.1.2)
     eac_rest (0.12.0)
       eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
@@ -165,21 +135,21 @@ GEM
       eac_cli (~> 0.35)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.117)
-    eac_ruby_gem_support (0.9.0)
-      eac_ruby_utils (~> 0.119, >= 0.119.2)
+    eac_ruby_gem_support (0.10.0)
+      eac_ruby_utils (~> 0.120)
       rspec (~> 3.12)
-      rubocop (~> 1.57, >= 1.57.2)
-      rubocop-rails (~> 2.22, >= 2.22.1)
-      rubocop-rspec (~> 2.25)
-    eac_ruby_utils (0.120.0)
+      rubocop (~> 1.60, >= 1.60.1)
+      rubocop-rails (~> 2.23, >= 2.23.1)
+      rubocop-rspec (~> 2.26, >= 2.26.1)
+    eac_ruby_utils (0.121.0)
       activesupport (>= 4, < 7)
-      addressable (~> 2.8, >= 2.8.5)
+      addressable (~> 2.8, >= 2.8.6)
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)
-    eac_templates (0.5.0)
-      eac_config (~> 0.12)
-      eac_ruby_utils (~> 0.112)
+    eac_templates (0.5.1)
+      eac_config (~> 0.14, >= 0.14.1)
+      eac_ruby_utils (~> 0.121)
     faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
@@ -192,58 +162,53 @@ GEM
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
-    faraday-retry (2.2.0)
+    faraday-retry (2.2.1)
       faraday (~> 2.0)
     filesize (0.2.0)
-    git (1.19.1)
-      addressable (~> 2.8)
-      rchardet (~> 1.8)
     hpricot (0.8.6)
-    htmlbeautifier (1.4.2)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
-    minitest (5.21.1)
-    multipart-post (2.3.0)
+    minitest (5.23.0)
+    multipart-post (2.4.1)
     net-ssh (4.2.0)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
     os (1.1.4)
     parallel (1.24.0)
-    parseconfig (1.1.2)
-    parser (3.3.0.4)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     racc (1.7.3)
-    rack (3.0.8)
+    rack (3.0.11)
     rainbow (3.1.1)
-    rchardet (1.8.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.60.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -251,24 +216,27 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.26.1)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-filemagic (0.7.3)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -282,6 +250,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    strscan (3.1.0)
     taglib-ruby (1.1.3)
     telegram-bot-ruby (0.23.0)
       dry-inflector
@@ -306,7 +275,7 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.14)
     zlib (2.1.1)
 
 PLATFORMS
@@ -319,4 +288,4 @@ DEPENDENCIES
   ehbrs_ruby_utils!
 
 BUNDLED WITH
-   2.4.19
+   2.4.22

data/lib/ehbrs/tools/executables.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs'
+require 'eac_ruby_utils/simple_cache'
+
+module Ehbrs
+  module Tools
+    module Executables
+      class << self
+        include ::EacRubyUtils::SimpleCache
+
+        def env
+          ::EacRubyUtils::Envs.local
+        end
+
+        private
+
+        {
+          '--version' => %w[flips]
+        }.each do |validate_arg, commands|
+          commands.each do |command|
+            define_method("#{command}_uncached") do
+              env.executable(command, validate_arg)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/sort/dump.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/base'
+require 'ehbrs_ruby_utils/music/sort/files/factory'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          class Dump
+            runner_with :confirmation
+
+            private
+
+            def run
+              if File.exist?(config_file)
+                @config = YAML.load_file(config_file)
+                to_rename.each { |sf| rename(sf) }
+              else
+                fatal_error("File \"#{config_file}\" does not exist")
+              end
+            end
+
+            def to_rename
+              r = []
+              ::EhbrsRubyUtils::Music::Sort::Files::Factory::SECTIONS.each do |section|
+                i = 1
+                (@config[section] || []).each do |name|
+                  r << ::EhbrsRubyUtils::Music::Sort::Files::Base.new(section, i, name, nil)
+                  i += 1
+                end
+              end
+              r
+            end
+
+            def rename(source_file)
+              o = scanner.search(source_file.name)
+              if o
+                rename_on_found(source_file, o)
+              else
+                warn("File not found for \"#{source_file}\"")
+              end
+            end
+
+            def rename_on_found(source_file, sorted_file)
+              o = sorted_file.reorder(source_file.section, source_file.order, order_padding)
+              info("\"#{o.source_basename}\" => \"#{o.target_basename}\"")
+              confirm_rename(o.source_basename, o.target_basename)
+            end
+
+            def confirm_rename(old_basename, new_basename)
+              op = File.expand_path(old_basename, path)
+              np = File.expand_path(new_basename, path)
+              return if np == op
+              raise "\"#{np}\" (From \"#{op}\") already exists" if File.exist?(np)
+
+              File.rename(op, np) if confirm?
+            end
+
+            def order_padding_uncached
+              scanner.count.to_s.length
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/sort/load.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/core_ext'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          class Load
+            runner_with :help, :confirmation
+
+            def run
+              info "Reading \"#{path}\"..."
+              config = build_config
+              s = config.to_yaml
+              puts s
+              if confirm?
+                info("Writing to \"#{config_file}\"...")
+                File.write(config_file, s)
+              end
+              puts 'Done!'.green
+            end
+
+            private
+
+            def build_config
+              config = {}
+              scanner.by_section.each do |section, fs|
+                config[section] = fs.sort.map(&:name)
+              end
+              config
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ehbrs/tools/runner/music/sort/shuffle.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'ehbrs_ruby_utils/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/factory'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          class Shuffle
+            runner_with :help do
+              bool_opt '-l', '--load'
+            end
+
+            def run
+              if parsed.load?
+                load_last_shuffle
+              else
+                dump_last_shuffle
+              end
+            end
+
+            private
+
+            def dump_last_shuffle
+              s = build_config.to_yaml
+              puts s
+              info("Writing to \"#{last_shuffle_file}\"...")
+              File.write(last_shuffle_file, s)
+              puts 'Done!'.green
+            end
+
+            def load_last_shuffle
+              if File.exist?(last_shuffle_file)
+                IO.copy_stream(last_shuffle_file, config_file)
+                File.unlink(last_shuffle_file)
+                puts 'Done!'.green
+              else
+                fatal_error "File \"#{last_shuffle_file}\" does not exist"
+              end
+            end
+
+            def last_shuffle_file
+              File.join(path, '.last_shuffle')
+            end
+
+            def build_config
+              config = {}
+              config[::EhbrsRubyUtils::Music::Sort::Files::Factory::SECTION_CURRENT] =
+                scanner.all.to_a.shuffle.map(&:name)
+              config[::EhbrsRubyUtils::Music::Sort::Files::Factory::SECTION_NEW] = []
+              config
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/core_ext'
+require 'ehbrs_ruby_utils/music/sort/files/scanner'
+
+module Ehbrs
+  module Tools
+    class Runner
+      class Music
+        class Sort
+          DEFAULT_PATH = '.'
+
+          runner_with :help, :subcommands do
+            desc 'Ordena arquivos/diretórios prefixando-os.'
+            arg_opt '-C', '--path', 'Path to the directory.', default: DEFAULT_PATH
+            subcommands
+          end
+          for_context :path, :scanner, :config_file
+
+          # @return [Pathname]
+          delegate :config_file, to: :scanner
+
+          # @return [Pathname]
+          def path
+            parsed.path.to_pathname
+          end
+
+          private
+
+          # @return [EhbrsRubyUtils::Music::Sort::Files::Scanner]
+          def scanner_uncached
+            ::EhbrsRubyUtils::Music::Sort::Files::Scanner.new(path)
+          end
+
+          require_sub __FILE__
+        end
+      end
+    end
+  end
+end

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

@@ -11,10 +11,38 @@ module Ehbrs
         class Spread
           runner_with :help do
             bool_opt '-i', '--ids', 'Escreve IDs em STDOUT no lugar de labels em STDERR.'
+            bool_opt '-v', '--verbose'
             pos_arg :albums, repeat: true
           end
 
           def run
+            start_info
+            show_results
+          end
+
+          def spreader_uncached
+            ::EhbrsRubyUtils::CircularListSpreader.new(albums)
+          end
+
+          protected
+
+          # @return [Array<EhbrsRubyUtils::Music::Ous::Album>]
+          def albums_uncached
+            parsed.albums.map do |path|
+              ::EhbrsRubyUtils::Music::Ous::Album.new(path)
+            end
+          end
+
+          # @return [void]
+          def albums_info
+            infov 'Albums', albums.count
+            albums.each do |album|
+              infov '  * ', album
+            end
+          end
+
+          # @return [void]
+          def show_results
             spreader.result.each do |album|
               if parsed.ids?
                 out("#{album.id}\n")
@@ -24,14 +52,11 @@ module Ehbrs
             end
           end
 
-          def spreader_uncached
-            ::EhbrsRubyUtils::CircularListSpreader.new(albums)
-          end
+          # @return [void]
+          def start_info
+            return unless parsed.verbose?
 
-          def albums
-            parsed.albums.map do |path|
-              ::EhbrsRubyUtils::Music::Ous::Album.new(path)
-            end
+            albums_info
           end
         end
       end

data/lib/ehbrs/tools/runner/vg/ips.rb

@@ -2,7 +2,7 @@
 
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/fs/temp'
-require 'ehbrs/executables'
+require 'ehbrs/tools/executables'
 
 module Ehbrs
   module Tools
@@ -35,7 +35,7 @@ module Ehbrs
           end
 
           def run_patch(source_path, ips_path, output_path)
-            command = ::Ehbrs::Executables.flips.command
+            command = ::Ehbrs::Tools::Executables.flips.command
                         .append(['--apply', ips_path, source_path, output_path])
 
             command.system!

data/lib/ehbrs/tools/runner/videos/languages.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_base0/core_ext'
-require 'ehbrs/executables'
+require 'ehbrs/tools/executables'
 require 'ehbrs_ruby_utils/videos/file'
 require 'ehbrs_ruby_utils/videos/convert_job'
 

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.39.1'
+    VERSION = '0.41.0'
   end
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.41.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: avm-tools
+  name: avm-files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.159'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.159'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '0.41'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.120'
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.120'
+        version: '0.121'
 - !ruby/object:Gem::Dependency
   name: ehbrs_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +154,6 @@ files:
 - Gemfile.lock
 - exe/ehbrs
 - lib/ehbrs.rb
-- lib/ehbrs/executables.rb
 - lib/ehbrs/google.rb
 - lib/ehbrs/google/translate.rb
 - lib/ehbrs/google/translate/session.rb
@@ -156,6 +169,7 @@ files:
 - lib/ehbrs/tools.rb
 - lib/ehbrs/tools/application.rb
 - lib/ehbrs/tools/core_ext.rb
+- lib/ehbrs/tools/executables.rb
 - lib/ehbrs/tools/instance.rb
 - lib/ehbrs/tools/runner.rb
 - lib/ehbrs/tools/runner/cooking_book.rb
@@ -171,6 +185,10 @@ files:
 - lib/ehbrs/tools/runner/music/lyrics.rb
 - lib/ehbrs/tools/runner/music/lyrics_book.rb
 - lib/ehbrs/tools/runner/music/selected.rb
+- lib/ehbrs/tools/runner/music/sort.rb
+- lib/ehbrs/tools/runner/music/sort/dump.rb
+- lib/ehbrs/tools/runner/music/sort/load.rb
+- lib/ehbrs/tools/runner/music/sort/shuffle.rb
 - lib/ehbrs/tools/runner/music/spread.rb
 - lib/ehbrs/tools/runner/telegram.rb
 - lib/ehbrs/tools/runner/telegram/send_message.rb
@@ -200,8 +218,6 @@ files:
 - lib/ehbrs/tools/runner/web_utils/videos.rb
 - lib/ehbrs/tools/runner/web_utils/videos/download.rb
 - lib/ehbrs/tools/runner/web_utils/videos/upload.rb
-- lib/ehbrs/tools/runner_with.rb
-- lib/ehbrs/tools/runner_with/filesystem_renamer.rb
 - lib/ehbrs/tools/version.rb
 - lib/ehbrs/user_dirs.rb
 - template/ehbrs/cooking_book/build/base_page/layout.html.erb

data/lib/ehbrs/executables.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/envs'
-require 'eac_ruby_utils/simple_cache'
-
-module Ehbrs
-  module Executables
-    class << self
-      include ::EacRubyUtils::SimpleCache
-
-      def env
-        ::EacRubyUtils::Envs.local
-      end
-
-      private
-
-      {
-        '--version' => %w[flips]
-      }.each do |validate_arg, commands|
-        commands.each do |command|
-          define_method("#{command}_uncached") do
-            env.executable(command, validate_arg)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/tools/runner_with/filesystem_renamer.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Ehbrs
-  module Tools
-    module RunnerWith
-      module FilesystemRenamer
-        common_concern do
-          runner_with :confirmation, :filesystem_traverser
-          prepend PrependMethods
-        end
-
-        class RenameFile
-          enable_speaker
-          common_constructor :runner, :file
-          delegate :path, :target_path, :valid?, to: :file
-
-          CONFIRM_MESSAGE = 'Rename?'
-
-          def show
-            if rename?
-              puts [target_path_to_s, '<='.green, path_to_s].join(' ')
-            else
-              puts path_to_s
-            end
-          end
-
-          def rename
-            return unless rename?
-
-            show
-            do_rename if runner.confirm?(CONFIRM_MESSAGE)
-          end
-
-          # @return [Boolean]
-          def rename?
-            path.to_pathname != target_path.to_pathname
-          end
-
-          private
-
-          def do_rename
-            ::FileUtils.mv(path, target_path)
-          end
-
-          # @return [String]
-          def path_to_s
-            path.basename.to_path.light_black
-          end
-
-          # @return [String]
-          def target_path_to_s
-            target_path.relative_path_from(path.dirname).to_path
-          end
-        end
-
-        module PrependMethods
-          # @param path [Pathname]
-          # @return [void]
-          def traverser_check_file(path)
-            file = RenameFile.new(self, file_class.new(path))
-            files << file if file.valid?
-          end
-        end
-
-        FILE_WRAPPER_CLASS_BASENAME = 'FileWrapper'
-
-        # @return [Class]
-        def file_class
-          self.class.const_get(FILE_WRAPPER_CLASS_BASENAME)
-        end
-
-        # @return [void]
-        def run_filesystem_renamer
-          self.files = []
-          run_filesystem_traverser
-          show_files
-          rename_files
-          success 'Done'
-        end
-
-        # @return [void]
-        def show_files
-          infov 'Files found', files.count
-          files.each(&:show)
-        end
-
-        # @return [void]
-        def rename_files
-          return if parsed.no? || files.none?(&:rename?)
-
-          infom 'Renaming files...'
-          files.each(&:rename)
-        end
-
-        private
-
-        attr_accessor :files
-      end
-    end
-  end
-end

data/lib/ehbrs/tools/runner_with.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Ehbrs
-  module Tools
-    module RunnerWith
-      require_sub __FILE__
-    end
-  end
-end