docopt-compgen 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f524e54bf6f9520b41f0e64f2cd710d64a87241d7b0780fc2421655983eb1f
-  data.tar.gz: 5204ce5211e06c02871b42e05f49371c2b6e3b4731dd6669ae39a7f026167e07
+  metadata.gz: 44bcf88d3208f5870a54bd566bddbdbf010a6be6a9d656c9875b36301714b519
+  data.tar.gz: af8eefcae73223d825ab8cb2ca2e8db2312912f4f4bac89bac047ddcd477b131
 SHA512:
-  metadata.gz: 53ae0d920fb9d37eab1298fc07d1172d4c57ffa6e607a2243cb283e84f77bdf9eb7b87d3f33c3c86701e1646d7a3137ad338eb1c2c9fb11c7ea11dc366aae103
-  data.tar.gz: c9935c4ca6acdb855a87d2bb663bf279c4cc6ec9df5d2c145f9479f212dbd3290d7a7b590ab8841b633532ec52acc96f1e8963712fcf5025fea81c985656b9b2
+  metadata.gz: 59c215aaaf9033dad335fd5965caa7320d6dd0e59d2cc3716d34e0c8c2da31315d9f40c359194da5f58987f4b8b42f4b88b15a7ccbf9423b0e02d07f73ccc4cb
+  data.tar.gz: 8a3d52b71f8e1ddf062d2097ae2d7ad9e4f360e7a7d239ba7e1ffe7b561891df490c1545b9c71bc20872cdafd51b04b859594a92ed378cb308d5c165404b6e5f

data/bin/docopt-compgen

@@ -8,9 +8,11 @@ usage = <<~EOF
         #{File.basename($0)} [options] [<command>]
 
     Options:
+        --complete-short       Complete short options (long options are always completed)
         --command-name NAME    Command name
                                If not specified then the slugified basename of <command> will be used
         --namespace NAME       Prefix for generated bash functions [default: cmd]
+        -v, --version          Show version
         -h, --help             Show help
 EOF
 
@@ -21,8 +23,20 @@ rescue Docopt::Exit
     exit 2
 end
 
+require_relative '../lib/docopt_compgen'
+
+if opts['--version']
+    puts DocoptCompgen::VERSION
+    exit
+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 +46,33 @@ 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, complete_short: opts['--complete-short'])
 generator = DocoptCompgen::Generator.new(
     command,
     parser.to_node,
-    command_name: opts['--command-name'],
+    command_name: command_name,
     namespace: opts['--namespace'],
 )
 

data/lib/{docopt-compgen → docopt_compgen}/parser.rb

@@ -1,7 +1,8 @@
 module DocoptCompgen
     class Parser
-        def initialize(help)
+        def initialize(help, complete_short: false)
             @help = help
+            @complete_short = complete_short
         end
 
         def to_node
@@ -55,17 +56,15 @@ module DocoptCompgen
                 end
             end
 
-            # rubocop:disable Style/SoleNestedConditional
             if [Docopt::Option].include?(pattern.class)
-                # if pattern.short
-                #     node.add_option(pattern.short)
-                # end
+                if pattern.short && @complete_short
+                    node.add_option(pattern.short)
+                end
 
                 if pattern.long
                     node.add_option(pattern.long)
                 end
             end
-            # rubocop:enable Style/SoleNestedConditional
 
             if [Docopt::Argument].include?(pattern.class)
                 node.add_argument(pattern.name)

data/lib/{docopt-compgen → docopt_compgen}/version.rb

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

data/lib/docopt_compgen.rb

@@ -0,0 +1,11 @@
+module DocoptCompgen
+    def self.root_dir
+        File.expand_path('..', __dir__)
+    end
+end
+
+require_relative 'docopt_compgen/version'
+require_relative 'docopt_compgen/util'
+require_relative 'docopt_compgen/node'
+require_relative 'docopt_compgen/parser'
+require_relative 'docopt_compgen/generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docopt-compgen
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -60,12 +60,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/docopt-compgen
-- lib/docopt-compgen.rb
-- lib/docopt-compgen/generator.rb
-- lib/docopt-compgen/node.rb
-- lib/docopt-compgen/parser.rb
-- lib/docopt-compgen/util.rb
-- lib/docopt-compgen/version.rb
+- lib/docopt_compgen.rb
+- lib/docopt_compgen/generator.rb
+- lib/docopt_compgen/node.rb
+- lib/docopt_compgen/parser.rb
+- lib/docopt_compgen/util.rb
+- lib/docopt_compgen/version.rb
 homepage: https://github.com/crdx/docopt-compgen
 licenses:
 - MIT
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/docopt-compgen.rb

@@ -1,11 +0,0 @@
-module DocoptCompgen
-    def self.root_dir
-        File.expand_path('../..', __FILE__)
-    end
-end
-
-require_relative 'docopt-compgen/version'
-require_relative 'docopt-compgen/util'
-require_relative 'docopt-compgen/node'
-require_relative 'docopt-compgen/parser'
-require_relative 'docopt-compgen/generator'