avm-eac_ruby_base1 0.32.1 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 789c1286e939fea7eaec5d9840fdcdd08e7fb95b1878a07a4778e34cad1658b0
-  data.tar.gz: 15331da0f7215694e7641414f0f2ce371f1b6c7abc029fa8782f4c4b3e9373fa
+  metadata.gz: e07ebc8e6c013cdf5c62b2e5d4a1b669d695f60811c6505f546bb519debfae70
+  data.tar.gz: 515fbb01e99c1f952119cc38dfc388dd9fff5adfee60c2f21fad95430e0d0dcf
 SHA512:
-  metadata.gz: 22103d338d843d4fc4de1281d74b09b591e00d218c19d076a01bd1ca9116aec6a226f86aab95302d85fa5d841e6d8729236599a039a36aa2e1efac0675ea61bd
-  data.tar.gz: 247d13c01bb3bb1afe1502465b57aa34897d28ff78391fa4d34991299b689e4aeac51f3493e9b64e5d40329d6585a267e1c71d0ed746c8a43dbc026bd298b471
+  metadata.gz: da54bfb57b044b97e672a6d8c3ffe666f840884b3ebae551135ec2efe694bc7e0178eed2022a987f2545388b7c91be4f4551b83b23f36301b6ba8b4367c40525
+  data.tar.gz: d9c6210d9852c45f7fb9257e20be769a877e55979f067199aa709d69d778d0a8785fadc94dc9059b029f8253f31a17dacd2cebe359db3940d13f31dd228db321

data/lib/avm/eac_ruby_base1/launcher/gem/build.rb

@@ -104,8 +104,8 @@ module Avm
             end
           end
 
-          def on_clean_ruby
-            on_clear_envvars('BUNDLE', 'RUBY') { yield }
+          def on_clean_ruby(&block)
+            on_clear_envvars('BUNDLE', 'RUBY', &block)
           end
 
           def on_clear_envvars(*start_with_vars)

data/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish.rb

@@ -59,7 +59,7 @@ module Avm
 
           def version_unpublished_check_result
             ::Avm::Launcher::Publish::CheckResult.pending("#{gem_spec.full_name} not found " \
-                'in RubyGems')
+                                                          'in RubyGems')
           end
 
           def source_uncached

data/lib/avm/eac_ruby_base1/rubocop/gemfile.rb

@@ -33,7 +33,8 @@ module Avm
         def find_gem(path)
           r = ::Avm::EacRubyBase1::Sources::Base.new(path)
           return r if r.gemfile_path.exist?
-          return find_gem(path.dirname) unless path.root?
+
+          find_gem(path.dirname) unless path.root?
         end
       end
     end

data/lib/avm/eac_ruby_base1/rubygems/gemspec.rb

@@ -25,7 +25,7 @@ module Avm
 
         # @return [Array<Avm::EacRubyBase1::Bundler::Gemfile::Dependency>]
         def dependencies
-          lines.lazy.map { |line| DEPENDENCY_LINE_PARSER.parse(line) }.reject(&:blank?)
+          lines.lazy.map { |line| DEPENDENCY_LINE_PARSER.parse(line) }.compact_blank
             .map { |gem_name| dependency(gem_name) }.to_a
         end
 

data/lib/avm/eac_ruby_base1/source_generators/base/options.rb

@@ -10,11 +10,11 @@ module Avm
         module Options
           common_concern
 
-          GEMFILE_LOCK_OPTION = 'gemfile-lock'.to_sym
+          GEMFILE_LOCK_OPTION = :'gemfile-lock'
 
           OPTIONS = {
-            'eac-ruby-utils-version'.to_sym => 'Version for "eac_ruby_utils" gem.',
-            'eac-ruby-gem-support-version'.to_sym => 'Version for "eac_ruby_gem_support" gem.',
+            :'eac-ruby-utils-version' => 'Version for "eac_ruby_utils" gem.',
+            :'eac-ruby-gem-support-version' => 'Version for "eac_ruby_gem_support" gem.',
             GEMFILE_LOCK_OPTION => 'Run "bundle install" at the end'
           }.freeze
 

data/lib/avm/eac_ruby_base1/source_generators/base.rb

@@ -44,7 +44,7 @@ module Avm
 
         def root_module_close
           root_module_components.count.times.map do |index|
-            (IDENT * index) + 'end'
+            "#{IDENT * index}end"
           end.reverse.join("\n")
         end
 
@@ -54,7 +54,7 @@ module Avm
 
         def root_module_open
           root_module_components.each_with_index.map do |component, index|
-            (IDENT * index) + 'module ' + component
+            "#{IDENT * index}module #{component}"
           end.join("\n")
         end
 

data/lib/avm/eac_ruby_base1/sources/base/bundler.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'addressable'
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/base/bundle_command'
 require 'avm/eac_ruby_base1/sources/bundle_update'
@@ -12,6 +13,9 @@ module Avm
         module Bundler
           CONFIGURED_GEMFILE_PATH_ENTRY_KEY = 'ruby.gemfile_path'
           DEFAULT_GEMFILE_PATH = 'Gemfile'
+          GEMFILE_SOURCE_PARSER = /^\s*source\s+['"]([^'"]+)['"]$/.to_parser do |m|
+            ::Addressable::URI.parse(m[1])
+          end
 
           # @return [Avm::EacRubyBase1::Sources::Base::BundleCommand]
           def bundle(*args)
@@ -52,6 +56,11 @@ module Avm
           def gemfile_path
             path.join(configured_gemfile_path || default_gemfile_path)
           end
+
+          # @return [Addressable::URI]
+          def gemfile_source
+            GEMFILE_SOURCE_PARSER.parse!(gemfile_path.read)
+          end
         end
       end
     end

data/lib/avm/eac_ruby_base1/sources/base/rubocop_command.rb

@@ -56,7 +56,8 @@ module Avm
 
           # @return [Array<String>]
           def rubocop_command_args
-            r = ['--config', source.rubocop_config_path]
+            r = []
+            r += ['--config', source.rubocop_config_path] if source.rubocop_config_path.file?
             r << ignore_parent_exclusion_option if ignore_parent_exclusion?
             if autocorrect_all?
               r << autocorrect_all_option

data/lib/avm/eac_ruby_base1/sources/namespace_replacer.rb

@@ -45,7 +45,7 @@ module Avm
           parts.each_with_index do |_part, index|
             tabc = (parts.count - 1 - index)
             tabc -= 1 if index.zero?
-            s += ('  ' * tabc) + "end\n"
+            s += "#{'  ' * tabc}end\n"
           end
           s
         end

data/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb

@@ -52,10 +52,9 @@ module Avm
             end
 
             def sibling_gemfile_local_line(sibling)
-              ["gem '#{sibling.gem_name}'",
-               "path: ::File.expand_path('" +
-                 sibling.path.relative_path_from(the_source.path).to_path +
-                 "', __dir__)",
+              ["gem '#{sibling.gem_name}'", # rubocop:disable Style/StringConcatenation
+               ["path: ::File.expand_path('",
+                sibling.path.relative_path_from(the_source.path).to_path, "', __dir__)"].join,
                'require: false'].join(', ') + "\n"
             end
 

data/lib/avm/eac_ruby_base1/sources/runners/bundler/incompatible.rb

@@ -54,7 +54,7 @@ module Avm
             end
 
             def print_requirement(req)
-              infov '  ' + requirement_title(req), requirement_value(req)
+              infov "  #{requirement_title(req)}", requirement_value(req)
             end
 
             def requirement_stack(req)

data/lib/avm/eac_ruby_base1/sources/tests/multiple/decorated_gem.rb

@@ -18,7 +18,7 @@ module Avm
 
               unless can_remove_gemfile_lock?
                 raise '"bundle install" failed and the Gemfile.lock is part of gem' \
-                  '(Should be changed by developer)'
+                      '(Should be changed by developer)'
               end
 
               prepare_with_removable_gemfile_lock
@@ -42,7 +42,7 @@ module Avm
             end
 
             def can_remove_gemfile_lock?
-              !files.include?(gemfile_lock_path.relative_path_from(root))
+              files.exclude?(gemfile_lock_path.relative_path_from(root))
             end
           end
         end

data/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -29,7 +29,7 @@ module Avm
         def format_gemspec
           source.rubocop_command.ignore_parent_exclusion(true).autocorrect(true)
             .file(source.gemspec_path)
-            .execute!(exit_outputs: RUBOCOP_OK_CODES.map { |k| [k, nil] }.to_h)
+            .execute!(exit_outputs: RUBOCOP_OK_CODES.index_with { |_k| nil })
         end
 
         # @return [Array<String>]

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.32.1'
+    VERSION = '0.33.1'
   end
 end

data/template/avm/eac_ruby_base1/source_generators/base/gemspec.template

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = 'Put here de description.'
 
   s.files = Dir['{lib}/**/*']
+  s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'eac_ruby_utils', %%EAC_RUBY_UTILS_VERSION%%
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '0.84'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '0.84'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -124,14 +124,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.9'
 description: 
 email: 
 executables: []
@@ -238,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="