mothership 0.1.0 → 0.1.1

data/lib/mothership/inputs.rb

@@ -25,11 +25,11 @@ class Mothership
     end
 
     def merge(inputs)
-      self.class.new(@command, @context, @inputs.merge(inputs), @given)
+      self.class.new(@command, @context, @inputs.merge(inputs), @given, @global)
     end
 
     def merge_given(inputs)
-      self.class.new(@command, @context, @inputs, @given.merge(inputs))
+      self.class.new(@command, @context, @inputs, @given.merge(inputs), @global)
     end
 
     def without(*names)
@@ -40,7 +40,7 @@ class Mothership
         inputs.delete(n)
       end
 
-      self.class.new(@command, @context, given, inputs)
+      self.class.new(@command, @context, given, inputs, @global)
     end
 
     def [](name, *args)
@@ -57,16 +57,13 @@ class Mothership
     def get(name, context, *args)
       return @inputs[name] if @inputs.key?(name)
 
-      if meta = @command.inputs[name]
+      if @command && meta = @command.inputs[name]
         # special case so #invoke can be called with singular-named inputs
         singular = meta[:singular]
         return @inputs[name] = [@inputs[singular]] if @inputs.key?(singular)
 
         found, val = find_in(@given, name, meta, context, *args)
-      end
-
-      # if not found locally and the default is nil, search globally
-      if !found && val.nil? && meta = Mothership.global_option(name)
+      elsif meta = Mothership.global_option(name)
         found, val = find_in(@global, name, meta, context, *args)
       end
 

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/mothership.rb

@@ -29,7 +29,10 @@ class Mothership
 
       app = new
 
-      return app.default_action unless name
+      unless name
+        app.input = Inputs.new(@@global, app, global_parser.given)
+        return app.default_action
+      end
 
       cmdname = name.gsub("-", "_").to_sym
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-22 00:00:00 Z
+date: 2012-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake