stepmod-utils 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b2f0b9f05434375d9b8fe91885488cc3efc712b2188aac852e02fd58d5a5809
-  data.tar.gz: d7a9244861b65696173a61cc46bfd70739b50beefd184612b07f10e24ab2207a
+  metadata.gz: 452e61db6853badb9ad2d292020fe4e2209b8929b350aa1e72eb2861774fad18
+  data.tar.gz: 585b3f1442e98f0416c061410dd0308d34912d065bc6eb347f05fe1a4d09ae3f
 SHA512:
-  metadata.gz: 64610bbd1d253e7d3dab575d4bb4a16059633a0526009bde73e867aed7fa873281a0256ed188f917737167d32362dbca80448169067c3f0634533323afeb8156
-  data.tar.gz: a4e39cdac5b8fea94d28ca2683cd662efc5eb9273e12371ca74e524bf6d65f4c45ea9aac38a59ea233665c6ff79fb19448639adbf93ed7ea8313767cdd0bd403
+  metadata.gz: d94e1ee3ff438a2982c464b7e0c478f0b1fade7c7472d01bfeabccab76892834bec5e5bc0f62739a6ab37062be3cc3ececdbf7d8f7f1fe8aa7a6fc6b7564e2d6
+  data.tar.gz: 92c857ca6f410d1f00a3498a908a5255cbab78cec9cac603b54c0e40ecf38c3de442827176df4cd3ac81aac4b7fa22f17b4a667b859153f89c7169b2293fdb48

data/exe/stepmod-annotate-all

@@ -25,13 +25,21 @@ OptionParser.new do |opts|
   end
 
   opts.on(
-    "--output SRL_SCHEMAS_DIR",
+    "--schemas SRL_SCHEMAS_DIR",
     String,
     "Path to output SRL schemas",
   ) do |path|
     options[:srl_output_schemas_dir] = path
   end
 
+  opts.on(
+    "--documents SRL_DOCS_DIR",
+    String,
+    "Path to SRL documents (generated by stepmod2mn)",
+  ) do |path|
+    options[:srl_output_docs_dir] = path
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -48,9 +56,17 @@ end
 log "STEPmod data path: `#{stepmod_dir}`"
 
 srl_output_schemas_dir = options[:srl_output_schemas_dir]
-raise StandardError.new("--output directory for SRL schemas not set") unless srl_output_schemas_dir
+raise StandardError.new("--schemas directory for SRL schemas not set") unless srl_output_schemas_dir
 log "SRL schemas output path: `#{srl_output_schemas_dir}`"
 
+srl_output_docs_dir = options[:srl_output_docs_dir]
+raise StandardError.new("--documents directory for SRL documents (generated by stepmod2mn) not set") unless srl_output_docs_dir
+log "SRL documents path: `#{srl_output_docs_dir}`"
+
+unless File.exist?(srl_output_docs_dir) && File.directory?(srl_output_docs_dir)
+  raise StandardError.new("--documents directory for SRL documents (generated by stepmod2mn) does not exist yet, please run stepmod2mn")
+end
+
 def all_express_files(stepmod_dir)
   index_file = File.read(File.join(stepmod_dir, "repository_index.xml"))
   index = Nokogiri::XML(index_file).root
@@ -113,6 +129,9 @@ files = all_express_files(stepmod_dir)
 filename_cache = {}
 
 FileUtils.mkdir_p(srl_output_schemas_dir)
+srl_output_schemas_path = Pathname.new(srl_output_schemas_dir)
+srl_output_docs_path = Pathname.new(srl_output_docs_dir)
+
 
 files.each do |file|
   puts "#{Thread.current.object_id}: `#{file}` processing..."
@@ -125,7 +144,6 @@ files.each do |file|
   destination_rel_path = Pathname.new(file).dirname.relative_path_from(stepmod_path.join("data"))
   directory_type = destination_rel_path.each_filename.to_a.first
 
-  srl_output_schemas_path = Pathname.new(srl_output_schemas_dir)
   destination_path = srl_output_schemas_path.join(destination_rel_path)
   FileUtils.mkdir_p(destination_path)
 
@@ -151,7 +169,7 @@ files.each do |file|
 
       puts "#{Thread.current.object_id}:     Copy image NOT FOUND at schema path: `#{source_file}`, trying glob..."
 
-      source_path = srl_output_schemas_path.glob("**/#{source_file}").first
+      source_path = (srl_output_schemas_path.glob("**/#{source_file}") + srl_output_docs_path.glob("**/#{source_file}")).first
       if source_path
         puts "EXISTS" if source_path.exist?
         system_source_path = file_system_path(source_path.to_s, filename_cache)

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.4.5".freeze
+    VERSION = "0.4.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby