avm-eac_ruby_base1 0.26.2 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50d3e290a79623c49e2d1362bf5a9a6eb2ec11ef7aa6a40f587af62b7a1ba07
-  data.tar.gz: 4a47913bf5a63054902bf77ddaf22db5dae5ca00e2c600ef1be334ee15c2fdae
+  metadata.gz: 2b3b854eaf853b07f96b3d02f4b5be117ad42eaa1be073a4814db10050cbcf28
+  data.tar.gz: 6e55aac9c970addc0e24af9698c4c86e5fd3bbe76e020ef1cf651147985df0e1
 SHA512:
-  metadata.gz: 94fccc76a6d013aeb8f8308d4dc3456e5a0944718abf6c8b0813d0218fd1c105c1acbfabe3f29a3a40ec4dab38dca903a35428f822e63dc916423a24f8dd3780
-  data.tar.gz: c680b56e8102da02e95271ca20a9a20f9285d899892878757a4c2310a54cbcc8615562f1a019f91e1ee87187c75d63b96f501794a8231dd5d7baaf434d2cfd95
+  metadata.gz: 04bed57ade581e711bb79fe204189d450e12bdbd7bac22b845554eaf36879aadd812c9a86b064f9fc958404706346d8cbfb38a9f2afa0f48590b3eeb77596004
+  data.tar.gz: cc9b9d4de71a82ebd4049c4c61a70030784ce3dd68b41589842146ca3f0963d8adb2bed62f40beba9b0f60ff8e8e18b8d90777045a791aef6fba6fbfa8b73771

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

@@ -0,0 +1,27 @@
+# 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
+      class Base < ::Avm::SourceGenerators::Base
+        module Dependencies
+          def eac_ruby_gem_support_version
+            dependency_version('eac_ruby_gem_support')
+          end
+
+          def eac_ruby_utils_version
+            dependency_version('eac_ruby_utils')
+          end
+
+          def dependency_version(gem_name)
+            ::Avm::EacRubyBase1::SourceGenerators::Base::VersionBuilder.new(gem_name, options).to_s
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# 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
+      class Base < ::Avm::SourceGenerators::Base
+        module GemfileLock
+          def generate_gemfile_lock
+            return unless generate_gemfile_lock?
+
+            self_gem.bundle('install').chdir_root.execute!
+          end
+
+          # @return [Boolean]
+          def generate_gemfile_lock?
+            options[::Avm::EacRubyBase1::SourceGenerators::Base::Options::GEMFILE_LOCK_OPTION]
+              .to_bool
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        module Options
+          common_concern
+
+          GEMFILE_LOCK_OPTION = 'gemfile-lock'.to_sym
+
+          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.',
+            GEMFILE_LOCK_OPTION => 'Run "bundle install" at the end'
+          }.freeze
+
+          module ClassMethods
+            def option_list
+              OPTIONS.inject(super) { |a, e| a.option(*e) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        class VersionBuilder
+          enable_simple_cache
+          common_constructor :gem_name, :options
+
+          def to_s
+            r = "'~> #{two_segments}'"
+            r += ", '>= #{three_segments}'" if segments.count >= 3 && segments[2].positive?
+            r
+          end
+
+          # @return [Gem::Version]
+          def version
+            (options_version || default_version)
+          end
+
+          def two_segments
+            segments.first(2).join('.')
+          end
+
+          def three_segments
+            segments.first(3).join('.')
+          end
+
+          private
+
+          def segments_uncached
+            version.release.to_s.split('.').map(&:to_i)
+          end
+
+          def default_version
+            ::Gem.loaded_specs[gem_name].version
+          end
+
+          def options_version
+            options["#{gem_name}_version".dasherize.to_sym].if_present do |v|
+              ::Gem::Version.new(v)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,32 +12,15 @@ module Avm
         IDENT = '  '
         JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
-        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.'
-        }.freeze
 
         enable_speaker
         enable_simple_cache
-
-        class << self
-          def option_list
-            OPTIONS.inject(super) { |a, e| a.option(*e) }
-          end
-        end
+        require_sub __FILE__, include_modules: true
 
         def root_directory
           target_path
         end
 
-        def eac_ruby_gem_support_version
-          dependency_version('eac_ruby_gem_support')
-        end
-
-        def eac_ruby_utils_version
-          dependency_version('eac_ruby_utils')
-        end
-
         def name
           root_directory.basename.to_s
         end
@@ -93,18 +76,10 @@ module Avm
           end
         end
 
-        def dependency_version(gem_name)
-          VersionBuilder.new(gem_name, options).to_s
-        end
-
         def generate_gemspec
           template_apply('gemspec', "#{name}.gemspec")
         end
 
-        def generate_gemfile_lock
-          self_gem.bundle('install').chdir_root.execute!
-        end
-
         def generate_root_directory
           root_directory.mkpath
         end
@@ -130,46 +105,6 @@ module Avm
           target.dirname.mkpath
           template.child("#{from}.template").apply_to_file(self, target.to_path)
         end
-
-        class VersionBuilder
-          enable_simple_cache
-          common_constructor :gem_name, :options
-
-          def to_s
-            r = "'~> #{two_segments}'"
-            r += ", '>= #{three_segments}'" if segments.count >= 3 && segments[2].positive?
-            r
-          end
-
-          # @return [Gem::Version]
-          def version
-            (options_version || default_version)
-          end
-
-          def two_segments
-            segments.first(2).join('.')
-          end
-
-          def three_segments
-            segments.first(3).join('.')
-          end
-
-          private
-
-          def segments_uncached
-            version.release.to_s.split('.').map(&:to_i)
-          end
-
-          def default_version
-            ::Gem.loaded_specs[gem_name].version
-          end
-
-          def options_version
-            options["#{gem_name}_version".dasherize.to_sym].if_present do |v|
-              ::Gem::Version.new(v)
-            end
-          end
-        end
       end
     end
   end

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.26.2'
+    VERSION = '0.27.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.54'
+        version: '0.55'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.54'
+        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: '0.107'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.106'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.106.1
+        version: '0.107'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +134,10 @@ files:
 - lib/avm/eac_ruby_base1/runners/base/rubocop.rb
 - lib/avm/eac_ruby_base1/source_generators.rb
 - lib/avm/eac_ruby_base1/source_generators/base.rb
+- lib/avm/eac_ruby_base1/source_generators/base/dependencies.rb
+- lib/avm/eac_ruby_base1/source_generators/base/gemfile_lock.rb
+- lib/avm/eac_ruby_base1/source_generators/base/options.rb
+- lib/avm/eac_ruby_base1/source_generators/base/version_builder.rb
 - lib/avm/eac_ruby_base1/sources.rb
 - lib/avm/eac_ruby_base1/sources/base.rb
 - lib/avm/eac_ruby_base1/sources/base/bundle_command.rb