moister 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b02c0dfdcf4ec83c6750efcb5589a09173de2293
-  data.tar.gz: 887ee4e75b941f2eefade7f92bab78c11164c623
+  metadata.gz: 7f34abd6542354861f7906c23a802a75825f360e
+  data.tar.gz: 0a2ed87afece35b57db47b54a672babdbb74fe33
 SHA512:
-  metadata.gz: dc1da69c1ac94657a716d7f5c36c63f34f8b06a5eaae1c0780a98c9313c6e89b626fe8d4e2dd05a4ae442137f4d8461c44979fa8325a506a8b04d07d6cbe0259
-  data.tar.gz: a29a1316c3f16077b66e199f66d45efc3c0fafc53c63c97cc85cc011d87aaebb74657012dd0745cc4d8641fc16c9cd1169b87ab04b4d643bd30849a65388ae3b
+  metadata.gz: 71dfa2354c457163c5059e95aab6d86c72f683a2d3ae038562748303f122c418742fa7a53f825b30d8d7126627803c942fae4b3b2e250bbf9b8760247784b68a
+  data.tar.gz: cc489bf49fa04bcb378c97e0943da37a8a4f296e49f34d0d30b02578b839f772fde371f92ff24fd997ded7fc7e9bd9fe0f5a38e0cb84930c1f19d01b79d2f761

data/lib/moister.rb

@@ -28,11 +28,17 @@ module Moister
       # options applicable to all subcommands
       @for_all = []
       @subcommands = {}
+      @aliases = {}
       super
     end
 
     def subcommand name, banner, &block
-      @subcommands[name] = { name: name, banner: banner, parse_cmdline: block }
+      name, *positionals = name.split ' '
+      name, *aliases = name.split(',')
+      subcmd = { name: name, banner: banner, parse_cmdline: block }
+      subcmd[:positionals] = positionals unless positionals.empty?
+      @subcommands[name] = subcmd
+      aliases.each { |_alias| @aliases[_alias] = name }
     end
 
     # add a block to configure every subcommand
@@ -42,10 +48,16 @@ module Moister
 
     def to_s
       ret = super
-      max_len = @subcommands.values.map { |subcmd| subcmd[:name].length }.max
-      ret += "\ncommands:\n"
-      @subcommands.values.each do |subcmd|
+      prefixes = @subcommands.values.map do |subcmd|
         prefix = subcmd[:name]
+        prefix +=  ' ' + subcmd[:positionals].join(' ') if subcmd.has_key? :positionals
+        prefix
+      end
+      max_len = prefixes.map(&:length).max
+
+      ret += "\ncommands:\n"
+      @subcommands.values.each_with_index do |subcmd, idx|
+        prefix = prefixes[idx]
         prefix += ' ' * (max_len - prefix.length + 2)
         ret += "    #{prefix}  #{subcmd[:banner]}\n"
       end
@@ -61,17 +73,56 @@ module Moister
         ParseResults.new(nil, [], @config)
       else
         cmd = args.first
+        _alias = @aliases[cmd]
+        cmd = _alias if _alias
         subcmd_meta = @subcommands[cmd]
         raise "invalid subcommand: #{cmd}" unless @subcommands.has_key? cmd
         args.shift
 
-        positionals = OptionParserExtra.new(@config) do |subop|
+        subcmd_config = @config[cmd] = {}
+        positionals = OptionParserExtra.new(@config[cmd]) do |subop|
           apply_for_all subop
           subop.banner = subcmd_meta[:banner]
           parse_cmdline = subcmd_meta[:parse_cmdline]
           parse_cmdline.call(subop) if parse_cmdline
         end.order! args
 
+        positionals_meta = subcmd_meta[:positionals]
+        if positionals_meta
+          positionals_meta.each do |positional_meta|
+            array_match = false
+            optional = if positional_meta =~ /^\[.+\]$/
+              optional = true
+              positional_meta = positional_meta[1..-2]
+            end
+
+            positional_name = if positional_meta =~ /^\*[a-z\-]+$/
+              array_match = true
+              positional_meta[1..-1]
+            else
+              positional_meta
+            end
+
+            if array_match
+              if positionals.empty?
+                if optional
+                  subcmd_config[positional_name] = []
+                  next
+                end
+                raise "`#{cmd}' subcommand requires at least one `#{positional_name}' parameter"
+              end
+              subcmd_config[positional_name] = positionals
+              positionals = []
+            else
+              if positionals.empty?
+                next if optional
+                raise "`#{cmd}' subcommand requires `#{positional_name}' parameter"
+              end
+              subcmd_config[positional_name] = positionals.shift
+            end
+          end
+        end
+
         ParseResults.new(cmd, positionals, @config)
       end
     end

data/lib/moister/version.rb

@@ -1,3 +1,3 @@
 module Moister
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moister
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An OptionParser wrapper that supports subcommands and shorter syntax.