eac_tools 0.94.0 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de8194475d2a078bd3d8330c6daec6558a2f568656cb4bfa000a751a1251a1d1
-  data.tar.gz: 71ab9f54e9a885e17755d774434d3ea7356dad44e5f49c6c2924808d3acf2042
+  metadata.gz: a124b9d5d4a885d3d505b8fc99ece9ff1efc29abdef44b0b26eafff061b5b744
+  data.tar.gz: b3ec5c4b38557617a6b83f72315bd7a9ef37a528694d05928cb7f778bedaa6ec
 SHA512:
-  metadata.gz: 2a72e472acc586fcce802c22507dcfd1e8f8d9dcbc524c2cdd091746cd9832c8d55a85a3ddbb5d05c345384070005bde49d86aa7826742ae6de54112de16133e
-  data.tar.gz: b403d2d290a763b6cd0b23432bb4d5fcd744c1491068442c7579335d8cb0b336bec2908888c5e885006d9583d044749e327c1654265f4d25d5eb8db343bf2f1c
+  metadata.gz: 76bc38b3f70c766bf0cf236518c897e0fe25fe53c6a0e80b5a020c013e5a1ee68ab722c620356ba16b308f648e71c56a330554bc35d883249a0ee0e763288d69
+  data.tar.gz: 61abdd5b8b306e7218164a2e008cb9d5be0915471fd8d1c6fa40860d9c8659f4f5875b337d7080ec47b0763ee05ef38ac24cf584424322d1b225e8bb3fcda85d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.94.0)
+    eac_tools (0.95.0)
       avm (~> 0.94)
       avm-eac_asciidoctor_base0 (~> 0.23)
       avm-eac_generic_base0 (~> 0.13)
@@ -16,55 +16,23 @@ 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.34, >= 0.34.1)
+      avm-eac_ruby_base1 (~> 0.35)
       avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.2)
       avm-git (~> 0.18)
       avm-tools (~> 0.162)
+      eac_ruby_gem_support (~> 0.10)
       eac_ruby_utils (~> 0.122)
 
 PATH
-  remote: sub/avm-eac_webapp_base0
+  remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_webapp_base0 (0.20.1)
+    avm-eac_ruby_base1 (0.35.0)
       avm (~> 0.94)
       avm-eac_generic_base0 (~> 0.13)
-      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
-      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
-      avm-files (~> 0.8)
-      eac_ruby_utils (~> 0.122)
-      htmlbeautifier (~> 1.4, >= 1.4.3)
-
-PATH
-  remote: sub/avm-git
-  specs:
-    avm-git (0.18.0)
-      avm (~> 0.94)
-      avm-files (~> 0.8)
-      eac_git (~> 0.16)
+      eac_envs-http (~> 0.5, >= 0.5.1)
+      eac_ruby_gem_support (~> 0.10)
       eac_ruby_utils (~> 0.122)
-      git (~> 1.19, >= 1.19.1)
-
-PATH
-  remote: sub/avm-tools
-  specs:
-    avm-tools (0.162.0)
-      avm (~> 0.94)
-      clipboard (~> 1.4, >= 1.4.1)
-      eac_ruby_base0 (~> 0.19)
-
-PATH
-  remote: sub/avm
-  specs:
-    avm (0.94.0)
-      eac_cli (~> 0.42)
-      eac_config (~> 0.14, >= 0.14.2)
-      eac_docker (~> 0.7)
-      eac_fs (~> 0.18)
-      eac_ruby_utils (~> 0.122)
-      eac_templates (~> 0.7, >= 0.7.1)
-      minitar (~> 0.9)
-      ruby-progressbar (~> 1.13)
 
 GEM
   remote: https://rubygems.org/
@@ -79,6 +47,15 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     asciidoctor (2.0.23)
     ast (2.4.2)
+    avm (0.94.0)
+      eac_cli (~> 0.42)
+      eac_config (~> 0.14, >= 0.14.2)
+      eac_docker (~> 0.7)
+      eac_fs (~> 0.18)
+      eac_ruby_utils (~> 0.122)
+      eac_templates (~> 0.7, >= 0.7.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)
@@ -133,25 +110,38 @@ GEM
     avm-eac_ruby_base0 (0.1.0)
       avm-eac_ruby_base1 (~> 0.34)
       eac_ruby_utils (~> 0.122)
-    avm-eac_ruby_base1 (0.34.1)
-      avm (~> 0.92)
-      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)
       eac_templates (~> 0.5, >= 0.5.1)
+    avm-eac_webapp_base0 (0.20.1)
+      avm (~> 0.94)
+      avm-eac_generic_base0 (~> 0.13)
+      avm-eac_postgresql_base0 (~> 0.5, >= 0.5.3)
+      avm-eac_ubuntu_base0 (~> 0.5, >= 0.5.1)
+      avm-files (~> 0.8)
+      eac_ruby_utils (~> 0.122)
+      htmlbeautifier (~> 1.4, >= 1.4.3)
     avm-eac_wordpress_base0 (0.3.2)
       avm (~> 0.86, >= 0.86.2)
       avm-eac_webapp_base0 (~> 0.18, >= 0.18.4)
       eac_ruby_utils (~> 0.121)
-    avm-files (0.8.0)
+    avm-files (0.8.1)
       avm (~> 0.93)
       eac_cli (~> 0.42)
       eac_fs (~> 0.18)
       eac_ruby_utils (~> 0.122)
       eac_templates (~> 0.7, >= 0.7.1)
+    avm-git (0.18.0)
+      avm (~> 0.94)
+      avm-files (~> 0.8)
+      eac_git (~> 0.16)
+      eac_ruby_utils (~> 0.122)
+      git (~> 1.19, >= 1.19.1)
+    avm-tools (0.162.0)
+      avm (~> 0.94)
+      clipboard (~> 1.4, >= 1.4.1)
+      eac_ruby_base0 (~> 0.19)
     base64 (0.2.0)
     clipboard (1.4.1)
     colorize (0.8.1)
@@ -233,7 +223,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitar (0.12)
+    minitar (0.12.1)
     minitest (5.25.1)
     multipart-post (2.4.1)
     net-ssh (4.2.0)
@@ -323,10 +313,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  avm!
-  avm-eac_webapp_base0!
-  avm-git!
-  avm-tools!
+  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.94.0'
+  VERSION = '0.95.0'
 end

data/sub/{avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec → avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec}

@@ -2,24 +2,22 @@
 
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 
-require 'avm/eac_webapp_base0/version'
+require 'avm/eac_ruby_base1/version'
 
 Gem::Specification.new do |s|
-  s.name        = 'avm-eac_webapp_base0'
-  s.version     = Avm::EacWebappBase0::VERSION
+  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,template}/**/{*,.*}']
+  s.files = Dir['{lib,locale,template}/**/*']
   s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'avm', '~> 0.94'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.13'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.5', '>= 0.5.3'
-  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.5', '>= 0.5.1'
-  s.add_dependency 'avm-files', '~> 0.8'
+  s.add_dependency 'eac_envs-http', '~> 0.5', '>= 0.5.1'
+  s.add_dependency 'eac_ruby_gem_support', '~> 0.10'
   s.add_dependency 'eac_ruby_utils', '~> 0.122'
-  s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.3'
 
   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-git/lib/avm/git/application_scms.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 Git
-    module ApplicationScms
+  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