fylla 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e4ab52af2d12b3d0078c3c0451da1a28c0e795c06b9e9867f6188e849c304a
-  data.tar.gz: 8267d2624d22df38cdce36e8b9f245458ec43b6659634e02a5970eaa099fef21
+  metadata.gz: 314b5586ed38f48c0ddaec4a02725f2c8aac75e53c46be9bd9c49ce3f8732584
+  data.tar.gz: ad49c03801fdfef68904a27184ea0395b99a4c89ed14ebcf1a5d6392a73022d7
 SHA512:
-  metadata.gz: 0ff83b9fcc93795be5fc9feadc6dc4cc04cf3fbc178a6430a7f2602e2363d7d0ab5961430f78da4bad91957846690b648638e317ac019f272e5d184272a79971
-  data.tar.gz: f92146028038df7a651eb82579bc5dc437032fb554e1518290cc2f9c40319fd43fa8204bb914b0e4c8bbf0c9c46db09dc9e7da28c8a444e465b4d4b998b0061b
+  metadata.gz: 4fa98a04457e512452f91bad2014b14887735f580e35d21398345371349c28b590f6f9f32dfb4e7338525f6b3b15402880c0005e8186d6c4978e4ac7eeaf113f
+  data.tar.gz: c2a727408a06d17d17d8f6a75e79efeb04e8923b7a8ff30064f26a560d3db8d518244cdb2a923814009227657b36f21337ac114a475bf3d87d5979e0e34f2184

data/lib/fylla/completion_generator.rb

@@ -176,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, opt.enum, opt.filter)
+            ParsedOption.new(opt.name, description, opt.aliases, opt.enum, opt.filter, opt.type)
           end
         end
       end

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

@@ -2,21 +2,10 @@ function _<%= @executable_name %><%= context_name %> {
   _arguments \
   <%- unless command.options.nil? -%>
     <%- command.options.each do |option| -%>
-      <%- 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.name %><%= option.equals_type %>[<%= desc %>]<%= option.action %>" \
       <%- option.aliases.each do |al| -%>
-    "-<%= al %><%= option.enum ? '=' : '' %>[<%= desc %>]<%= option.enum ? actions : '' %>" \
+    "-<%= al %><%= option.equals_type %>[<%= desc %>]<%= option.action %>" \
       <%- end -%>
     <%- end -%>
   <%- end -%>

data/lib/fylla/parsed_option.rb

@@ -1,14 +1,27 @@
 module Fylla
   class ParsedOption
-    attr_accessor :aliases, :description, :name, :enum, :filter
-    attr_reader :completion, :banner # used just for parsing class_options recursively. Don't ever set these.
+    attr_accessor :aliases, :description, :name
+    attr_reader :completion, :banner, :enum, :filter, :type # used just for parsing class_options recursively. Don't ever set these.
+    attr_reader :action, :equals_type # used for erb file action
 
-    def initialize(name, description, aliases, enum, filter)
+    def initialize(name, description, aliases, enum, filter, type)
       @name = name
       @description = description
       @aliases = aliases
-      @enum = enum || nil
-      @filter = filter
+      @equals_type = type == :boolean ? '' : '=' # used for switches that take values (everything, but not necessary for boolean)
+      @action = ''
+      if enum
+        case type
+        when :array
+          if filter
+            @action = %Q|: :_values -s , 'options' #{enum.join(' ')}|
+          else
+            @action = %Q|: :_sequence -d compadd - #{enum.join(' ')}|
+          end
+        when :string
+          @action = %Q|: :(#{enum.join(' ')})|
+        end
+      end
     end
   end
 end

data/lib/fylla/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fylla
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tyler Thrailkill
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler