clactive 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2807221f858d1a13f24c600df346ab12e4364b6f
-  data.tar.gz: aa5c10a9e6db92bf2a0ef42e1db8f9a41f862cf5
+  metadata.gz: daad5612a86170ff930f6e855097ab6a476dd50d
+  data.tar.gz: 09e07f5330009a902652da91c948611aa1976b08
 SHA512:
-  metadata.gz: 80671a97c54c39b6634b2c0ee45521a57d95165355277cccc74955cd6c6f13c12906dd908618b634342325292d428cfe02dbbb092c0ec56d47aa65ee44cb73c5
-  data.tar.gz: 93913244e093331057cb52e7c16501c063ecfccbc5702594680c61f10f9b8c23ef0b1a12a20d63d8c2f963fb137ed65730a4f388a90b1a69dd21a2713b936013
+  metadata.gz: b146d8187e5615cad6c6845198582fa5f770651c909cd4e0ecc82271481b3a0255a783353747279fe150f4d2995d0cf8f0df945fad6275203095f98110ca65bd
+  data.tar.gz: 610782ae18c29e9337e8444bc352676495697c0d15d36fcf45be4d72b8e4278b72b6a7935767715795c1792d4c622dfaf27983c620a2912177ea2927abd32c3c

data/lib/clactive.rb

@@ -1,5 +1,3 @@
-require 'optparse'
-
 module CLActive
   tos = Module.new do
     def [](key)
@@ -12,11 +10,12 @@ module CLActive
   end
 
   parser = lambda do |cmd, args|
-    queue = [cmd]
+    start = cmd
+    require 'optparse'
 
     until args.empty?
       begin
-        subcmds = cmd.parse(args)
+        cmd.parse(args)
       rescue OptionParser::ParseError => e
         puts e.message
         return
@@ -24,67 +23,90 @@ module CLActive
 
       break unless name = args.shift
 
-      unless cmd = subcmds[name]
+      unless subcmd = cmd[name]
         puts "invalid option: " << name
         return
       end
 
-      queue << cmd
+      cmd.subcmd = subcmd
+      cmd = subcmd
     end
 
-    queue.each(&:run)
+    start.run
   end
 
   klass_subcmd = Class.new do
+    attr_reader :options
+    attr_reader :subcmds
+
     define_method :initialize do
+      @options = {}.extend(tos)
       @subcmds = {}.extend(tos)
       @usropts = {}.extend(tos)
       @parser = OptionParser.new
     end
 
+    def name(key = nil)
+      key ? (@name = key.to_s) : @name
+    end
+
+    def symbol
+      name.to_sym if name
+    end
+
     def parse(args)
       @parser.order!(args)
-      @subcmds
     end
 
     def help
-      puts @parser.help
+      @parser.help
     end
 
     def run
       if @action
-        argv = [@usropts]
-        argc = @action.arity
-        argv << self if argc > 1 || argc < 0
-        @action.call(*argv)
+        self.instance_exec(@usropts, &@action)
+        subcmd.run if subcmd
       end
     end
 
-    def subcmd(name)
-      if block_given?
-        yield cmd = self.class.new
-        @subcmds[name] = cmd
+    def subcmd=(cmd)
+      @subcmd = cmd
+    end
+
+    def [](key)
+      subcmds[key]
+    end
+
+    def subcmd(&block)
+      if block
+        cmd = self.class.new
+        cmd.instance_exec(&block)
+        subcmds[cmd.name] = cmd if cmd.name
+      else
+        @subcmd
       end
-      self
     end
 
-    def option(name, *argv)
-      @parser.on(*argv) do |val|
-        @usropts[name] = val
+    def option(key, *argv)
+      if argv
+        @options[key] = argv
+        @parser.on(*argv) do |val|
+          @usropts[key] = val
+        end
       end
-      self
     end
 
     def action(&block)
       @action = block if block
-      self
     end
   end
 
-  apis = [:subcmd, :option, :action]
+  apis = %w(name subcmd option action)
   eigen = class << self; self end
   cmd = klass_subcmd.new
 
+  cmd.name File::basename($0, '.*')
+
   apis.each do |api|
     eigen.send(:define_method, api) do |*args, &block|
       cmd.send(api, *args, &block)
@@ -95,3 +117,7 @@ module CLActive
     parser.call(cmd, ARGV.dup)
   end
 end
+
+def CLActive(&block)
+  CLActive.instance_exec(&block) if block
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clactive
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tang Tianyong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies: []
 description: CLActive help you to build command quickly
 email: tang3w@gmail.com