lib/mothership/inputs.rb in mothership-0.3.1 vs lib/mothership/inputs.rb in mothership-0.3.2

@@ -64,11 +64,11 @@
         if @inputs.key?(singular)
           return @inputs[name] = [@inputs[singular]]
         end
       end
 
-      val = get(name, @context, *args)
+      found, val = get(name, @context, *args)
 
       @inputs[name] = val unless meta && meta[:forget]
 
       val
     end
@@ -97,19 +97,21 @@
       before_input = @current_input
       @current_input = [name, args]
 
       if @command && meta = @command.inputs[name]
         found, val = find_in(@given, name, meta, context, *args)
-      elsif meta = Mothership.global_option(name)
-        found, val = find_in(@global, name, meta, context, *args)
+      elsif @global.is_a?(self.class)
+        found, val = @global.get(name, context, *args)
+      elsif @global.key?(name)
+        return [true, @global[name]]
       end
 
-      return val if not found
+      return [false, val] if not found
 
       if val == :interact && interact = meta[:interact]
-        context.instance_exec(*args, &interact)
+        [true, context.instance_exec(*args, &interact)]
       else
-        convert_given(meta, context, val, *args)
+        [true, convert_given(meta, context, val, *args)]
       end
     ensure
       @current_input = before_input
     end