avm-tools 0.83.0 → 0.87.0

data/lib/avm/tools/runner/launcher.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         require_sub __FILE__
         include ::EacCli::DefaultRunner

data/lib/avm/tools/runner/launcher/instances.rb

@@ -4,7 +4,7 @@ require 'eac_launcher/instances/runner_helper'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         class Instances < ::EacLauncher::Instances::RunnerHelper
           DOC = <<~DOCOPT

data/lib/avm/tools/runner/launcher/projects.rb

@@ -5,7 +5,7 @@ require 'eac_launcher/instances/runner_helper'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         class Projects < ::EacLauncher::Instances::RunnerHelper
           DOC = <<~DOCOPT

data/lib/avm/tools/runner/launcher/publish.rb

@@ -4,7 +4,7 @@ require 'eac_launcher/instances/runner_helper'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Launcher < ::EacRubyUtils::Console::DocoptRunner
         class Publish < ::EacLauncher::Instances::RunnerHelper
           DOC = <<~DOCOPT

data/lib/avm/tools/runner/local_project.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 require 'avm/local_projects/instance'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         require_sub __FILE__
-        include ::EacCli::DefaultRunner
-
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Utilities for local projects.'
           arg_opt '-C', '--path', 'Path to local project instance.'
           subcommands
@@ -29,7 +26,7 @@ module Avm
         end
 
         def instance_path_uncached
-          (options.fetch('--path') || '.').to_pathname.expand_path
+          (parsed.path || '.').to_pathname.expand_path
         end
       end
     end

data/lib/avm/tools/runner/local_project/eac_writings_base0.rb

@@ -6,14 +6,13 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           require_sub __FILE__
-          runner_with
           enable_simple_cache
 
-          runner_definition do
+          runner_with :help, :subcommands do
             desc 'EacWritingsBase0 utitilies for local projects.'
             subcommands
           end
@@ -26,7 +25,7 @@ module Avm
           private
 
           def project_uncached
-            ::Avm::EacWritingsBase0::Project.new(context(:instance_path))
+            ::Avm::EacWritingsBase0::Project.new(runner_context.call(:instance_path))
           end
         end
       end

data/lib/avm/tools/runner/local_project/eac_writings_base0/build_chapters.rb

@@ -6,13 +6,11 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           class BuildChapters
-            runner_with
-
-            runner_definition do
+            runner_with :help do
               arg_opt '-o', '--output-dir', 'Output chapters to specific directory.'
             end
 

data/lib/avm/tools/runner/local_project/eac_writings_base0/build_single.rb

@@ -6,12 +6,11 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           class BuildSingle
-            runner_with
-            runner_definition do
+            runner_with :help do
               arg_opt '-s', '--source-dir', 'Write .tex source code in specific directory.'
               arg_opt '-f', '--output-file', 'Output to specific file.'
               arg_opt '-c', '--chapter', 'Write only the chapter <chapter>.'

data/lib/avm/tools/runner/local_project/eac_writings_base0/info.rb

@@ -6,12 +6,11 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class EacWritingsBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
+        class EacWritingsBase0
           class Info
-            runner_with
-            runner_definition do
+            runner_with :help do
               desc 'Information about a loca EacRailsBase0 local project.'
             end
 

data/lib/avm/tools/runner/local_project/eac_writings_base1.rb

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase1
           require_sub __FILE__
 

data/lib/avm/tools/runner/local_project/eac_writings_base1/build.rb

@@ -7,8 +7,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class EacWritingsBase1
           class Build
             runner_with :help do

data/lib/avm/tools/runner/local_project/info.rb

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Info < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

data/lib/avm/tools/runner/local_project/ruby.rb

@@ -7,8 +7,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Ruby < ::EacRubyUtils::Console::DocoptRunner
           require_sub __FILE__
           include ::EacCli::DefaultRunner

data/lib/avm/tools/runner/local_project/ruby/bundler.rb

@@ -6,8 +6,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Ruby < ::EacRubyUtils::Console::DocoptRunner
           class Bundler < ::EacRubyUtils::Console::DocoptRunner
             require_sub __FILE__

data/lib/avm/tools/runner/local_project/ruby/bundler/gemfile_lock.rb

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Ruby < ::EacRubyUtils::Console::DocoptRunner
           class Bundler < ::EacRubyUtils::Console::DocoptRunner
             class GemfileLock < ::EacRubyUtils::Console::DocoptRunner

data/lib/avm/tools/runner/local_project/test.rb

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Test < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

data/lib/avm/tools/runner/local_project/update.rb

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class LocalProject
         class Update < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner
 

data/lib/avm/tools/runner/local_project/version_bump.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 require 'avm/version'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class LocalProject < ::EacRubyUtils::Console::DocoptRunner
-        class VersionBump < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+    class Runner
+      class LocalProject
+        class VersionBump
+          runner_with :help do
             desc 'Bump version of a local project.'
             arg_opt '-n', '--new', 'Set new version.'
             arg_opt '-s', '--segment', 'Increment de <segment>-th segment (Left-most is 0)'
@@ -29,7 +26,7 @@ module Avm
           def run_version_changed
             infom 'Version changed'
             if confirm?
-              context(:instance).run_job(:version_bump, target_version)
+              runner_context.call(:instance).run_job(:version_bump, target_version)
               success 'Bumped'
             else
               fatal_error 'Bump unconfirmed'
@@ -41,23 +38,23 @@ module Avm
           end
 
           def start_banner
-            context(:instance_banner)
+            runner_context.call(:instance_banner)
             infov 'Current version', current_version.if_present('-')
             infov 'Target version', target_version.if_present('-')
           end
 
           def confirm?
-            options.fetch('--yes') || request_input('Confirm version bump?', bool: true)
+            parsed.yes? || request_input('Confirm version bump?', bool: true)
           end
 
           def current_version_uncached
-            context(:instance).if_respond('version')
+            runner_context.call(:instance).if_respond('version')
           end
 
           def target_version_uncached
             r = current_version
             %w[new segment major minor patch].each do |option|
-              option_value = options.fetch("--#{option}")
+              option_value = parsed[option]
               next if option_value.blank?
 
               r = send("target_version_from_#{option}", r, option_value)

data/lib/avm/tools/runner/ruby.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Ruby < ::EacRubyUtils::Console::DocoptRunner
         require_sub __FILE__
 

data/lib/avm/tools/runner/ruby/gems.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Ruby < ::EacRubyUtils::Console::DocoptRunner
         class Gems < ::EacRubyUtils::Console::DocoptRunner
           require_sub __FILE__

data/lib/avm/tools/runner/ruby/gems/generate.rb

@@ -7,7 +7,7 @@ require 'eac_cli/default_runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Ruby < ::EacRubyUtils::Console::DocoptRunner
         class Gems < ::EacRubyUtils::Console::DocoptRunner
           class Generate < ::EacRubyUtils::Console::DocoptRunner

data/lib/avm/tools/runner/ruby/rubocop.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Ruby < ::EacRubyUtils::Console::DocoptRunner
         class Rubocop < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::Console::Speaker

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

@@ -6,7 +6,7 @@ require 'avm/self'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Self < ::EacRubyUtils::Console::DocoptRunner
         ::EacRubyUtils.require_sub(__FILE__)
 

data/lib/avm/tools/runner/self/docker.rb

@@ -4,7 +4,7 @@ require 'avm/docker/runner'
 
 module Avm
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Self < ::EacRubyUtils::Console::DocoptRunner
         class Docker < ::Avm::Docker::Runner
         end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.83.0'
+    VERSION = '0.87.0'
   end
 end

data/template/avm/eac_rails_base0/deploy/config/database.yml.template

@@ -1,12 +1,13 @@
 default: &default
   adapter: %%DATABASE.SYSTEM%%
-  pool: 40
-  timeout: 5000
+  pool: %%DATABASE.LIMIT%%
+  timeout: %%DATABASE.TIMEOUT%%
   encoding: unicode
   username: %%DATABASE.USERNAME%%
   password: %%DATABASE.PASSWORD%%
   host: %%DATABASE.HOSTNAME%%
   port: %%DATABASE.PORT%%
+  reconnect: true
 
 development: &development
   <<: *default

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacCli
+  module Docopt
+    class RunnerContextReplacement
+      common_constructor :runner
+
+      def argv
+        runner.settings[:argv] || ARGV
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_cli/docopt/doc_builder'
+require 'eac_cli/docopt/runner_context_replacement'
 require 'eac_cli/runner'
 require 'eac_ruby_utils/console/docopt_runner'
 
@@ -32,6 +33,10 @@ module EacCli
         def docopt_options
           super.merge(options_first: self.class.runner_definition.options_first?)
         end
+
+        def runner_context
+          @runner_context ||= ::EacCli::Docopt::RunnerContextReplacement.new(self)
+        end
       end
 
       def extra_available_subcommands

data/vendor/eac_cli/lib/eac_cli/parser/alternative.rb

@@ -35,11 +35,11 @@ module EacCli
       attr_accessor :phase
 
       def any_collect_argv_value
-        if argv_current_option?
-          option_collect_argv_value
-        else
-          positional_collect_argv_value
+        %w[double_dash long_option short_option].each do |arg_type|
+          return send("#{arg_type}_collect_argv_value") if send("argv_current_#{arg_type}?")
         end
+
+        positional_collect_argv_value
       end
 
       def collector

data/vendor/eac_cli/lib/eac_cli/parser/alternative/long_options.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module LongOptions
+        LONG_OPTION_PREFIX = '--'
+        OPTION_WITH_ARGUMENT_PATTERN = /\A([^=]+)(?:=(.*))\z/.freeze
+
+        private
+
+        def argv_current_long_option?
+          phase == PHASE_ANY && argv_enum.peek.start_with?(LONG_OPTION_PREFIX) &&
+            !argv_current_double_dash?
+        end
+
+        def long_option_collect_argv_value
+          option_long, value = parse_option_current_argv
+          alternative.options.any? do |option|
+            next false unless option.long == option_long
+
+            if value.nil?
+              option_collect_option(option)
+            else
+              option_argument_collect(option, value)
+            end
+          end || raise_argv_current_invalid_option
+        end
+
+        def parse_option_current_argv
+          m = OPTION_WITH_ARGUMENT_PATTERN.match(argv_enum.peek)
+          m ? [m[1], m[2].if_present('')] : [argv_enum.peek, nil]
+        end
+      end
+    end
+  end
+end