avm-tools 0.117.0 → 0.117.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae509f1d4971fd8a6d39a9f20cc4a3dab9fd28267c333ffe521cba9252f20bb
-  data.tar.gz: f27d6bd59c10b9638f1f42b173d38a53a677b1d8de4b1a01c63e170ed1ed362f
+  metadata.gz: 3c5b9e1cd2e14d276b38a0efe3965a884143065eafbade65938f37f72f0857e9
+  data.tar.gz: 81d047244f7fa7478bffc26e23457da9da5cc7e33839b6108e7fe55cb78a4706
 SHA512:
-  metadata.gz: ea73fcc793b05f0265396c36a592969b9f60c6ccb8a0e7526f7f5e12f5c7b58688489c11cda94b7e17ab8a0430029dccca11d3a0b799a49e6c65d11c5f200b8a
-  data.tar.gz: bf13a36e7cdf500a7538c75531b108b7f09ef76dfd1b5a4ceb102cc32f2c2b76026df875c593de2fa6c240b3b5fccc43b9d7a989941dab6b15e61a8b142ee503
+  metadata.gz: 4c802171d7c42fde415e6674888a0d430c003107d87846e7159cfc5aebb7d04a604b7b7f6c034b9d0081206e111f373e13e7fada07e2130d92624409f4389b17
+  data.tar.gz: 30765546f1f0faab035133812dd4f0508ac5a63112e2aa1925758c1bf66e7a81d92e01ed61f298c9f05f12cd156d49940d333c89ce3f9971b40021ef9c566bfd

data/lib/avm/ruby/bundler/incompatible_parser/in_gemfile.rb

@@ -10,8 +10,6 @@ module Avm
         class InGemfile < ::Avm::Ruby::Bundler::IncompatibleParser::LineParserBase
           LINE_PARSER = /In Gemfile:/
                           .to_parser { |_m| new }
-
-          common_constructor
         end
       end
     end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.117.0'
+    VERSION = '0.117.1'
   end
 end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/add_or_replace_gem_line.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class Gemfile
+        class AddOrReplaceGemLine
+          enable_method_class
+          common_constructor :sender, :gem_name, :gem_specs
+          delegate :lines, to: :sender
+
+          def existing_gem_line_index
+            lines.index { |line| line.start_with?(gem_line_prefix) }
+          end
+
+          def result
+            if existing_gem_line_index.present?
+              replace_line
+            else
+              add_line
+            end
+          end
+
+          def add_line
+            lines.insert(add_line_index, new_gem_line)
+          end
+
+          def add_line_index
+            (gems_lines_start_index..(lines.count - 1)).each do |e|
+              return e if new_gem_line < lines[e]
+            end
+            lines.count
+          end
+
+          def gems_lines_start_index
+            lines.index { |line| line.start_with?('gem ') } || lines.count
+          end
+
+          def new_gem_line
+            ([gem_line_prefix] + gem_specs).join(', ')
+          end
+
+          def gem_line_prefix
+            "gem '#{gem_name}'"
+          end
+
+          def replace_line
+            lines[existing_gem_line_index] = new_gem_line
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/dependency.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class Gemfile
+        class Dependency
+          common_constructor :gemfile, :gem_name
+
+          def version_specs=(version_specs)
+            gemfile.add_or_replace_gem_line(gem_name, version_specs)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class Gemfile
+        require_sub __FILE__, require_dependency: true
+
+        class << self
+          def from_file(path)
+            new(path.read.each_line.map(&:rstrip))
+          end
+        end
+
+        common_constructor :lines
+
+        # @return [Avm::EacRubyBase1::Bundler::Gemfile::Dependency]
+        def dependency(gem_name)
+          ::Avm::EacRubyBase1::Bundler::Gemfile::Dependency.new(self, gem_name)
+        end
+
+        def write(path)
+          path.to_pathname.write(to_text)
+        end
+
+        def to_text
+          lines.map { |line| "#{line}\n" }.join
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/sub/eac_cli/eac_cli.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'colorize', '~> 0.8.1'
   s.add_dependency 'eac_config', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.83'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

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

@@ -33,7 +33,7 @@ module EacCli
         # @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
+          raise_argv_current_invalid_option unless option
 
           option_collect_option(option)
         end

data/sub/eac_cli/lib/eac_cli/runner/after_class_methods.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/speaker'
+require 'eac_cli/definition'
+require 'eac_cli/runner/class_runner'
 
 module EacCli
   module Runner
     module AfterClassMethods
+      # @return [EacCli::Runner::ClassRunner]
+      def class_runner(runner_context_args)
+        ::EacCli::Runner::ClassRunner.new(self, runner_context_args)
+      end
+
       def create(*runner_context_args)
-        r = new
-        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
-        r
+        class_runner(runner_context_args).create
       end
 
       def run(*runner_context_args)
-        on_asserted_speaker do
-          r = create(*runner_context_args)
-          r.run_run
-          r
-        end
+        class_runner(runner_context_args).run
       end
 
       def runner_definition(&block)
@@ -29,18 +28,6 @@ module EacCli
       def super_runner_definition
         superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
       end
-
-      private
-
-      def on_asserted_speaker
-        if ::EacRubyUtils::Speaker.context.optional_current
-          yield
-        else
-          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
-            yield
-          end
-        end
-      end
     end
   end
 end

data/sub/eac_cli/lib/eac_cli/runner/class_runner.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/speaker'
+
+module EacCli
+  module Runner
+    class ClassRunner
+      PARSER_ERROR_EXIT_CODE = 1
+
+      common_constructor :klass, :context_args
+
+      def create
+        r = klass.new
+        r.runner_context = ::EacCli::Runner::Context.new(r, *context_args)
+        r
+      end
+
+      def run
+        on_asserted_speaker do
+          r = create
+          begin
+            r.run_run
+          rescue ::EacCli::Parser::Error => e
+            run_parser_error(r, e)
+          end
+          r
+        end
+      end
+
+      def run_parser_error(runner_instance, error)
+        $stderr.write("#{runner_instance.program_name}: #{error}\n")
+        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
+      end
+
+      private
+
+      def on_asserted_speaker
+        if ::EacRubyUtils::Speaker.context.optional_current
+          yield
+        else
+          ::EacRubyUtils::Speaker.context.on(::EacCli::Speaker.new) do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/sub/eac_cli/lib/eac_cli/runner/instance_methods.rb

@@ -3,22 +3,13 @@
 module EacCli
   module Runner
     module InstanceMethods
-      PARSER_ERROR_EXIT_CODE = 1
-
       def run_run
         parsed
         run_callbacks(:run) { run }
-      rescue ::EacCli::Parser::Error => e
-        run_parser_error(e)
       rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
         # Do nothing
       end
 
-      def run_parser_error(error)
-        $stderr.write("#{program_name}: #{error}\n")
-        ::Kernel.exit(PARSER_ERROR_EXIT_CODE)
-      end
-
       def runner_context
         return @runner_context if @runner_context
 

data/sub/eac_cli/lib/eac_cli/runner_with/help.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module RunnerWith
     module Help
-      require_sub __FILE__
+      require_sub __FILE__, require_dependency: true
       common_concern do
         include ::EacCli::Runner
 

data/sub/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.27.3'
+  VERSION = '0.27.4'
 end

data/sub/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb

@@ -20,23 +20,29 @@ RSpec.describe ::EacCli::RunnerWith::Help do
     end
   end
 
-  let(:runner_argv) { ['--help'] }
-  let(:instance) { runner.create(argv: runner_argv) }
-  let(:expected_output) do
-    <<~OUTPUT
-      A stub runner.
-
-      Usage:
-        __PROGRAM__ [options] <a_argument>
-        __PROGRAM__ --help
-
-      Options:
-        -h --help    Show help.
-
-    OUTPUT
-  end
+  [
+    ['--help'],
+    ['trash-pos-arg-before', '--help', 'trash-pos-arg-after']
+  ].each do |runner_argv|
+    context "when runner ARGV is #{runner_argv}" do
+      let(:instance) { runner.create(argv: runner_argv) }
+      let(:expected_output) do
+        <<~OUTPUT
+          A stub runner.
+
+          Usage:
+            __PROGRAM__ [options] <a_argument>
+            __PROGRAM__ --help
+
+          Options:
+            -h --help    Show help.
+
+        OUTPUT
+      end
 
-  it 'show help text' do
-    expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process
+      it 'show help text' do
+        expect { instance.run_run }.to output(expected_output).to_stdout_from_any_process
+      end
+    end
   end
 end

data/sub/eac_ruby_base0/eac_ruby_base0.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.26'
+  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.4'
   s.add_dependency 'eac_fs', '~> 0.10'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '~> 0.9.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.70'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.16.2'
+  VERSION = '0.16.3'
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb

@@ -68,12 +68,12 @@ module EacRubyUtils
 
     def setup_class_attr_readers(klass)
       klass.send(:attr_reader, *args)
-      klass.send(:public, *args)
+      klass.send(:public, *args) if args.any?
     end
 
     def setup_class_attr_writers(klass)
       klass.send(:attr_writer, *args)
-      klass.send(:private, *args.map { |a| "#{a}=" })
+      klass.send(:private, *args.map { |a| "#{a}=" }) if args.any?
     end
 
     def setup_class_initialize(klass)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.95.0'
+  VERSION = '0.95.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.117.0
+  version: 0.117.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -194,14 +194,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gems_utils
   requirement: !ruby/object:Gem::Requirement
@@ -542,6 +548,10 @@ files:
 - sub/avm-eac_ruby_base1/Gemfile
 - sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/add_or_replace_gem_line.rb
+- sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler/gemfile/dependency.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/configured.rb
 - sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubocop/envvar.rb
@@ -822,6 +832,7 @@ files:
 - sub/eac_cli/lib/eac_cli/rspec/setup.rb
 - sub/eac_cli/lib/eac_cli/runner.rb
 - sub/eac_cli/lib/eac_cli/runner/after_class_methods.rb
+- sub/eac_cli/lib/eac_cli/runner/class_runner.rb
 - sub/eac_cli/lib/eac_cli/runner/context.rb
 - sub/eac_cli/lib/eac_cli/runner/exit.rb
 - sub/eac_cli/lib/eac_cli/runner/instance_methods.rb