mothership 0.2.3 → 0.2.4

data/lib/mothership/inputs.rb

@@ -22,8 +22,8 @@ class Mothership
     def given(name)
       if @inputs.key?(name)
         @inputs[name]
-      else
-        @given[name]
+      elsif (given = @given[name]) != :interact
+        given
       end
     end
 
@@ -43,11 +43,26 @@ class Mothership
         inputs.delete(n)
       end
 
-      self.class.new(@command, @context, given, inputs, @global)
+      self.class.new(@command, @context, inputs, given, @global)
     end
 
     def [](name, *args)
-      get(name, @context, *args)
+      return @inputs[name] if @inputs.key?(name)
+
+      if @command && meta = @command.inputs[name]
+        # special case so #invoke can be called with singular-named inputs
+        singular = meta[:singular]
+
+        if @inputs.key?(singular)
+          return @inputs[name] = [@inputs[singular]]
+        end
+      end
+
+      val = get(name, @context, *args)
+
+      @inputs[name] = val unless meta && meta[:forget]
+
+      val
     end
 
     def interact(name, *args)
@@ -71,16 +86,10 @@ class Mothership
     # 5. global
     # 6. global, singular
     def get(name, context, *args)
-      return @inputs[name] if @inputs.key?(name)
-
       before_input = @current_input
       @current_input = [name, args]
 
       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)
       elsif meta = Mothership.global_option(name)
         found, val = find_in(@global, name, meta, context, *args)
@@ -89,16 +98,15 @@ class Mothership
       return val if not found
 
       if val == :interact && interact = meta[:interact]
-        @inputs[name] = context.instance_exec(*args, &interact)
+        context.instance_exec(*args, &interact)
       else
-        @inputs[name] = convert_given(meta, context, val, *args)
+        convert_given(meta, context, val, *args)
       end
     ensure
       @current_input = before_input
     end
 
     def forget(name)
-      @given.delete(name)
       @inputs.delete(name)
     end
 
@@ -117,12 +125,7 @@ class Mothership
         [true, [where[singular]]]
       else
         # no value given; set as default
-        val = default_for(meta, context, *args)
-
-        # cache default value
-        @inputs[name] = val unless meta[:forget]
-
-        [false, val]
+        [false, default_for(meta, context, *args)]
       end
     end
 

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-15 00:00:00 Z
+date: 2012-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake