mothership 0.3.1 → 0.3.2

data/lib/mothership.rb

@@ -28,7 +28,7 @@ class Mothership
       name, *argv = global_parser.parse_flags(argv, @@commands)
 
       global = new
-      global.input = Inputs.new(@@global, global, global_parser.given)
+      global.input = Inputs.new(@@global, global, global_parser)
 
       return global.default_action unless name
 

data/lib/mothership/inputs.rb

@@ -66,7 +66,7 @@ class Mothership
         end
       end
 
-      val = get(name, @context, *args)
+      found, val = get(name, @context, *args)
 
       @inputs[name] = val unless meta && meta[:forget]
 
@@ -99,16 +99,18 @@ class Mothership
 
       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

data/lib/mothership/version.rb

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

data/spec/flags_spec.rb

@@ -5,33 +5,33 @@ describe Mothership::Parser do
     describe "any" do
       it "accepts --foo=bar and --foo bar" do
         command(:foo => {}) do |c|
-          inputs(c, "--foo=bar").should == {:foo => "bar"}
-          inputs(c, "--foo", "bar").should == {:foo => "bar"}
+          inputs(c, "--foo=bar").should == { :foo => "bar" }
+          inputs(c, "--foo", "bar").should == { :foo => "bar" }
         end
       end
 
       it "accepts --foo-bar bar as :foo_bar => \"bar\"" do
         command(:foo_bar => {}) do |c|
-          inputs(c, "--foo-bar", "bar").should == {:foo_bar => "bar"}
+          inputs(c, "--foo-bar", "bar").should == { :foo_bar => "bar" }
         end
       end
 
       it "accepts --foo as :foo => \"\"" do
         command(:foo => {}) do |c|
-          inputs(c, "--foo").should == {:foo => ""}
+          inputs(c, "--foo").should == { :foo => "" }
         end
       end
     end
 
     describe :integer do
       it "interprets --foo 1 as :foo => 1" do
-        command(:foo => {:type => :integer}) do |c|
-          inputs(c, "--foo", "1").should == {:foo => 1}
+        command(:foo => { :type => :integer }) do |c|
+          inputs(c, "--foo", "1").should == { :foo => 1 }
         end
       end
 
       it "fails with --foo bar" do
-        command(:foo => {:type => :integer}) do |c|
+        command(:foo => { :type => :integer }) do |c|
           proc {
             inputs(c, "--foo", "bar")
           }.should raise_error(Mothership::TypeMismatch)
@@ -39,7 +39,7 @@ describe Mothership::Parser do
       end
 
       it "fails with --foo" do
-        command(:foo => {:type => :integer}) do |c|
+        command(:foo => { :type => :integer }) do |c|
           proc {
             inputs(c, "--foo")
           }.should raise_error(Mothership::TypeMismatch)
@@ -49,25 +49,25 @@ describe Mothership::Parser do
 
     describe :float do
       it "interprets --foo 1 as :foo => 1.0" do
-        command(:foo => {:type => :float}) do |c|
-          inputs(c, "--foo", "1").should == {:foo => 1.0}
+        command(:foo => { :type => :float }) do |c|
+          inputs(c, "--foo", "1").should == { :foo => 1.0 }
         end
       end
 
       it "interprets --foo 1. as :foo => 1.0" do
-        command(:foo => {:type => :float}) do |c|
-          inputs(c, "--foo", "1.").should == {:foo => 1.0}
+        command(:foo => { :type => :float }) do |c|
+          inputs(c, "--foo", "1.").should == { :foo => 1.0 }
         end
       end
 
       it "interprets --foo 2.5 as :foo => 2.5" do
-        command(:foo => {:type => :float}) do |c|
-          inputs(c, "--foo", "2.5").should == {:foo => 2.5}
+        command(:foo => { :type => :float }) do |c|
+          inputs(c, "--foo", "2.5").should == { :foo => 2.5 }
         end
       end
 
       it "fails with --foo bar" do
-        command(:foo => {:type => :float}) do |c|
+        command(:foo => { :type => :float }) do |c|
           proc {
             inputs(c, "--foo", "bar")
           }.should raise_error(Mothership::TypeMismatch)
@@ -75,7 +75,7 @@ describe Mothership::Parser do
       end
 
       it "fails with --foo" do
-        command(:foo => {:type => :float}) do |c|
+        command(:foo => { :type => :float }) do |c|
           proc {
             inputs(c, "--foo")
           }.should raise_error(Mothership::TypeMismatch)
@@ -85,36 +85,36 @@ describe Mothership::Parser do
 
     describe :boolean do
       it "interprets --foo as :foo => true" do
-        command(:foo => {:type => :boolean}) do |c|
-          inputs(c, "--foo").should == {:foo => true}
+        command(:foo => { :type => :boolean }) do |c|
+          inputs(c, "--foo").should == { :foo => true }
         end
       end
 
       it "interprets --no-foo as :foo => false" do
-        command(:foo => {:type => :boolean}) do |c|
-          inputs(c, "--no-foo").should == {:foo => false}
+        command(:foo => { :type => :boolean }) do |c|
+          inputs(c, "--no-foo").should == { :foo => false }
         end
       end
       it "interprets --foo true as :foo => true" do
-        command(:foo => {:type => :boolean}) do |c|
-          inputs(c, "--foo", "true").should == {:foo => true}
+        command(:foo => { :type => :boolean }) do |c|
+          inputs(c, "--foo", "true").should == { :foo => true }
         end
       end
 
       it "interprets --no-foo true as :foo => false" do
-        command(:foo => {:type => :boolean}) do |c|
-          inputs(c, "--no-foo", "true").should == {:foo => false}
+        command(:foo => { :type => :boolean }) do |c|
+          inputs(c, "--no-foo", "true").should == { :foo => false }
         end
       end
       it "interprets --foo false as :foo => false" do
-        command(:foo => {:type => :boolean}) do |c|
-          inputs(c, "--foo", "false").should == {:foo => false}
+        command(:foo => { :type => :boolean }) do |c|
+          inputs(c, "--foo", "false").should == { :foo => false }
         end
       end
 
       it "interprets --no-foo false as :foo => true" do
-        command(:foo => {:type => :boolean}) do |c|
-          inputs(c, "--no-foo", "false").should == {:foo => true}
+        command(:foo => { :type => :boolean }) do |c|
+          inputs(c, "--no-foo", "false").should == { :foo => true }
         end
       end
     end

data/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+require "mothership"
+
+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)
+    input_hash = {}
+    given = Mothership::Parser.new(cmd).parse_argv(argv)
+    inputs = Mothership::Inputs.new(cmd, nil, {}, given)
+    given.each_key do |k|
+      input_hash[k] = inputs[k]
+    end
+    input_hash
+  end
+end
+
+RSpec.configure do |c|
+  c.include MothershipHelpers
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-04 00:00:00 Z
+date: 2012-12-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -73,6 +73,7 @@ files:
 - spec/combination_spec.rb
 - spec/flags_spec.rb
 - spec/Rakefile
+- spec/spec_helper.rb
 homepage: https://github.com/vito/mothership
 licenses: []
 
@@ -111,3 +112,4 @@ test_files:
 - spec/combination_spec.rb
 - spec/flags_spec.rb
 - spec/Rakefile
+- spec/spec_helper.rb