simple-command-parser 1.2 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16cd07f174304e5638c44cba3f2a5a9c16c72e6261740d780b8b66a373e27618
-  data.tar.gz: 51144364948e633245a6905fe28fff3abfd513a635e56b8fa2720b1610aa9f84
+  metadata.gz: 43782f38998248c2bee3cd938562cf2e6ccf957894ae46a3739abb13c9d61092
+  data.tar.gz: 00771d4e6e45430cc7c5bd8b6ad3e227e809389cdc76244eb88e3acb144b8501
 SHA512:
-  metadata.gz: 9c0eaf2507ec0fa82229b940dee182916b037359aede01f5e41fb5c8f55a7f18d3567a310e98cb04ff2350ed89ffd7c82b6939f483abc09b37a1529bd7de8c2c
-  data.tar.gz: 2eec0d8655855c24492597a61b111a6184dbe8782f5309df887ab2836b9dd6e07f40f8e5418b4f015a4479f2fd577258f519dd1ae78f3954999d255fd61daf11
+  metadata.gz: 0c6b65da73616bf264f09188e41bfaf4be4ff6b5a23413e5446f46a244d9fd2ef52fb253c49a1dcb1d1b7a168d2129c071de548b3d0498e588cb464af32d1299
+  data.tar.gz: a9d205597d294eca69c9a883a44681faa5850724b33cc50f17c5fbfe87ee57974aa27eb0560f5d00d45406cd70f6671478b6630f4f0260994f1a2625fe187b75

data/lib/simple-command-parser.rb

@@ -9,34 +9,38 @@ module Simple
     def self.run!(*args)
       begin
         run(*args)
+      rescue Interrupt => e
+        warn "\n[Interrupt]"
       rescue UsageError => e
         warn "#{$0}: #{e}"
         exit(1)
       end
     end
 
-    def self.run(args=ARGV, **defaults)
+    def self.run(args=ARGV, base_class=Command, **defaults)
       cmd_name = args.shift or raise UsageError, "No command given"
-      cmd_class = Command.find_command(cmd_name) or raise UsageError, "Unknown command: #{cmd_name.inspect}"
+      cmd_class = base_class.find_command(cmd_name) or raise UsageError, "Unknown command: #{cmd_name.inspect}"
       options = defaults.merge(cmd_class.defaults.merge(SimpleOptionParser.parse(args)))
       cmd_class.new(options).tap { |cmd| cmd.run(args) }
     end
 
     class Command
 
-      def self.inherited(klass)
-        @@command_classes ||= []
-        @@command_classes << klass
+      def self.find_command(name)
+        @command_map ||= leaf_descendants.map { |k| [k.command_name, k] }.to_h
+        @command_map[name]
       end
 
-      def self.find_command(name)
-        @@command_classes ||= []
-        map = @@command_classes.select { |k| k.subclasses.empty? }.map { |k| [k.command_name, k] }.to_h
-        map[name]
+      def self.descendants
+        subclasses + subclasses.flat_map(&:descendants)
+      end
+
+      def self.leaf_descendants
+        descendants.select { |c| c.subclasses.empty? }
       end
 
       def self.command_name
-        name.to_s.
+        @command_name ||= name.to_s.
           split('::').last.
           gsub(/([a-z])([A-Z])/, '\1-\2').
           downcase

data/simple-command-parser.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'simple-command-parser'
-  s.version       = '1.2'
+  s.version       = '1.4'
   s.summary       = 'A simple command parser.'
   s.author        = 'John Labovitz'
   s.email         = 'johnl@johnlabovitz.com'
@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path  = 'lib'
 
-  s.add_dependency 'simple_option_parser', '~> 0.8'
+  s.add_dependency 'simple_option_parser', '~> 0.9'
 
-  s.add_development_dependency 'minitest', '~> 5.25'
+  s.add_development_dependency 'minitest', '~> 6.0'
   s.add_development_dependency 'minitest-power_assert', '~> 0.3'
   s.add_development_dependency 'rake', '~> 13.3'
   s.add_development_dependency 'simple-rake-tasks', '~> 0.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-command-parser
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.4'
 platform: ruby
 authors:
 - John Labovitz
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.25'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.25'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-power_assert
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A simple command parser.
 test_files: