mothership 0.3.5 → 0.4.0

data/lib/mothership/base.rb

@@ -31,6 +31,11 @@ class Mothership
       @command.add_input(name, options, &interact)
     end
 
+    # specify a module that defines interactions for each input
+    def interactions(mod)
+      @command.interactions = mod
+    end
+
     # register a command
     def method_added(name)
       return unless @command
@@ -41,8 +46,8 @@ class Mothership
       @command = nil
     end
 
-    def alias_command(orig, new)
-      @@commands[new] = @@commands[orig]
+    def alias_command(new, orig = nil)
+      @@commands[new] = orig ? @@commands[orig] : @command
     end
   end
 
@@ -89,6 +94,6 @@ class Mothership
 
     raise "no active input" unless input
 
-    @input.interact(input, *args)
+    @input.interact(input, self, *args)
   end
 end

data/lib/mothership/command.rb

@@ -2,7 +2,7 @@ require "mothership/inputs"
 
 class Mothership
   class Command
-    attr_accessor :name, :description
+    attr_accessor :name, :description, :interactions
 
     attr_reader :context, :inputs, :arguments, :flags
 
@@ -60,9 +60,13 @@ class Mothership
       @before.each { |f, c| c.new.instance_exec(&f) }
 
       name = @name
+
       ctx = @context.new(self)
+      ctx.extend @interactions if @interactions
+
       ctx.input = Inputs.new(self, ctx, inputs, given, global)
 
+
       action = proc do |*given_inputs|
         ctx.input = given_inputs.first || ctx.input
         ctx.run(name)
@@ -90,6 +94,16 @@ class Mothership
       options[:interact] = interact if interact
       options[:description] = options.delete(:desc) if options.key?(:desc)
 
+      options[:type] ||=
+        case options[:default]
+        when true, false
+          :boolean
+        when Integer
+          :integer
+        when Float
+          :floating
+        end
+
       unless options[:hidden]
         @flags["--#{name.to_s.gsub("_", "-")}"] = name
 

data/lib/mothership/inputs.rb

@@ -73,7 +73,7 @@ class Mothership
       val
     end
 
-    def interact(name, *args)
+    def interact(name, context, *args)
       meta =
         if @command
           @command.inputs[name]
@@ -81,8 +81,13 @@ class Mothership
           Mothership.global_option(name)
         end
 
-      if interact = meta[:interact]
-        @context.instance_exec(*args, &interact)
+      interact = meta[:interact] || :"ask_#{name}"
+
+      case interact
+      when Symbol, String
+        context.send(interact, *args)
+      else
+        context.instance_exec(*args, &interact)
       end
     end
 
@@ -107,8 +112,8 @@ class Mothership
 
       return [false, val] if not found
 
-      if val == :interact && interact = meta[:interact]
-        [true, context.instance_exec(*args, &interact)]
+      if val == :interact
+        [true, interact(name, context, *args)]
       else
         [true, convert_given(meta, context, val, *args)]
       end
@@ -136,7 +141,7 @@ class Mothership
         [true, [where[singular]]]
       else
         # no value given; set as default
-        [false, default_for(meta, context, *args)]
+        [false, default_for(name, meta, context, *args)]
       end
     end
 
@@ -153,9 +158,9 @@ class Mothership
         case meta[:type]
         when :integer, :number, :numeric
           given.to_i
-        when :float
+        when :float, :floating
           given.to_f
-        when :boolean
+        when :bool, :boolean
           given == "true"
         else
           given
@@ -163,7 +168,7 @@ class Mothership
       end
     end
 
-    def default_for(meta, context, *args)
+    def default_for(name, meta, context, *args)
       if meta.key?(:default)
         default = meta[:default]
 
@@ -172,8 +177,8 @@ class Mothership
         else
           default
         end
-      elsif interact = meta[:interact]
-        context.instance_exec(*args, &interact)
+      elsif meta[:interact] || context.respond_to?(:"ask_#{name}", true)
+        interact(name, context, *args)
       elsif meta[:type] == :boolean
         false
       elsif meta[:argument] == :splat

data/lib/mothership/parser.rb

@@ -41,7 +41,7 @@ class Mothership
 
         input = @command.inputs[name]
 
-        if input[:interact] && argv.first == "_"
+        if argv.first == "--ask"
           @given[name] = :interact
           argv.shift
           next
@@ -162,7 +162,7 @@ class Mothership
         "--#$1"
 
       when /^--ask-(.+)/
-        argv.unshift "_"
+        argv.unshift "--ask"
         "--#$1"
 
       # --foo=bar form

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 5
-  version: 0.3.5
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-07 00:00:00 -08:00
+date: 2012-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency