thor-zsh_completion 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd91ee306a415b0689fcdb5f58ad3c52f1d049e1
-  data.tar.gz: 692e2d425ff2779550b3d2b5e0edd13de418262b
+  metadata.gz: 7e7f271e7920b86a3507c69dcba4f1161bfd8508
+  data.tar.gz: 3a43af41a8d16d7a4d8bd193a184099925ba2693
 SHA512:
-  metadata.gz: 638a502306f9c061ee9f1d3689a497709e414227829430341aa7c66a73f9bca56a038d8882b947d3498f7d89d775f942b3914b21255de240466d4f28052e9910
-  data.tar.gz: d17f7a4fd9339fec15f08951af2cecbef1af08147febc75e89a4c9aa1cdcc9858bff8787a30a939cab9b45a6deb8e2cd9dd2dd8d4a149954cb46def2c840b81b
+  metadata.gz: d734e5a168bfeb0d5d563962896d63a2ec9d718d76cf2bcbd0e5b822d38920a3747b24fbc8c1fdfe711efdb6e8dbc0366c6ce7aabb262a19f3307945e66631a0
+  data.tar.gz: 4a8a3da7011a7c2d33ea2d48d214ba5d5750fd4d51ab9279a66079cc970519c767cd1edcc3c5a688f9f078d42427c5f15d148abeed041b5e7836354af8e50f61

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+### 0.1.4
+
+Bugfixes
+
+- support `Thor.map`. (by @Zhomart)
+
+### 0.1.3
+
+Bugfixes
+
+- fix invalid script generation bug for option description. (by @tbpgr)
+- fix invalid script generation bug for not aliased option.
+
+### 0.1.1
+
+Features
+
+- support ruby 1.9.3.
+
+### 0.1.0
+
+- initial release.

data/lib/thor/zsh_completion/generator.rb

@@ -65,6 +65,7 @@ class Thor
         depth = prefix.size + 1
 
         source << SUBCOMMAND_FUNCTION_TEMPLATE.result(binding)
+
         subcommand[:subcommands].each do |subcommand|
           source << render_subcommand_function(subcommand, prefix: prefix)
         end
@@ -72,20 +73,30 @@ class Thor
       end
 
       def subcommand_metadata(thor)
-        thor.tasks.map do |(name, command)|
-          if subcommand_class = thor.subcommand_classes[name]
-            subcommands = subcommand_metadata(subcommand_class)
-          else
-            subcommands = []
-          end
-          { name: command.name.gsub("_", "-"),
-            usage: command.usage,
-            description: command.description,
-            options: thor.class_options.map{|_, o| option_metadata(o) } +
-                     command.options.map{|(_, o)| option_metadata(o) },
-            subcommands: subcommands
-          }
+        result = []
+        thor.tasks.each do |(name, command)|
+          aliases = thor.map.select{|_, original_name|
+            name == original_name
+          }.map(&:first)
+          result << generate_command_information(thor, name, command, aliases)
+        end
+        result
+      end
+
+      def generate_command_information(thor, name, command, aliases)
+        if subcommand_class = thor.subcommand_classes[name]
+          subcommands = subcommand_metadata(subcommand_class)
+        else
+          subcommands = []
         end
+        { name: hyphenate(name),
+          aliases: aliases.map{|a| hyphenate(a) },
+          usage: command.usage,
+          description: command.description,
+          options: thor.class_options.map{|_, o| option_metadata(o) } +
+                   command.options.map{|(_, o)| option_metadata(o) },
+          subcommands: subcommands
+        }
       end
 
       def option_metadata(option)
@@ -110,6 +121,10 @@ class Thor
           "{" + names.join(",") + "}"
         end
       end
+
+      def hyphenate(s)
+        s.gsub("_", "-")
+      end
     end
   end
 end

data/lib/thor/zsh_completion/template/subcommand_function.erb

@@ -16,6 +16,9 @@
             'subcommand' \
             <%- subcommand[:subcommands].each do |subcommand| -%>
             <%= quote(subcommand[:name] + bracket(subcommand[:description])) %> \
+            <%- subcommand[:aliases].each do |_alias| -%>
+            <%= quote(_alias + bracket(subcommand[:description])) %> \
+            <%- end -%>
             <%- end -%>
             ;
           ;;
@@ -27,6 +30,11 @@
         <%= subcommand[:name] %>)
           <%= function_name %>_<%= subcommand[:name] %>
           ;;
+        <%- subcommand[:aliases].each do |_alias| -%>
+        <%= _alias %>)
+          <%= function_name %>_<%= subcommand[:name] %>
+          ;;
+        <%- end -%>
         <%- end -%>
         *)
           # if does not match any subcommand

data/lib/thor/zsh_completion/version.rb

@@ -1,5 +1,5 @@
 class Thor
   module ZshCompletion
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

data/thor-zsh_completion.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "thor", "~> 0"
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: thor-zsh_completion
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - labocho
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +76,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt