expressir 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50f641491331a6faa4d3d4f1e85ad279e97b3aeb98bedb93d323feff1cb8ac51
-  data.tar.gz: 1fd6c283f17387d978a8af4b425fcbef8cbb90e6515d8c56a8841a70310317dc
+  metadata.gz: 0cf66e8d02967b85a1d4514eabaf543948bb3631c651b27dcbd74794f65eb56a
+  data.tar.gz: 6d04084c3f3498d716a4e81bff5bb5098dd233756c3c8decac9887214a25e394
 SHA512:
-  metadata.gz: 95330409badd0fd0991db258eca184f0e4e2c08c53bd6356f01b7cedbd6a8500972509bc235c896d3ca5e25329251c492dbea5b13138a20c85beeb29ad607bee
-  data.tar.gz: b009c202b816d473e80ffc326ff3f0ca9d4841a754313f8332dc8dde8fcc8add7f0025af9a3ad1ed1009e3cf32da4b3c1bcbbfd76298a0e6e25236af21c52307
+  metadata.gz: 995539b97506ccd8547382efd281922b00ae60855e22f433e8568f9149bd14fc444a7890c373c8f984610b2e0d06694a8bc3fc89f7c864c24136bfe629496784
+  data.tar.gz: 2634792ad654c03c71992dc976c3dc44b96d344961c1256f7e5f4a55f30b8345b4ba8b2587d7af058bf0068693637cc7eaec5975ee9aa61344889f22dc7bd00a

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-03-05 05:14:10 UTC using RuboCop version 1.85.0.
+# on 2026-03-12 10:28:38 UTC using RuboCop version 1.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -18,7 +18,7 @@ Layout/ExtraSpacing:
   Exclude:
     - 'lib/expressir/benchmark.rb'
 
-# Offense count: 993
+# Offense count: 990
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -47,12 +47,6 @@ Lint/DuplicateMethods:
   Exclude:
     - 'lib/expressir/commands/validate_ascii.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/ScriptPermission:
-  Exclude:
-    - 'regenerate_yaml.rb'
-
 # Offense count: 2
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: (?-mix:(exactly|at_least|at_most)\(\d+\)\.times)
@@ -80,7 +74,7 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 98
 
-# Offense count: 11
+# Offense count: 14
 # Configuration parameters: CountBlocks, CountModifierForms.
 Metrics/BlockNesting:
   Max: 6
@@ -93,7 +87,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 276
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 193
+  Max: 170
 
 # Offense count: 6
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -323,11 +317,6 @@ Style/HashLikeCase:
   Exclude:
     - 'lib/expressir/express/remark_attacher.rb'
 
-# Offense count: 1
-Style/OpenStructUse:
-  Exclude:
-    - 'spec/expressir/commands/package_tree_spec.rb'
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/PartitionInsteadOfDoubleSelect:
@@ -359,3 +348,19 @@ Style/SelectByKind:
 Style/SoleNestedConditional:
   Exclude:
     - 'lib/expressir/model/search_engine.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/SuperArguments:
+  Exclude:
+    - 'lib/expressir/errors.rb'
+
+# Offense count: 18
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
+Style/TrailingCommaInArguments:
+  Exclude:
+    - 'lib/expressir/commands/format.rb'
+    - 'lib/expressir/commands/package.rb'
+    - 'lib/expressir/commands/validate_load.rb'

data/expressir.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_dependency "base64"
+  spec.add_dependency "benchmark"
   spec.add_dependency "benchmark-ips"
   spec.add_dependency "csv"
   spec.add_dependency "liquid"

data/lib/expressir/commands/base.rb

@@ -17,15 +17,8 @@ module Expressir
         end
       end
 
-      def exit_with_error(message, exit_code = 1)
-        say message
-        # In test mode, raise an exception instead of exiting
-        # This makes it easier to test error cases
-        if defined?(@test_mode) && @test_mode
-          raise message # Just raise the message as an exception
-        else
-          exit exit_code
-        end
+      def exit_with_error(message, _exit_code = 1)
+        raise Expressir::CommandError.new(message)
       end
     end
   end

data/lib/expressir/commands/format.rb

@@ -12,9 +12,11 @@ module Expressir
         when "iso"
           format_with_iso_profile(repository)
         else
-          say "Error: Unknown profile '#{profile}'. Valid profiles are: 'iso', 'elf'",
-              :red
-          exit 1
+          raise Expressir::InvalidOptionError.new(
+            "profile",
+            profile,
+            valid_options: ["iso", "elf"]
+          )
         end
       end
 

data/lib/expressir/commands/package.rb

@@ -101,18 +101,16 @@ module Expressir
         schema_files = if options[:manifest]
                          # Manifest-based mode
                          unless File.exist?(options[:manifest])
-                           say "Error: Manifest file not found: #{options[:manifest]}",
-                               :red
-                           exit 1
+                           raise Expressir::ManifestNotFoundError.new(options[:manifest])
                          end
 
                          # Override output if not provided
                          output ||= root_schema
                          unless output
-                           say "Error: OUTPUT path is required", :red
-                           say "Usage: expressir package build --manifest MANIFEST.yaml OUTPUT.ler",
-                               :yellow
-                           exit 1
+                           raise Expressir::MissingRequiredArgumentError.new(
+                             "OUTPUT path is required",
+                             usage_hint: "expressir package build --manifest MANIFEST.yaml OUTPUT.ler"
+                           )
                          end
 
                          # Build repository
@@ -141,29 +139,19 @@ module Expressir
                            # Check file existence
                            file_errors = validator.validate_file_existence
                            unless file_errors.empty?
-                             say "✗ Manifest validation failed", :red
-                             say ""
-                             file_errors.each do |e|
-                               say "  - #{e[:message]}", :red
-                             end
-                             exit 1
+                             raise Expressir::ManifestValidationError.new(
+                               "Manifest validation failed",
+                               errors: file_errors.map { |e| e[:message] }
+                             )
                            end
 
                            # Check referential integrity
                            reference_errors = validator.validate_referential_integrity
                            unless reference_errors.empty?
-                             say "✗ Manifest has unresolved dependencies", :red
-                             say ""
-                             say "The following schema references cannot be resolved:",
-                                 :red
-                             reference_errors.each do |e|
-                               say "  - #{e[:message]}", :red
-                             end
-                             say ""
-                             say "This package may be incomplete or inconsistent.",
-                                 :red
-                             say "To build anyway, use: --skip-verify", :yellow
-                             exit 1
+                             raise Expressir::ReferentialIntegrityError.new(
+                               reference_errors,
+                               message: "Manifest has unresolved dependencies"
+                             )
                            end
 
                            say "✓ Manifest verified", :green
@@ -199,9 +187,10 @@ module Expressir
                          end
 
                          unless errors.empty?
-                           say "Error: Manifest validation failed", :red
-                           errors.each { |e| say "  - #{e}", :red }
-                           exit 1
+                           raise Expressir::ManifestValidationError.new(
+                             "Manifest validation failed",
+                             errors: errors
+                           )
                          end
 
                          if options[:verbose] && warnings.any?
@@ -214,18 +203,17 @@ module Expressir
                        else
                          # Auto-resolution mode
                          unless root_schema
-                           say "Error: ROOT_SCHEMA is required when not using --manifest",
-                               :red
-                           say "Usage: expressir package build ROOT_SCHEMA OUTPUT.ler",
-                               :yellow
-                           exit 1
+                           raise Expressir::MissingRequiredArgumentError.new(
+                             "ROOT_SCHEMA is required when not using --manifest",
+                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler"
+                           )
                          end
 
                          unless output
-                           say "Error: OUTPUT path is required", :red
-                           say "Usage: expressir package build ROOT_SCHEMA OUTPUT.ler",
-                               :yellow
-                           exit 1
+                           raise Expressir::MissingRequiredArgumentError.new(
+                             "OUTPUT path is required",
+                             usage_hint: "expressir package build ROOT_SCHEMA OUTPUT.ler"
+                           )
                          end
 
                          say "Building LER package from #{root_schema}..." if options[:verbose]
@@ -272,35 +260,21 @@ module Expressir
           say "Validating repository..." if options[:verbose]
           validation = repo.validate
           unless validation[:valid?]
-            say "✗ Repository validation failed", :red
-            say ""
-            errors = validation[:errors] || []
-            say "Validation errors (#{errors.size}):", :red
-            errors.each_with_index do |e, i|
-              error_msg = if e.is_a?(Hash)
-                            # Format hash errors properly
-                            msg = e[:message] || "Unknown error"
-                            type = e[:type] ? "[#{e[:type]}] " : ""
-                            "#{type}#{msg}"
-                          else
-                            # Fallback for string errors
-                            e.to_s
-                          end
-              say "  #{i + 1}. #{error_msg}", :red
-              if e.is_a?(Hash) && e[:schema]
-                say "     Schema: #{e[:schema]}",
-                    :red
-              end
-              if e.is_a?(Hash) && e[:referenced_schema]
-                say "     Referenced: #{e[:referenced_schema]}",
-                    :red
+            raise Expressir::SchemaValidationError.new(
+              "Repository validation failed",
+              errors: (validation[:errors] || []).map do |e|
+                if e.is_a?(Hash)
+                  msg = e[:message] || "Unknown error"
+                  type = e[:type] ? "[#{e[:type]}] " : ""
+                  schema = e[:schema] ? " (schema: #{e[:schema]})" : ""
+                  ref = e[:referenced_schema] ? " (referenced: #{e[:referenced_schema]})" : ""
+                  iface = e[:interface_type] ? " (interface: #{e[:interface_type]})" : ""
+                  "#{type}#{msg}#{schema}#{ref}#{iface}"
+                else
+                  e.to_s
+                end
               end
-              if e.is_a?(Hash) && e[:interface_type]
-                say "     Interface: #{e[:interface_type]}",
-                    :red
-              end
-            end
-            exit 1
+            )
           end
           say "  ✓ Validation passed" if options[:verbose]
         end
@@ -311,10 +285,13 @@ module Expressir
 
         say "✓ Package created: #{output}", :green
         say "  Schemas: #{repo.schemas.size}", :green if options[:verbose]
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error building package: #{e.message}", :red
-        say e.backtrace.join("\n") if options[:verbose]
-        exit 1
+        raise Expressir::PackageBuildError.new(
+          "Error building package: #{e.message}",
+          command_name: "package build"
+        )
       end
 
       desc "info PACKAGE", "Display package metadata and statistics"
@@ -349,9 +326,13 @@ module Expressir
         else
           output_text_info(metadata, repo)
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error reading package info: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageReadError.new(
+          "Error reading package info: #{e.message}",
+          command_name: "package info"
+        )
       end
 
       desc "validate PACKAGE", "Validate package structure and integrity"
@@ -412,10 +393,19 @@ module Expressir
           output_text_validation(validation)
         end
 
-        exit 1 unless validation[:valid?]
+        unless validation[:valid?]
+          raise Expressir::PackageValidationError.new(
+            "Package validation failed",
+            errors: validation[:errors] || []
+          )
+        end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error validating package: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageValidationError.new(
+          "Error validating package: #{e.message}",
+          command_name: "package validate"
+        )
       end
 
       desc "extract PACKAGE", "Extract package contents to directory"
@@ -439,10 +429,10 @@ module Expressir
         require "fileutils"
 
         unless options[:output]
-          say "Error: output directory is required", :red
-          say "Usage: expressir package extract PACKAGE --output OUTPUT_DIR",
-              :yellow
-          exit 1
+          raise Expressir::MissingRequiredArgumentError.new(
+            "output directory is required",
+            usage_hint: "expressir package extract PACKAGE --output OUTPUT_DIR"
+          )
         end
 
         output_dir = options[:output]
@@ -460,9 +450,13 @@ module Expressir
         say "  Files extracted: #{Dir.glob(File.join(output_dir, '**', '*')).select do |f|
           File.file?(f)
         end.size}", :green
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error extracting package: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageExtractError.new(
+          "Error extracting package: #{e.message}",
+          command_name: "package extract"
+        )
       end
 
       desc "list PACKAGE", "List all elements of a specific type"
@@ -522,9 +516,13 @@ module Expressir
           output_text_list(results, options[:type], options[:schema],
                            options[:category])
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error listing elements: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageListError.new(
+          "Error listing elements: #{e.message}",
+          command_name: "package list"
+        )
       end
 
       desc "search PACKAGE PATTERN", "Search for elements matching a pattern"
@@ -602,9 +600,13 @@ module Expressir
         else
           output_text_search_results(results, pattern)
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error searching: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageSearchError.new(
+          "Error searching: #{e.message}",
+          command_name: "package search"
+        )
       end
       desc "tree PACKAGE", "Display hierarchical tree view of package contents"
       long_desc <<~DESC
@@ -669,9 +671,13 @@ module Expressir
           is_last_schema = idx == schemas.size - 1
           display_schema_tree(schema, is_last_schema, "", 1)
         end
+      rescue Expressir::Error
+        raise # Re-raise Expressir errors
       rescue StandardError => e
-        say "Error displaying tree: #{e.message}", :red
-        exit 1
+        raise Expressir::PackageTreeError.new(
+          "Error displaying tree: #{e.message}",
+          command_name: "package tree"
+        )
       end
 
       private
@@ -694,8 +700,7 @@ module Expressir
       # @return [Model::Repository] Loaded repository
       def load_package(package_path)
         unless File.exist?(package_path)
-          say "Package file not found: #{package_path}", :red
-          exit 1
+          raise Expressir::PackageNotFoundError.new(package_path)
         end
 
         Expressir::Model::Repository.from_package(package_path)

data/lib/expressir/commands/validate_ascii.rb

@@ -559,8 +559,7 @@ module Expressir
 
       def validate_from_manifest(manifest_path)
         unless File.exist?(manifest_path)
-          say "Error: Manifest file not found: #{manifest_path}", :red
-          exit 1
+          raise Expressir::ManifestNotFoundError.new(manifest_path)
         end
 
         say "Loading manifest: #{manifest_path}..." if options[:verbose]
@@ -574,8 +573,7 @@ module Expressir
         end
 
         if exp_files.empty?
-          say "Error: No valid schema paths found in manifest", :red
-          exit 1
+          raise Expressir::NoValidSchemaPathsError.new("No valid schema paths found in manifest")
         end
 
         say "Validating #{exp_files.size} schema(s) from manifest for ASCII compliance..." if options[:verbose]

data/lib/expressir/commands/validate_load.rb

@@ -16,8 +16,7 @@ module Expressir
 
       def validate_from_manifest(manifest_path)
         unless File.exist?(manifest_path)
-          say "Error: Manifest file not found: #{manifest_path}", :red
-          exit 1
+          raise Expressir::ManifestNotFoundError.new(manifest_path)
         end
 
         say "Loading manifest: #{manifest_path}..." if options[:verbose]
@@ -29,8 +28,7 @@ module Expressir
         paths = manifest.schemas.map(&:path).reject { |p| p.nil? || p.empty? }
 
         if paths.empty?
-          say "Error: No valid schema paths found in manifest", :red
-          exit 1
+          raise Expressir::NoValidSchemaPathsError.new("No valid schema paths found in manifest")
         end
 
         say "Validating #{paths.size} schema(s) from manifest..." if options[:verbose]
@@ -60,7 +58,12 @@ module Expressir
         print_validation_errors(:failed_to_parse, no_valid)
         print_validation_errors(:missing_version_string, no_version)
 
-        exit 1 unless [no_valid, no_version].all?(&:empty?)
+        unless [no_valid, no_version].all?(&:empty?)
+          raise Expressir::SchemaValidationError.new(
+            "Schema validation failed",
+            errors: no_valid + no_version
+          )
+        end
 
         say "Validation passed for all EXPRESS schemas."
       end

data/lib/expressir/errors.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Expressir
+  # Base error class with details support
+  class Error < StandardError
+    attr_reader :details
+
+    def initialize(message = nil, details: nil)
+      @details = details
+      super(message)
+    end
+  end
+
+  # File/Resource Errors
+  class FileNotFoundError < Error
+    attr_reader :file_path, :file_type
+
+    def initialize(file_path, file_type: nil)
+      @file_path = file_path
+      @file_type = file_type
+      super("#{file_type || 'File'} not found: #{file_path}")
+    end
+  end
+
+  class ManifestNotFoundError < FileNotFoundError
+    def initialize(file_path)
+      super(file_path, file_type: "Manifest file")
+    end
+  end
+
+  class PackageNotFoundError < FileNotFoundError
+    def initialize(file_path)
+      super(file_path, file_type: "Package file")
+    end
+  end
+
+  class SchemaNotFoundError < FileNotFoundError
+    def initialize(file_path)
+      super(file_path, file_type: "Schema file")
+    end
+  end
+
+  # Usage/Argument Errors
+  class UsageError < Error
+    attr_reader :usage_hint
+
+    def initialize(message, usage_hint: nil)
+      @usage_hint = usage_hint
+      super(message)
+    end
+  end
+
+  class MissingRequiredArgumentError < UsageError; end
+
+  class InvalidOptionError < UsageError
+    attr_reader :option_name, :valid_options
+
+    def initialize(option_name, value, valid_options: nil)
+      @option_name = option_name
+      @valid_options = valid_options
+      msg = "Invalid value '#{value}' for #{option_name}"
+      msg += ". Valid options: #{valid_options.join(', ')}" if valid_options
+      super(msg)
+    end
+  end
+
+  # Validation Errors
+  class ValidationError < Error
+    attr_reader :errors
+
+    def initialize(message, errors: [])
+      @errors = errors
+      super(message)
+    end
+  end
+
+  class ManifestValidationError < ValidationError; end
+  class SchemaValidationError < ValidationError; end
+
+  class ReferentialIntegrityError < ValidationError
+    attr_reader :unresolved_references
+
+    def initialize(unresolved_references, message: "Referential integrity check failed")
+      @unresolved_references = unresolved_references
+      super(message)
+    end
+  end
+
+  class NoValidSchemaPathsError < ValidationError
+    def initialize(message = "No valid schema paths found")
+      super(message)
+    end
+  end
+
+  # Command Errors (for rescue blocks)
+  class CommandError < Error
+    attr_reader :command_name
+
+    def initialize(message, command_name: nil)
+      @command_name = command_name
+      super(message)
+    end
+  end
+
+  class PackageBuildError < CommandError; end
+  class PackageReadError < CommandError; end
+  class PackageExtractError < CommandError; end
+  class PackageValidationError < CommandError; end
+  class PackageListError < CommandError; end
+  class PackageSearchError < CommandError; end
+  class PackageTreeError < CommandError; end
+
+  # Backward compatibility - alias the old name to the new class
+  InvalidSchemaManifestError = ManifestValidationError
+end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "2.2.0".freeze
+  VERSION = "2.2.1".freeze
 end

data/lib/expressir.rb

@@ -1,4 +1,5 @@
 require_relative "expressir/version"
+require_relative "expressir/errors"
 require_relative "expressir/cli"
 require_relative "expressir/config"
 require_relative "expressir/benchmark"
@@ -28,9 +29,6 @@ else
 end
 
 module Expressir
-  class Error < StandardError; end
-  class InvalidSchemaManifestError < Error; end
-
   def self.root
     File.dirname(__dir__)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-05 00:00:00.000000000 Z
+date: 2026-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -305,6 +319,7 @@ files:
 - lib/expressir/eengine/compare_report.rb
 - lib/expressir/eengine/mim_compare_report.rb
 - lib/expressir/eengine/modified_object.rb
+- lib/expressir/errors.rb
 - lib/expressir/express/builder.rb
 - lib/expressir/express/builders.rb
 - lib/expressir/express/builders/attribute_decl_builder.rb