mothership 0.0.6 → 0.0.7

data/lib/mothership.rb

@@ -32,7 +32,8 @@ class Mothership
       name, *argv =
         Parser.new(@@global).parse_flags(
           @@inputs.inputs,
-          argv)
+          argv,
+          @@commands)
 
       app = new
 

data/lib/mothership/command.rb

@@ -4,7 +4,7 @@ class Mothership
   class Command
     attr_accessor :name, :description
 
-    attr_reader :inputs, :arguments, :flags
+    attr_reader :context, :inputs, :arguments, :flags
 
     attr_reader :before, :after, :around, :filters
 

data/lib/mothership/parser.rb

@@ -14,14 +14,26 @@ class Mothership
       inputs
     end
 
-    def parse_flags(inputs, argv)
+    def parse_flags(inputs, argv, find_in = nil)
+      local = nil
       args = []
 
       until argv.empty?
         flag = normalize_flag(argv.shift, argv)
 
-        name = @command.flags[flag]
+        name = local && local.flags[flag] || @command.flags[flag]
         unless name
+          # assume first argument is subcommand
+          if args.empty? && find_in && !local
+            local = find_in[flag.to_sym]
+          end
+
+          args << flag
+          next
+        end
+
+        # skip flags defined by the local cmd
+        if local && local.inputs[name]
           args << flag
           next
         end

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-16 00:00:00 Z
+date: 2012-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake