ehbrs-tools 0.29.0 → 0.31.1

data/spec/lib/ehbrs/tools/runner/fs/used_space_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_fs/cache'
+require 'eac_fs/storage_tree'
 require 'eac_ruby_utils/fs/temp'
 require 'ehbrs/tools/runner'
 require 'ehbrs/tools/runner/fs/used_space'
@@ -9,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) { ::EacFs::Cache.new(user_dir) }
+  let(:cached_user_dir) { ::EacFs::StorageTree.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.31.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -16,88 +16,88 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.82'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.82.1
+        version: '0.135'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.82'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.82.1
+        version: '0.135'
 - !ruby/object:Gem::Dependency
   name: eac_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.5
+        version: 0.27.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.5
+        version: 0.27.8
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.102'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.102.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: '0.102'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.102.1
 - !ruby/object:Gem::Dependency
   name: ehbrs_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.17'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -116,30 +116,42 @@ dependencies:
   name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: telegram-bot-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +196,6 @@ files:
 - lib/ehbrs/google/translate.rb
 - lib/ehbrs/google/translate/session.rb
 - lib/ehbrs/music.rb
-- lib/ehbrs/music/album.rb
 - lib/ehbrs/observers.rb
 - lib/ehbrs/observers/base.rb
 - lib/ehbrs/observers/with_persistence.rb
@@ -213,8 +224,7 @@ 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/self.rb
-- lib/ehbrs/tools/runner/self/test.rb
+- lib/ehbrs/tools/runner/music/spread.rb
 - lib/ehbrs/tools/runner/telegram.rb
 - lib/ehbrs/tools/runner/telegram/send_message.rb
 - lib/ehbrs/tools/runner/vg.rb
@@ -252,16 +262,6 @@ files:
 - lib/ehbrs/videos/file.rb
 - lib/ehbrs/videos/profiles/base.rb
 - lib/ehbrs/videos/profiles/same_quality.rb
-- lib/ehbrs/videos/series.rb
-- lib/ehbrs/videos/series/rename.rb
-- lib/ehbrs/videos/series/rename/directory_group.rb
-- lib/ehbrs/videos/series/rename/file.rb
-- lib/ehbrs/videos/series/rename/file/basename_parser.rb
-- lib/ehbrs/videos/series/rename/file/options.rb
-- lib/ehbrs/videos/series/rename/line_result.rb
-- lib/ehbrs/videos/series/rename/line_result_group.rb
-- lib/ehbrs/videos/series/rename/results_builder.rb
-- lib/ehbrs/videos/series/rename/season_group.rb
 - lib/ehbrs/videos/track.rb
 - lib/ehbrs/videos/unsupported/check_result.rb
 - lib/ehbrs/videos/unsupported/check_set.rb

data/lib/ehbrs/music/album.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Ehbrs
-  module Music
-    class Album
-      include ::Comparable
-      common_constructor :path do
-        self.path = path.to_pathname.expand_path
-      end
-
-      def <=>(other)
-        to_a <=> other.to_a
-      end
-
-      def to_a
-        [category, artist, name]
-      end
-
-      def to_label
-        (to_a + [id]).map(&:light_white).join(' | '.blue)
-      end
-
-      delegate :to_path, to: :path
-
-      def id
-        [artist, name].join('_').variableize
-      end
-
-      def name
-        path.basename.to_s
-      end
-
-      def artist
-        path.parent.basename.to_s
-      end
-
-      def category
-        path.parent.parent.basename.to_s
-      end
-    end
-  end
-end

data/lib/ehbrs/tools/runner/self/test.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'ehbrs/gems'
-require 'eac_ruby_gems_utils/tests/multiple'
-
-module Ehbrs
-  module Tools
-    class Runner
-      class Self
-        class Test
-          runner_with :help do
-            desc 'Test core and local gems.'
-          end
-
-          def run
-            fatal_error 'Some test did not pass' unless tests.ok?
-          end
-
-          def tests_uncached
-            ::EacRubyGemsUtils::Tests::Multiple.new(::Ehbrs::Gems.all)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/tools/runner/self.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Ehbrs
-  module Tools
-    class Runner
-      class Self
-        require_sub __FILE__
-
-        runner_with :help, :subcommands do
-          desc 'Self utilities'
-          subcommands
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/directory_group.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'ehbrs/videos/series/rename/line_result_group'
-require 'ehbrs/videos/series/rename/season_group'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class DirectoryGroup < LineResultGroup
-          def line_out
-            name.light_yellow
-          end
-
-          protected
-
-          def child_key
-            :season
-          end
-
-          def child_class
-            ::Ehbrs::Videos::Series::Rename::SeasonGroup
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/file/basename_parser.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'ehbrs/videos/series/rename/line_result'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class File < ::Ehbrs::Videos::Series::Rename::LineResult
-          module BasenameParser
-            FORMATS = [{
-              format: /(\d+)(\d{2})(\d{2})/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) + '-' + padding(m[3]) } }
-            }, {
-              format: /s(\d+)e(\d+)-(\d+)/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) + '-' + padding(m[3]) } }
-            }, {
-              format: /(\d{1,2})\s*[^\d]\s*(\d{2})/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) } }
-            }, {
-              format: /(\d+)(\d{2})/i,
-              build: ->(m) { { s: padding(m[1]), e: padding(m[2]) } }
-            }, {
-              format: /(\d{2})/i,
-              build: ->(m) { { s: padding(1), e: padding(m[1]) } }
-            }].freeze
-
-            def self.padding(string)
-              string.to_s.rjust(2, '0')
-            end
-
-            def parse_uncached
-              FORMATS.each do |format|
-                m = format.fetch(:format).match(current_name)
-                return format.fetch(:build).call(m) if m
-              end
-              nil
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/file/options.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class File
-          class Options
-            common_constructor :options
-            delegate :kernel, :confirm, :recursive, :extension, to: :options
-
-            def episode_increment
-              options.episode_increment.if_present(0, &:to_i)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/file.rb

@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/fs/extname'
-require 'ostruct'
-require_relative 'line_result'
-require_relative 'file/basename_parser'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class File < ::Ehbrs::Videos::Series::Rename::LineResult
-          include ::Ehbrs::Videos::Series::Rename::File::BasenameParser
-
-          attr_reader :file, :options
-
-          def initialize(file, options)
-            @file = file
-            @options = options
-            @options = ::OpenStruct.new(options) if options.is_a?(::Hash)
-          end
-
-          def rename
-            target = ::File.expand_path(new_name, dirname)
-            return if ::File.exist?(target)
-
-            infov 'Renaming', @file
-            FileUtils.mv(@file, target)
-          end
-
-          def season
-            return '??' if parse.blank?
-
-            parse.fetch(:s)
-          end
-
-          def episode
-            return '??' if parse.blank?
-
-            parse.fetch(:e)
-          end
-
-          def dirname
-            d = @file
-            while d != '/'
-              d = ::File.dirname(d)
-              return ::File.expand_path(d) + '/' unless ::File.basename(d).starts_with?('_')
-            end
-            raise "series_dirname not found for #{@file}"
-          end
-
-          def line_out
-            "#{episode.green}: " + if new_name == current_name
-                                     current_name.light_black
-                                   else
-                                     "#{new_name} <= #{current_name}"
-                                   end
-          end
-
-          def new_name
-            return "#{kernel}-s#{parse[:s]}e#{new_name_episodes}#{extension}" if parse.present?
-
-            current_name
-          end
-
-          private
-
-          def current_name
-            ::File.expand_path(@file).gsub(/\A#{::Regexp.quote(dirname)}/, '')
-          end
-
-          def rename?
-            return false unless new_name
-
-            current_name != new_name
-          end
-
-          def kernel
-            options.kernel || kernel_from_directory_name ||
-              raise("Kernel undefined (File: #{@file})")
-          end
-
-          def kernel_from_directory_name
-            dir = ::File.basename(dirname).sub(/\([0-9]+\)/, '')
-            dir.split(/\W+/).select { |w| /\A[a-z0-9]/.match(w) }.map { |p| p[0].downcase }.join('')
-          end
-
-          def extension
-            return options.extension if options.extension
-
-            extension_by_directory || ::EacRubyUtils::Fs.extname2(current_name)
-          end
-
-          def extension_by_directory
-            r = ::File.dirname(current_name)
-            return nil if r == '.'
-
-            r.gsub(/\A_/, '.')
-          end
-
-          def source_episodes
-            parse[:e].split('-').map(&:to_i)
-          end
-
-          def new_name_episodes
-            source_episodes.map do |i|
-              (i + options.episode_increment).to_s.rjust(2, '0')
-            end.join('-')
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/line_result.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class LineResult
-          enable_simple_cache
-          enable_speaker
-
-          def show(level)
-            out(padding_level(level) + line_out + "\n")
-          end
-
-          private
-
-          def padding_level(level)
-            ('  ' * level.to_i) + '* '
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/line_result_group.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'line_result'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class LineResultGroup < ::Ehbrs::Videos::Series::Rename::LineResult
-          attr_reader :name, :children
-
-          def initialize(name, files)
-            @name = name
-            @children = build_children(files)
-          end
-
-          def show(level)
-            super(level)
-            children.each do |child|
-              child.show(level + 1)
-            end
-          end
-
-          private
-
-          def build_children(files)
-            r = {}
-            files.each do |file|
-              key = file.send(child_key)
-              r[key] ||= []
-              r[key] << file
-            end
-            r.sort.map { |v| child_class.new(v[0], v[1]) }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/results_builder.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'ehbrs/videos/series/rename/directory_group'
-require 'ehbrs/videos/series/rename/line_result_group'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class ResultsBuilder < LineResultGroup
-          def initialize(files)
-            super '', files
-          end
-
-          def line_out
-            'Groups: '.cyan + children.count.to_s
-          end
-
-          protected
-
-          def child_key
-            :dirname
-          end
-
-          def child_class
-            ::Ehbrs::Videos::Series::Rename::DirectoryGroup
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename/season_group.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'line_result'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        class SeasonGroup < ::Ehbrs::Videos::Series::Rename::LineResult
-          attr_reader :season, :files
-
-          def initialize(season, files)
-            @season = season
-            @files = files.sort_by { |f| [f.episode] }
-          end
-
-          def line_out
-            'Season: '.cyan + "#{season} (#{first_episode} - #{last_episode})"
-          end
-
-          def show(level)
-            super
-            files.each { |file| file.show(level + 1) }
-          end
-
-          private
-
-          def first_episode
-            files.first.episode
-          end
-
-          def last_episode
-            files.last.episode
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series/rename.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Ehbrs
-  module Videos
-    module Series
-      module Rename
-        require_sub __FILE__
-      end
-    end
-  end
-end

data/lib/ehbrs/videos/series.rb

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