ehbrs-tools 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9197f68f8849f5b939a2209bd1b5659aa2aa9544286e80b5290a06620f680628
-  data.tar.gz: 75f0b60d3f0971aa33913374932630dfa101378698f0210f28619f59f0a63aaa
+  metadata.gz: 2ea7376b27f5582e0f1c154f3a218de64c6bb27c0d0c9109b6194c2ad1dc779b
+  data.tar.gz: d7916decd5768e2008e43313669bfd9d605662fb95d13c7fa64d33581b86afac
 SHA512:
-  metadata.gz: 6e675d639a57fc2f6d4d14ab8733cdb9cc96be6818d18252443e575eb3b21c2f1d25139a1c237720c1473b6b369f7c47c5fe1ba547ad49319d9cd1411fdc70f7
-  data.tar.gz: 25b77dab28684229355feb9295073fadaf42ed78c4ef27d347e907cf959fa5ff2c822ba96f99a955a6b2adc561b138d241fc9ce3f31026b9b3fdfb398d4c1d36
+  metadata.gz: 6798766e6cfbe66142f7ab0100016ddcf34744a2fd8c12e021d00a67d068310fa7e901521daba98a72a9c8bd6c85a9bd5bc7afb0270b4bdf99b646c354e553f1
+  data.tar.gz: 6ea855740d28d2676f9723cfe86f8ba3c12e29fb5ceda65ec068d3857172ff07d79df72df76332079afdec79f2725cb752179cc35f659c426485d59068e792eb

data/lib/ehbrs/patches/object/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'ehbrs/tools/application'
-require 'eac_ruby_utils/patches/object/template'
+require 'eac_templates/patches/object/template'
 
-::EacRubyUtils::Templates::Searcher.default.included_paths <<
+::EacTemplates::Searcher.default.included_paths <<
   ::Ehbrs::Tools.application.gemspec_dir.join('template').to_path

data/lib/ehbrs/runner/cooking_book/build.rb

@@ -2,6 +2,7 @@
 
 require 'eac_cli/core_ext'
 require 'ehbrs/cooking_book/build'
+require 'os'
 
 module Ehbrs
   class Runner
@@ -10,12 +11,13 @@ module Ehbrs
         runner_with :help, :subcommands do
           desc 'Operações para livros de receitas.'
           arg_opt '-d', '--target-dir', 'Caminho para o diretório destino da construção.'
+          bool_opt '--open', 'Show the result.'
         end
 
         def run
-          infov 'Project', build.project
-          infov 'Target directory', build.target_dir
+          start_banner
           build.run
+          open
           success 'Done'
         end
 
@@ -26,6 +28,22 @@ module Ehbrs
             runner_context.call(:project), target_dir: parsed.target_dir
           )
         end
+
+        def open
+          return unless parsed.open?
+
+          infom "Opening \"#{open_path}\"..."
+          ::EacRubyUtils::Envs.local.command(OS.open_file_command, open_path).system!
+        end
+
+        def open_path
+          build.index_page.target_path
+        end
+
+        def start_banner
+          infov 'Project', build.project
+          infov 'Target directory', build.target_dir
+        end
       end
     end
   end

data/lib/ehbrs/runner/fs/used_space.rb

@@ -48,7 +48,7 @@ module Ehbrs
 
         class PathBase
           enable_simple_cache
-          enable_console_speaker
+          enable_speaker
           common_constructor :runner, :path do
             self.path = path.to_pathname
           end

data/lib/ehbrs/runner/videos/probe.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_cli/core_ext'
 require 'ehbrs_ruby_utils/videos/container'
+require 'eac_ruby_base0/core_ext'
 require 'eac_ruby_utils/yaml'
 
 module Ehbrs
   class Runner
     class Videos
       class Probe
-        runner_with :help, :output_file do
+        runner_with :help, :output do
           desc 'FFProbe em um arquivo de vídeo.'
           pos_arg :file_path
         end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.20.0'
+    VERSION = '0.21.0'
   end
 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,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_cli/speaker'
 require 'ehbrs/videos/unsupported/check_result'
 
 module Ehbrs
@@ -9,7 +10,7 @@ module Ehbrs
         extend ::ActiveSupport::Concern
 
         included do
-          include ::EacRubyUtils::Console::Speaker
+          include ::EacCli::Speaker
           include ::EacRubyUtils::SimpleCache
         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-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,10 @@ 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 'docopt', '~> 0.6.1'
+  s.add_dependency 'eac_config', '~> 0.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.64'
 
-  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/default_runner.rb

@@ -7,7 +7,7 @@ module EacCli
   module DefaultRunner
     common_concern do
       include ::EacCli::RunnerWith::Help
-      enable_console_speaker
+      enable_speaker
       enable_simple_cache
     end
   end

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -28,7 +28,11 @@ module EacCli
       end
 
       def identifier
-        long.to_s.variableize.to_sym
+        [long, short].each do |v|
+          v.to_s.if_present { |vv| return vv.variableize.to_sym }
+        end
+
+        raise 'No short or long option to build identifier'
       end
 
       def repeat?

data/vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb

@@ -27,7 +27,7 @@ module EacCli
 
       def positional_argument(positional)
         if positional.subcommand?
-          ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+          ::EacCli::DocoptRunner::SUBCOMMANDS_MACRO
         else
           r = "<#{positional.name}>"
           r += '...' if positional.repeat?
@@ -52,7 +52,7 @@ module EacCli
       end
 
       def self_usage_arguments
-        [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+        [::EacCli::DocoptRunner::PROGRAM_MACRO] +
           definition.options_argument.if_present([]) { |_v| ['[options]'] } +
           self_usage_arguments_options +
           self_usage_arguments_positional

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 
 module EacCli
   module Docopt
@@ -36,7 +36,9 @@ module EacCli
       end
 
       def option_definition(option)
-        self.class.option_usage_full(option) + OPTION_DESC_SEP + option.description
+        self.class.option_usage_full(option) + option.description.if_present('') do |v|
+          OPTION_DESC_SEP + v
+        end
       end
 
       def section(header, include_header = true)

data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 
 module EacCli
   module Docopt
@@ -11,7 +11,7 @@ module EacCli
 
         def to_s
           (
-            [::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
+            [::EacCli::DocoptRunner::PROGRAM_MACRO] +
               alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
               options +
               positionals
@@ -36,7 +36,7 @@ module EacCli
 
         def positional(positional)
           if positional.subcommand?
-            ::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
+            ::EacCli::DocoptRunner::SUBCOMMANDS_MACRO
           else
             r = "<#{positional.name}>"
             r += '...' if positional.repeat?

data/vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb

@@ -3,7 +3,7 @@
 require 'eac_cli/docopt/doc_builder'
 require 'eac_cli/docopt/runner_context_replacement'
 require 'eac_cli/runner'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 
 module EacCli
   module Docopt
@@ -16,7 +16,7 @@ module EacCli
 
       class << self
         def check(klass)
-          return unless klass < ::EacRubyUtils::Console::DocoptRunner
+          return unless klass < ::EacCli::DocoptRunner
 
           ::EacCli::Runner.alias_runner_class_methods(klass, '', 'eac_cli')
           ::EacCli::Runner.alias_runner_class_methods(klass, 'original', '')

data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/slice'
+require 'docopt'
+require 'eac_ruby_utils/contextualizable'
+require 'eac_ruby_utils/patches/hash/sym_keys_hash'
+Dir["#{__dir__}/#{::File.basename(__FILE__, '.*')}/_*.rb"].sort.each do |partial|
+  require partial
+end
+
+module EacCli
+  class DocoptRunner
+    include ::EacRubyUtils::Contextualizable
+
+    class << self
+      def create(settings = {})
+        new(settings)
+      end
+    end
+
+    attr_reader :settings
+
+    def initialize(settings = {})
+      @settings = settings.with_indifferent_access.freeze
+      check_subcommands
+    end
+
+    def options
+      @options ||= ::Docopt.docopt(target_doc, docopt_options)
+    end
+
+    def parent
+      settings[:parent]
+    end
+
+    protected
+
+    def docopt_options
+      settings.slice(:version, :argv, :help, :options_first).to_sym_keys_hash
+    end
+  end
+end