docopt-compgen 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f524e54bf6f9520b41f0e64f2cd710d64a87241d7b0780fc2421655983eb1f
-  data.tar.gz: 5204ce5211e06c02871b42e05f49371c2b6e3b4731dd6669ae39a7f026167e07
+  metadata.gz: 7c87d112789dd4ea1b0830ab3c5d004bf4e56fd42565de0c058cc3245ad9c58d
+  data.tar.gz: 1145fcc4bab68d7414deab14eceae576cc2902d8b35155219c47990171907d21
 SHA512:
-  metadata.gz: 53ae0d920fb9d37eab1298fc07d1172d4c57ffa6e607a2243cb283e84f77bdf9eb7b87d3f33c3c86701e1646d7a3137ad338eb1c2c9fb11c7ea11dc366aae103
-  data.tar.gz: c9935c4ca6acdb855a87d2bb663bf279c4cc6ec9df5d2c145f9479f212dbd3290d7a7b590ab8841b633532ec52acc96f1e8963712fcf5025fea81c985656b9b2
+  metadata.gz: 52cfc2f51e175ad014c4c575eb5da8cdaab2e1e2e8ad7473c0a6827d2c5775f68d9ae9a6782034c505d87abb4d5ba9a7f27c204fc52e660d651458360c06be43
+  data.tar.gz: eba600aa23409e5a9ee18c72991c32f1e5ed5a82805afc3f5943c9fd2fde3549f21cdc915904b62915677be006ae27f4a5fad90ff64cec5d9b4e474dbb676539

data/bin/docopt-compgen

@@ -23,6 +23,11 @@ end
 
 require 'colorize'
 
+def extract_command_name(usage)
+    matches = /Usage:\s*(\S+)/.match(usage)
+    matches[1] if matches
+end
+
 if $stdin.tty?
     command = opts['<command>']
     if command.nil?
@@ -32,33 +37,35 @@ if $stdin.tty?
     end
 
     begin
-        help = `#{command} --help`
+        usage = `#{command} --help`
     rescue => e
         $stderr.puts e.to_s.red
         exit 1
     end
+
+    command_name = opts['--command-name']
 else
-    if !opts['--command-name']
-        $stderr.puts 'Error: --command-name is mandatory when passing help via stdin'.red
-        puts usage
+    usage = $stdin.read
+    command_name = extract_command_name(usage)
+
+    if command_name.nil?
+        $stderr.puts 'Error: Unable to parse command name from usage output'.red
         exit 1
     end
-
-    help = $stdin.read
 end
 
-if help.nil? || help.lines.first !~ /Usage:/
-    $stderr.puts 'Unable to parse help output from "%s"'.red % command
+if usage.nil? || usage.lines.first !~ /Usage:/
+    $stderr.puts 'Unable to parse usage output from "%s"'.red % command
     exit 1
 end
 
 require_relative '../lib/docopt-compgen'
 
-parser = DocoptCompgen::Parser.new(help)
+parser = DocoptCompgen::Parser.new(usage)
 generator = DocoptCompgen::Generator.new(
     command,
     parser.to_node,
-    command_name: opts['--command-name'],
+    command_name: command_name,
     namespace: opts['--namespace'],
 )
 

data/lib/docopt-compgen/version.rb

@@ -1,3 +1,3 @@
 module DocoptCompgen
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docopt-compgen
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize