mothership 0.3.0 → 0.3.1

data/lib/mothership/inputs.rb

@@ -31,8 +31,16 @@ class Mothership
       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)
@@ -139,6 +147,12 @@ class Mothership
         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

data/lib/mothership/parser.rb

@@ -50,19 +50,19 @@ class Mothership
         case input[:type]
         when :bool, :boolean
           if argv.first == "false" || argv.first == "true"
-            @given[name] = argv.shift == "true"
+            @given[name] = argv.shift
           else
-            @given[name] = true
+            @given[name] = "true"
           end
         when :float, :floating
           if !argv.empty? && argv.first =~ /^[0-9]+(\.[0-9]*)?$/
-            @given[name] = argv.shift.to_f
+            @given[name] = argv.shift
           else
             raise TypeMismatch.new(@command, name, "floating")
           end
         when :integer, :number, :numeric
           if !argv.empty? && argv.first =~ /^[0-9]+$/
-            @given[name] = argv.shift.to_i
+            @given[name] = argv.shift
           else
             raise TypeMismatch.new(@command, name, "numeric")
           end

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/arguments_spec.rb

@@ -1,5 +1,4 @@
-require "mothership"
-require "./helpers"
+require "spec_helper"
 
 describe Mothership::Parser do
   describe "arguments" do

data/spec/combination_spec.rb

@@ -1,5 +1,4 @@
-require "mothership"
-require "./helpers"
+require "spec_helper"
 
 describe Mothership::Parser do
   describe "combinations" do

data/spec/flags_spec.rb

@@ -1,5 +1,4 @@
-require "mothership"
-require "./helpers"
+require "spec_helper"
 
 describe Mothership::Parser do
   describe "flags" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-28 00:00:00 Z
+date: 2012-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -72,7 +72,6 @@ files:
 - spec/arguments_spec.rb
 - spec/combination_spec.rb
 - spec/flags_spec.rb
-- spec/helpers.rb
 - spec/Rakefile
 homepage: https://github.com/vito/mothership
 licenses: []
@@ -111,5 +110,4 @@ test_files:
 - spec/arguments_spec.rb
 - spec/combination_spec.rb
 - spec/flags_spec.rb
-- spec/helpers.rb
 - spec/Rakefile

data/spec/helpers.rb

@@ -1,23 +0,0 @@
-module MothershipHelpers
-  def command(inputs = {})
-    cmd = Mothership::Command.new(Mothership)
-
-    inputs.each do |name, opts|
-      cmd.add_input(name, opts)
-    end
-
-    if block_given?
-      yield cmd
-    else
-      cmd
-    end
-  end
-
-  def inputs(cmd, *argv)
-    Mothership::Parser.new(cmd).parse_argv(argv)
-  end
-end
-
-RSpec.configure do |c|
-  c.include MothershipHelpers
-end