fylla 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37d5c86abc42354f12c24adadd654c6d2cbc4b090834d091d1c60f31c9424e7
-  data.tar.gz: f9a4e6414ba530f1aac31b00fdd5e201ec41f5c21be935c293b23c1e9f4b849f
+  metadata.gz: 14e4ab52af2d12b3d0078c3c0451da1a28c0e795c06b9e9867f6188e849c304a
+  data.tar.gz: 8267d2624d22df38cdce36e8b9f245458ec43b6659634e02a5970eaa099fef21
 SHA512:
-  metadata.gz: 114177248eed456e9df5902faef1db685ecff2377e81a3a9525872be7c6b1136b5ade5c964cc6c9c6ba19e33fc48e3a9f8e0e038add709cfcffd46773f7e0e18
-  data.tar.gz: 2f8c8789125f743d4e38e85186e10cbee76c5d5a39ec8dc2c81f03b338998a66f3ba046802ba4712db0db9d17d2dcbe506078ef88a06b5cc1dbfb3eaf7b918f0
+  metadata.gz: 0ff83b9fcc93795be5fc9feadc6dc4cc04cf3fbc178a6430a7f2602e2363d7d0ab5961430f78da4bad91957846690b648638e317ac019f272e5d184272a79971
+  data.tar.gz: f92146028038df7a651eb82579bc5dc437032fb554e1518290cc2f9c40319fd43fa8204bb914b0e4c8bbf0c9c46db09dc9e7da28c8a444e465b4d4b998b0061b

data/lib/fylla.rb

@@ -3,10 +3,12 @@ require 'fylla/completion_generator'
 require 'fylla/parsed_command'
 require 'fylla/parsed_subcommand'
 require 'fylla/completion_extension'
+require 'fylla/thor/extensions/comma_array_extension'
 require 'thor'
 
 # We _must prepend before thor loads_ Ideally this is at require time...
 ::Thor::Option.prepend Fylla::Thor::Option
+::Thor::Arguments.prepend Fylla::Thor::Arguments
 
 #
 # Top level module for the Fylla project.

data/lib/fylla/completion_extension.rb

@@ -1,13 +1,17 @@
 require 'thor'
 
-# add the 'completion:' option to Thor::Option, which
-# allows passing a shorter description for the shell
+# add more options to Thor::Option
+#
+# :completion => allows providing a custom completion description for zsh
+# :filter => allows filtering completions for arrays based on past completions
 module Fylla
   module Thor
     module Option
-      attr_accessor :completion
+      attr_accessor :completion, :filter
       def initialize(name, options = {})
-        @completion = options[:completion]
+        @completion = options[:fylla]&.[](:completion)
+        @filter = options[:fylla]&.[](:filter)
+        @filter = true if @filter.nil?
         super
       end
     end

data/lib/fylla/completion_generator.rb

@@ -29,6 +29,7 @@ module Fylla
           builder = map_to_completion_string [command]
           completion = "#compdef _#{executable_name} #{executable_name}\n"
           completion += builder
+          completion += %Q(_#{executable_name} "$@")
           completion
         end
 
@@ -175,7 +176,7 @@ module Fylla
         def parse_options(options)
           options.map do |opt|
             description = opt.completion || opt.description || opt.banner || opt.name.to_s.upcase
-            ParsedOption.new(opt.name, description, opt.aliases)
+            ParsedOption.new(opt.name, description, opt.aliases, opt.enum, opt.filter)
           end
         end
       end

data/lib/fylla/erb_templates/zsh/command.erb

@@ -2,14 +2,24 @@ function _<%= @executable_name %><%= context_name %> {
   _arguments \
   <%- unless command.options.nil? -%>
     <%- command.options.each do |option| -%>
-    "--<%= option.name %>=[<%= option.description.gsub('"', %q|\\"|) %>]" \
-    <%- option.aliases.each do |al| -%>
-    "-<%= al %>=[<%= option.description.gsub('"', %q|\\"|) %>]" \
-    <%- end -%>
+      <%- enums_exist = option.enum -%>
+      <%- filtered = option.filter -%>
+      <%- desc = option.description.gsub('"', %q|\\"|) -%>
+      <%- if enums_exist -%>
+        <%- if filtered -%>
+        <%- actions = ": :_values -s , 'options' #{option.enum.join(' ')}" -%>
+        <%- else -%>
+        <%- actions = ": :_sequence -d compadd - #{option.enum.join(' ')}" -%>
+        <%- end -%>
+    "--<%= option.name %>=[<%= desc %>]<%= actions %>" \
+      <%- else -%>
+    "--<%= option.name %>[<%= desc %>]" \
+      <%- end -%>
+      <%- option.aliases.each do |al| -%>
+    "-<%= al %><%= option.enum ? '=' : '' %>[<%= desc %>]<%= option.enum ? actions : '' %>" \
+      <%- end -%>
     <%- end -%>
   <%- end -%>
     "-h[Show help information]" \
-    "--help[Show help information]" \
-    "1: :_commands" \
-    "*::arg:->args"/.
+    "--help[Show help information]"
 }

data/lib/fylla/erb_templates/zsh/subcommand.erb

@@ -1,35 +1,37 @@
 function _<%= @executable_name %><%= context_name %> {
   local line
   <%- unless command.commands.empty? %>
-    function _commands {
-    local -a commands
-    commands=(
-    <%-# remove newlines and leading space on this loop -%>
-    <%- command.commands.sort_by(&:name).each do |command| -%>
-      '<%= command.name %>:<%= command.description.gsub("'", %q|'"'"'|) %>'
-    <%- end -%>
-    )
-    _describe 'command' commands
-    }
+  local -a commands
+  commands=(
+  <%-# remove newlines and leading space on this loop -%>
+  <%- command.commands.sort_by(&:name).each do |command| -%>
+    '<%= command.name %>:<%= command.description.gsub("'", %q|'"'"'|) %>'
+  <%- end -%>
+  )
   <%- end %>
   _arguments \
   <%- unless class_options.nil? -%>
     <%- class_options.each do |option| -%>
       <%- option.aliases.each do |al| -%>
-    "-<%= al %>=[<%= option.description.gsub('"', %q|\\"|) %>]" \
+    "-<%= al %>[<%= option.description.gsub('"', %q|\\"|) %>]" \
       <%- end -%>
-    "--<%= option.name %>=[<%= option.description.gsub('"', %q|\\"|) %>]" \
+    "--<%= option.name %>[<%= option.description.gsub('"', %q|\\"|) %>]" \
     <%- end -%>
   <%- end -%>
     "-h[Show help information]" \
     "--help[Show help information]" \
-    "1: :_commands" \
-    "*::arg:->args"/.
-  case $line[1] in
-  <%- command.commands.sort_by(&:name).each do |command| -%>
-    <%= command.name %>)
-    _<%= @executable_name %><%= context_name %>_<%= command.name %>
+    "1: : _describe 'command' commands" \
+    "*::arg:->args"
+
+  case $state in
+    args)
+      case $line[1] in
+      <%- command.commands.sort_by(&:name).each do |command| -%>
+        <%= command.name %>)
+          _<%= @executable_name %><%= context_name %>_<%= command.name %>
+        ;;
+      <%- end -%>
+      esac
     ;;
-  <%- end -%>
   esac
 }

data/lib/fylla/parsed_option.rb

@@ -1,12 +1,14 @@
 module Fylla
   class ParsedOption
-    attr_accessor :aliases, :description, :name
+    attr_accessor :aliases, :description, :name, :enum, :filter
     attr_reader :completion, :banner # used just for parsing class_options recursively. Don't ever set these.
 
-    def initialize(name, description, aliases)
+    def initialize(name, description, aliases, enum, filter)
       @name = name
       @description = description
       @aliases = aliases
+      @enum = enum || nil
+      @filter = filter
     end
   end
 end

data/lib/fylla/thor/extensions/comma_array_extension.rb

@@ -0,0 +1,21 @@
+require 'thor'
+
+# Modify how Thor parses array arguments to be POSIX standard per
+# getopt_long(3)
+# @see https://linux.die.net/man/3/getopt_long
+module Fylla
+  module Thor
+    module Arguments
+      def parse_array(name)
+        return shift if peek.is_a?(Array)
+        array = []
+        if peek.include? ","
+          array.push(*shift.split(","))
+        else
+          array << shift while current_is_value?
+        end
+        array
+      end
+    end
+  end
+end

data/lib/fylla/version.rb

@@ -1,3 +1,3 @@
 module Fylla
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fylla
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Tyler Thrailkill
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-02 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ files:
 - lib/fylla/parsed_command.rb
 - lib/fylla/parsed_option.rb
 - lib/fylla/parsed_subcommand.rb
-- lib/fylla/thor/extensions/ShellDescriptionExtension.rb
+- lib/fylla/thor/extensions/comma_array_extension.rb
 - lib/fylla/version.rb
 homepage: https://github.com/snowe2010/fylla
 licenses:

data/lib/fylla/thor/extensions/ShellDescriptionExtension.rb

@@ -1 +0,0 @@
-