eac_tools 0.95.0 → 0.96.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a124b9d5d4a885d3d505b8fc99ece9ff1efc29abdef44b0b26eafff061b5b744
-  data.tar.gz: b3ec5c4b38557617a6b83f72315bd7a9ef37a528694d05928cb7f778bedaa6ec
+  metadata.gz: 194395a1e093f372c5c1cc9d839494745705412fb56e662256a51b22da74d0da
+  data.tar.gz: fcd99ef1c6da1fff0822f3d9f4a1665bb4624bd0e18f2428797654c1c38ed4c5
 SHA512:
-  metadata.gz: 76bc38b3f70c766bf0cf236518c897e0fe25fe53c6a0e80b5a020c013e5a1ee68ab722c620356ba16b308f648e71c56a330554bc35d883249a0ee0e763288d69
-  data.tar.gz: 61abdd5b8b306e7218164a2e008cb9d5be0915471fd8d1c6fa40860d9c8659f4f5875b337d7080ec47b0763ee05ef38ac24cf584424322d1b225e8bb3fcda85d
+  metadata.gz: aef95411c2e9650c6512a966bf0b3256149195966afc08b9654e09a617450314d01976656ac5fa91f3bf1e79eac75a32977ff3ebb1d127f1b0f5f3072d140f53
+  data.tar.gz: a603b730da95fc9dbb7c5fcd9d29d82552823ed2eb970492b8d1eb5d4ce643713a6186634a643cef03e3b2111661f99f13dc0864013efbaa42a6b7fc269335f1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.95.0)
+    eac_tools (0.96.1)
       avm (~> 0.94)
-      avm-eac_asciidoctor_base0 (~> 0.23)
+      avm-eac_asciidoctor_base0 (~> 0.24)
       avm-eac_generic_base0 (~> 0.13)
       avm-eac_github_base0 (~> 0.3)
       avm-eac_gitlab_base0 (~> 0.4)
@@ -16,22 +16,20 @@ 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)
+      avm-eac_ruby_base1 (~> 0.35, >= 0.35.1)
       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_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.35.0)
+    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_gem_support (~> 0.10)
       eac_ruby_utils (~> 0.122)
 
 GEM
@@ -56,10 +54,12 @@ GEM
       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)
-      eac_ruby_utils (~> 0.121)
+    avm-eac_asciidoctor_base0 (0.24.0)
+      asciidoctor (~> 2.0, >= 2.0.23)
+      avm-eac_webapp_base0 (~> 0.20, >= 0.20.1)
+      eac_fs (~> 0.18)
+      eac_ruby_gem_support (~> 0.10)
+      eac_ruby_utils (~> 0.122)
       os (~> 1.1, >= 1.1.4)
       rouge (~> 3.30)
     avm-eac_generic_base0 (0.13.0)
@@ -219,7 +219,7 @@ GEM
       addressable (~> 2.8)
       rchardet (~> 1.8)
     htmlbeautifier (1.4.3)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
@@ -230,7 +230,7 @@ GEM
     os (1.1.4)
     parallel (1.26.3)
     parseconfig (1.1.2)
-    parser (3.3.4.2)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -242,43 +242,40 @@ GEM
     rainbow (3.1.1)
     rchardet (1.8.0)
     regexp_parser (2.9.2)
-    rexml (3.3.6)
-      strscan
     rouge (3.30.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.26.1)
       rubocop (~> 1.61)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.26.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
@@ -295,7 +292,6 @@ 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)
@@ -304,9 +300,9 @@ GEM
       tty-screen (~> 0.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.18)
     zlib (2.1.1)
 
 PLATFORMS

data/lib/eac_tools/version.rb

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

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

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'avm', '~> 0.94'
   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_gem_support', '~> 0.10'
   s.add_dependency 'eac_ruby_utils', '~> 0.122'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.10'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/add_or_replace_gem_line.rb

@@ -8,13 +8,20 @@ module Avm
       class Gemspec
         class AddOrReplaceGemLine
           enable_method_class
-          common_constructor :sender, :gem_name, :gem_specs
+          common_constructor :sender, :gem_name, :gem_specs, :dependency_type do
+            self.dependency_type = ::Avm::EacRubyBase1::Rubygems::Gemspec::Dependency.lists.type
+                                     .value_validate!(dependency_type)
+          end
           delegate :lines, to: :sender
 
-          DEPENDENCY_PREFIX = '  s.add_dependency'
+          DEPENDENCY_PREFIX = '  s.add%<dependency_type>s_dependency \'%<gem_name>s\''
 
+          # @return [Integer]
           def existing_gem_line_index
-            lines.index { |line| line.start_with?(gem_line_prefix) }
+            lines.index do |line|
+              ::Avm::EacRubyBase1::Rubygems::Gemspec::DEPENDENCY_LINE_PARSER.parse(line)
+                .if_present(&:first) == gem_name
+            end
           end
 
           def result
@@ -36,16 +43,18 @@ module Avm
             lines.count
           end
 
+          # @return [Integer]
           def gems_lines_start_index
-            lines.index { |line| line.start_with?(DEPENDENCY_PREFIX) } || lines.count
+            existing_gem_line_index || (lines.count - 1)
           end
 
           def new_gem_line
             ([gem_line_prefix] + quoted_gem_specs).join(', ')
           end
 
+          # @return [String]
           def gem_line_prefix
-            "#{DEPENDENCY_PREFIX} '#{gem_name}'"
+            format(DEPENDENCY_PREFIX, { dependency_type: dependency_type, gem_name: gem_name })
           end
 
           def replace_line

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/rubygems/gemspec/dependency.rb

@@ -16,7 +16,7 @@ module Avm
           end
 
           def version_specs=(version_specs)
-            gemspec.add_or_replace_gem_line(gem_name, version_specs)
+            gemspec.add_or_replace_gem_line(gem_name, version_specs, type)
           end
         end
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.35.0'
+    VERSION = '0.35.1'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/rubygems/gemspec'
+
+RSpec.describe Avm::EacRubyBase1::Rubygems::Gemspec do
+  let(:gemspec_path) { fixtures_directory.join('the_gem.gemspec') }
+
+  include_examples 'source_target_fixtures', __FILE__
+
+  # @return [Avm::EacRubyBase1::Rubygems::Gemspec]
+  def new_gemspec
+    described_class.from_file(gemspec_path)
+  end
+
+  # @return [String]
+  def source_data(file)
+    EacRubyUtils::Yaml.load_file(file).each_with_object(new_gemspec) do |e, a|
+      a.dependency(e.fetch(0)).version_specs = e.fetch(1)
+    end.to_text
+  end
+
+  # @return [String]
+  def target_data(target_file)
+    target_file.to_pathname.read
+  end
+
+  # @param data [String]
+  # @return [String]
+  def target_content(data)
+    data
+  end
+
+  # @return [String]
+  def target_file_extname
+    '.txt'
+  end
+end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/changes1.source.yaml

@@ -0,0 +1,5 @@
+---
+avm: ['~> 1.0', '>= 1.0.5']
+eac_envs-http: ['~> 0.5', '>= 0.5.1']
+eac_ruby_gem_support: ['> 0.5']
+avm-eac_generic_base0: ['1.0.0']

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/changes1.target.txt

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |s|
+  s.name        = 'the_gem'
+  s.version     = '0.0.0'
+
+  s.required_ruby_version = '>= 2.7'
+
+  s.add_dependency 'avm', '~> 1.0', '>= 1.0.5'
+  s.add_dependency 'avm-eac_generic_base0', '1.0.0'
+  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.5'
+end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/the_gem.gemspec

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |s|
+  s.name        = 'the_gem'
+  s.version     = '0.0.0'
+
+  s.required_ruby_version = '>= 2.7'
+
+  s.add_dependency 'avm', '~> 0.94'
+  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/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec.rb

@@ -3,8 +3,9 @@
 require 'avm/eac_ruby_base1/rubygems/version_file'
 
 RSpec.describe Avm::EacRubyBase1::Rubygems::VersionFile do
-  let(:stubs_dir) { Pathname.new(__dir__).join('version_file_spec_files') }
-  let(:stub_file) { stubs_dir.join('a_version_file.rb') }
+  include_context 'spec_paths', __FILE__
+
+  let(:stub_file) { fixtures_directory.join('a_version_file.rb') }
   let(:instance) { described_class.new(stub_file) }
   let(:target_version) { Gem::Version.new('0.69.1') }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.95.0
+  version: 0.96.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-25 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -256,6 +259,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -324,20 +330,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.162'
-- !ruby/object:Gem::Dependency
-  name: eac_ruby_gem_support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -481,6 +473,10 @@ files:
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/launcher_stereotypes/base_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/preferred_version_requirements_spec.rb
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec.rb
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/changes1.source.yaml
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/changes1.target.txt
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/gemspec_spec_files/the_gem.gemspec
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec_files/a_version_file.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec.rb