unitsdb 2.1.0 → 2.2.1

data/exe/unitsdb

@@ -4,4 +4,10 @@
 require "unitsdb"
 require "unitsdb/cli"
 
-Unitsdb::CLI.start(ARGV)
+begin
+  Unitsdb::Cli.start(ARGV)
+rescue SystemExit => e
+  # Only print if not already handled (exit code 0 = normal exit)
+  # Exit code 1 from our commands is already handled, don't duplicate
+  raise if e.status.zero?
+end

data/lib/unitsdb/cli.rb

@@ -1,21 +1,31 @@
 # frozen_string_literal: true
 
 require "thor"
-require_relative "commands/validate"
-require_relative "commands/_modify"
 require "fileutils"
 
 module Unitsdb
-  class CLI < Thor
+  class Cli < Thor
+    # Enable --trace globally for all subcommands
+    # When enabled, Thor shows full backtraces on error
+    class_option :trace, type: :boolean, default: false,
+                         desc: "Show full backtrace on error"
+
     # Fix Thor deprecation warning
     def self.exit_on_failure?
       true
     end
 
+    desc "ucum SUBCOMMAND", "UCUM-related commands"
+    subcommand "ucum", Commands::UcumCommand
+
+    desc "qudt SUBCOMMAND", "QUDT-related commands"
+    subcommand "qudt", Commands::QudtCommand
+
     desc "_modify SUBCOMMAND", "Commands that modify the database"
     subcommand "_modify", Commands::ModifyCommand
 
-    desc "validate SUBCOMMAND", "Validate database files for different conditions"
+    desc "validate SUBCOMMAND",
+         "Validate database files for different conditions"
     subcommand "validate", Commands::ValidateCommand
 
     desc "search QUERY", "Search for entities containing the given text"
@@ -31,8 +41,7 @@ module Unitsdb
                       desc: "Path to UnitsDB database (required)"
 
     def search(query)
-      require_relative "commands/search"
-      Commands::Search.new(options).run(query)
+      run_command(Commands::Search, :run, query)
     end
 
     desc "get ID", "Get detailed information about an entity by ID"
@@ -43,11 +52,11 @@ module Unitsdb
     option :database, type: :string, required: true, aliases: "-d",
                       desc: "Path to UnitsDB database (required)"
     def get(id)
-      require_relative "commands/get"
-      Commands::Get.new(options).get(id)
+      run_command(Commands::Get, :get, id)
     end
 
-    desc "check_si", "Check and update SI digital framework references in UnitsDB"
+    desc "check_si",
+         "Check and update SI digital framework references in UnitsDB"
     option :entity_type, type: :string, aliases: "-e",
                          desc: "Entity type to check (units, quantities, or prefixes). If not specified, all types are checked"
     option :ttl_dir, type: :string, required: true, aliases: "-t",
@@ -62,8 +71,7 @@ module Unitsdb
                       desc: "Path to UnitsDB database (required)"
 
     def check_si
-      require_relative "commands/check_si"
-      Commands::CheckSi.new(options).run
+      run_command(Commands::CheckSiCommand, :run)
     end
 
     desc "release", "Create release files (unified YAML and/or ZIP archive)"
@@ -71,11 +79,37 @@ module Unitsdb
                     desc: "Output format: 'yaml' (single file), 'zip' (archive), or 'all' (both)"
     option :output_dir, type: :string, default: ".", aliases: "-o",
                         desc: "Directory to output release files"
+    option :version, type: :string, aliases: "-v", required: true,
+                     desc: "Version number for the release (x.y.z)"
     option :database, type: :string, required: true, aliases: "-d",
                       desc: "Path to UnitsDB database (required)"
     def release
-      require_relative "commands/release"
-      Commands::Release.new(options).run
+      run_command(Commands::Release, :run)
+    end
+
+    private
+
+    def run_command(command_class, method, *args)
+      command = command_class.new(options)
+      command.send(method, *args)
+    rescue Unitsdb::Errors::CLIRuntimeError => e
+      handle_cli_error(e)
+    rescue StandardError => e
+      handle_error(e)
+    end
+
+    def handle_cli_error(error)
+      raise error if debugging?
+
+      warn "Error: #{error.message}"
+      exit 1
+    end
+
+    def handle_error(error)
+      raise error if debugging?
+
+      warn "Error: #{error.message}"
+      exit 1
     end
   end
 end

data/lib/unitsdb/commands/_modify.rb

@@ -5,17 +5,53 @@ require "thor"
 module Unitsdb
   module Commands
     class ModifyCommand < Thor
-      desc "normalize [INPUT] [OUTPUT]", "Normalize a YAML file or all YAML files with --all"
-      method_option :sort, type: :string, default: "short",
-                           desc: "Sort units by: 'short' (name), 'nist' (ID), 'unitsml' (ID), or 'none'"
+      # Inherit trace option from parent CLI
+      class_option :trace, type: :boolean, default: false,
+                           desc: "Show full backtrace on error"
+
+      desc "normalize INPUT OUTPUT",
+           "Normalize a YAML file or all YAML files with --all"
+      method_option :sort, type: :string,
+                           default: "nist",
+                           enum: ["short", "nist", "unitsml", "none"],
+                           aliases: "-s",
+                           desc: "Sort units by: 'short' (name), 'nist' (ID, default), 'unitsml' (ID), or 'none'"
       method_option :database, type: :string, required: true, aliases: "-d",
                                desc: "Path to UnitsDB database (required)"
       method_option :all, type: :boolean, default: false, aliases: "-a",
                           desc: "Process all YAML files in the repository"
 
       def normalize(input = nil, output = nil)
-        require_relative "normalize"
-        Normalize.new(options).run(input, output)
+        run_command(Normalize, options, input, output)
+      rescue Unitsdb::Errors::CLIRuntimeError => e
+        handle_cli_error(e)
+      rescue StandardError => e
+        handle_error(e)
+      end
+
+      private
+
+      def run_command(command_class, options, *args)
+        command = command_class.new(options)
+        command.run(*args)
+      end
+
+      def handle_cli_error(error)
+        if options[:trace]
+          raise error
+        else
+          warn "Error: #{error.message}"
+          exit 1
+        end
+      end
+
+      def handle_error(error)
+        if options[:trace]
+          raise error
+        else
+          warn "Error: #{error.message}"
+          exit 1
+        end
       end
     end
   end

data/lib/unitsdb/commands/base.rb

@@ -1,51 +1,29 @@
 # frozen_string_literal: true
 
-require "thor"
 require "yaml"
-require_relative "../utils"
-require_relative "../database"
+require "fileutils"
 
 module Unitsdb
   module Commands
     class Base
       def initialize(options = {})
         @options = options
+        puts "Database directory path: #{@options[:database]}" if @options[:database]
       end
 
       protected
 
-      def yaml_files(input = nil, opts = nil)
-        options_to_use = opts || @options
-
-        if options_to_use[:all]
-          Unitsdb::Utils::DEFAULT_YAML_FILES.map { |f| File.join(options_to_use[:database], f) }
-        elsif input
-          [input]
-        else
-          puts "Error: INPUT file is required when not using --all"
-          exit(1)
+      def load_database(path = nil)
+        path ||= @options[:database]
+        unless path
+          raise Unitsdb::Errors::DatabaseError,
+                "Database path not specified"
         end
-      end
-
-      def load_database(database_path = nil)
-        path = database_path || @options[:database]
-
-        raise Unitsdb::Errors::DatabaseError, "Database path must be specified using the --database option" if path.nil?
 
         Unitsdb::Database.from_db(path)
-      rescue Unitsdb::Errors::DatabaseError => e
-        puts "Error: #{e.message}"
-        exit(1)
-      end
-
-      def load_yaml(file_path)
-        return nil unless File.exist?(file_path)
-
-        YAML.safe_load(File.read(file_path))
-      end
-
-      def file_type(file_path)
-        File.basename(file_path, ".yaml")
+      rescue StandardError => e
+        raise Unitsdb::Errors::DatabaseError,
+              "Failed to load database: #{e.message}"
       end
     end
   end