avm-tools 0.116.2 → 0.117.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ade74f1c59b191c0af317c03f8acb00fffc0e2bcac3120b56a604ab72a31ac1
-  data.tar.gz: 9d9967c47a11500142f7843b53ac7430f40fb191e441ce177ce583a58f46fffc
+  metadata.gz: 35fb18a5736eb65f686b0915a77da3f4e548a64b0ce7e0bd5bc754483c675757
+  data.tar.gz: 053eeec2795b4cf08660991b06d13127e1a66b112a084642f8213fbe89a82e59
 SHA512:
-  metadata.gz: dae95c3e50159a7cd7a9c77745a106d462c2d5c8445a43f92f35cadeb42545509d83b53f2085a339b9dac930610a6cc68cb4551a2dd35e0a2566a1d07f932ce1
-  data.tar.gz: 7dc23f20f7430e88fd0a75582a899df38a81eb6a102f948611c96d810d766032656c730395ef66f4a3f89a11ad4b84d429252dcbf8e58082777b632f5e2ad188
+  metadata.gz: 356218e0b80f21fbd6612ef6f88b49112ee7d97bff1c7b3ef21039964f024dffbcf0944d4ab01b82c6f919384b0bba401319572911599154a418f8a1e3d50c99
+  data.tar.gz: f290a18803f13ae99202ec10ee6106f267913a27b8537dd2fc3f6156151b6d0f01a34354c980de17885b85dc7614019adb7747c03e91ebe1038aca22c6d898a5

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/runner/app_src/version_bump.rb

@@ -8,14 +8,13 @@ module Avm
     class Runner
       class AppSrc
         class VersionBump
-          runner_with :help do
+          runner_with :help, :confirmation 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)'
             bool_opt '-M', '--major', 'Same as --segment=0.'
             bool_opt '-m', '--minor', 'Same as --segment=1.'
             bool_opt '-p', '--patch', 'Same as --segment=2.'
-            bool_opt '-y', '--yes', 'Bump without confirmation.'
           end
 
           def run
@@ -26,7 +25,7 @@ module Avm
           def run_version_changed
             infom 'Version changed'
             if confirm?
-              runner_context.call(:instance).run_job(:version_bump, target_version)
+              runner_context.call(:subject).version_bump(target_version)
               success 'Bumped'
             else
               fatal_error 'Bump unconfirmed'
@@ -38,17 +37,13 @@ module Avm
           end
 
           def start_banner
-            runner_context.call(:instance_banner)
+            infov 'Instance', runner_context.call(:subject)
             infov 'Current version', current_version.if_present('-')
             infov 'Target version', target_version.if_present('-')
           end
 
-          def confirm?
-            parsed.yes? || input('Confirm version bump?', bool: true)
-          end
-
           def current_version_uncached
-            runner_context.call(:instance).if_respond('version')
+            runner_context.call(:subject).if_respond('version')
           end
 
           def target_version_uncached

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.116.2'
+    VERSION = '0.117.2'
   end
 end

data/sub/avm/avm.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.23', '>= 0.23.1'
   s.add_dependency 'eac_docker', '~> 0.3'
   s.add_dependency 'eac_git', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.80'
+  s.add_dependency 'eac_ruby_utils', '~> 0.95'
   s.add_dependency 'eac_templates', '~> 0.1', '>= 0.1.1'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.3', '>= 1.3.1'

data/sub/avm/lib/avm/scms/base.rb

@@ -6,6 +6,7 @@ module Avm
   module Scms
     class Base
       enable_abstract_methods
+      enable_simple_cache
       abstract_methods :update, :valid?
       common_constructor :path do
         self.path = path.to_pathname
@@ -28,6 +29,18 @@ module Avm
       def to_s
         name
       end
+
+      private
+
+      # @return [Avm::Scms::Base]
+      def parent_scm
+        parent_path = path.parent
+        until parent_path.root?
+          ::Avm::Registry.scms.detect_optional(parent_path).if_present { |v| return v }
+          parent_path = parent_path.parent
+        end
+        nil
+      end
     end
   end
 end

data/sub/avm/lib/avm/sources/base/configuration.rb

@@ -29,7 +29,8 @@ module Avm
 
         # @return [Avm::Sources::Configuration]
         def old_configuration_uncached
-          ::Avm::Sources::Configuration.find_in_path(path)
+          ::Avm::Sources::Configuration.find_in_path(path) ||
+            ::Avm::Sources::Configuration.temp_instance
         end
       end
     end

data/sub/avm/lib/avm/sources/base/parent.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Sources
+    class Base
+      module Parent
+        # @return [Avm::Sources::Base]
+        def parent
+          parent_by_option || parent_by_search
+        end
+
+        # @return [Avm::Sources::Base]
+        def parent_by_option
+          options[OPTION_PARENT]
+        end
+
+        # @return [Avm::Sources::Base]
+        def parent_by_search
+          parent_path = path.parent
+          until parent_path.root?
+            ::Avm::Registry.sources.detect_optional(parent_path).if_present { |v| return v }
+            parent_path = parent_path.parent
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/base.rb

@@ -21,12 +21,6 @@ module Avm
       abstract_methods :update, :valid?
 
       delegate :locale, to: :old_configuration
-      delegate :to_s, to: :path
-
-      # @return [Avm::Sources::Base]
-      def parent
-        options[OPTION_PARENT]
-      end
 
       # @return [Pathname]
       def relative_path
@@ -35,6 +29,10 @@ module Avm
         path.relative_path_from(parent.path)
       end
 
+      def to_s
+        "#{self.class}[#{path}]"
+      end
+
       # @return [Enumerable<Avm::Sources::Base>]
       def subs
         scm.subs.map { |subrepo| ::Avm::Registry.sources.detect(subrepo.path, parent: self) }

data/sub/avm/lib/avm/sources/configuration/{_locale.rb → locale.rb}

@@ -6,10 +6,12 @@ require 'i18n'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      LOCALE_KEY = :locale
+      module Locale
+        LOCALE_KEY = :locale
 
-      def locale
-        read_entry(LOCALE_KEY) || ::I18n.default_locale
+        def locale
+          read_entry(LOCALE_KEY) || ::I18n.default_locale
+        end
       end
     end
   end

data/sub/avm/lib/avm/sources/configuration/rubocop.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Rubocop
+        RUBOCOP_COMMAND_KEY = 'ruby.rubocop.command'
+        RUBOCOP_GEMFILE_KEY = 'ruby.rubocop.gemfile'
+
+        def rubocop_command
+          read_command(RUBOCOP_COMMAND_KEY)
+        end
+
+        def rubocop_gemfile
+          gemfile_path = read_entry(RUBOCOP_GEMFILE_KEY)
+          return nil if gemfile_path.blank?
+
+          gemfile_path = gemfile_path.to_pathname.expand_path(storage_path.parent)
+          return gemfile_path if gemfile_path.file?
+
+          raise "Gemfile path \"#{gemfile_path}\" does not exist or is not a file"
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/configuration/tests.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/patches/eac_ruby_gems_utils/gem'
+
+module Avm
+  module Sources
+    class Configuration < ::EacConfig::OldConfigs
+      module Tests
+        BUNDLE_TEST_COMMAND_KEY = 'test.bundle_command'
+        TEST_COMMAND_KEY = 'test.command'
+
+        def any_test_command
+          bundle_test_command || test_command
+        end
+
+        def test_command
+          read_command(TEST_COMMAND_KEY)
+        end
+
+        def bundle_test_command
+          read_entry(BUNDLE_TEST_COMMAND_KEY).if_present do |v|
+            args = v.is_a?(::Enumerable) ? v.map(&:to_s) : ::Shellwords.split(v)
+            ::EacRubyGemsUtils::Gem.new(::File.dirname(storage_path)).bundle(*args).chdir_root
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/sources/configuration.rb

@@ -7,7 +7,7 @@ require 'yaml'
 module Avm
   module Sources
     class Configuration < ::EacConfig::OldConfigs
-      require_sub __FILE__
+      require_sub __FILE__, include_modules: true
 
       FILENAMES = %w[.avm.yml .avm.yaml].freeze
 
@@ -28,6 +28,10 @@ module Avm
           nil
         end
 
+        def temp_instance
+          new(::Tempfile.new(['.avm', '.yaml']))
+        end
+
         private
 
         def internal_find_path(absolute_pathname)

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.18.1'
+  VERSION = '0.19.0'
 end

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.10'
+  s.add_dependency 'avm', '~> 0.19'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base/version_bump.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacGenericBase0
+    module Sources
+      class Base < ::Avm::Sources::Base
+        module VersionBump
+          def after_sub_version_bump_do_changes
+            # Do nothing
+          end
+
+          # @return [Avm::Scms::Commit, nil]
+          def version_bump(target_version)
+            scm.commit_if_change(version_bump_commit_message(target_version)) do
+              version_bump_do_changes(target_version)
+              parent.if_present(&:after_sub_version_bump_do_changes)
+            end
+          end
+
+          # @return [String]
+          def version_bump_commit_message(target_version)
+            i18n_translate(__method__, version: target_version, __locale: locale)
+          end
+
+          def version_bump_do_changes(_target_version)
+            raise_abstract_method(__METHOD__)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_generic_base0/lib/avm/eac_generic_base0/sources/base.rb

@@ -8,13 +8,16 @@ module Avm
   module EacGenericBase0
     module Sources
       class Base < ::Avm::Sources::Base
+        require_sub __FILE__, include_modules: true
+        enable_abstract_methods
+
         # @return [Avm::EacGenericBase0::Sources::Tester]
         def tester_class
           Avm::EacGenericBase0::Sources::Tester
         end
 
         def valid?
-          path.directory?
+          ::Avm::Registry.scms.detect_optional(path).present?
         end
       end
     end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_generic_base0/locale/en.yaml

@@ -0,0 +1,6 @@
+en:
+  avm:
+    eac_generic_base0:
+      sources:
+        base:
+          version_bump_commit_message: Bump to '%{version}'.

data/sub/avm-eac_generic_base0/locale/pt-BR.yaml

@@ -0,0 +1,6 @@
+pt-BR:
+  avm:
+    eac_generic_base0:
+      sources:
+        base:
+          version_bump_commit_message: Versão para '%{version}'.

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib,locale}/**/*']
 
   s.add_dependency 'avm', '~> 0.9'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
   s.add_dependency 'eac_ruby_gems_utils', '~> 0.9', '>= 0.9.8'
   s.add_dependency 'eac_ruby_utils', '~> 0.80'
 

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/sources/base/version_bump.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module VersionBump
+          def after_sub_version_bump_do_changes
+            the_gem.bundle('install').chdir_root.execute!
+          end
+
+          def version_bump_do_changes(target_version)
+            self.version = target_version
+            the_gem.bundle('install').chdir_root.execute!
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base.rb

@@ -3,6 +3,7 @@
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/update'
 require 'avm/eac_ruby_base1/sources/tester'
+require 'avm/version_number'
 require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 
@@ -10,6 +11,7 @@ module Avm
   module EacRubyBase1
     module Sources
       class Base < ::Avm::EacGenericBase0::Sources::Base
+        require_sub __FILE__, include_modules: :prepend, require_dependency: true
         delegate :gemspec_path, to: :the_gem
 
         def gemfile_path
@@ -33,6 +35,15 @@ module Avm
         def update
           ::Avm::EacRubyBase1::Sources::Update.new(self)
         end
+
+        # @return [Avm::VersionNumber]
+        def version
+          the_gem.version.if_present { |v| ::Avm::VersionNumber.new(v) }
+        end
+
+        def version=(value)
+          the_gem.version_file.value = value
+        end
       end
     end
   end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/patches/i18n'
 require 'eac_ruby_utils/core_ext'
 
 module Avm

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

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

data/sub/avm-git/lib/avm/git/scms/git_subrepo.rb

@@ -8,9 +8,7 @@ module Avm
   module Git
     module Scms
       class GitSubrepo < ::Avm::Scms::Base
-        def commit_if_change(_message)
-          nyi
-        end
+        delegate :commit_if_change, to: :parent_scm
 
         def update
           git_subrepo.command('clean').execute!

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.3.2'
+    VERSION = '0.4.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/definition.rb

@@ -39,10 +39,6 @@ module EacCli
       self.description = description
     end
 
-    def help_formatter
-      @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
-    end
-
     def main_alternative
       @main_alternative ||= begin
         r = ::EacCli::Definition::Alternative.new

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