avm-eac_ruby_base1 0.33.2 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb9953ef8eb61c9805e7ec553a2f7d9337c505b9b0ddb07d82e837cd3c0d928
-  data.tar.gz: ecdff3c27a2078416f3a888a0838af86f0fa1d72d05e15b513f572abba624976
+  metadata.gz: ba1b2ccbba6af68c7a620b57f52799eab587b01c612b4a469bbd755e0506652b
+  data.tar.gz: dc698a77abe634b26197ceb28241a15988d99c45bcd2d130c3b3a60ed2e2507d
 SHA512:
-  metadata.gz: 8156b5a96757b7102ed5dbba4ed565b14e9ef4a0b28cbb27f77b5866131fc923a156f18ef2f708f25874f57cdef25784c1b8d66cf2940533713f20d744d9c83f
-  data.tar.gz: 6fb495664de6628608090b06d8f87b2520bcdc0a5e0e14840c29acb7f6676aa82cf53f00d1e46bd6b0b44aff3df352ea12297aada2f7ca64765b248433040218
+  metadata.gz: 6203de727473926431355e4e945198b91a3566163649ed1fda516a0f8be0f273aab3de661cc7bc782cdafa457d2bae10e801fa60f99924a2327870f7244cd80b
+  data.tar.gz: 5fdf7b83ea6cb8c8113cb84357d3c8a571f539aed4bc6d9cbfb2a1f0114d368a8e01cc7fb4d87192b1c147a9a9dc2e9a6bb22b15d2a393c4b177d8a7d512ba78

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

@@ -14,7 +14,7 @@ module Avm
 
         def internal_apply(files)
           ::Avm::EacRubyBase1::Rubocop.new('.', ['-a', '--ignore-parent-exclusion'] + files).run
-          super(files)
+          super
         end
       end
     end

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

@@ -3,11 +3,10 @@
 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'
-require 'eac_envs/http/request'
-require 'eac_envs/http/response'
 
 module Avm
   module EacRubyBase1
@@ -98,16 +97,17 @@ module Avm
           end
 
           # @return [Array]
-          def gem_versions_uncached
-            ::EacEnvs::Http::Request.new
-              .url("https://rubygems.org/api/v1/versions/#{gem_spec.name}.json")
-              .response.body_data_or_raise
-          rescue EacEnvs::Http::Response => e
-            e.status == 404 ? [] : raise(e)
+          def gem_versions
+            remote_gem.versions
           end
 
-          def gem_version_max_uncached
-            gem_versions.map { |v| ::Gem::Version.new(v['number']) }.max
+          def gem_version_max
+            remote_gem.maximum_number
+          end
+
+          # @return [Avm::EacRubyBase1::Rubygems::Remote]
+          def remote_gem_uncached
+            ::Avm::EacRubyBase1::Rubygems::Remote.new(gem_spec.name)
           end
 
           def push_gem

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_envs/http/request'
+
+module Avm
+  module EacRubyBase1
+    module Rubygems
+      class Remote
+        enable_simple_cache
+        common_constructor :name
+
+        # @return [Gem::Version, nil]
+        def maximum_number
+          numbers.max.if_present { |v| ::Gem::Version.new(v) }
+        end
+
+        # @return [Array<Gem::Version>]
+        def numbers
+          versions.map { |v| ::Gem::Version.new(v.fetch('number')) }
+        end
+
+        protected
+
+        # @return [Array<Hash>]
+        def versions_uncached
+          ::EacEnvs::Http::Request.new
+            .url("https://rubygems.org/api/v1/versions/#{name}.json")
+            .response.body_data_or_raise
+        rescue EacEnvs::Http::Response => e
+          e.status == 404 ? [] : raise(e)
+        end
+      end
+    end
+  end
+end

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

@@ -9,17 +9,53 @@ module Avm
     module SourceGenerators
       class Base < ::Avm::SourceGenerators::Base
         module Dependencies
