avm-eac_ruby_base1 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0551452197578de7d88bf0dd64036f934868b554dd4109d51bacdb185ab62a0a'
-  data.tar.gz: 4e012d782e992b4124597b66dafd4a01ac7d11d8838001ca4e226394cdc32cae
+  metadata.gz: 047b53c01e9863005516d56747f17c0b404f1045ad84c0b87608c0ad4256019d
+  data.tar.gz: 74bb4e7007c935f345242e36bd2d5c0aa438939322d59250cbbeaaf26b5bd804
 SHA512:
-  metadata.gz: 13380e052781533f80d899beda569abb36f5fb18267be920374351e48ba83f41709584f839ea3b3ec8f44b469bf8b9899544114c012fe4a8b4dcd115112db49a
-  data.tar.gz: 78be6a19cea6806ead0261d93e08cc1264f0b1dfd515c16c9ad0ee14e500c442b58731bc94c57c422801d3b6c8e3499a539a30c8f3bff8b3d9619a4deedab7bc
+  metadata.gz: 853d612a021dabb3920c9de969719cad348714a8fb11e3f542abb2cdbcbfe5f5d3caba34ebf572a9ca78c58765487d81d59621c5aca42b9d2d0da46188095c0a
+  data.tar.gz: 4dc164a18cb11760acaba38b13f9bea3d8515054fec6c76cf777ba8e6d77bd5799b75de1b29c30eef2099635ff8609394a73bcc100497061c02198e95fb41632

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

@@ -7,7 +7,13 @@ module Avm
     module Rubygems
       class Gemspec
         class Dependency
-          common_constructor :gemspec, :gem_name
+          enable_listable
+          lists.add_string :type, '' => :common, '_development' => :development,
+                                  '_runtime' => :runtime
+
+          common_constructor :gemspec, :gem_name, :type do
+            self.type = self.class.lists.type.value_validate!(type)
+          end
 
           def version_specs=(version_specs)
             gemspec.add_or_replace_gem_line(gem_name, version_specs)

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

@@ -7,8 +7,10 @@ module Avm
     module Rubygems
       class Gemspec
         require_sub __FILE__, require_dependency: true
+        enable_simple_cache
 
-        DEPENDENCY_LINE_PARSER = /s\.add_dependency\s*'(\S+)'/.to_parser { |m| m[1] }
+        DEPENDENCY_LINE_PARSER = /s\.add([a-zA-Z0-9_]*)_dependency\s*'(\S+)'/
+                                   .to_parser { |m| [m[2], m[1]] }
 
         class << self
           def from_file(path)
@@ -18,15 +20,15 @@ module Avm
 
         common_constructor :lines
 
+        # @param gem_name [String]
         # @return [Avm::EacRubyBase1::Bundler::Gemfile::Dependency]
         def dependency(gem_name)
-          ::Avm::EacRubyBase1::Rubygems::Gemspec::Dependency.new(self, gem_name)
+          dependencies_hash.fetch(gem_name)
         end
 
         # @return [Array<Avm::EacRubyBase1::Bundler::Gemfile::Dependency>]
         def dependencies
-          lines.lazy.map { |line| DEPENDENCY_LINE_PARSER.parse(line) }.compact_blank
-            .map { |gem_name| dependency(gem_name) }.to_a
+          dependencies_hash.values
         end
 
         def write(path)
@@ -36,6 +38,21 @@ module Avm
         def to_text
           lines.map { |line| "#{line}\n" }.join
         end
+
+        protected
+
+        # @param gem_name [String]
+        # @param type [String] Avm::EacRubyBase1::Rubygems::Gemspec::Dependency::TYPE_*
+        # @return [Avm::EacRubyBase1::Bundler::Gemfile::Dependency]
+        def create_dependency(gem_name, type)
+          ::Avm::EacRubyBase1::Rubygems::Gemspec::Dependency.new(self, gem_name, type)
+        end
+
+        # @return [Hash<String, Avm::EacRubyBase1::Bundler::Gemfile::Dependency>]
+        def dependencies_hash_uncached
+          lines.lazy.map { |line| DEPENDENCY_LINE_PARSER.parse(line) }.compact_blank
+            .map { |dependency_args| create_dependency(*dependency_args) }.index_by(&:gem_name)
+        end
       end
     end
   end

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

@@ -10,14 +10,14 @@ module Avm
         enable_simple_cache
         common_constructor :name
 
-        # @return [String]
+        # @return [Gem::Version, nil]
         def maximum_number
-          numbers.max
+          numbers.max.if_present { |v| ::Gem::Version.new(v) }
         end
 
-        # @return [Array<String>]
+        # @return [Array<Gem::Version>]
         def numbers
-          versions.map { |v| v.fetch('number') }
+          versions.map { |v| ::Gem::Version.new(v.fetch('number')) }
         end
 
         protected

data/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.34.0'
+    VERSION = '0.35.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_ruby_base1
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.92'
+        version: '0.94'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.92'
+        version: '0.94'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement