avm-eac_ruby_base1 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 047b53c01e9863005516d56747f17c0b404f1045ad84c0b87608c0ad4256019d
-  data.tar.gz: 74bb4e7007c935f345242e36bd2d5c0aa438939322d59250cbbeaaf26b5bd804
+  metadata.gz: 42b5ed9a16e526fbd2e4e03b6f28a89e346698007a415eb39b384476239da683
+  data.tar.gz: 439905a596f9ed1a84443cf6dacc626ad4cb52edfd77ce3ce1b9f982ec881dd7
 SHA512:
-  metadata.gz: 853d612a021dabb3920c9de969719cad348714a8fb11e3f542abb2cdbcbfe5f5d3caba34ebf572a9ca78c58765487d81d59621c5aca42b9d2d0da46188095c0a
-  data.tar.gz: 4dc164a18cb11760acaba38b13f9bea3d8515054fec6c76cf777ba8e6d77bd5799b75de1b29c30eef2099635ff8609394a73bcc100497061c02198e95fb41632
+  metadata.gz: fa5110db78281c59aa10cca7c2a6b6407e99a9b21fe83bc21b3bbb84ec09dce2b111c050b13781946e3a47ae11b19d797f7c9ee3083b890b3c25665da8cf77d8
+  data.tar.gz: a9421a0a55d975bb6421fc830d85c72d28826653efa325c09623f3747bb7b9b504d880f1a641949c88fef949c957ced90c42da360241348c0d6b729ba9806a1f

data/lib/avm/eac_ruby_base1/bundler/gemfile/add_or_replace_gem_line.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Bundler

data/lib/avm/eac_ruby_base1/bundler/gemfile/dependency.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Bundler

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Bundler

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

@@ -1,8 +1,5 @@
 # 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

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

@@ -1,8 +1,5 @@
 # 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

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

@@ -1,8 +1,5 @@
 # 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

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

@@ -1,9 +1,5 @@
 # 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

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

@@ -1,12 +1,5 @@
 # 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

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Bundler

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

@@ -1,8 +1,5 @@
 # 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

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

@@ -1,8 +1,5 @@
 # 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

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Bundler

data/lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/file_formats/base'
-require 'avm/eac_ruby_base1/rubocop'
-
 module Avm
   module EacRubyBase1
     module FileFormats

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/file_formats/base'
 require 'avm/eac_ruby_base1/rubocop'
 
 module Avm

data/lib/avm/eac_ruby_base1/instances/mixin.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Instances

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

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require 'tmpdir'
-require 'eac_cli/speaker'
-require 'eac_ruby_utils/envs'
-require 'avm/launcher/paths/real'
-require 'avm/eac_ruby_base1/launcher/gem/specification'
-
 module Avm
   module EacRubyBase1
     module Launcher

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/object'
-
 module Avm
   module EacRubyBase1
     module Launcher

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/sources/base'
-require 'avm/version_number'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module LauncherStereotypes

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

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/simple_cache'
-require 'rubygems'
-require 'eac_cli/speaker'
-require 'avm/eac_ruby_base1/rubygems/remote'
-require 'avm/launcher/publish/base'
-require 'avm/launcher/publish/check_result'
-require 'avm/eac_ruby_base1/launcher/gem'
-
 module Avm
   module EacRubyBase1
     module LauncherStereotypes

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/stereotype'
-require 'avm/eac_ruby_base1/launcher/gem/specification'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module LauncherStereotypes

data/lib/avm/eac_ruby_base1/preferred_version_requirements.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/version_number'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     class PreferredVersionRequirements

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'avm/eac_ruby_base1/rspec/source_generator'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRubyBase1

data/lib/avm/eac_ruby_base1/rspec/source_generator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Rspec

data/lib/avm/eac_ruby_base1/rspec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Rspec

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/sources/configuration'
-
 module Avm
   module EacRubyBase1
     class Rubocop

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     class Rubocop

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/sources/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     class Rubocop

data/lib/avm/eac_ruby_base1/rubocop.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/ruby/on_clean_environment'
-
 module Avm
   module EacRubyBase1
     class Rubocop

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

@@ -1,20 +1,25 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Rubygems
       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 +41,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/lib/avm/eac_ruby_base1/rubygems/gemspec/dependency.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Rubygems
@@ -16,7 +14,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/lib/avm/eac_ruby_base1/rubygems/gemspec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Rubygems

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-require 'eac_envs/http/request'
-
 module Avm
   module EacRubyBase1
     module Rubygems

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Rubygems

data/lib/avm/eac_ruby_base1/rubygems.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Rubygems

data/lib/avm/eac_ruby_base1/runners/base/lib_rename.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_cli/core_ext'
-require 'avm/eac_ruby_base1/sources/namespace_replacer'
-
 module Avm
   module EacRubyBase1
     module Runners

data/lib/avm/eac_ruby_base1/runners/base/rubocop.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/rubocop'
-require 'eac_cli/core_ext'
-
 module Avm
   module EacRubyBase1
     module Runners

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/runners/base'
-
 module Avm
   module EacRubyBase1
     module Runners

data/lib/avm/eac_ruby_base1/runners.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Runners

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/source_generators/base/version_builder'
-require 'avm/source_generators/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module SourceGenerators

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/source_generators/base/options'
-require 'avm/source_generators/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module SourceGenerators

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/source_generators/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module SourceGenerators

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        module RootModule
+          def root_module
+            lib_path.camelize
+          end
+
+          def root_module_close
+            root_module_components.count.times.map do |index|
+              "#{IDENT * index}end"
+            end.reverse.join("\n")
+          end
+
+          def root_module_inner_identation
+            IDENT * root_module_components.count
+          end
+
+          def root_module_open
+            root_module_components.each_with_index.map do |component, index|
+              "#{IDENT * index}module #{component}"
+            end.join("\n")
+          end
+
+          def root_module_components
+            root_module.split('::')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/source_generators/base'
-require 'avm/eac_ruby_base1/rubygems/remote'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module SourceGenerators

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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_ruby_base1/sources/base'
-require 'avm/source_generators/base'
-require 'eac_templates/core_ext'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module SourceGenerators
@@ -54,30 +49,6 @@ module Avm
           name.split('-').join('/')
         end
 
-        def root_module
-          lib_path.camelize
-        end
-
-        def root_module_close
-          root_module_components.count.times.map do |index|
-            "#{IDENT * index}end"
-          end.reverse.join("\n")
-        end
-
-        def root_module_inner_identation
-          IDENT * root_module_components.count
-        end
-
-        def root_module_open
-          root_module_components.each_with_index.map do |component, index|
-            "#{IDENT * index}module #{component}"
-          end.join("\n")
-        end
-
-        def root_module_components
-          root_module.split('::')
-        end
-
         protected
 
         def generate_gemspec

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/sources/base'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/ruby/command'
-
 module Avm
   module EacRubyBase1
     module Sources

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

@@ -1,10 +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'
-require 'eac_ruby_utils/core_ext'
 
 module Avm
   module EacRubyBase1

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/sources/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Sources

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

@@ -1,10 +1,5 @@
 # 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

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/sources/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Sources

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/sources/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Sources

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/sources/base'
-require 'avm/sources/update_error'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Sources

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Sources

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'avm/eac_generic_base0/sources/base'
-require 'eac_ruby_utils/core_ext'
-
 module Avm
   module EacRubyBase1
     module Sources