avm-eac_ruby_base1 0.33.1 → 0.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07ebc8e6c013cdf5c62b2e5d4a1b669d695f60811c6505f546bb519debfae70
-  data.tar.gz: 515fbb01e99c1f952119cc38dfc388dd9fff5adfee60c2f21fad95430e0d0dcf
+  metadata.gz: bfb9953ef8eb61c9805e7ec553a2f7d9337c505b9b0ddb07d82e837cd3c0d928
+  data.tar.gz: ecdff3c27a2078416f3a888a0838af86f0fa1d72d05e15b513f572abba624976
 SHA512:
-  metadata.gz: da54bfb57b044b97e672a6d8c3ffe666f840884b3ebae551135ec2efe694bc7e0178eed2022a987f2545388b7c91be4f4551b83b23f36301b6ba8b4367c40525
-  data.tar.gz: d9c6210d9852c45f7fb9257e20be769a877e55979f067199aa709d69d778d0a8785fadc94dc9059b029f8253f31a17dacd2cebe359db3940d13f31dd228db321
+  metadata.gz: 8156b5a96757b7102ed5dbba4ed565b14e9ef4a0b28cbb27f77b5866131fc923a156f18ef2f708f25874f57cdef25784c1b8d66cf2940533713f20d744d9c83f
+  data.tar.gz: 6fb495664de6628608090b06d8f87b2520bcdc0a5e0e14840c29acb7f6676aa82cf53f00d1e46bd6b0b44aff3df352ea12297aada2f7ca64765b248433040218

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

@@ -34,7 +34,7 @@ module Avm
           end
 
           def result_from_spec
-            result_from_patterns(SPEC_PATTERNS) { |m| "RSpec.describe('#{m[1].camelize}')" }
+            result_from_patterns(SPEC_PATTERNS) { |m| "RSpec.describe(#{m[1].camelize})" }
           end
 
           def result_from_superclass

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

@@ -19,7 +19,7 @@ module Avm
 
           # @return [Gem::Version]
           def version
-            (options_version || default_version)
+            options_version || default_version
           end
 
           def two_segments

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class GemfileLocal
+        class Sibling
+          common_constructor :gemfile_local, :source
+          delegate :relative_path, to: :source
+
+          # @return [String]
+          def gemspec_relative_path
+            source.gemspec_path.relative_path_from(gemfile_local.source.path).to_path
+          end
+
+          # @return [String]
+          def root_relative_path
+            source.path.relative_path_from(gemfile_local.source.path).to_path
+          end
+
+          # @return [String]
+          def target_content
+            "gem '#{source.gem_name}', #{gem_options_content} if #{condition_content}\n"
+          end
+
+          protected
+
+          # @return [String]
+          def condition_content
+            "::File.directory?('#{gemspec_relative_path}')"
+          end
+
+          # @return [String]
+          def gem_option_path
+            ["::File.expand_path('", root_relative_path, "', __dir__)"].join
+          end
+
+          # @return [String]
+          def gem_option_require
+            'false'
+          end
+
+          # @return [String]
+          def gem_options_content
+            %w[path require].map { |v| [v, send("gem_option_#{v}")].join(': ') }.join(', ')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class GemfileLocal
+        enable_simple_cache
+        common_constructor :source
+
+        def dependency_sub?(sub)
+          sub.is_a?(::Avm::EacRubyBase1::Sources::Base) &&
+            sub.gem_name != source.gem_name &&
+            source.gemfile_lock_gem_version(sub.gem_name).present?
+        end
+
+        # @return [String]
+        def target_content
+          siblings.map(&:target_content).join
+        end
+
+        # @return [Pathname]
+        def target_path
+          source.path.join('Gemfile.local')
+        end
+
+        def on_unexisting_gemfile_local
+          return yield unless target_path.exist?
+
+          ::EacRubyUtils::Fs::Temp.on_file do |temp_file|
+            ::FileUtils.cp(target_path, temp_file)
+            begin
+              ::FileUtils.rm_f(target_path)
+              yield
+            ensure
+              ::FileUtils.cp(temp_file, target_path)
+            end
+          end
+        end
+
+        def run_bundle
+          on_unexisting_gemfile_local do
+            source.bundle.execute!
+          rescue ::RuntimeError
+            source.bundle('update').execute!
+          end
+        end
+
+        # @return [void]
+        def write_target_file
+          target_path.write(target_content)
+        end
+
+        private
+
+        def siblings_uncached
+          source.parent.if_present([]) do |v|
+            v.subs.select { |sub| dependency_sub?(sub) }.map do |sub|
+              ::Avm::EacRubyBase1::Sources::GemfileLocal::Sibling.new(self, sub)
+            end
+          end
+        end
+
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_ruby_base1/sources/gemfile_local'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -11,53 +12,17 @@ module Avm
             runner_with :help do
               bool_opt '-w', '--write', 'Write the Gemfile.local file.'
             end
+            delegate :siblings, to: :builder
 
             def run
               start_banner
-              run_bundle
+              builder.run_bundle
               siblings_banner
               write_gemfile_local
             end
 
             private
 
-            def gemfile_local_path
-              the_source.path.join('Gemfile.local')
-            end
-
-            def gemfile_local_content
-              siblings.map { |s| sibling_gemfile_local_line(s) }.join
-            end
-
-            def on_unexisting_gemfile_local
-              return yield unless gemfile_local_path.exist?
-
-              ::EacRubyUtils::Fs::Temp.on_file do |temp_file|
-                ::FileUtils.cp(gemfile_local_path, temp_file)
-                begin
-                  ::FileUtils.rm_f(gemfile_local_path)
-                  yield
-                ensure
-                  ::FileUtils.cp(temp_file, gemfile_local_path)
-                end
-              end
-            end
-
-            def run_bundle
-              on_unexisting_gemfile_local do
-                the_source.bundle.execute!
-              rescue ::RuntimeError
-                the_source.bundle('update').execute!
-              end
-            end
-
-            def sibling_gemfile_local_line(sibling)
-              ["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
-
             def start_banner
               runner_context.call(:source_banner)
               infov 'Parent', the_source.parent
@@ -73,24 +38,17 @@ module Avm
             def write_gemfile_local
               return unless parsed.write?
 
-              infom "Writing #{gemfile_local_path}..."
-              gemfile_local_path.write(gemfile_local_content)
-            end
-
-            def siblings_uncached
-              the_source.parent.if_present([]) do |v|
-                v.subs.select { |sub| dependency_sub?(sub) }
-              end
+              infom "Writing #{builder.target_path}..."
+              builder.write_target_file
             end
 
             def the_source
               runner_context.call(:source)
             end
 
-            def dependency_sub?(sub)
-              sub.is_a?(::Avm::EacRubyBase1::Sources::Base) &&
-                sub.gem_name != the_source.gem_name &&
-                the_source.gemfile_lock_gem_version(sub.gem_name).present?
+            # @return [Avm::EacRubyBase1::Sources::GemfileLocal]
+            def builder_uncached
+              ::Avm::EacRubyBase1::Sources::GemfileLocal.new(the_source)
             end
           end
         end

data/lib/avm/eac_ruby_base1/version.rb

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

data/template/avm/eac_ruby_base1/source_generators/base/static/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
-eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

data/template/avm/eac_ruby_base1/source_generators/base/static/spec/rubocop_spec.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-::EacRubyUtils::Rspec.default_setup.describe_rubocop
+EacRubyUtils::Rspec.default_setup.describe_rubocop

data/template/avm/eac_ruby_base1/source_generators/base/static/spec/spec_helper.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))
+EacRubyUtils::Rspec.default_setup_create(File.expand_path('..', __dir__))

metadata

@@ -1,137 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.33.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2024-05-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: aranha-parsers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.84'
+        version: '0.91'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.84'
+        version: '0.91'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: eac_envs-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.122'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
-- !ruby/object:Gem::Dependency
-  name: aranha-parsers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.122'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 description: 
 email: 
 executables: []
@@ -200,6 +154,8 @@ files:
 - lib/avm/eac_ruby_base1/sources/base/version.rb
 - lib/avm/eac_ruby_base1/sources/base/version_bump.rb
 - lib/avm/eac_ruby_base1/sources/bundle_update.rb
+- lib/avm/eac_ruby_base1/sources/gemfile_local.rb
+- lib/avm/eac_ruby_base1/sources/gemfile_local/sibling.rb
 - lib/avm/eac_ruby_base1/sources/namespace_replacer.rb
 - lib/avm/eac_ruby_base1/sources/runners.rb
 - lib/avm/eac_ruby_base1/sources/runners/bundle.rb