everyday_thor_util 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a216e1652ad7274ca794b9bc6d65888d89675fb1
-  data.tar.gz: 4ebf5cee5e768ff699cfdd37d48f3e62fa51857e
+  metadata.gz: 1e393a7a4c5f308c9c860190febb79e3a393225e
+  data.tar.gz: 429a625a092745e4f0b422f99933fd7b76a409f6
 SHA512:
-  metadata.gz: 84a895c84691d7048809782f8f9cbc134c5e0ffa2d1fe46cceb9eb67641220ef6359c48bae5280446e179cecdbea88ce243d924cd2f35abcc12f2cda4b065ee1
-  data.tar.gz: f5cd7907f989117133585a45f3f0b2d118eb1adb528d9ff9f8195a9f6b6cbf2188c596ff04a5c9a0b14db0ae3284c94211d468eb9c63b30bbaa484a0fe63d8de
+  metadata.gz: 1cec2097d74b1e130547f3a0e667e8398ea4ae5a4812abf26b2cfe4904d2f644f2a9cd1304b3aadbbd4a4b9748b60bc6628e529819deb703b2e4919bb096e697
+  data.tar.gz: 6ed3970a5f1ae7022c7b1b54335832e14ffcadae07e5f43348b04705552d419907b44d25df21ed66076676c6aa2d493ef53adf4a54731108f55dd68892a969da

data/lib/everyday_thor_util/plugin-helper.rb

@@ -71,7 +71,7 @@ module EverydayThorUtil
                     Plugins.get flag_symbol, command_class2, id, true
                     Plugins.get command_symbol, command_class2, id
                     Plugins.get flag_symbol, parent_class, id, false
-                    parent_class.desc short_desc.gsub(/^#{name}/, a), desc if short_desc && desc
+                    parent_class.desc short_desc.gsub(/^\S+(?=\s|$)/, a.gsub(/_/, '-')), desc if short_desc && desc
                     parent_class.long_desc long_desc if long_desc
                     parent_class.subcommand a, command_class2
                   } if aliases
@@ -83,7 +83,7 @@ module EverydayThorUtil
                 parent_class.create_method(name.to_sym, &v[:block])
                 aliases.each { |a|
                   Plugins.get flag_symbol, parent_class, id, false
-                  parent_class.desc short_desc.gsub(/^#{name}/, a), desc if short_desc && desc
+                  parent_class.desc short_desc.gsub(/^\S+(?=\s|$)/, a.gsub(/_/, '-')), desc if short_desc && desc
                   parent_class.long_desc long_desc if long_desc
                   parent_class.dup_method a.to_sym, name.to_sym
                 } if aliases
@@ -132,7 +132,7 @@ module EverydayThorUtil
                           d == '1' || d == 1 || d == 'true' || d == 't'
                         end
                 if debug
-                  puts "command: #{self.class.basename2} #{__method__.to_s}"
+                  puts "command: #{self.class.basename2} #{__method__.gsub(/_/, '-').to_s}"
                   puts "parent_options: #{parent_options.inspect}"
                   puts "options: #{options.inspect}"
                   original_method.parameters.each_with_index { |p, i| puts "#{p[1].to_s}: #{args[i]}" }

data/lib/everyday_thor_util/thor-fix.rb

@@ -21,5 +21,13 @@ class Thor
       subcommand_class.parent_class = self
       old_subcommand(subcommand, subcommand_class)
     end
+
+    def handle_argument_error(command, error, args, arity)
+      msg = "ERROR: \"#{basename2} #{command.name.gsub(/_/, '-')}\" was called with "
+      msg << 'no arguments' if args.empty?
+      msg << 'arguments ' << args.inspect unless args.empty?
+      msg << "\nUsage: #{banner(command).inspect}"
+      fail InvocationError, msg
+    end
   end
 end

data/lib/everyday_thor_util/version.rb

@@ -1,3 +1,3 @@
 module EverydayThorUtil
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everyday_thor_util
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Eric Henderson