avm-eac_ruby_base1 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ae62e6c56b3147b5493e2a19b97f3cb63bd154ab23e4d99e9b0d6a547d869c
-  data.tar.gz: 2f356b0212eb18e5446f7df71fb71bd926b23d95dae0871ef6a133f1505f05c2
+  metadata.gz: d57127a12221d5e41acf09b5aec5a42c8b88b2d3f510964987bdd4c9fcd21755
+  data.tar.gz: 514710819de15df2bb927f2dd5aef318625747e456db4a8aa59a93b171ba3b0d
 SHA512:
-  metadata.gz: 4eb7765d286489a78af0e7d9da4faa191c84ff1d3ae4384a8a6961186cc41570211fcac198730ea64c140cfb521d61de712e0235582000f9c27c5079e1e2db00
-  data.tar.gz: b11b9eefca718ce69ff54a4c7dc6bd8ca530ddbdbab66cec902d7725566f26b785694fb64b2061d45824324f95bb2594977356d51e82b00b0e5ea3832348b27c
+  metadata.gz: 5d241acfa1baac7b6a0526cc6b29b03bf4a5b1cd285f94218ca4f084e4ace8dad266317513f24aab4dd9754945af9c13d35de2645e3c0848bbc168be6d6e4621
+  data.tar.gz: 4061030c7f2137fde8d11eab96c73d8d3f38c5dd3e70a0ebf23a6eced838606c32384548f68f8b7134e25ba304f88811a6370ff2dd882070e97382ac40256d59

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb

@@ -56,6 +56,10 @@ module Avm
             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

data/lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb

@@ -4,13 +4,15 @@ 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, VersionRequirement].freeze
+          TYPES = [GemConflict, InGemfile, DependsOn, RubyRequirement, VersionRequirement].freeze
 
           enable_simple_cache
           common_constructor :content do

data/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/lib/avm/eac_ruby_base1/sources/base/rubocop.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'avm/eac_ruby_base1/sources/base/bundle_command'
+require 'avm/eac_ruby_base1/sources/bundle_update'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module Rubocop
+          RUBOCOP_CONFIG_SUBPATH = '.rubocop.yml'
+
+          # @return [Avm::EacRubyBase1::Sources::Base::RubocopCommand]
+          def rubocop_command
+            ::Avm::EacRubyBase1::Sources::Base::RubocopCommand.new(self)
+          end
+
+          # @return [Pathname]
+          def rubocop_config_path
+            path.join(RUBOCOP_CONFIG_SUBPATH)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        class RubocopCommand
+          acts_as_immutable
+          immutable_accessor :ignore_parent_exclusion, :autocorrect, :autocorrect_all,
+                             type: :boolean
+          immutable_accessor :file, type: :array
+          common_constructor :source
+          delegate :execute, :execute!, :system, :system!, to: :bundle_command
+
+          # @return [Enumerable]
+          def immutable_constructor_args
+            [source]
+          end
+
+          # @return [Gemspec::Version]
+          def version
+            @version ||= ::Gemspec::Version.new(
+              source.bundle('exec', 'rubocop', '--version').execute!
+            )
+          end
+
+          private
+
+          # @return [String]
+          def autocorrect_option
+            '--auto-correct'
+          end
+
+          # @return [String]
+          def autocorrect_all_option
+            '--auto-correct-all'
+          end
+
+          # @return [String]
+          def ignore_parent_exclusion_option
+            '--ignore-parent-exclusion'
+          end
+
+          # @return [Avm::EacRubyBase1::Sources::Base::BundleCommand]
+          def bundle_command
+            source.bundle(*bundle_command_args)
+          end
+
+          # @return [Array<String>]
+          def bundle_command_args
+            %w[exec rubocop] + rubocop_command_args
+          end
+
+          # @return [Array<String>]
+          def rubocop_command_args
+            r = ['--config', source.rubocop_config_path]
+            r << ignore_parent_exclusion_option if ignore_parent_exclusion?
+            if autocorrect_all?
+              r << autocorrect_all_option
+            elsif autocorrect?
+              r << autocorrect_option
+            end
+            r + files
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,11 @@ module Avm
                          __locale: source.locale)
         end
 
+        def format_gemspec
+          source.rubocop_command.ignore_parent_exclusion(true).autocorrect(true)
+            .file(source.gemspec_path).system!
+        end
+
         # @return [Array<String>]
         def requirements_list_uncached
           ::Avm::EacRubyBase1::PreferredVersionRequirements.new(
@@ -48,9 +53,7 @@ module Avm
         def update_gemspec
           gemspec.dependency(gem_name).version_specs = requirements_list
           gemspec.write(source.gemspec_path)
-          ::Avm::EacRubyBase1::Rubocop.new(
-            source.path, ['-a', '--ignore-parent-exclusion', source.gemspec_path]
-          ).run
+          format_gemspec
         end
       end
     end

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.31.1'
+    VERSION = '0.32.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: eac_envs-http
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +87,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +97,7 @@ dependencies:
         version: '0.119'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.119.1
+        version: 0.119.2
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +150,7 @@ files:
 - lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_buffer.rb
 - lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_factory.rb
 - lib/avm/eac_ruby_base1/bundler/incompatible_parser/line_parser_base.rb
+- lib/avm/eac_ruby_base1/bundler/incompatible_parser/ruby_requirement.rb
 - lib/avm/eac_ruby_base1/bundler/incompatible_parser/version_requirement.rb
 - lib/avm/eac_ruby_base1/file_formats.rb
 - lib/avm/eac_ruby_base1/file_formats/base.rb
@@ -180,6 +193,8 @@ files:
 - lib/avm/eac_ruby_base1/sources/base/bundle_command.rb
 - lib/avm/eac_ruby_base1/sources/base/bundler.rb
 - lib/avm/eac_ruby_base1/sources/base/rake.rb
+- lib/avm/eac_ruby_base1/sources/base/rubocop.rb
+- lib/avm/eac_ruby_base1/sources/base/rubocop_command.rb
 - lib/avm/eac_ruby_base1/sources/base/rubygems.rb
 - lib/avm/eac_ruby_base1/sources/base/update.rb
 - lib/avm/eac_ruby_base1/sources/base/version.rb