avm-tools 0.86.0 → 0.90.0

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.86.0'
+    VERSION = '0.90.0'
   end
 end

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

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module OptionArgument
+        private
+
+        attr_accessor :argument_option
+
+        def argument_option_collect_argv(option)
+          self.argument_option = option
+          self.phase = PHASE_OPTION_ARGUMENT
+        end
+
+        def option_argument_collect(option, value)
+          collector.collect(option, value)
+          self.argument_option = nil
+          self.phase = PHASE_ANY
+          option
+        end
+
+        def option_argument_collect_argv_value
+          option_argument_collect(argument_option, argv_enum.peek)
+        end
+      end
+    end
+  end
+end

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

@@ -4,49 +4,20 @@ module EacCli
   class Parser
     class Alternative
       module Options
-        DOUBLE_DASH = '--'
-
         private
 
-        attr_accessor :argument_option, :double_dash
-
-        def argument_option_collect_argv(option)
-          self.argument_option = option
-          self.phase = PHASE_OPTION_ARGUMENT
-        end
-
-        def argv_current_option?
-          phase == PHASE_ANY && argv_enum.peek.start_with?('-')
-        end
-
-        def argv_current_double_dash?
-          argv_enum.peek == DOUBLE_DASH && !double_dash
-        end
-
         def boolean_option_collect_argv(option)
           collector.collect(option, true)
         end
 
-        def option_argument_collect_argv_value
-          collector.collect(argument_option, argv_enum.peek)
-          self.argument_option = nil
-          self.phase = PHASE_ANY
-        end
-
-        def option_collect_argv_value
-          return double_dash_collect_argv_value if argv_current_double_dash?
-
-          alternative.options.any? do |option|
-            next false unless [option.short, option.long].include?(argv_enum.peek)
-
-            if option.argument?
-              argument_option_collect_argv(option)
-            else
-              boolean_option_collect_argv(option)
-            end
+        def option_collect_option(option)
+          if option.argument?
+            argument_option_collect_argv(option)
+          else
+            boolean_option_collect_argv(option)
+          end
 
-            true
-          end || raise_argv_current_invalid_option
+          option
         end
 
         def raise_argv_current_invalid_option

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module EacCli
+  class Parser
+    class Alternative
+      module ShortOptions
+        SHORT_OPTION_PREFIX = '-'
+
+        private
+
+        def argv_current_short_option?
+          phase == PHASE_ANY && argv_enum.peek.start_with?(SHORT_OPTION_PREFIX) &&
+            !argv_current_long_option?
+        end
+
+        def find_short_option(char)
+          alternative.options.find { |option| short_without_prefix(option.short) == char }
+        end
+
+        def short_option_collect_argv_value
+          last_option = nil
+          short_without_prefix(argv_enum.peek).each_char do |char|
+            raise_error "Option \"#{last_option}\" requires a argument not provided" if
+            last_option.present?
+
+            collected_option = short_option_collect_char(char)
+            last_option = collected_option if collected_option.argument?
+          end
+        end
+
+        # @return [EacCli::Definition::BaseOption] The option collected.
+        def short_option_collect_char(char)
+          option = find_short_option(char)
+          raise_error "Invalid short option \"#{char}\"" unless option
+
+          option_collect_option(option)
+        end
+
+        def short_without_prefix(short)
+          short.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
+        end
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -47,53 +47,5 @@ module EacCli
       include ActiveSupport::Callbacks
       define_callbacks :run
     end
-
-    module AfterClassMethods
-      def create(*runner_context_args)
-        r = new
-        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
-        r
-      end
-
-      def run(*runner_context_args)
-        r = create(*runner_context_args)
-        r.run_run
-        r
-      end
-
-      def runner_definition(&block)
-        @runner_definition ||= super_runner_definition
-        @runner_definition.instance_eval(&block) if block
-        @runner_definition
-      end
-
-      def super_runner_definition
-        superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
-      end
-    end
-
-    module InstanceMethods
-      def run_run
-        parsed
-        run_callbacks(:run) { run }
-      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
-        # Do nothing
-      end
-
-      def runner_context
-        return @runner_context if @runner_context
-
-        raise 'Context was required, but was not set yet'
-      end
-
-      def runner_context=(new_runner_context)
-        @runner_context = new_runner_context
-        @parsed = nil
-      end
-
-      def parsed
-        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
-      end
-    end
   end
 end