eac_tools 0.116.0 → 0.117.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cba04d2fca4d8decd2065f615918155947c6f0b9d08b52ac3d55d12f189dc2
-  data.tar.gz: ac8a37832d991d81e8dd685d95fb2ec2a844275ef555c54da5df40c0f43b9739
+  metadata.gz: b9d602c2d1834e92b6a22f3ccdae155d42a281ad51c5689baa7a2c444742573e
+  data.tar.gz: b4f40cfeab8da22ba922c11b5f4d55f0a0e22c4d478cd92b76d3223f7520c714
 SHA512:
-  metadata.gz: 39eb9e006d4a8fa38366e5164c4dab73aac8f8345a66aa8f80fdca15ce0f43ac01428ebae510ce6e8132e1875289497d24fc8f84ba29f8c0bfa1058da08825b0
-  data.tar.gz: 97fa9487da030ebcf7ddc6ec3970c4f7d3c69302309e2c0867951e8f04aa5b0acef5132a2012c60711910b07a33c45e9b102a379a9db10159ab0d00f5b097f93
+  metadata.gz: 50f81a0b8c5e24d53e9a34cce2d6e98592df12f70749e8ee98430b9a258541310dc6c2800981d919847d4e3bf9542924bf9f01630ae57985822aad93f87684e2
+  data.tar.gz: 4088c021ae1979c991a8fd48c66fa177f965cae11b4267f722fcf3363404c4cce15ca465b4193dfee125542cebedd25414079a2cd374bdbbef5e77ba131fc160

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.116.0)
-      avm (~> 0.101)
+    eac_tools (0.117.0)
+      avm (~> 0.102)
       avm-eac_asciidoctor_base0 (~> 0.27)
       avm-eac_generic_base0 (~> 0.15, >= 0.15.3)
       avm-eac_github_base0 (~> 0.4, >= 0.4.1)
@@ -16,7 +16,7 @@ PATH
       avm-eac_redmine_base0 (~> 0.26)
       avm-eac_redmine_plugin_base0 (~> 0.5)
       avm-eac_ruby_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_ruby_base1 (~> 0.41, >= 0.41.1)
+      avm-eac_ruby_base1 (~> 0.42)
       avm-eac_webapp_base0 (~> 0.22, >= 0.22.2)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.21, >= 0.21.2)
@@ -24,16 +24,19 @@ PATH
       eac_ruby_utils (~> 0.131)
 
 PATH
-  remote: sub/avm-eac_generic_base0
+  remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_generic_base0 (0.15.3)
-      avm (~> 0.100)
+    avm-eac_ruby_base1 (0.42.0)
+      aranha-parsers (~> 0.29)
+      avm (~> 0.101)
+      avm-eac_generic_base0 (~> 0.15, >= 0.15.3)
+      eac_envs-http (~> 0.7, >= 0.7.1)
       eac_ruby_utils (~> 0.131)
 
 PATH
   remote: sub/avm
   specs:
-    avm (0.101.0)
+    avm (0.102.0)
       eac_cli (~> 0.47)
       eac_config (~> 0.15)
       eac_docker (~> 0.8)
@@ -72,6 +75,9 @@ GEM
       eac_ruby_utils (~> 0.130)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
+    avm-eac_generic_base0 (0.15.3)
+      avm (~> 0.100)
+      eac_ruby_utils (~> 0.131)
     avm-eac_github_base0 (0.4.1)
       avm (~> 0.98, >= 0.98.5)
       avm-git (~> 0.21, >= 0.21.2)
@@ -116,12 +122,6 @@ GEM
     avm-eac_ruby_base0 (0.2.1)
       avm-eac_ruby_base1 (~> 0.41)
       eac_ruby_utils (~> 0.131)
-    avm-eac_ruby_base1 (0.41.1)
-      aranha-parsers (~> 0.27)
-      avm (~> 0.100)
-      avm-eac_generic_base0 (~> 0.15, >= 0.15.2)
-      eac_envs-http (~> 0.7, >= 0.7.1)
-      eac_ruby_utils (~> 0.131)
     avm-eac_ubuntu_base0 (0.7.0)
       avm (~> 0.98, >= 0.98.2)
       eac_ruby_utils (~> 0.128, >= 0.128.6)
@@ -232,7 +232,7 @@ GEM
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     json (2.20.0)
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     memoized (1.1.3)
@@ -281,7 +281,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.88.0)
+    rubocop (1.88.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -292,7 +292,7 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-rails (2.35.5)
@@ -337,7 +337,7 @@ PLATFORMS
 
 DEPENDENCIES
   avm!
-  avm-eac_generic_base0!
+  avm-eac_ruby_base1!
   eac_ruby_gem_support (~> 0.13)
   eac_tools!
 

data/eac_tools.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 3.2'
 
-  s.add_dependency 'avm', '~> 0.101'
+  s.add_dependency 'avm', '~> 0.102'
   s.add_dependency 'avm-eac_asciidoctor_base0', '~> 0.27'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.15', '>= 0.15.3'
   s.add_dependency 'avm-eac_github_base0', '~> 0.4', '>= 0.4.1'
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm-eac_redmine_base0', '~> 0.26'
   s.add_dependency 'avm-eac_redmine_plugin_base0', '~> 0.5'
   s.add_dependency 'avm-eac_ruby_base0', '~> 0.2', '>= 0.2.1'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.41', '>= 0.41.1'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.42'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.22', '>= 0.22.2'
   s.add_dependency 'avm-eac_wordpress_base0', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'avm-git', '~> 0.21', '>= 0.21.2'

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.116.0'
+  VERSION = '0.117.0'
 end

data/sub/avm/lib/avm/launcher/context/instance_discovery/source_wrapper.rb

@@ -7,7 +7,7 @@ module Avm
     class Context
       class InstanceDiscovery
         class SourceWrapper
-          enable_simple_cache
+          enable_memoized
           enable_speaker
 
           common_constructor :owner, :logical_path, :parent_project
@@ -24,9 +24,10 @@ module Avm
           end
 
           # @return [Avm::Launcher::Instances::Base, nil]
-          def self_project
+          memoize def self_project
             return nil unless logical_path.project?
 
+            infov logical_path, logical_path.real
             ::Avm::Launcher::Instances::Base.instanciate(logical_path,
                                                          parent_project)
           end
@@ -49,10 +50,8 @@ module Avm
             []
           end
 
-          protected
-
           # @return [Avm::Sources::Base]
-          def warped_source_uncached
+          memoize def warped_source
             ::Avm::Registry.sources.detect(logical_path.warped)
           end
         end

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

@@ -4,32 +4,60 @@ module Avm
   module Sources
     class Base
       module Update
+        common_concern do
+          enable_speaker
+        end
+
         # To override in subclasses.
         def on_sub_updated
           # Do nothing
         end
 
+        # @return [void]
         def update
-          update_self
+          update_self_before_subs
           update_subs
+          update_self_after_subs
         end
 
-        def update_self
-          scm.commit_if_change(-> { update_self_commit_message }) do
-            update_self_content
-            parent.if_present(&:on_sub_updated)
-          end
+        # @param changes [Enumerable<Avm::Sources::Change>]
+        # @return [void]
+        def update_self(changes)
+          changes.each { |change| update_self_with_change(change) }
         end
 
-        # Update source self content.
-        #
-        # To override in subclasses.
-        def update_self_content
-          # Do nothing
+        # @return [void]
+        def update_self_after_subs
+          infov __method__, self
+          update_self(update_self_changes_after_subs)
+        end
+
+        # @return [void]
+        def update_self_before_subs
+          infov __method__, self
+          update_self(update_self_changes_before_subs)
+        end
+
+        # Changes for update after subs' updating.
+        # @return [Enumerable<Avm::Sources::Change>]
+        def update_self_changes_after_subs
+          []
         end
 
-        def update_self_commit_message
-          i18n_translate(__method__)
+        # Changes for update before subs' updating.
+        # @return [Enumerable<Avm::Sources::Change>]
+        def update_self_changes_before_subs
+          []
+        end
+
+        # @param change [Avm::Sources::Change]
+        # @return [void]
+        def update_self_with_change(change)
+          infov 'Performing change', change
+          scm.commit_if_change(-> { change.commit_message }) do
+            change.perform
+            parent.if_present(&:on_sub_updated)
+          end
         end
       end
     end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Avm
+  module Sources
+    class Change
+      acts_as_abstract
+      common_constructor :source
+
+      # Message for the commit.
+      # @return [String]
+      def commit_message
+        i18n_translate(__method__)
+      end
+
+      # Apply the changes to the source.
+      # @return [void]
+      def perform
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

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

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

data/sub/avm-eac_ruby_base1/.gitignore

@@ -0,0 +1,2 @@
+/Gemfile.local
+/Gemfile.lock

data/sub/avm-eac_ruby_base1/.gitrepo

@@ -0,0 +1,7 @@
+[subrepo]
+  cmdver = 0.4.9
+  commit = 3e1b3f87d7d8296504ccf506db546bc52ef492ee
+  method = merge
+  parent = 8877b6b4c21c1d4e50c213f03816288681485ce5
+  branch = master
+  remote = https://github.com/esquilo-azul/avm-eac_ruby_base1.git

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_ruby_base1/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_ruby_base1'
+  s.version     = Avm::EacRubyBase1::VERSION
+  s.authors     = ['Put here the authors']
+  s.summary     = 'Put here de description.'
+
+  s.add_dependency 'aranha-parsers', '~> 0.29'
+
+  s.files = Dir.glob('{lib,locale,template}/**/*', File::FNM_DOTMATCH)
+              .reject { |f| ['.', '..'].include?(File.basename(f)) }
+  s.required_ruby_version = '>= 3.2'
+
+  s.add_dependency 'avm', '~> 0.101'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.15', '>= 0.15.3'
+  s.add_dependency 'eac_envs-http', '~> 0.7', '>= 0.7.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.131'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.13'
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+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,17 @@
+# frozen_string_literal: true
+
+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,32 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class Gemfile
+        require_sub __FILE__, require_mode: :kernel
+
+        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/incompatible_parser/depends_on.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class DependsOn < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /(.+) was resolved to (.+), which depends on/
+                          .to_parser { |m| new(m[1], m[2]) }
+
+          common_constructor :gem_name, :version do
+            self.version = ::Gem::Version.new(version)
+          end
+
+          def data
+            { gem_name: gem_name, version: version }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class GemConflict < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /Bundler could not find compatible versions for gem "(.+)":/
+                          .to_parser { |m| new(m[1]) }
+
+          enable_simple_cache
+          common_constructor :gem_name
+
+          def add_depends_on(depends_on)
+            depends_on_stack << depends_on
+          end
+
+          def add_version_requirement(version_requirement)
+            version_requirement.stack = depends_on_stack
+            versions_requirements << version_requirement
+            @depends_on_stack = nil
+          end
+
+          def data
+            { gem_name: gem_name, versions_requirements: versions_requirements.map(&:data) }
+          end
+
+          def versions_requirements
+            @versions_requirements ||= []
+          end
+
+          private
+
+          def depends_on_stack
+            @depends_on_stack ||= []
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class InGemfile < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /In Gemfile:/
+                          .to_parser { |_m| new }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class LineBuffer
+          class << self
+            def from_file(path)
+              new(::File.read(path.to_s))
+            end
+          end
+
+          attr_reader :gems_in_conflict
+
+          def initialize(content)
+            self.gems_in_conflict = []
+            self.parsing_required = false
+            content.each_line { |string_line| add_line(LineFactory.new(string_line)) }
+          end
+
+          private
+
+          attr_accessor :parsing_required
+          attr_writer :gems_in_conflict
+
+          def add_line(line)
+            return if line.blank?
+
+            return if LineFactory::TYPES.any? do |type|
+              next false unless line.result.is_a?(type)
+
+              send("on_#{type.name.demodulize.underscore.variableize}_line", line.result)
+              true
+            end
+
+            return unless parsing_required
+
+            raise(::ArgumentError, "Unparsed line: \"#{line.content}\"")
+          end
+
+          def on_gem_conflict_line(result)
+            self.parsing_required = true
+            gems_in_conflict << result
+          end
+
+          def on_in_gemfile_line(result)
+            # Do nothing
+          end
+
+          def on_depends_on_line(result)
+            current_gem_conflict.add_depends_on(result)
+          end
+
+          def on_ruby_requirement_line(result)
+            # Do nothing
+          end
+
+          def on_version_requirement_line(result)
+            current_gem_conflict.add_version_requirement(result)
+          end
+
+          def current_gem_conflict
+            raise 'No gems in conflict' if gems_in_conflict.none?
+            raise 'Last gem is blank' if gems_in_conflict.last.blank?
+
+            gems_in_conflict.last
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class LineFactory
+          TYPES = [GemConflict, InGemfile, DependsOn, RubyRequirement, VersionRequirement].freeze
+
+          enable_simple_cache
+          common_constructor :content do
+            self.content = content.strip
+          end
+
+          delegate :blank?, to: :content
+
+          private
+
+          def result_uncached
+            TYPES.lazy.map { |type| type.parse(content) }.find(&:present?)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class LineParserBase
+          class << self
+            def parse(line_content)
+              const_get('LINE_PARSER').parse(line_content)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class RubyRequirement < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /\Aruby/.to_parser { |_m| new }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        class VersionRequirement < ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineParserBase
+          LINE_PARSER = /\A([a-z][a-z\-_0-9]*)(?: \((.+)\))?\z/
+                          .to_parser { |m| new(m[1], m[2]) }
+
+          enable_simple_cache
+          attr_accessor :stack
+
+          common_constructor :gem_name, :requirements_source
+
+          def data
+            { requirements_source: requirements_source, stack: stack.map(&:data) }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        enable_simple_cache
+        attr_reader :gems_in_conflict
+
+        def initialize(path)
+          @gems_in_conflict = ::Avm::EacRubyBase1::Bundler::IncompatibleParser::LineBuffer
+                                .from_file(path).gems_in_conflict.freeze
+        end
+
+        def data
+          gems_in_conflict.map(&:data)
+        end
+      end
+    end
+  end
+end