avm-eac_ruby_base1 0.29.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2896d03abcc90e179fc713e94d4930c5175303442a04623ef583bfeb5ef7f553
-  data.tar.gz: 3fe9970b0a67da2e94c91d64251f3b8663304473d3f494d142a13b788e7ae812
+  metadata.gz: eebbbb947b955ddfd5ebc1bf09accf8f4d6ec6ba5cfc34c3fad0254cbf7828e5
+  data.tar.gz: c567196709686254b1c623a2e2ff6c68fe16172106c3b938160a0c9e97872e4c
 SHA512:
-  metadata.gz: 1dccead983b448244b067922960cfef081336bd5e5c06deaefe14ef991a5f8f6bd6309165d4947038b17f12965c3e08a18cf443f986362a6c1aa156778baff01
-  data.tar.gz: 4fb9c10bb63bb74e0c90836fb4ad4ea1c11061c09da5d8d896f8f75f673dd9bd5f566b5a5144ac1a5ef67ca7c641c6ab00eb2337501bddc19f90f952607a047d
+  metadata.gz: 997f65c6c85949bb925bb1ca9885387d247b35662478f712d3f482e79206075f6435055c2b6a3e8aee8d2a790f66005a32f25ca4fdfe852f92b34e253749ea27
+  data.tar.gz: d6fe3efdbd465bc2a8acf9add1d4ccf3b381530245489fd6f428912e2b1893cc56f45d83068ec96cfafda6f2e63a0641fc88951a01844bd4569539563bd6fd2c

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Instances
+      module Mixin
+        DEFAULT_RUBY_VERSION = '2.7.7'
+        RUBY_VERSION_KEY = 'ruby.version'
+
+        def auto_ruby_version
+          inherited_entry_value(::Avm::Instances::EntryKeys::INSTALL_ID, RUBY_VERSION_KEY) ||
+            DEFAULT_RUBY_VERSION
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_ruby_base1/instances.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Instances
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -11,6 +11,8 @@ module Avm
         VERSION_LINE_PATTERN = /\A(\s*)VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"](\s*)\z/.freeze
 
         def value
+          return nil unless path.file?
+
           path.read.each_line.lazy.map { |line| line_value(line) }.find { |v| v }
         end
 

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_generic_base0/sources/base'
+require 'avm/sources/update_error'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -14,6 +15,8 @@ module Avm
 
           def update_self_content
             bundle_update.execute!
+          rescue ::EacRubyUtils::Envs::ExecutionError
+            raise ::Avm::Sources::UpdateError
           end
         end
       end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class Base < ::Avm::EacGenericBase0::Sources::Base
+        module Version
+          # @return [Avm::VersionNumber]
+          def version
+            version_file.value.if_present { |v| ::Avm::VersionNumber.new(v) }
+          end
+
+          def version=(value)
+            version_file.value = value
+          end
+
+          # @return [Avm::EacRubyBase1::Rubygems::VersionFile]
+          def version_file
+            ::Avm::EacRubyBase1::Rubygems::VersionFile.new(version_file_path)
+          end
+
+          def version_file_path
+            path.join('lib', *gem_namespace_parts, 'version.rb')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -55,24 +55,6 @@ module Avm
         def valid?
           gemfile_path.exist? || gemspec_path.present?
         end
-
-        # @return [Avm::VersionNumber]
-        def version
-          version_file.value.if_present { |v| ::Avm::VersionNumber.new(v) }
-        end
-
-        def version=(value)
-          version_file.value = value
-        end
-
-        # @return [Avm::EacRubyBase1::Rubygems::VersionFile]
-        def version_file
-          ::Avm::EacRubyBase1::Rubygems::VersionFile.new(version_file_path)
-        end
-
-        def version_file_path
-          path.join('lib', *gem_namespace_parts, 'version.rb')
-        end
       end
     end
   end

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.29.1'
+    VERSION = '0.30.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '0.65'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.62'
+        version: '0.65'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,8 @@ files:
 - lib/avm/eac_ruby_base1/file_formats.rb
 - lib/avm/eac_ruby_base1/file_formats/base.rb
 - lib/avm/eac_ruby_base1/file_formats/base/file_resource_name.rb
+- lib/avm/eac_ruby_base1/instances.rb
+- lib/avm/eac_ruby_base1/instances/mixin.rb
 - lib/avm/eac_ruby_base1/launcher.rb
 - lib/avm/eac_ruby_base1/launcher/gem.rb
 - lib/avm/eac_ruby_base1/launcher/gem/build.rb
@@ -160,6 +162,7 @@ files:
 - lib/avm/eac_ruby_base1/sources/base/rake.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
 - 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/namespace_replacer.rb