-          def eac_ruby_gem_support_version
-            dependency_version('eac_ruby_gem_support')
+          common_concern
+
+          COMMON_DEPENDENCY_GEMS = %w[eac_ruby_utils].freeze
+          DEVELOPMENT_DEPENDENCY_GEMS = %w[eac_ruby_gem_support].freeze
+
+          module ClassMethods
+            # @return [Array<String>]
+            def common_dependency_gems
+              COMMON_DEPENDENCY_GEMS
+            end
+
+            # @return [Array<String>]
+            def development_dependency_gems
+              DEVELOPMENT_DEPENDENCY_GEMS
+            end
           end
 
-          def eac_ruby_utils_version
-            dependency_version('eac_ruby_utils')
+          # @return [String]
+          def common_dependencies
+            dependencies_section(:common_dependency_gems, '')
           end
 
           def dependency_version(gem_name)
             ::Avm::EacRubyBase1::SourceGenerators::Base::VersionBuilder.new(gem_name, options).to_s
           end
+
+          # @return [String]
+          def development_dependencies
+            dependencies_section(:development_dependency_gems, 'development_')
+          end
+
+          protected
+
+          # @param gem_name [String]
+          # @param prefix [String]
+          # @return [String]
+          def dependency_line(gem_name, prefix)
+            "#{IDENT}s.add_#{prefix}dependency '#{gem_name}', #{dependency_version(gem_name)}\n"
+          end
+
+          # @param setting_key [Symbol]
+          # @param prefix [String]
+          # @return [String]
+          def dependencies_section(gems_method, prefix)
+            self.class.send(gems_method).sort.map { |gem_name| dependency_line(gem_name, prefix) }
+              .join.rstrip
+          end
         end
       end
     end

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

@@ -13,14 +13,19 @@ module Avm
           GEMFILE_LOCK_OPTION = :'gemfile-lock'
 
           OPTIONS = {
-            :'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
 
           module ClassMethods
             def option_list
-              OPTIONS.inject(super) { |a, e| a.option(*e) }
+              OPTIONS.merge(dependency_version_options).inject(super) { |a, e| a.option(*e) }
+            end
+
+            # @return [Hash<Symbol, String>]
+            def dependency_version_options
+              (common_dependency_gems + development_dependency_gems).sort.to_h do |gem_name|
+                ["#{gem_name}_version".dasherize.to_sym, "Version for \"#{gem_name}\" gem."]
+              end
             end
           end
         end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/source_generators/base'
+require 'avm/eac_ruby_base1/rubygems/remote'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -19,7 +20,7 @@ module Avm
 
           # @return [Gem::Version]
           def version
-            options_version || default_version
+            options_version || loaded_version || maximum_version
           end
 
           def two_segments
@@ -32,12 +33,21 @@ module Avm
 
           private
 
+          # @return [Gem::Version]
+          def maximum_version
+            r = ::Avm::EacRubyBase1::Rubygems::Remote.new(gem_name).maximum_number
+            return ::Gem::Version.new(r) if r.present?
+
+            raise "None version found for gem \"#{gem_name}\""
+          end
+
           def segments_uncached
             version.release.to_s.split('.').map(&:to_i)
           end
 
-          def default_version
-            ::Gem.loaded_specs[gem_name].version
+          # @return [Gem::Version, nil]
+          def loaded_version
+            ::Gem.loaded_specs[gem_name].if_present(&:version)
           end
 
           def options_version

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

@@ -9,33 +9,49 @@ module Avm
   module EacRubyBase1
     module SourceGenerators
       class Base < ::Avm::SourceGenerators::Base
+        GEMSPEC_FILES_DIRECTORY_PATHS = %w[lib].freeze
+        GEMSPEC_FILES_FILE_PATHS = [].freeze
         IDENT = '  '
-        JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
+        JOBS = %w[gemspec root_lib version_lib gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
 
         enable_speaker
         enable_simple_cache
         require_sub __FILE__, include_modules: true
 
-        def root_directory
-          target_path
+        # @return [String]
+        def gemspec_extra
+          gemspec_extra_lines.map { |line| "\n#{IDENT}#{line}" }.join
         end
 
-        def name
-          root_directory.basename.to_s
+        # @return [Array<String>]
+        def gemspec_extra_lines
+          []
         end
 
-        def lib_path
-          name.split('-').join('/')
+        # @return [String]
+        def gemspec_files_value
+          "Dir[#{gemspec_files_paths.map { |path| "'#{path}'" }.join(', ')}]"
         end
 
-        def perform
-          infov 'Root directory', root_directory
-          infov 'Gem name', name
-          JOBS.each do |job|
-            infom "Generating #{job.humanize}..."
-            send("generate_#{job}")
-          end
+        # @return [Array<String>]
+        def gemspec_files_paths
+          ["{#{gemspec_files_directory_paths.sort.join(',')}}/**/*"] +
+            gemspec_files_file_paths.sort
+        end
+
+        # @return [Array<String>]
+        def gemspec_files_directory_paths
+          GEMSPEC_FILES_DIRECTORY_PATHS
+        end
+
+        # @return [Array<String>]
+        def gemspec_files_file_paths
+          GEMSPEC_FILES_FILE_PATHS
+        end
+
+        def lib_path
+          name.split('-').join('/')
         end
 
         def root_module
@@ -64,46 +80,31 @@ module Avm
 
         protected
 
-        def apply_to_root_directory(template, subpath)
-          if template.is_a?(::EacTemplates::Variables::Directory)
-            template.children.each do |child|
-              apply_to_root_directory(child, subpath.join(child.basename))
-            end
-          elsif template.is_a?(::EacTemplates::Variables::File)
-            template.apply_to_file(template_variables, root_directory.join(subpath))
-          else
-            raise "Unknown template object: #{template}"
-          end
-        end
-
         def generate_gemspec
           template_apply('gemspec', "#{name}.gemspec")
         end
 
-        def generate_root_directory
-          root_directory.mkpath
-        end
-
         def generate_root_lib
           template_apply('root_lib', "lib/#{lib_path}.rb")
         end
 
-        def generate_static
-          template.child('static').apply(self, root_directory)
-        end
-
         def generate_version_lib
           template_apply('version', "lib/#{lib_path}/version.rb")
         end
 
+        # @return [EacTemplates::Modules::Base]
+        def root_template
+          template.child('static')
+        end
+
         def self_gem_uncached
-          ::Avm::EacRubyBase1::Sources::Base.new(root_directory)
+          ::Avm::EacRubyBase1::Sources::Base.new(target_path)
         end
 
         def template_apply(from, to)
-          target = root_directory.join(to)
+          target = target_path.join(to)
           target.dirname.mkpath
-          template.child("#{from}.template").apply_to_file(self, target.to_path)
+          template.child(from).apply_to_file(self, target.to_path)
         end
       end
     end

data/lib/avm/eac_ruby_base1/sources/gemfile_local/sibling.rb

@@ -29,7 +29,7 @@ module Avm
 
           # @return [String]
           def condition_content
-            "::File.directory?('#{gemspec_relative_path}')"
+            "::File.file?(::File.expand_path('#{gemspec_relative_path}', __dir__))"
           end
 
           # @return [String]

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.33.2'
+    VERSION = '0.34.1'
   end
 end

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

@@ -10,10 +10,10 @@ Gem::Specification.new do |s|
   s.authors     = ['Put here the authors']
   s.summary     = 'Put here de description.'
 
-  s.files = Dir['{lib}/**/*']
-  s.required_ruby_version = '>= 2.7'
+  s.files = %%gemspec_files_value%%
+  s.required_ruby_version = '>= 2.7'%%gemspec_extra%%
 
-  s.add_dependency 'eac_ruby_utils', %%EAC_RUBY_UTILS_VERSION%%
+%%COMMON_DEPENDENCIES%%
 
-  s.add_development_dependency 'eac_ruby_gem_support', %%EAC_RUBY_GEM_SUPPORT_VERSION%%
+%%DEVELOPMENT_DEPENDENCIES%%
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.33.2
+  version: 0.34.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.91'
+        version: '0.92'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.91'
+        version: '0.92'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - lib/avm/eac_ruby_base1/rubygems/gemspec.rb
 - lib/avm/eac_ruby_base1/rubygems/gemspec/add_or_replace_gem_line.rb
 - lib/avm/eac_ruby_base1/rubygems/gemspec/dependency.rb
+- lib/avm/eac_ruby_base1/rubygems/remote.rb
 - lib/avm/eac_ruby_base1/rubygems/version_file.rb
 - lib/avm/eac_ruby_base1/runners.rb
 - lib/avm/eac_ruby_base1/runners/base.rb