everyday_thor_util 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e10a18e08aac4d4696245884b5bd3172af25756
-  data.tar.gz: 05112220ff41221cb49c4675453d189518f0bac9
+  metadata.gz: f929d1d0b101083c8b1883c0b912b9a81d47cc84
+  data.tar.gz: a89c6e92dea3dda294c4ebaeecc637cb087456a1
 SHA512:
-  metadata.gz: 0f5c3975fda2524cb21c65cf09049c0a90ce3376eb63d49fa09cea69153f1066ea0d04eb08780fcb109d2192198d6a2e32719e8e07082b78721951fb8f808159
-  data.tar.gz: c475d42073e35b4eaade31f2bc72273282cb59db4c96db1d58459572afaa4b03fd0145ddc1f44494a367380044b0e4845fe0d439c4e945d962583031b96011a1
+  metadata.gz: 5df372dcaf50ccf8456ff049bb82fc96561d740d09526be61b2febcd66d59d25ebbbf8f7322774b1f547d292a53bc8a327b24acba308f7dfb44f7ca6abaf3f35
+  data.tar.gz: 48773e7eb081c6bd52913b6b223187057b632185758b30cf30831fdb58d3253895cd4e53cf96bb4f42bd32394850d43ac7486e14b885843573a9e78d728286b9

data/lib/everyday_thor_util/builder.rb

@@ -204,11 +204,19 @@ module EverydayThorUtil
       rc
     end
 
+    def build_helpers(p, pc)
+      self.global.helpers.helpers.each { |hn, h| pc.no_commands { pc.create_method(hn.to_sym, &h) } }
+      p.helpers.helpers.each { |hn, h| pc.no_commands { pc.create_method(hn.to_sym, &h) } }
+    end
+
+    def build_flags(p, pc, has_children)
+      p.flags.each { |fn, f| has_children ? pc.class_option(fn.to_sym, f) : pc.option(fn.to_sym, f) }
+    end
+
     def build_recurse(p, pc)
       if p.parent.nil?
-        p.flags.flags.each { |fn, f| pc.class_option(fn.to_sym, f) }
-        self.global.helpers.helpers.each { |hn, h| pc.no_commands { pc.create_method(hn.to_sym, &h) } }
-        p.helpers.helpers.each { |hn, h| pc.no_commands { pc.create_method(hn.to_sym, &h) } }
+        build_flags(p, pc, true)
+        build_helpers(p, pc)
       end
       p.commands.commands.each { |cn, c|
         short_desc = c.options[:short_desc]
@@ -218,33 +226,31 @@ module EverydayThorUtil
         if !c.leaf?
           cc = Class.new(Thor)
           cc.namespace cn.to_s
-          self.global.helpers.helpers.each { |hn, h| cc.no_commands { cc.create_method(hn.to_sym, &h) } }
-          c.helpers.helpers.each { |hn, h| pc.no_commands { pc.create_method(hn.to_sym, &h) } }
-          c.flags.flags.each { |fn, f| cc.class_option(fn.to_sym, f) }
+          build_helpers(c, cc)
+          build_flags(c, cc, true)
           build_recurse(c, cc)
-          c.flags.flags.each { |fn, f| pc.class_option(fn.to_sym, f) }
+          build_flags(c, pc, false)
           pc.desc short_desc, desc if short_desc && desc
           pc.long_desc long_desc if long_desc
           pc.subcommand cn, cc
           aliases.each { |an|
             cc2 = Class.new(Thor)
             cc2.namespace an
-            self.global.helpers.helpers.each { |hn, h| cc2.no_commands { cc2.create_method(hn.to_sym, &h) } }
-            c.helpers.helpers.each { |hn, h| pc.no_commands { pc.create_method(hn.to_sym, &h) } }
-            c.flags.flags.each { |fn, f| cc2.class_option(fn.to_sym, f) }
+            build_helpers(c, cc2)
+            build_flags(c, cc2, true)
             build_recurse(c, cc2)
-            c.flags.flags.each { |fn, f| pc.class_option(fn.to_sym, f) }
+            build_flags(c, pc, false)
             pc.desc short_desc.gsub(/^\S+(?=\s|$)/, an.gsub(/_/, '-')), desc if short_desc && desc
             pc.long_desc long_desc if long_desc
             pc.subcommand an, cc2
           } if aliases && !aliases.empty?
         elsif c.body
-          c.flags.flags.each { |fn, f| pc.option(fn.to_sym, f) }
+          build_flags(c, pc, false)
           pc.desc short_desc, desc if short_desc && desc
           pc.long_desc long_desc if long_desc
           pc.create_method(cn.to_sym, &c.body)
           aliases.each { |an|
-            c.flags.flags.each { |fn, f| pc.option(fn.to_sym, f) }
+            build_flags(c, pc, false)
             pc.desc short_desc.gsub(/^\S+(?=\s|$)/, an.gsub(/_/, '-')), desc if short_desc && desc
             pc.long_desc long_desc if long_desc
             pc.dup_method an.to_sym, cn.to_sym

data/lib/everyday_thor_util/version.rb

@@ -1,3 +1,3 @@
 module EverydayThorUtil
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: everyday_thor_util
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler