ehbrs-tools 0.20.0 → 0.23.1

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.20.0'
+    VERSION = '0.23.1'
   end
 end

data/lib/ehbrs/vg/wii/game_file.rb

@@ -20,8 +20,10 @@ module Ehbrs
           D: :disc_number,
           e: :extname,
           i: :id6,
+          m: :normalized_disc_name,
           n: :disc_name,
           N: :nintendont_basename,
+          s: :sanitized_disc_name,
           t: :database_title,
           T: :disc_type
         )
@@ -46,6 +48,10 @@ module Ehbrs
           FORMAT.format(string).with(self)
         end
 
+        def normalized_disc_name
+          sanitized_disc_name.downcase
+        end
+
         def nintendont_basename
           n = disc_number
           n == 1 ? 'game' : "disc#{n}"
@@ -55,6 +61,10 @@ module Ehbrs
           properties.fetch('Disc & part IDs/disc')
         end
 
+        def sanitized_disc_name
+          ::ActiveSupport::Inflector.transliterate(disc_name).gsub(/[^0-9a-z ]/i, '')
+        end
+
         def valid?
           properties.present?
         end

data/lib/ehbrs/videos/convert_job.rb

@@ -7,7 +7,7 @@ require 'fileutils'
 module Ehbrs
   module Videos
     class ConvertJob
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
 
       FORMATS_TO_EXTENSIONS = {

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

@@ -8,7 +8,7 @@ module Ehbrs
       module Rename
         class LineResult
           enable_simple_cache
-          enable_console_speaker
+          enable_speaker
 
           def show(level)
             out(padding_level(level) + line_out + "\n")

data/lib/ehbrs/videos/unsupported/check_support.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
 require 'ehbrs/videos/unsupported/check_result'
 
 module Ehbrs
   module Videos
     module Unsupported
       module CheckSupport
-        extend ::ActiveSupport::Concern
-
-        included do
-          include ::EacRubyUtils::Console::Speaker
-          include ::EacRubyUtils::SimpleCache
+        common_concern do
+          enable_simple_cache
+          enable_speaker
         end
 
         def aggressions_banner(title)
@@ -57,11 +56,17 @@ module Ehbrs
         end
 
         def pad_speaker
-          on_speaker_node do |node|
-            node.stderr_line_prefix = node.stderr_line_prefix.to_s + '  '
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new(err_line_prefix: '  ')) do
             yield
           end
         end
+
+        def new_padded_cli_speaker
+          ::EacCli::Speaker.new(
+            err_line_prefix(::EacRubyUtils::Speaker.context.optional_current
+            .if_present('') { |v| v.is_a?(::EacCli::Speaker) ? v.err_line_prefix : '' } + '  ')
+          )
+        end
       end
     end
   end

data/lib/ehbrs/videos/unsupported/search.rb

@@ -9,7 +9,7 @@ module Ehbrs
     module Unsupported
       class Search
         include ::EacRubyUtils::Fs::Traversable
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
 
         VALID_EXTENSIONS = %w[.avi .mp4 .mkv .m4v].freeze

data/lib/ehbrs/videos/unsupported/track.rb

@@ -8,7 +8,7 @@ module Ehbrs
       class Track < ::SimpleDelegator
         include ::Ehbrs::Videos::Unsupported::CheckSupport
 
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
         attr_reader :video
 

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

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'httpclient', '~> 2.8', '>= 2.8.3'
   s.add_dependency 'ofx-parser', '~> 1.1.0'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/module/delegation'
-require 'eac_ruby_utils/require_sub'
+require 'eac_ruby_utils/core_ext'
 require 'yaml'
 
 module Aranha
   module Parsers
     class SourceAddress
-      ::EacRubyUtils.require_sub __FILE__
+      require_sub __FILE__
 
       class << self
         SUBS = [
@@ -35,12 +35,8 @@ module Aranha
         end
       end
 
-      attr_reader :sub
-
-      def initialize(source)
-        @sub = self.class.detect_sub(source)
-      end
-
+      enable_simple_cache
+      common_constructor :source
       delegate :content, :url, to: :sub
 
       def to_s
@@ -50,6 +46,12 @@ module Aranha
       def serialize
         sub.serialize.strip + "\n"
       end
+
+      private
+
+      def sub_uncached
+        self.class.detect_sub(source)
+      end
     end
   end
 end

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

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.7.0'
+    VERSION = '0.7.2'
   end
 end

data/vendor/aranha-parsers/spec/lib/rubocop_check_spec.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_gem_support/spec/examples/rubocop_check'
-
-RSpec.describe ::RuboCop do
-  include_examples 'rubocop_check', ::File.expand_path('../..', __dir__)
-end
+::EacRubyGemSupport::Rspec.default.describe_rubocop

data/vendor/aranha-parsers/spec/spec_helper.rb

@@ -5,4 +5,7 @@ require 'tmpdir'
 
 RSpec.configure do |config|
   config.example_status_persistence_file_path = ::File.join(::Dir.tmpdir, 'aranha-parsers_rspec')
+
+  require 'eac_ruby_gem_support/rspec'
+  ::EacRubyGemSupport::Rspec.setup(::File.expand_path('..', __dir__), config)
 end

data/vendor/aranha-selenium/lib/aranha/selenium/driver_factory/base.rb

@@ -57,6 +57,14 @@ module Aranha
           option_value(:headless)
         end
 
+        def profile_dir
+          options[:profile_dir].to_s
+        end
+
+        def profile_name
+          options[:profile_name]
+        end
+
         def user_agent
           option_value(:user_agent)
         end

data/vendor/aranha-selenium/lib/aranha/selenium/driver_factory/chrome.rb

@@ -14,14 +14,19 @@ module Aranha
 
         def chrome_options
           r = ::Selenium::WebDriver::Chrome::Options.new
-          r.add_argument('--ignore-certificate-errors') if accept_insecure_certs?
-          r.add_argument('--headless') if headless?
-          r.add_argument('--disable-popup-blocking')
-          r.add_argument('--disable-translate')
-          r.add_argument("user-agent=#{user_agent}") if user_agent.present?
+          chrome_arguments.each { |arg| r.add_argument(arg) }
           r.add_preference(:download, prompt_for_download: false, default_directory: downloads_dir)
           r
         end
+
+        def chrome_arguments
+          r = %w[--disable-popup-blocking --disable-translate]
+          r << '--ignore-certificate-errors' if accept_insecure_certs?
+          r << '--headless' if headless?
+          r << "--user-agent=#{user_agent}" if user_agent.present?
+          r << "--user-data-dir=#{profile_dir}" if profile_dir.present?
+          r
+        end
       end
     end
   end

data/vendor/aranha-selenium/lib/aranha/selenium/driver_factory/firefox.rb

@@ -9,10 +9,7 @@ module Aranha
         def build
           ::Selenium::WebDriver.for(
             :firefox,
-            options: ::Selenium::WebDriver::Firefox::Options.new(
-              profile: build_profile,
-              args: build_args
-            ),
+            options: build_options,
             desired_capabilities: build_capabilities
           )
         end
@@ -21,7 +18,7 @@ module Aranha
 
         def build_args
           r = []
-          r << '-headless' if headless?
+          r << '--headless' if headless?
           r
         end
 
@@ -33,16 +30,33 @@ module Aranha
           end
         end
 
-        def build_profile
-          r = ::Selenium::WebDriver::Firefox::Profile.new
-          r['browser.download.dir'] = downloads_dir
-          r['browser.download.folderList'] = 2
-          r['browser.helperApps.neverAsk.saveToDisk'] = auto_download_mime_types.join(';')
-          r['pdfjs.disabled'] = true
+        def build_options
+          r = ::Selenium::WebDriver::Firefox::Options.new(args: build_args,
+                                                          prefs: build_preferences)
+          build_profile.if_present { |v| r.profile = v }
+          r
+        end
+
+        def build_preferences
+          r = {
+            'browser.download.dir' => downloads_dir,
+            'browser.download.folderList' => 2,
+            'browser.helperApps.neverAsk.saveToDisk' => auto_download_mime_types.join(';'),
+            'pdfjs.disabled' => true
+          }
           r['general.useragent.override'] = user_agent if user_agent.present?
           r
         end
 
+        def build_profile
+          if profile_name.present?
+            ::Selenium::WebDriver::Firefox::Profile.from_name(v)
+          elsif profile_dir.present?
+            ::FileUtils.mkdir_p(profile_dir)
+            ::Selenium::WebDriver::Firefox::Profile.new(profile_dir)
+          end
+        end
+
         def auto_download_mime_types
           ::File.read(
             ::File.join(__dir__, 'firefox_auto_download_mime_types')

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

@@ -2,6 +2,6 @@
 
 module Aranha
   module Selenium
-    VERSION = '0.1.3'
+    VERSION = '0.2.0'
   end
 end

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.55'
+  s.add_dependency 'colorize', '~> 0.8.1'
+  s.add_dependency 'eac_config', '~> 0.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.67'
 
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/vendor/eac_cli/lib/eac_cli/config.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Config
+    require_sub __FILE__
+    attr_reader :sub
+
+    def initialize(sub_node)
+      @sub = sub_node
+    end
+
+    def entry(path, options = {})
+      ::EacCli::Config::Entry.new(self, path, options)
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/config/entry.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker'
+require 'eac_config/entry_path'
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  class Config
+    class Entry
+      require_sub __FILE__, include_modules: true
+      enable_listable
+      enable_simple_cache
+      enable_speaker
+
+      common_constructor :config, :path, :options do
+        self.path = ::EacConfig::EntryPath.assert(path)
+        self.options = ::EacCli::Config::Entry::Options.new(options)
+      end
+
+      def value
+        return sub_value_to_return if sub_entry.found?
+        return nil unless options.required?
+
+        puts "|#{sub_entry.path}|"
+
+        input_value
+      end
+
+      delegate :found?, :value=, to: :sub_entry
+
+      private
+
+      def sub_value_to_return
+        sub_entry.value.presence || ::EacRubyUtils::BlankNotBlank.instance
+      end
+
+      def sub_entry_uncached
+        config.sub.entry(path)
+      end
+
+      def input_value_uncached
+        r = send("#{options.type}_value")
+        sub_entry.value = r if options.store?
+        r
+      end
+    end
+  end
+end

data/vendor/{eac_ruby_utils/lib/eac_ruby_utils/console/configs/read_entry_options.rb → eac_cli/lib/eac_cli/config/entry/options.rb}

@@ -2,21 +2,26 @@
 
 require 'eac_ruby_utils/core_ext'
 
-module EacRubyUtils
-  module Console
-    class Configs
-      class ReadEntryOptions
+module EacCli
+  class Config
+    class Entry
+      class Options
         enable_simple_cache
-        common_constructor :options do
-          self.options = options.to_h.symbolize_keys
-                                .assert_valid_keys(DEFAULT_VALUES.keys).freeze
-        end
+        enable_listable
+
+        lists.add_symbol :type, :undefined
 
         DEFAULT_VALUES = {
           before_input: nil, bool: false, list: false, noecho: false, noenv: false, noinput: false,
-          required: true, store: true, validator: nil
+          required: true, store: true, type: TYPE_UNDEFINED, validator: nil
         }.freeze
 
+        lists.add_symbol :option, *DEFAULT_VALUES.keys
+
+        common_constructor :options do
+          self.options = self.class.lists.option.hash_keys_validate!(options)
+        end
+
         delegate :to_h, to: :options
 
         def [](key)
@@ -27,6 +32,12 @@ module EacRubyUtils
           values.slice(:bool, :list, :noecho)
         end
 
+        DEFAULT_VALUES.each do |attr, default_value|
+          define_method(attr.to_s + ([true, false].include?(default_value) ? '?' : '')) do
+            self[attr]
+          end
+        end
+
         private
 
         def values_uncached