rgen 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718b7e6aeacd446bb08225196146552c65033210
-  data.tar.gz: cc635adbb4efece25018192e3252329908c33816
+  metadata.gz: 96344b29d7c6d46b4301287f9d3c21d70d985ee4
+  data.tar.gz: 03c20ad4e81aff6bc1b9dc6e11fe3cc3d961fbfe
 SHA512:
-  metadata.gz: df6c209888d596ff60c3ec98727a725ff5bc3633c4623064394d3836348538d69e0ffa3fb279f9d41aade24fcc7620c3e5f5b0a32d38654f0509fc952991cbeb
-  data.tar.gz: 622b0cd9abe40acba98091eb0fdcb7c2abcc73cde5c755ed51da2792f22d1c40b7546eb71e2a8905305a1718c79d330686954056e2e81c3b76569ad3e0d25b5e
+  metadata.gz: 3123e149f308ce0a9cea45e4c1d253bd23227bb30a9b3c8057c75a296dfa7fd0cb637ee94944b3a5edf0d21765ec2f31b49af220504f0c420643f86e5da7db59
+  data.tar.gz: ad09dd2f55dbefef661416567bbb82e0f8f48c0f86ce5bf2ff9e458cc098de2f8069aa4cda8f7dcceb7b9ecf416fccbc5662ee515dc6b89403c1722a748c58fa

data/CHANGELOG

@@ -233,4 +233,12 @@
 
 =0.10.0
 
-* Added support for Ruby up to 3.2
+* Added support for Rubies 3.0, 3.1, 3.2
+
+=0.10.1
+
+* Updated dependencies
+
+=0.10.2
+
+* Fixed issue with Kernel methods name clash with features

data/Project.yaml

@@ -1,7 +1,7 @@
 name: rgen
 gemspec: rgen.gemspec
 git: https://github.com/mthiede/rgen.git
-version: 0.10.0
+version: 0.10.2
 summary: Ruby Modelling and Generator Framework
 email: martin dot thiede at gmx de
 homepage: http://ruby-gen.org
@@ -15,8 +15,8 @@ exclude_files: ['**/*.bak']
 encrypt_sources: false
 dependencies:
   https://rubygems.org:
-    - {name: nokogiri,           version: ['>= 1.14.2', '< 1.15'],    development: true}
-    - {name: rake,               version: '~> 12.0',                  development: true}
-    - {name: minitest,           version: ['~> 5.0', '>= 5.10.1'],    development: true}
-    - {name: minitest-fail-fast, version: '~> 0.1.0',                 development: true}
-    - {name: andand,             version: '1.3.3',                    development: true}
+    - {name: nokogiri,           version: ['>= 1.15.4', '< 1.16'],    development: true}
+    - {name: rake,               version: ['>= 13.0.0', '< 14.0'],    development: true}
+    - {name: minitest,           version: ['>= 5.20.0', '< 6.0'],     development: true}
+    - {name: minitest-fail-fast, version: ['>= 0.1.0', '< 0.2'],      development: true}
+    - {name: andand,             version: ['>= 1.3.3', '< 1.4'],      development: true}

data/lib/rgen/ecore/ecore_to_ruby.rb

@@ -12,7 +12,7 @@ class ECoreToRuby
     @modules = {}
     @classifiers = {}
     @features_added = {}
-    @reserved = Set.new(Object.methods)
+    @reserved = Set.new(Object.methods).merge(Kernel.methods)
   end
 
   # Create a Ruby module representing +epackage+.

data/lib/rgen/template_language/template_container.rb

@@ -29,7 +29,7 @@ module RGen
   	      	@@metamodels = @metamodels
     	    	fileContent = f.read
       	  	_detectNewLinePattern(fileContent)
-        		ERB.new(fileContent, eoutvar:'@output').result(binding)
+        		ERB.new(fileContent, eoutvar: '@output').result(binding)
           rescue Exception => e
             processAndRaise(e)
           end

data/test/array_extensions_test.rb

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'minitest/autorun'
 require 'rgen/array_extensions'
 
-class ArrayExtensionsTest < MiniTest::Test
+class ArrayExtensionsTest < Minitest::Test
 
   def test_element_methods
     c = Struct.new("SomeClass",:name,:age)

data/test/ea_instantiator_test.rb

@@ -9,7 +9,7 @@ require 'testmodel/class_model_checker'
 require 'testmodel/object_model_checker'
 require 'testmodel/ecore_model_checker'
 
-class EAInstantiatorTest < MiniTest::Test
+class EAInstantiatorTest < Minitest::Test
 
     include Testmodel::ClassModelChecker
     include Testmodel::ObjectModelChecker

data/test/ea_serializer_test.rb

@@ -6,7 +6,7 @@ require 'metamodels/uml13_metamodel'
 require 'ea_support/ea_support'
 require 'rgen/serializer/xmi11_serializer'
 
-class EASerializerTest < MiniTest::Test
+class EASerializerTest < Minitest::Test
 
 	MODEL_DIR = File.join(File.dirname(__FILE__),"testmodel")
 	TEST_DIR = File.join(File.dirname(__FILE__),"ea_serializer_test")

data/test/ecore_self_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 require 'rgen/array_extensions'
 
-class ECoreSelfTest < MiniTest::Test
+class ECoreSelfTest < Minitest::Test
   include RGen::ECore
   
   def test_simple

data/test/ecore_to_ruby_test.rb

@@ -6,7 +6,7 @@ require 'rgen/ecore/ecore'
 require 'rgen/ecore/ecore_ext'
 require 'rgen/ecore/ecore_to_ruby'
 
-class ECoreToRubyTest < MiniTest::Test
+class ECoreToRubyTest < Minitest::Test
 
 module ContainerSimple
 end

data/test/environment_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/environment'
 require 'rgen/metamodel_builder'
 
-class EnvironmentTest < MiniTest::Test
+class EnvironmentTest < Minitest::Test
 
 	class Model
 		attr_accessor :name

data/test/json_test.rb

@@ -6,7 +6,7 @@ require 'rgen/metamodel_builder'
 require 'rgen/serializer/json_serializer'
 require 'rgen/instantiator/json_instantiator'
 
-class JsonTest < MiniTest::Test
+class JsonTest < Minitest::Test
 
   module TestMM
     extend RGen::MetamodelBuilder::ModuleExtension

data/test/metamodel_builder_test.rb

@@ -5,7 +5,7 @@ require 'rgen/metamodel_builder'
 require 'rgen/array_extensions'
 require 'bigdecimal'
 
-class MetamodelBuilderTest < MiniTest::Test
+class MetamodelBuilderTest < Minitest::Test
   
   module TestMetamodel
     extend RGen::MetamodelBuilder::ModuleExtension
@@ -226,7 +226,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       sc.allowed = :someSymbol
     end
-    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(someSymbol\)\(:someSymbol\) where a \[true,false\] is expected/, err.message
+    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol(\(someSymbol\))?\(:someSymbol\) where a \[true,false\] is expected/, err.message
     err = assert_raises StandardError do
       sc.allowed = "a string"
     end
@@ -244,7 +244,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       sc.kind = :false
     end
-    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(false\)\(:false\) where a \[:simple,:extended\] is expected/, err.message
+    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol(\(false\))?\(:false\) where a \[:simple,:extended\] is expected/, err.message
     err = assert_raises StandardError do
       sc.kind = "a string"
     end
@@ -281,6 +281,7 @@ class MetamodelBuilderTest < MiniTest::Test
     sc.longWithDefault = (2**(0.size * 8 -2) -1) + 1
     assert_equal (2**(0.size * 8 -2) -1) + 1, sc.longWithDefault
     assert sc.longWithDefault.is_a?(Integer)
+    assert sc.longWithDefault.is_a?(Integer)
     err = assert_raises StandardError do
       sc.longWithDefault = "a string"
     end
@@ -615,7 +616,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       bc.addAClasses :notaaclass
     end
-    assert_match /In (\w+::)+BClassMM : Can not use a Symbol\(notaaclass\)\(:notaaclass\) where a (\w+::)+AClassMM is expected/, err.message
+    assert_match /In (\w+::)+BClassMM : Can not use a Symbol(\(notaaclass\))?\(:notaaclass\) where a (\w+::)+AClassMM is expected/, err.message
     
     # remove the AClass from the BClass
     bc.removeAClasses ac
@@ -631,7 +632,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       ac.addBClasses :notabclass
     end
-    assert_match /In (\w+::)+AClassMM : Can not use a Symbol\(notabclass\)\(:notabclass\) where a (\w+::)+BClassMM is expected/, err.message
+    assert_match /In (\w+::)+AClassMM : Can not use a Symbol(\(notabclass\))?\(:notabclass\) where a (\w+::)+BClassMM is expected/, err.message
     
     # remove the BClass from the AClass
     ac.removeBClasses bc

data/test/metamodel_order_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 require 'rgen/array_extensions'
 
-class MetamodelOrderTest < MiniTest::Test
+class MetamodelOrderTest < Minitest::Test
 	include RGen::ECore
 	
   module TestMM1

data/test/metamodel_roundtrip_test.rb

@@ -7,7 +7,7 @@ require 'mmgen/metamodel_generator'
 require 'rgen/instantiator/ecore_xml_instantiator'
 require 'rgen/serializer/xmi20_serializer'
 
-class MetamodelRoundtripTest < MiniTest::Test
+class MetamodelRoundtripTest < Minitest::Test
   
   TEST_DIR = File.dirname(__FILE__)+"/metamodel_roundtrip_test"
   

data/test/method_delegation_test.rb

@@ -3,7 +3,7 @@ $:.unshift File.dirname(__FILE__) + "/../lib"
 require 'minitest/autorun'
 require 'rgen/util/method_delegation'
 
-class MethodDelegationTest < MiniTest::Test
+class MethodDelegationTest < Minitest::Test
   include RGen
   
   class TestDelegate

data/test/model_builder/builder_context_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 require 'rgen/model_builder/builder_context'
 
-class BuilderContextTest < MiniTest::Test
+class BuilderContextTest < Minitest::Test
   
   module BuilderExtension1
     module PackageA

data/test/model_builder/builder_test.rb

@@ -7,7 +7,7 @@ require 'rgen/environment'
 require 'rgen/model_builder'
 require 'model_builder/statemachine_metamodel'
 
-class ModelBuilderTest < MiniTest::Test
+class ModelBuilderTest < Minitest::Test
       
   def test_statemachine
     result = RGen::ModelBuilder.build(StatemachineMetamodel) do 

data/test/model_builder/reference_resolver_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/model_builder/reference_resolver'
 
-class ReferenceResolverTest < MiniTest::Test
+class ReferenceResolverTest < Minitest::Test
 
   class ClassA < RGen::MetamodelBuilder::MMBase
     has_attr "name"

data/test/model_builder/serializer_test.rb

@@ -28,7 +28,7 @@ require 'rgen/instantiator/ecore_xml_instantiator'
 require 'rgen/model_builder'
 require 'model_builder/statemachine_metamodel'
 
-class ModelSerializerTest < MiniTest::Test
+class ModelSerializerTest < Minitest::Test
   def test_ecore_internal
     File.open(File.dirname(__FILE__)+"/ecore_internal.rb","w") do |f|
       serializer = RGen::ModelBuilder::ModelSerializer.new(f, RGen::ECore.ecore)

data/test/model_fragment_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/fragment/model_fragment'
 
-class ModelFragmentTest < MiniTest::Test
+class ModelFragmentTest < Minitest::Test
 
 module TestMetamodel
   extend RGen::MetamodelBuilder::ModuleExtension

data/test/output_handler_test.rb

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'minitest/autorun'
 require 'rgen/template_language/output_handler'
 
-class MetamodelBuilderTest < MiniTest::Test
+class MetamodelBuilderTest < Minitest::Test
 	def test_direct_nl
 		h = RGen::TemplateLanguage::OutputHandler.new
 		h.mode = :direct

data/test/qualified_name_provider_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/serializer/qualified_name_provider'
 
-class QualifiedNameProviderTest < MiniTest::Test
+class QualifiedNameProviderTest < Minitest::Test
 
   class AbstractTestNode < RGen::MetamodelBuilder::MMBase
     contains_many 'children', AbstractTestNode, "parent"

data/test/qualified_name_resolver_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/instantiator/qualified_name_resolver'
 
-class QualifiedNameResolverTest < MiniTest::Test
+class QualifiedNameResolverTest < Minitest::Test
 
   class TestNode < RGen::MetamodelBuilder::MMBase
     has_attr 'name', String

data/test/reference_resolver_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/metamodel_builder'
 require 'rgen/instantiator/reference_resolver'
 
-class ReferenceResolverTest < MiniTest::Test
+class ReferenceResolverTest < Minitest::Test
 
   class TestNode < RGen::MetamodelBuilder::MMBase
     has_attr 'name', String

data/test/template_language_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'rgen/template_language'
 require 'rgen/metamodel_builder'
 
-class TemplateContainerTest < MiniTest::Test
+class TemplateContainerTest < Minitest::Test
   
   TEMPLATES_DIR = File.dirname(__FILE__)+"/template_language_test/templates"
   OUTPUT_DIR = File.dirname(__FILE__)+"/template_language_test"

data/test/transformer_test.rb

@@ -8,7 +8,7 @@ require 'rgen/util/model_comparator'
 require 'metamodels/uml13_metamodel'
 require 'testmodel/class_model_checker'
 
-class TransformerTest < MiniTest::Test
+class TransformerTest < Minitest::Test
 
 	class ModelIn
 		attr_accessor :name

data/test/util/file_cache_map_test.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'fileutils'
 require 'rgen/util/file_cache_map'
 
-class FileCacheMapTest < MiniTest::Test
+class FileCacheMapTest < Minitest::Test
 
   TestDir = File.dirname(__FILE__)+"/file_cache_map_test/testdir"
  

data/test/util/pattern_matcher_test.rb

@@ -6,7 +6,7 @@ require 'rgen/metamodel_builder'
 require 'rgen/model_builder'
 require 'rgen/util/pattern_matcher'
 
-class PatternMatcherTest < MiniTest::Test
+class PatternMatcherTest < Minitest::Test
 
 module TestMM
   extend RGen::MetamodelBuilder::ModuleExtension

data/test/xml_instantiator_test.rb

@@ -18,7 +18,7 @@ module DefaultMM
   Person.one_to_one 'personalRoom', MNS::Room, 'inhabitant'
 end
 
-class XMLInstantiatorTest < MiniTest::Test
+class XMLInstantiatorTest < Minitest::Test
 
   XML_DIR = File.join(File.dirname(__FILE__),"testmodel")
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgen
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,82 +16,100 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '14.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.10.1
+        version: 5.20.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.10.1
+        version: 5.20.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-fail-fast
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: RGen is a framework for Model Driven Software Development (MDSD) in Ruby.
   This means that it helps you build Metamodels, instantiate Models, modify and transform
   Models and finally generate arbitrary textual content from it.