stepmod-utils 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ba239ce1178c1cff73be94862409e8d0801f45b4844a779502df8c9f33d2c5e
-  data.tar.gz: 22e929a35fb7eea95b829f43d06f18cc95d25ef79a8361c273a57bb311624884
+  metadata.gz: dd6272ff4c3c263a1bb31f5dabb58058d933a2fa0ef9c9711d23152f79f3634a
+  data.tar.gz: cf84426917abec57f8abf4af78f23089bc50eb475103860672a748f9023155bf
 SHA512:
-  metadata.gz: 5c74b4390e7d32cc70160da65bb1c401b00fc509454f8e35a7ef4148378fab5ab80dd96d7c4a9be9286dab5bbc7bd230a546c9a4a42443257880b2638bf003ed
-  data.tar.gz: acdd911c1c8d0213904424fc936827fd1f2e97da77915b9897ca3b417943205e6b4012f30d6ad0679262f43220aada65d6dabd479a5a1ed3a1907614b987930b
+  metadata.gz: 6342de4cb0ebb220c0d8f0849796e738e75d9ec2182120471af41e11f6eb65f8c1f1944386ec42e7639ba7f69a915c6e4e25552f119fdfb43e0cb35dc7b022fb
+  data.tar.gz: e78c8c07b90fe7e27521849235dc3c60e3be12eb2e122eca8c2ea5a06701c764205ac8f346714114cf3b5c9470753ee04abcf2da8f9f52f302e51862c0cfbcb9

data/exe/stepmod-srl-migrate

@@ -214,6 +214,12 @@ Dir.glob("#{stepmod_dir}/data/**/changes.yaml").each do |filepath|
   copy_files_to_document(path, stepmod_dir, srl_output_docs_dir)
 end
 
+# Move mappings into document directories
+Dir.glob("#{stepmod_dir}/data/**/mapping.yaml").each do |filepath|
+  path = Pathname.new(filepath)
+  copy_files_to_document(path, stepmod_dir, srl_output_docs_dir)
+end
+
 log("*" * 30)
 log("[SRL MIGRATION: stepmod-utils] COMPLETE EXPRESS change YAML extraction.")
 

data/lib/stepmod/utils/stepmod_file_annotator.rb

@@ -43,7 +43,7 @@ module Stepmod
         end
       end
 
-      SCHEMA_VERSION_MATCH_REGEX = /^SCHEMA [0-9a-zA-Z_]+;\s*$/
+      SCHEMA_VERSION_MATCH_REGEX = /^[[:space:]]*?SCHEMA [0-9a-zA-Z_]+;(?<trailing>.*)[[:space:]]*$/
       def is_missing_version(schema_content)
         m = schema_content.match(SCHEMA_VERSION_MATCH_REGEX)
         if m.nil?
@@ -55,6 +55,16 @@ module Stepmod
         end
       end
 
+      def replace_schema_string_with_version(content)
+        m = content.match(SCHEMA_VERSION_MATCH_REGEX)
+        result = build_schema_string_with_version
+        unless m['trailing'].nil?
+          result = "#{result}#{m['trailing']}"
+        end
+
+        content.gsub!(SCHEMA_VERSION_MATCH_REGEX, result)
+      end
+
       def build_schema_string_with_version
         # Geometric_tolerance_arm => geometric-tolarance-arm
         name_in_asn1 = @schema_name.downcase.gsub("_", "-")
@@ -80,7 +90,7 @@ module Stepmod
         edition = @identifier.edition
         schema_or_object = (schema_type == :module) ? "schema" : "object"
 
-        "SCHEMA #{@schema_name} '{ " \
+        "\nSCHEMA #{@schema_name} '{ " \
           "iso standard 10303 part(#{part}) " \
           "version(#{edition}) " \
           "#{schema_or_object}(1) " \
@@ -186,10 +196,7 @@ module Stepmod
           puts "[annotator-WARNING] schema (#{@schema_name}) missing version string. "\
             "Adding: `#{build_schema_string_with_version}` to schema."
 
-          output_express.gsub!(
-            SCHEMA_VERSION_MATCH_REGEX,
-            build_schema_string_with_version
-          )
+          output_express = replace_schema_string_with_version(output_express)
         end
 
         {

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.6.2".freeze
+    VERSION = "0.6.4".freeze
   end
 end

data/stepmod-utils.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "plurimath"
   spec.add_runtime_dependency "ptools"
   spec.add_runtime_dependency "pubid-iso"
-  spec.add_runtime_dependency "reverse_adoc", ">= 0.3"
+  spec.add_runtime_dependency "reverse_adoc", "~> 0.3.7"
   spec.add_runtime_dependency "shale"
   spec.add_runtime_dependency "thor", ">= 0.20"
   spec.add_runtime_dependency "unitsml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -140,16 +140,16 @@ dependencies:
   name: reverse_adoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: shale
   requirement: !ruby/object:Gem::Requirement