stepmod-utils 0.3.26 → 0.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ad52321cd8307aae7754edc2b9e45f2e20d372aceca95c667befce3717fae2
-  data.tar.gz: c86cb0fb6e7a7c8e654571cbc0eb31792e760be7069402e04d05c17db8e13e14
+  metadata.gz: b4bb366577c4b43d545ccbdf77ea88e46ece9f0bbefe5ca493769131e18ccaed
+  data.tar.gz: 9811424a834ad40699bfd1c2ed900762469407d764adbe714a5ccf47bc792ed7
 SHA512:
-  metadata.gz: 4e19c30c54c9f4b8d6b32fbdf998ac7b741f5fb81193552e991c3e3daa194dc2bd37c1a3277245e8954672cb64d0c1260a070509e1e3daa199628acd993c89cf
-  data.tar.gz: a3601da30f90d16a8bb6c53a17950af15ca761379ded0f7ebb0a25607822944221e8d2d79c32a78c752ba470badc68b69ce3d047a30452201fbd78dfb28a1664
+  metadata.gz: 38fe3f3a2292c0f4e891bcb29997165ff5550aa2c4e95d5997afda0a77b01bd037642b8f412cd84fa4b01ffd90c70a12dea7a29acb532376984259ed7522a39d
+  data.tar.gz: 2644087f0c877378d0d1e2fc417e74157906a0c00121f0504a0df3475d0d40de5b94a9ed542385ab3977b573e134747cb6f5bd2478d7ae41bb5a43fd9ce8622a

data/exe/stepmod-extract-concepts

@@ -142,7 +142,7 @@ end
 part_resources.each do |(_bibdata, current_part_resources)|
   current_part_resources.save_to_files(output_dir)
 end
-log "INFO: part_resources written to yaml files"
+log "INFO: part_resources written to YAML files in #{output_dir}"
 
 part_modules.sort_by do |(bibdata, _part_modules_arm, _part_modules_mim)|
   bibdata.part.to_i
@@ -159,7 +159,7 @@ end.each do |(_bibdata, part_modules_arm, part_modules_mim)|
     end
   end
 end
-log "INFO: part_modules written to yaml files"
+log "INFO: part_modules written to YAML files in #{output_dir}"
 
 resource_concepts.save_to_files(output_dir)
-log "INFO: resource_concepts written to yaml files"
+log "INFO: resource_concepts written to YAML files in #{output_dir}"

data/lib/stepmod/utils/terms_extractor.rb

@@ -66,29 +66,53 @@ module Stepmod
         end
       end
 
+      def published_part_numbers
+        docs_xml = Nokogiri::XML(File.read(@stepmod_path.join('library/docs.xml')))
+        docs_xml.xpath("//doc").map do |x|
+          x['part']
+        end.uniq.sort
+      end
+
       def call
         log "INFO: STEPmod directory set to #{stepmod_dir}."
         log "INFO: Detecting paths..."
 
-        # Run `cvs status` to find out version
         log "INFO: Detecting Git SHA..."
         Dir.chdir(stepmod_path) do
           @git_rev = `git rev-parse HEAD` || nil
         end
 
+        published_part_nos = published_part_numbers
         repo_index = Nokogiri::XML(File.read(@index_path)).root
 
         files = []
 
         # add module paths
         repo_index.xpath("//module").each do |x|
-          next if x['status'] == WITHDRAWN_STATUS
+          unless published_part_nos.include? x['part']
+            log "INFO: skipping module #{x['name']} as part #{x['part']} is not published in `docs.xml`."
+            next
+          end
 
-          arm_path = Pathname.new("#{stepmod_dir}/modules/#{x['name']}/arm_annotated.exp")
-          mim_path = Pathname.new("#{stepmod_dir}/modules/#{x['name']}/mim_annotated.exp")
+          if x['status'] == WITHDRAWN_STATUS
+            log "INFO: skipping module #{x['name']} as it is withdrawn."
+            next
+          end
 
-          files << arm_path if File.exist? arm_path
-          files << mim_path if File.exist? mim_path
+          arm_path = @stepmod_path.join("modules/#{x['name']}/arm_annotated.exp")
+          mim_path = @stepmod_path.join("modules/#{x['name']}/mim_annotated.exp")
+
+          if File.exist? arm_path
+            files << arm_path
+          else
+            log "INFO: skipping module ARM for #{x['name']} as it does not exist at #{arm_path}."
+          end
+
+          if File.exist? mim_path
+            files << mim_path
+          else
+            log "INFO: skipping module MIM for #{x['name']} as it does not exist at #{mim_path}."
+          end
         end
 
         # Should ignore these because the `<resource_docs>` elements do not provide any EXPRESS schemas
@@ -102,10 +126,27 @@ module Stepmod
 
         # add resource paths
         repo_index.xpath("//resource").each do |x|
-          next if x["status"] == WITHDRAWN_STATUS || x["name"] == "iso13584_expressions_schema"
+          unless published_part_nos.include? x['part']
+            log "INFO: skipping resource #{x['name']} as part #{x['part']} is not published in `docs.xml`."
+            next
+          end
+
+          if x['status'] == WITHDRAWN_STATUS
+            log "INFO: skipping resource #{x['name']} as it is withdrawn."
+            next
+          end
 
-          path = Pathname.new("#{stepmod_dir}/resources/#{x['name']}/#{x['name']}_annotated.exp")
-          files << path if File.exist? path
+          if x["name"] == "iso13584_expressions_schema"
+            log "INFO: skipping resource #{x['name']} as the ISO 13584 series is out of scope."
+            next
+          end
+
+          path = @stepmod_path.join("resources/#{x['name']}/#{x['name']}_annotated.exp")
+          if File.exist? path
+            files << path
+          else
+            log "INFO: skipping resource #{x['name']} as it does not exist at #{path}."
+          end
         end
 
         # Should ignore these because we are skiping Clause 3 terms

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.3.26".freeze
+    VERSION = "0.3.27".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.26
+  version: 0.3.27
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-05 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby