aixm 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa3066c9e65afaa76e4327da9a11a42c27f1baad1a712de3fee6400765c0b6a
-  data.tar.gz: 6c0d4261d076fddc05b150b5c1851a61ffa011ff6b8f15f254492987e4f80fb4
+  metadata.gz: 9fe9565888ad7ed4bcf509211380c7b7102551ebe9ae30a3aa18810e51eb6c30
+  data.tar.gz: 4b2d98978eeedb786c6df9ee15d1a58965da68661e8e8fe3e74706d5f2d403bc
 SHA512:
-  metadata.gz: 88bcefbea10f86f6f5b3c483f546197409dcd06b8751b8f0ced1d2e3730e27559a248486015a0673685d24afb04f306df4ea0acf3f14fe5347c3c9f89d72e23c
-  data.tar.gz: 067ee1c2ffc6b251a9063982ee4e5d07492746aa0d780be020b46f549868992397348054c09d08704bb5e4744a0a78da8936ee739870822029a8eb32776c10c0
+  metadata.gz: 0437a116319aaa8aef2bb8107b6d86481686a735734ba172ed451cc73924389fb4a160d518d87d817ef7a79f84c3388b9d39f3d925bab8329b93c84e3b92c1bb
+  data.tar.gz: c8fdeec76012ffe37a66096f6e57f620ea9a2c0b731ff569f8b325fec2a315cdab74080ddf53553880c5acfa7df17b24059047dd935802821c0d637955cc54ec

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 Nothing so far
 
+## 1.3.4
+
+#### Additions
+* `ckmid` skips XML schema validation if `-s` argument is set.
+
+## 1.3.3
+
+#### Changes
+* Extend `ckmid` and `mkmid` to accept multiple files and globbing.
+
 ## 1.3.2
 
 #### Changes

data/README.md

@@ -1,5 +1,5 @@
 [![Version](https://img.shields.io/gem/v/aixm.svg?style=flat)](https://rubygems.org/gems/aixm)
-[![Tests](https://img.shields.io/github/workflow/status/svoop/aixm/Test.svg?style=flat&label=tests)](https://github.com/svoop/aixm/actions?workflow=Test)
+[![Tests](https://img.shields.io/github/actions/workflow/status/svoop/aixm/test.yml?style=flat&label=tests)](https://github.com/svoop/aixm/actions?workflow=Test)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/svoop/aixm.svg?style=flat)](https://codeclimate.com/github/svoop/aixm/)
 [![Donorbox](https://img.shields.io/badge/donate-on_donorbox-yellow.svg)](https://donorbox.org/bitcetera)
 
@@ -291,7 +291,7 @@ By `using AIXM::Refinements` you get a few handy [extensions to Ruby core classe
 
 ### mkmid
 
-The `mkmid` executable reads an OFMX file, adds [OFMX-compliant `mid` values](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid) into all `*Uid` elements and validates the result against the schema.
+The `mkmid` executable reads OFMX files, adds [OFMX-compliant `mid` values](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid) into all `*Uid` elements and validates the result against the schema.
 
 ```
 mkmid --help
@@ -299,7 +299,7 @@ mkmid --help
 
 ### ckmid
 
-The `chmid` executable reads an OFMX file, validates it against the schema and checks all `mid` attributes for [OFMX-compliance](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid).
+The `chmid` executable reads OFMX files, validates them against the schema and checks all `mid` attributes for [OFMX-compliance](https://gitlab.com/openflightmaps/ofmx/wikis/Features#mid).
 
 ```
 ckmid --help

data/lib/aixm/executables.rb

@@ -8,66 +8,74 @@ module AIXM
         @options = options
         OptionParser.new do |o|
           o.banner = <<~END
-            Add mid attributes to a schema valid OFMX file.
-            Usage: #{File.basename($0)} infile.ofmx
+            Add mid attributes to OFMX files.
+            Usage: #{File.basename($0)} files
           END
           o.on('-i', '--[no-]in-place', 'overwrite file instead of dumping to STDOUT (default: false)') { @options[:in_place] = _1 }
           o.on('-f', '--[no-]force', 'ignore XML schema validation errors (default: false)') { @options[:force] = _1 }
           o.on('-A', '--about', 'show author/license information and exit') { AIXM::Executables.about }
           o.on('-V', '--version', 'show version and exit') { AIXM::Executables.version }
         end.parse!
-        @infile = ARGV.shift
+        @files = ARGV
       end
 
       def run
-        fail 'cannot read file' unless @infile && File.readable?(@infile)
-        fail 'file ist not OFMX' unless @infile.match?(/\.ofmx$/)
-        AIXM.ofmx!
-        document = File.open(@infile) { Nokogiri::XML(_1) }
-        AIXM::PayloadHash::Mid.new(document).insert_mid
-        errors = Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
-        case
-        when errors.any? && !@options[:force]
-          puts errors
-          fail "OFMX file is not schema valid"
-        when @options[:in_place]
-          File.write(@infile, document.to_xml)
-        else
-          puts document.to_xml
+        @files.each do |file|
+          fail "cannot read #{file}" unless file && File.readable?(file)
+          fail "#{file} is not OFMX" unless file.match?(/\.ofmx$/)
+          AIXM.ofmx!
+          document = File.open(file) { Nokogiri::XML(_1) }
+          AIXM::PayloadHash::Mid.new(document).insert_mid
+          errors = Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
+          case
+          when errors.any? && !@options[:force]
+            fail (["#{file} is not valid..."] + errors).join("\n")
+          when @options[:in_place]
+            File.write(file, document.to_xml)
+          else
+            puts document.to_xml
+          end
+        rescue => error
+          puts "ERROR: #{error.message}"
+          exit 1
         end
-      rescue => error
-        puts "ERROR: #{error.message}"
-        exit 1
       end
     end
 
     class Ckmid
       def initialize(**options)
+        @options = options
         OptionParser.new do |o|
           o.banner = <<~END
-            Check mid attributes of an OFMX file.
-            Usage: #{File.basename($0)} infile.ofmx
+            Check mid attributes of OFMX files.
+            Usage: #{File.basename($0)} files
           END
+          o.on('-s', '--[no-]skip-validation', 'skip XML schema validation (default: false)') { @options[:skip_validation] = _1 }
           o.on('-A', '--about', 'show author/license information and exit') { AIXM::Executables.about }
           o.on('-V', '--version', 'show version and exit') { AIXM::Executables.version }
         end.parse!
-        @infile = ARGV.shift
+        @files = ARGV
       end
 
       def run
-        fail 'cannot read file' unless @infile && File.readable?(@infile)
-        fail 'file ist not OFMX' unless @infile.match?(/\.ofmx$/)
-        AIXM.ofmx!
-        document = File.open(@infile) { Nokogiri::XML(_1) }
-        errors = Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
-        errors += AIXM::PayloadHash::Mid.new(document).check_mid
-        if errors.any?
-          puts errors
-          fail "OFMX file has errors"
-        end
-      rescue => error
-        puts "ERROR: #{error.message}"
-        exit 1
+        exit(
+          @files.reduce(true) do |success, file|
+            fail "cannot read #{file}" unless file && File.readable?(file)
+            fail "#{file} is not OFMX" unless file.match?(/\.ofmx$/)
+            AIXM.ofmx!
+            document = File.open(file) { Nokogiri::XML(_1) }
+            errors = []
+            unless @options[:skip_validation]
+              errors += Nokogiri::XML::Schema(File.open(AIXM.schema(:xsd))).validate(document)
+            end
+            errors += AIXM::PayloadHash::Mid.new(document).check_mid
+            fail (["#{file} is not valid..."] + errors).join("\n") if errors.any?
+            success && true
+          rescue RuntimeError => error
+            puts "ERROR: #{error.message}"
+            false
+          end
+        )
       end
     end
 

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "1.3.2".freeze
+  VERSION = "1.3.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: Builder for AIXM/OFMX aeronautical information