simple-command-parser 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16cd07f174304e5638c44cba3f2a5a9c16c72e6261740d780b8b66a373e27618
-  data.tar.gz: 51144364948e633245a6905fe28fff3abfd513a635e56b8fa2720b1610aa9f84
+  metadata.gz: 1db79f6094f5dd583d08d8fd1247f7343c0b4f4f8a7b54d1660c669505d70036
+  data.tar.gz: ecb15dd54360a6d0973bd1566a56db9862c6ce1d066e7d81149b54953f5d6d3b
 SHA512:
-  metadata.gz: 9c0eaf2507ec0fa82229b940dee182916b037359aede01f5e41fb5c8f55a7f18d3567a310e98cb04ff2350ed89ffd7c82b6939f483abc09b37a1529bd7de8c2c
-  data.tar.gz: 2eec0d8655855c24492597a61b111a6184dbe8782f5309df887ab2836b9dd6e07f40f8e5418b4f015a4479f2fd577258f519dd1ae78f3954999d255fd61daf11
+  metadata.gz: f09a4fdac10a54db359f3be01cb9f189f6d997ca3cdd73ffa1439d63f6481c7412b6544c7ef4b6991df6290c17cdb2c1b359126de82ba8a41f7a1ba47446fbec
+  data.tar.gz: 7f2484e8964bf10a474d78b1b60949b3310cf8aa3c33ba1e8997b1f150e9cb9985646011b2d913d98d0298921f813b0d44fffd83c64f39122832ea79732a56f4

data/lib/simple-command-parser.rb

@@ -15,28 +15,30 @@ module Simple
       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.3'
   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.3'
 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.4
 specification_version: 4
 summary: A simple command parser.
 test_files: