eac_tools 0.89.0 → 0.90.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb76604a2a0b5232d376cefac3d315c957d4e87b8b6b2580f2c7972f4a88aeb
-  data.tar.gz: 17ca5dc90d086d88446991053485c45c9e5a720ab74b1301ee2ff2019aa6cba5
+  metadata.gz: a8b16ec454af8f8455cd315b179294a8f9405eb7505066dd5ad6e98009d3b50e
+  data.tar.gz: a88a101b11302cca2206c985a94fb9f83c69d24a3463cc6b60cb4b27ea37d48b
 SHA512:
-  metadata.gz: 5c9ba6396b64568f48744e4cf59e7d6bcb16c8b1004ad8d079958d44b59828a9333a0add9f36d066ae9aef52f6133ce406bd2efc666105366d2cb102d0b78576
-  data.tar.gz: 60f4f4677b47dda6630a9006b1c5467a097cbc7afa7940cba95d5f81311fe60656f9475f6e9d8f9b290c37fdc9790ecbcfb1163c3fe8805d281a3c6501733337
+  metadata.gz: f480913969f120fea84b351ed5903be61ff91c1c32e09969429e13b1faa436b0602c5e824f2da2d000b40dfeebb586835f8496e065fa78044d70565a8c19ff21
+  data.tar.gz: c793fc50698b464fca757faf0860f53146fe4eef5ea9884bbe761b3fb5b099745fd341f63272d57d59598f1ba3f274a18ae9f886015f6885940cf93d8ec1b628

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.89.0)
+    eac_tools (0.90.1)
       avm (~> 0.91)
       avm-eac_asciidoctor_base0 (~> 0.23)
       avm-eac_generic_base0 (~> 0.13)
@@ -15,25 +15,21 @@ PATH
       avm-eac_rails_base1 (~> 0.10)
       avm-eac_redmine_base0 (~> 0.22, >= 0.22.2)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
-      avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
+      avm-eac_ruby_base1 (~> 0.33, >= 0.33.2)
       avm-eac_webapp_base0 (~> 0.19)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.17)
       avm-tools (~> 0.161)
-      eac_ruby_utils (~> 0.121)
+      eac_ruby_utils (~> 0.122)
 
 PATH
-  remote: sub/avm
+  remote: sub/avm-eac_ruby_base1
   specs:
-    avm (0.91.0)
-      eac_cli (~> 0.40, >= 0.40.1)
-      eac_config (~> 0.14, >= 0.14.2)
-      eac_docker (~> 0.7)
-      eac_fs (~> 0.17)
-      eac_ruby_utils (~> 0.121)
-      eac_templates (~> 0.5, >= 0.5.1)
-      minitar (~> 0.9)
-      ruby-progressbar (~> 1.13)
+    avm-eac_ruby_base1 (0.33.2)
+      avm (~> 0.91)
+      avm-eac_generic_base0 (~> 0.13)
+      eac_envs-http (~> 0.5, >= 0.5.1)
+      eac_ruby_utils (~> 0.122)
 
 GEM
   remote: https://rubygems.org/
@@ -46,15 +42,17 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    aranha-parsers (0.22.0)
-      activesupport (>= 4.0.0)
-      addressable (~> 2.8, >= 2.8.5)
-      eac_envs-http (~> 0.4, >= 0.4.1)
-      eac_ruby_utils (~> 0.119, >= 0.119.2)
-      nokogiri (~> 1.15, >= 1.15.4)
-      ofx-parser (~> 1.1)
-    asciidoctor (2.0.22)
+    asciidoctor (2.0.23)
     ast (2.4.2)
+    avm (0.91.0)
+      eac_cli (~> 0.40, >= 0.40.1)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_docker (~> 0.7)
+      eac_fs (~> 0.17)
+      eac_ruby_utils (~> 0.121)
+      eac_templates (~> 0.5, >= 0.5.1)
+      minitar (~> 0.9)
+      ruby-progressbar (~> 1.13)
     avm-eac_asciidoctor_base0 (0.23.0)
       asciidoctor (~> 2.0, >= 2.0.22)
       avm-eac_webapp_base0 (~> 0.19)
@@ -106,12 +104,6 @@ GEM
     avm-eac_redmine_plugin_base0 (0.4.1)
       avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
       eac_ruby_utils (~> 0.121)
-    avm-eac_ruby_base1 (0.33.1)
-      aranha-parsers (~> 0.22)
-      avm (~> 0.84)
-      avm-eac_generic_base0 (~> 0.12, >= 0.12.1)
-      eac_envs-http (~> 0.4, >= 0.4.1)
-      eac_ruby_utils (~> 0.119, >= 0.119.2)
     avm-eac_ubuntu_base0 (0.5.1)
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
@@ -152,7 +144,7 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.1)
-    eac_cli (0.40.1)
+    eac_cli (0.41.0)
       colorize (~> 0.8, >= 0.8.1)
       eac_config (~> 0.14, >= 0.14.2)
       eac_ruby_utils (~> 0.121)
@@ -193,15 +185,15 @@ GEM
       rubocop (~> 1.60, >= 1.60.1)
       rubocop-rails (~> 2.23, >= 2.23.1)
       rubocop-rspec (~> 2.26, >= 2.26.1)
-    eac_ruby_utils (0.121.0)
+    eac_ruby_utils (0.122.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.6)
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)
-    eac_templates (0.5.1)
-      eac_config (~> 0.14, >= 0.14.1)
-      eac_ruby_utils (~> 0.121)
+    eac_templates (0.6.0)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_ruby_utils (~> 0.122)
     faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
@@ -220,20 +212,15 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    hpricot (0.8.6)
     htmlbeautifier (1.4.3)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
     minitar (0.9)
-    minitest (5.22.3)
+    minitest (5.23.0)
     multipart-post (2.4.1)
     net-ssh (4.2.0)
-    nokogiri (1.15.6-x86_64-linux)
-      racc (~> 1.4)
-    ofx-parser (1.1.0)
-      hpricot (>= 0.6)
     os (1.1.4)
     parallel (1.24.0)
     parseconfig (1.1.2)
@@ -248,8 +235,9 @@ GEM
     rack (3.0.11)
     rainbow (3.1.1)
     rchardet (1.8.0)
-    regexp_parser (2.9.1)
-    rexml (3.2.6)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (3.30.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -281,7 +269,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -301,6 +289,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    strscan (3.1.0)
     tty-color (0.6.0)
     tty-screen (0.8.2)
     tty-table (0.12.0)
@@ -311,14 +300,14 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     unicode_utils (1.4.0)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
     zlib (2.1.1)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  avm!
+  avm-eac_ruby_base1!
   eac_ruby_gem_support (~> 0.10)
   eac_tools!
 

data/lib/eac_tools/version.rb

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

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

@@ -0,0 +1,22 @@
+# 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.files = Dir['{lib,locale,template}/**/*']
+  s.required_ruby_version = '>= 2.7'
+
+  s.add_dependency 'avm', '~> 0.91'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.13'
+  s.add_dependency 'eac_envs-http', '~> 0.5', '>= 0.5.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.122'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.10'
+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/incompatible_parser/depends_on.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+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,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+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,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+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,77 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_factory'
+
+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,33 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/depends_on'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/gem_conflict'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/in_gemfile'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement'
+
+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,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+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,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+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,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base'
+
+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,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Bundler
+      class IncompatibleParser
+        require_sub __FILE__
+
+        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

data/sub/{avm/lib/avm/entries/jobs.rb → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/bundler.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Entries
-    module Jobs
+  module EacRubyBase1
+    module Bundler
       require_sub __FILE__
     end
   end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_ruby_base1/rubocop'
+
+module Avm
+  module EacRubyBase1
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        class FileResourceName
+          enable_method_class
+          common_constructor :file_format, :path do
+            self.path = path.to_pathname
+          end
+
+          LIBRARY_PATTERNS = [%r{lib/((?!.*/lib/).+)\.rb\z},
+                              %r{app/[^/]+/(.+)\.rb\z}].freeze
+          SPEC_PATTERNS = [%r{spec/[^/]+/(.+)_spec\.rb\z}].freeze
+
+          # @param path [Pathname]
+          # @return [Avm::FileFormats::FileWith]
+          def result
+            result_from_spec || result_from_library || result_from_superclass
+          end
+
+          private
+
+          def result_from_library
+            result_from_patterns(LIBRARY_PATTERNS) { |m| m[1].camelize }
+          end
+
+          def result_from_patterns(patterns, &block)
+            file_format.result_from_patterns(patterns, path, &block)
+          end
+
+          def result_from_spec
+            result_from_patterns(SPEC_PATTERNS) { |m| "RSpec.describe(#{m[1].camelize})" }
+          end
+
+          def result_from_superclass
+            file_format.result_from_superclass(path)
+          end
+        end
+      end
+    end
+  end
+end