clactive 0.0.12 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7e4c4ba93357a7c358eadf5cbbe467a0763d50c
-  data.tar.gz: e516a1c1bf8f1de50a02137849a5882a4bc61831
+  metadata.gz: 5fbe801886dc426a98da5cf9dd0ebc68c5603e13
+  data.tar.gz: fe866941ea994017097781f587dfc8196ae68af3
 SHA512:
-  metadata.gz: 2e78465a5aeb0b5065f6292110bcd4853f3c9557f13c1632d99dcfccc9051c8976faf7751611ec3cc8b62450fb056cd90433caef8d0b9cb27f889c4106e4e8e1
-  data.tar.gz: 81c3b49f88fdbfe22ddd15f7b64ecea4e60684709999abccef0b1d336a05ef01ed98fd1c2e6967c722d34d612ee523ca0f99e32f959a117a1eca98bdaa0463cb
+  metadata.gz: c710cc74a92c7eb5979af5848f5ae3fdefc88d4635ef28f76b79a7fb35c26e9fe36f930875026fce65c56b5c1d80249cff524e4595fcfc872ce3bd6e25d69216
+  data.tar.gz: 04f3500abc11078523dc00d73f433437298b312fb69b08fed8e4898912fcf0aa2e8c4f31c6f93342099ebb0cb6597530c13d4f0ea98d8386f43ae63f2aac7650

data/lib/clactive.rb

@@ -12,8 +12,6 @@ module CLActive
   end
 
   parser = lambda do |cmd, args|
-    start = cmd
-
     until args.empty?
       begin
         cmd.parse(args)
@@ -22,23 +20,24 @@ module CLActive
         return
       end
 
-      break unless name = args.shift
+      name = args.shift
+      break if !name || !cmd.usropts.empty?
 
       unless subcmd = cmd[name]
         puts "invalid option: " << name
         return
       end
 
-      cmd.subcmd = subcmd
       cmd = subcmd
     end
 
-    start.run
+    cmd.run
   end
 
   klass_subcmd = Class.new do
     attr_reader :options
     attr_reader :subcmds
+    attr_reader :usropts
 
     define_method :initialize do
       @options = {}.extend(tos)
@@ -68,14 +67,9 @@ module CLActive
         argv = []
         argv << @usropts if @action.arity != 0
         self.instance_exec(*argv, &@action)
-        subcmd.run if subcmd
       end
     end
 
-    def subcmd=(cmd)
-      @subcmd = cmd
-    end
-
     def [](key)
       cmd = subcmds[key]
       unless cmd
@@ -97,8 +91,6 @@ module CLActive
         end
         cmd.instance_exec(&block)
         subcmds[cmd.name] = cmd if cmd.name
-      else
-        @subcmd
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clactive
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - Tang Tianyong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies: []
 description: CLActive help you to build command quickly
 email: tang3w@gmail.com
@@ -17,7 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/clactive.rb
-homepage: http://tang3w.com
+homepage: https://github.com/tang3w/CLActive
 licenses:
 - MIT
 metadata: {}