bales 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb40f18edf38481a779d05e661167b9a504577f
-  data.tar.gz: fdfb53af1b8ead967df753d0e03c332c10ffec3f
+  metadata.gz: 3697a0dc2411e2fed3dc7bacbd03a6d33c4ce785
+  data.tar.gz: d5aed1d5f97a63e0505ad77de3199be86b90a7dd
 SHA512:
-  metadata.gz: 08f36ccf3b1ca492be4d60d7881add98f74e9f3732491e0041fe8280cb2e4d61b2ca9817a1086c3e6f5338bf2c535b5b6a04f49346552c3edda00fe0de8f41f7
-  data.tar.gz: 4f86ed0b34ad824ea2bcab12100c1bfaa2fa921d8a7a3213ba9fb805df1375221cf7954c4bef6182bb546c2eac5b5be08950d13f6a51ce901cb0fcd686726fd1
+  metadata.gz: f15a4c35d75271d03d3e22b503c8eae3e8c295e1f912e724249ec7195e375df32282a1899e059901e9f7396d911a7c6675e6497c6c8885e1b8265f5b22eb686c
+  data.tar.gz: 9a979f78d9de61e06e719bd12951c356a8d935c38fef170f9c8ed05815a6b13e09bef24aa7b55cb7f091f1235c464d0e81762f9ea489b51713eceec83f72a531

data/lib/bales/application.rb

@@ -32,37 +32,16 @@ module Bales
     # Command should be a string corresponding to how the command will
     # be invoked on the command-line; thus, a command with the class
     # name +FooBar::Baz+ should be passed as "foo-bar baz".
-    def self.command(name=nil, **opts, &code)
+    def self.command(name, parent: Bales::Command, &code)
       const_name = "#{base_name.name}::Command"
-      opts[:parent] ||= Bales::Command
 
       if eval("defined? #{const_name}") == "constant"
-        const = eval(const_name)
+        base = eval(const_name)
       else
-        const = base_name.const_set('Command', Class.new(opts[:parent]))
+        base = base_name.const_set('Command', Class.new(parent))
       end
 
-      unless name.nil?
-        name
-          .to_s
-          .split(' ')
-          .map { |p| p
-                 .downcase
-                 .gsub('_','-')
-                 .split('-')
-                 .map { |pp| pp.capitalize }
-                 .join }
-          .each do |part|
-          name = "#{const.name}::#{part}"
-          if const.const_defined? name
-            const = eval(name)
-          else
-            const = const.const_set(part, Class.new(opts[:parent]))
-          end
-        end
-      end
-
-      const.instance_eval(&code) if block_given?
+      base.command(name, parent: parent, base: base, &code)
     end
 
     ##

data/lib/bales/command.rb

@@ -87,6 +87,36 @@ module Bales
       end
     end
 
+    ##
+    # Creates a new subcommand of the current command.  Identical in
+    # usage to +Bales::Application.command+, the only significant
+    # difference being that +Bales::Command.command+ defines a command
+    # on its own scope instead of that of the application's root
+    # command.  +Bales::Command.command+ also defaults to making
+    # subcommands' classes descendants of itself (unlike the
+    # application-level equivalent, which defaults to +Bales::Command+
+    # as the new subcommand's parent).
+    def self.command(name, parent: self, base: self, &code)
+      name
+        .to_s
+        .split(' ')
+        .map { |p| p
+               .downcase
+               .gsub('_','-')
+               .split('-')
+               .map { |pp| pp.capitalize }
+               .join }
+        .each do |part|
+        if base.const_defined? "#{base.name}::#{part}"
+          base = eval("#{base.name}::#{part}")
+        else
+          base = base.const_set(part, Class.new(parent))
+        end
+      end
+
+      base.instance_eval(&code) if block_given?
+    end
+
     ##
     # Assigns an action to this command.  Said action is represented
     # as a block, which should accept an array of arguments and a hash

data/lib/bales/version.rb

@@ -1,3 +1,3 @@
 module Bales
-  VERSION="0.0.3"
+  VERSION="0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bales
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan S. Northrup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies: []
 description: A framework for building command-line applications
 email: