eac_tools 0.99.1 → 0.100.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5085e609d1cc3debd7a551e2124d15d6ac55c99b3b3141dad5be7c7ce9deda
-  data.tar.gz: b5e16afec1b44493a6ddce3a907cc9ea326b3136c95b4238af03a52a65140668
+  metadata.gz: 970ab78fc4dce8ba6cd6c3a36868a433ed3fd2a08c12633b9dd4f3584688fe46
+  data.tar.gz: 88e7b598b807fccf3319de29722d18f42a6c9fd02bad27a198a51d24510f8cc7
 SHA512:
-  metadata.gz: e9a2d85155ea6851e5cb8311759f9cd54693f0b4743af6fb8da99e2ec59cb526c6983049f03847f46d5fe1ded8eea8f768363744c094725afbd78e384b905569
-  data.tar.gz: 79f7d46efbfdb2dc810faff118f8de4a0ce780998a37573d3249b3da6852e7d7f9996257fce9f795ea9e26d08212c03cf53dc216448664b076266cd2f30bfa5e
+  metadata.gz: 3256fc06c8b3dcd2359c2cac6faa8c6d522ff1f5fae00a9eb2a7bf048727dfb7f7c1056d39f1a7350d497f851320a7da2aaac2cc03dd908aaf386b78d97d42dc
+  data.tar.gz: 28e026ac17795ac504040dddf2ad0af1fc7056e4c494397a236237ecea4584c26527d54878129421da764e93850271c54c26012ff5a200d54128d96149f02d77

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.99.1)
-      avm (~> 0.95, >= 0.95.1)
+    eac_tools (0.100.0)
+      avm (~> 0.95, >= 0.95.2)
       avm-eac_asciidoctor_base0 (~> 0.25)
       avm-eac_generic_base0 (~> 0.15)
       avm-eac_github_base0 (~> 0.3)
@@ -16,7 +16,7 @@ PATH
       avm-eac_redmine_base0 (~> 0.22, >= 0.22.3)
       avm-eac_redmine_plugin_base0 (~> 0.4, >= 0.4.1)
       avm-eac_ruby_base0 (~> 0.1)
-      avm-eac_ruby_base1 (~> 0.35, >= 0.35.1)
+      avm-eac_ruby_base1 (~> 0.36)
       avm-eac_webapp_base0 (~> 0.21)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.19)
@@ -30,6 +30,15 @@ PATH
       avm (~> 0.95)
       eac_ruby_utils (~> 0.127)
 
+PATH
+  remote: sub/avm-eac_ruby_base1
+  specs:
+    avm-eac_ruby_base1 (0.36.0)
+      avm (~> 0.95, >= 0.95.2)
+      avm-eac_generic_base0 (~> 0.15)
+      eac_envs-http (~> 0.6, >= 0.6.1)
+      eac_ruby_utils (~> 0.127)
+
 PATH
   remote: sub/avm-tools
   specs:
@@ -41,17 +50,44 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.95.1)
+    avm (0.95.2)
       clipboard (~> 1.4, >= 1.4.1)
       eac_cli (~> 0.43)
       eac_config (~> 0.15)
       eac_docker (~> 0.7)
       eac_fs (~> 0.18, >= 0.18.1)
       eac_ruby_utils (~> 0.127)
-      eac_templates (~> 0.8)
+      eac_templates (~> 0.8, >= 0.8.1)
       minitar (~> 0.12, >= 0.12.1)
       ruby-progressbar (~> 1.13)
 
+PATH
+  remote: sub/eac_ruby_base0
+  specs:
+    eac_ruby_base0 (0.19.1)
+      avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
+      eac_cli (~> 0.38, >= 0.38.1)
+      eac_fs (~> 0.18, >= 0.18.1)
+      eac_ruby_utils (~> 0.126)
+
+PATH
+  remote: sub/eac_ruby_gem_support
+  specs:
+    eac_ruby_gem_support (0.12.0)
+      eac_ruby_utils (~> 0.127)
+      rspec (~> 3.13, >= 3.13.1)
+      rubocop (~> 1.76)
+      rubocop-rails (~> 2.32)
+      rubocop-rspec (~> 3.6)
+      super_diff (~> 0.9)
+
+PATH
+  remote: sub/eac_templates
+  specs:
+    eac_templates (0.8.1)
+      eac_config (~> 0.15)
+      eac_ruby_utils (~> 0.127)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -65,6 +101,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     asciidoctor (2.0.23)
     ast (2.4.3)
+    attr_extras (7.1.0)
     avm-eac_asciidoctor_base0 (0.25.0)
       asciidoctor (~> 2.0, >= 2.0.23)
       avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
@@ -117,11 +154,6 @@ GEM
     avm-eac_ruby_base0 (0.1.0)
       avm-eac_ruby_base1 (~> 0.34)
       eac_ruby_utils (~> 0.122)
-    avm-eac_ruby_base1 (0.35.1)
-      avm (~> 0.94)
-      avm-eac_generic_base0 (~> 0.13)
-      eac_envs-http (~> 0.5, >= 0.5.1)
-      eac_ruby_utils (~> 0.122)
     avm-eac_ubuntu_base0 (0.5.1)
       avm (~> 0.86, >= 0.86.2)
       eac_ruby_utils (~> 0.121)
@@ -185,17 +217,6 @@ GEM
       eac_envs-http (~> 0.5)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.120)
-    eac_ruby_base0 (0.19.1)
-      avm-eac_ruby_base1 (~> 0.33, >= 0.33.1)
-      eac_cli (~> 0.38, >= 0.38.1)
-      eac_fs (~> 0.18, >= 0.18.1)
-      eac_ruby_utils (~> 0.126)
-    eac_ruby_gem_support (0.11.1)
-      eac_ruby_utils (~> 0.126)
-      rspec (~> 3.13)
-      rubocop (~> 1.75, >= 1.75.4)
-      rubocop-rails (~> 2.31)
-      rubocop-rspec (~> 3.6)
     eac_ruby_utils (0.127.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.7)
@@ -203,9 +224,6 @@ GEM
       filesize (~> 0.2)
       net-ssh (~> 4.2)
       zeitwerk (~> 2.6, >= 2.6.18)
-    eac_templates (0.8.0)
-      eac_config (~> 0.15)
-      eac_ruby_utils (~> 0.127)
     faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
@@ -234,6 +252,7 @@ GEM
     minitest (5.25.5)
     multipart-post (2.4.1)
     net-ssh (4.2.0)
+    optimist (3.2.1)
     os (1.1.4)
     parallel (1.27.0)
     parseconfig (1.1.2)
@@ -243,6 +262,8 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
+    patience_diff (1.2.0)
+      optimist (~> 3.0)
     prism (1.4.0)
     public_suffix (5.1.1)
     racc (1.8.1)
@@ -265,7 +286,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.4)
-    rubocop (1.76.0)
+    rubocop (1.76.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -276,7 +297,7 @@ GEM
       rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.0)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-rails (2.32.0)
@@ -296,6 +317,10 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    super_diff (0.9.0)
+      attr_extras (>= 6.2.4)
+      diff-lcs
+      patience_diff
     tty-color (0.6.0)
     tty-screen (0.8.2)
     tty-table (0.12.0)
@@ -315,8 +340,11 @@ PLATFORMS
 DEPENDENCIES
   avm!
   avm-eac_generic_base0!
+  avm-eac_ruby_base1!
   avm-tools!
-  eac_ruby_gem_support (~> 0.11, >= 0.11.1)
+  eac_ruby_base0!
+  eac_ruby_gem_support!
+  eac_templates!
   eac_tools!
 
 BUNDLED WITH

data/lib/eac_tools/version.rb

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

data/lib/eac_tools.rb

@@ -3,6 +3,23 @@
 require 'eac_ruby_utils'
 EacRubyUtils::RootModuleSetup.perform __FILE__
 
+require 'avm/eac_asciidoctor_base0'
+require 'avm/eac_generic_base0'
+require 'avm/eac_github_base0'
+require 'avm/eac_gitlab_base0'
+require 'avm/eac_latex_base0'
+require 'avm/eac_php_base0'
+require 'avm/eac_postgresql_base0'
+require 'avm/eac_python_base0'
+require 'avm/eac_rails_base0'
+require 'avm/eac_rails_base1'
+require 'avm/eac_redmine_base0'
+require 'avm/eac_redmine_plugin_base0'
+require 'avm/eac_ruby_base0'
+require 'avm/eac_ruby_base1'
+require 'avm/eac_webapp_base0'
+require 'avm/eac_wordpress_base0'
+require 'avm/git'
 require 'avm/tools'
 
 module EacTools

data/sub/avm/avm.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_docker', '~> 0.7'
   s.add_dependency 'eac_fs', '~> 0.18', '>= 0.18.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.127'
-  s.add_dependency 'eac_templates', '~> 0.8'
+  s.add_dependency 'eac_templates', '~> 0.8', '>= 0.8.1'
   s.add_dependency 'minitar', '~> 0.12', '>= 0.12.1'
   s.add_dependency 'ruby-progressbar', '~> 1.13'
 
-  s.add_development_dependency 'avm-eac_ruby_base1', '~> 0.35', '>= 0.35.1'
+  s.add_development_dependency 'avm-eac_ruby_base1', '~> 0.36'
   s.add_development_dependency 'avm-git', '~> 0.19'
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.11', '>= 0.11.1'
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12'
 end

data/sub/avm/lib/avm/rspec/setup.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/rspec/setup/launcher'
 require 'avm/rspec/setup/source_generator'
 
 module Avm

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

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

data/sub/avm-eac_ruby_base1/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

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.95', '>= 0.95.2'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.15'
+  s.add_dependency 'eac_envs-http', '~> 0.6', '>= 0.6.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.127'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.12'
+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_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,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,23 @@
+# frozen_string_literal: true
+
+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