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

@@ -29,14 +29,22 @@
 
     def merge(inputs)
       self.class.new(@command, @context, @inputs.merge(inputs), @given, @global)
     end
 
-    def merge_given(inputs)
-      self.class.new(@command, @context, @inputs, @given.merge(inputs), @global)
+    def merge_given(given)
+      self.class.new(@command, @context, @inputs, @given.merge(given), @global)
     end
 
+    def rebase(inputs)
+      self.class.new(@command, @context, inputs.merge(@inputs), @given, @global)
+    end
+
+    def rebase_given(given)
+      self.class.new(@command, @context, @inputs, given.merge(@given), @global)
+    end
+
     def without(*names)
       given = @given.dup
       inputs = @inputs.dup
       names.each do |n|
         given.delete(n)
@@ -137,9 +145,15 @@
             context.instance_exec(i, *args, &convert)
           end
         else
           context.instance_exec(given, *args, &convert)
         end
+      elsif meta[:type] == :integer
+        given.to_i
+      elsif meta[:type] == :float
+        given.to_f
+      elsif meta[:type] == :boolean
+        given == "true"
       else
         given
       end
     end