stepmod-utils 0.4.2 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeeb38f76c7cf7cdab0b754625328b5415039bcbd55a72c0b242c9d0c65ab56d
-  data.tar.gz: 8cc243ca6ac8ac28e42a0459fb297623de8a49679afe325ba3e8efc13f5b42eb
+  metadata.gz: 452e61db6853badb9ad2d292020fe4e2209b8929b350aa1e72eb2861774fad18
+  data.tar.gz: 585b3f1442e98f0416c061410dd0308d34912d065bc6eb347f05fe1a4d09ae3f
 SHA512:
-  metadata.gz: 816f5e4870e736ef10890e04ff5d5652cf25d4bc3bda12618a356ae8fb0b48d936fc05861173b2a793e14eee69541d3572251f11233637971642dcd45e9499ae
-  data.tar.gz: f30e85a6cb731da00cf61e84314cbdc2faafc071380f6827706816cd419673b5c8c0725dd6d0de3f6a668f823fb986639bff3fb35961b6293027d6e32f259fd2
+  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,11 +144,7 @@ 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
 
-  if %w(resources modules).include?(directory_type)
-    destination_rel_path = Pathname.new(file).dirname.relative_path_from(stepmod_path.join("data").join(directory_type))
-  end
-
-  destination_path = Pathname.new(srl_output_schemas_dir).join(destination_rel_path)
+  destination_path = srl_output_schemas_path.join(destination_rel_path)
   FileUtils.mkdir_p(destination_path)
 
   annotated_file_path = destination_path.join(File.basename(file))
@@ -144,12 +159,26 @@ files.each do |file|
     system_source_path = file_system_path(source_path.to_s, filename_cache)
     image_dest_path = destination_path.join(destination)
 
+    if image_dest_path.exist?
+      puts "#{Thread.current.object_id}:     Copy image SKIPPED for `#{image_dest_path}` as destination exists."
+      next
+    end
+
     unless system_source_path
-      if image_dest_path.exist?
-        puts "#{Thread.current.object_id}:     Copy image SKIPPED for `#{image_dest_path}` as it exists."
-      else
-        puts "#{Thread.current.object_id}:     Copy image FAILED from `#{source_path}` to `#{image_dest_path}`"
+      source_file = Pathname.new(source).basename.to_s
+
+      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}") + 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)
+        puts "#{Thread.current.object_id}:     Copy image FOUND at different path: `#{system_source_path}`"
       end
+    end
+
+    unless system_source_path
+      puts "#{Thread.current.object_id}:     Copy image MISSING from `#{source_path}` to `#{image_dest_path}`"
       next
     end
 

data/exe/stepmod-srl-migrate

@@ -17,11 +17,11 @@ def log(message, indent = 0)
   puts "[stepmod-utils] #{message}"
 end
 
-def copy_files_to_schemas(path, srl_output_docs_dir)
-  schema_name = path.dirname.basename
+def copy_files_to_schemas(path, stepmod_path, srl_output_docs_dir)
+  base_path = path.dirname.relative_path_from(File.join(stepmod_path, "data"))
   file_name = path.basename
 
-  new_dir = File.join(srl_output_docs_dir, schema_name)
+  new_dir = File.join(srl_output_docs_dir, base_path.to_s)
   new_file_path = File.join(new_dir, file_name)
 
   unless Dir.exist?(new_dir)
@@ -75,7 +75,12 @@ OptionParser.new do |opts|
 end.parse!
 
 def download_stepmod2mn(path)
-  return path if path && path.exist?
+  if path && path.exist?
+    puts "Specified `stepmod2mn.jar` found, skipping download."
+    return path
+  end
+
+  puts "Specified `stepmod2mn.jar` not found, downloading from GitHub."
 
   require 'octokit'
   require "down"
@@ -104,7 +109,6 @@ if !stepmod2mn_path.nil?
   else
     stepmod2mn_path = download_stepmod2mn(Pathname.new(stepmod2mn_path))
   end
-  puts "Specified `stepmod2mn.jar` not found, downloading from GitHub."
 else
   stepmod2mn_path = download_stepmod2mn(nil)
 end
@@ -142,6 +146,13 @@ log "SRL output documents directory path: `#{srl_output_docs_dir}`"
 log("*"*30)
 log("[SRL MIGRATION] Migration starts!")
 
+log("*"*30)
+log("[SRL MIGRATION: stepmod2mn.jar] START SVG generation.")
+log("*"*30)
+system "java -Xss5m -jar #{stepmod2mn_path} #{stepmod_dir} --output #{srl_output_docs_dir} --svg"
+log("*"*30)
+log("[SRL MIGRATION: stepmod2mn.jar] COMPLETE SVG generation.")
+
 log("*"*30)
 log("[SRL MIGRATION: stepmod2mn.jar] START document migration and SVG generation.")
 log("*"*30)
@@ -161,7 +172,7 @@ log("[SRL MIGRATION: stepmod-utils] START EXPRESS change YAML extraction.")
 system "stepmod-extract-changes -p #{stepmod_dir}"
 Dir.glob("#{stepmod_dir}/data/**/*.changes.yaml").each do |filepath|
   path = Pathname.new(filepath)
-  copy_files_to_schemas(path, srl_output_schemas_dir)
+  copy_files_to_schemas(path, stepmod_dir, srl_output_schemas_dir)
 end
 log("*"*30)
 log("[SRL MIGRATION: stepmod-utils] COMPLETE EXPRESS change YAML extraction.")

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.4.2".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.2
+  version: 0.4.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby