stepmod-utils 0.4.1 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb309548a8dd492982004515c2d11e45b72e4043452e72e809355dc9a8ffa7fd
-  data.tar.gz: 27510963bd60fb68b0a63286bc7dd11efbaf3a780c3fcb0227c8934a550f830d
+  metadata.gz: 5b2f0b9f05434375d9b8fe91885488cc3efc712b2188aac852e02fd58d5a5809
+  data.tar.gz: d7a9244861b65696173a61cc46bfd70739b50beefd184612b07f10e24ab2207a
 SHA512:
-  metadata.gz: efc594b7dab3677aa2ada861d787abd7078b222de4b6e7c5463549a4ce8c7e511bac6266e8973e3904e0dbbd4be2eb864f15cd817a172811cee5ec866783f143
-  data.tar.gz: b3d08ac1688b6a0e0a6aafd64b7f19339fef0414f43848a84fa6a3503300c457ea52a5d585ffdd7d77a85798725a3817d54c9d032767de26c48cdfac30089870
+  metadata.gz: 64610bbd1d253e7d3dab575d4bb4a16059633a0526009bde73e867aed7fa873281a0256ed188f917737167d32362dbca80448169067c3f0634533323afeb8156
+  data.tar.gz: a4e39cdac5b8fea94d28ca2683cd662efc5eb9273e12371ca74e524bf6d65f4c45ea9aac38a59ea233665c6ff79fb19448639adbf93ed7ea8313767cdd0bd403

data/exe/stepmod-annotate-all

@@ -125,11 +125,8 @@ 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)
+  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)
 
   annotated_file_path = destination_path.join(File.basename(file))
@@ -144,12 +141,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}").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
@@ -143,10 +147,17 @@ log("*"*30)
 log("[SRL MIGRATION] Migration starts!")
 
 log("*"*30)
-log("[SRL MIGRATION: stepmod2mn.jar] START document migration and SVG generation.")
+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)
+system "java -Xss5m -jar #{stepmod2mn_path} #{stepmod_dir} --output #{srl_output_docs_dir}"
+log("*"*30)
 log("[SRL MIGRATION: stepmod2mn.jar] COMPLETE 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.1".freeze
+    VERSION = "0.4.5".freeze
   end
 end

metadata

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