bashly 1.4.0.rc1 → 1.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4417e2acaa7177450ab206c368039c46db5e2e3839b015c7dac235d23d3899a
-  data.tar.gz: e62782cd28d229c36adcc4be6d09243b693f8c1536fadcfb98ceaddb203fbc49
+  metadata.gz: 77fc095074710d1003657f7ee7360e06e6864c9142d283d8bab88a9776fc737f
+  data.tar.gz: fae57e0c6bdf23a09d83bb280a4161b2e4b0de0e46518a44a1c36f902f9993cb
 SHA512:
-  metadata.gz: f2827e99a65bbfc2cdaa77b2533400d6a85d7af72cbb35471654bb2ce840cef897f76e19c51504027559405a410cb46d150c2b2680d9b471526a94ee29dc4083
-  data.tar.gz: 1cbe9b74014155e5cbd920fa29249a4102afea7738334b811583d5bdc1ef9064a1595d87d238bc350dd46b4dbe32926546a341956b1f417b521f5d459947ba1c
+  metadata.gz: a23dd4c92491a97aef54990418b930ae38ce826ede3bf1352c18f99ac8c53d5391e613eef113f5996c2757a60d5c9ebf96fe7e277e69a6a07456d02df35c2b28
+  data.tar.gz: 369a787f5851da5ac1b07afe6f7ddb985ebd64fc3ffe08aa5379376b3f8ddbc53e313dc31ba832096361a15ebf5aa973d6fd4dabfe64d7f8c6249799a9a7e1f9

data/lib/bashly/completion_builder.rb

@@ -27,7 +27,7 @@ module Bashly
       pattern_groups = inherited_global_groups.dup
       pattern_groups << local_group if local_group
 
-      @patterns << pattern_for(command, pattern_groups)
+      @patterns << pattern_for(command, pattern_groups) unless visible_default_command(command)
 
       child_global_groups = inherited_global_groups.dup
       if command.global_flags?
@@ -36,6 +36,7 @@ module Bashly
       end
 
       command.visible_commands.each do |child|
+        add_default_command_pattern command, child, pattern_groups
         add_command child, inherited_global_groups: child_global_groups
       end
     end
@@ -47,6 +48,38 @@ module Bashly
       parts.join ' '
     end
 
+    def add_default_command_pattern(parent, command, parent_option_groups)
+      return unless command.default
+
+      default_group = add_default_options parent, command, parent_option_groups
+      option_groups = default_group ? [default_group] : []
+
+      @patterns << pattern_for_default_command(parent, command, option_groups)
+    end
+
+    def add_default_options(parent, command, parent_option_groups)
+      local_group = add_local_options command
+      group_names = parent_option_groups.dup
+      group_names << local_group if local_group
+
+      entries = group_names.flat_map { |name| @options[name] || [] }.uniq
+      return if entries.empty?
+
+      name = token_name "#{group_name(parent)}_#{group_name(command)}_default"
+      @options[name] = entries
+      name
+    end
+
+    def pattern_for_default_command(parent, command, option_groups)
+      parts = [command_path(parent)]
+      parts.concat(option_groups.map { |group| "[#{group} options]" })
+      parts.concat positional_tokens(
+        command,
+        first_source_extra: static_source(parent.visible_command_aliases)
+      )
+      parts.join ' '
+    end
+
     def command_path(command)
       command_chain(command).map.with_index do |item, index|
         index.zero? ? item.name : item.aliases.join('|')
@@ -102,14 +135,20 @@ module Bashly
       register_token flag.arg || flag.name, command, flag_source(flag)
     end
 
-    def positional_tokens(command)
-      command.args.map do |arg|
-        token_name = register_token arg.name, command, arg_source(arg, command)
+    def positional_tokens(command, first_source_extra: nil)
+      command.args.map.with_index do |arg, index|
+        source = arg_source arg, command
+        source = merge_sources(first_source_extra, source) if index.zero? && first_source_extra
+        token_name = register_token arg.name, command, source
         suffix = arg.repeatable ? '...' : nil
         "<#{token_name}>#{suffix}"
       end
     end
 
+    def merge_sources(*sources)
+      sources.compact.flatten.uniq
+    end
+
     def flag_source(flag)
       return static_source(flag.allowed) if flag.allowed
       return completion_source(flag.completions) if flag.completions
@@ -178,6 +217,10 @@ module Bashly
       token_name command.root_command? ? 'root' : command.action_name
     end
 
+    def visible_default_command(command)
+      command.visible_commands.find(&:default)
+    end
+
     def token_name(value)
       value.to_s
         .gsub(/[^a-zA-Z0-9]+/, '_')

data/lib/bashly/version.rb

@@ -1,3 +1,3 @@
 module Bashly
-  VERSION = '1.4.0.rc1'
+  VERSION = '1.4.0.rc2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bashly
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc1
+  version: 1.4.0.rc2
 platform: ruby
 authors:
 - Danny Ben Shitrit