mothership 0.1.5 → 0.2.0

data/lib/mothership.rb

@@ -14,8 +14,8 @@ class Mothership
 
   class << self
     # define a global option
-    def option(name, options = {}, &default)
-      @@global.add_input(name, options, &default)
+    def option(name, options = {}, &interact)
+      @@global.add_input(name, options, &interact)
     end
 
     # parse argv, by taking the first arg as the command, and the rest as

data/lib/mothership/base.rb

@@ -20,10 +20,10 @@ class Mothership
     end
 
     # define an input for the current command or the global command
-    def input(name, options = {}, &default)
+    def input(name, options = {}, &interact)
       raise "no current command" unless @command
 
-      @command.add_input(name, options, &default)
+      @command.add_input(name, options, &interact)
     end
 
     # register a command
@@ -65,4 +65,25 @@ class Mothership
       unknown_command(name)
     end
   end
+
+  # explicitly perform the interaction of an input
+  #
+  # if no input specified, assume current input and reuse the arguments
+  #
+  # example:
+  #   input(:foo, :default => proc { |foos|
+  #           foos.find { |f| f.name == "XYZ" } ||
+  #             interact
+  #         }) { |foos|
+  #     ask("Foo?", :choices => foos, :display => proc(&:name))
+  #   }
+  def interact(input = nil, *args)
+    unless input
+      input, args = @input.current_input
+    end
+
+    raise "no active input" unless input
+
+    @input.interact(input, *args)
+  end
 end

data/lib/mothership/callbacks.rb

@@ -42,8 +42,8 @@ class Mothership
     end
 
     # add an input/flag to a command
-    def add_input(cmd, name, options = {}, &default)
-      @@commands[cmd].add_input(name, options, &default)
+    def add_input(cmd, name, options = {}, &interact)
+      @@commands[cmd].add_input(name, options, &interact)
     end
   end
 

data/lib/mothership/command.rb

@@ -33,23 +33,27 @@ class Mothership
       "\#<Command '#{@name}'>"
     end
 
-    def usage
-      str = @name.to_s.gsub("_", "-")
+    def display_name
+      @name.to_s.gsub("_", "-")
+    end
 
+    def usage
+      args = [display_name]
       @arguments.each do |a|
         name = (a[:value] || a[:name]).to_s.upcase
+        input = @inputs[a[:name]]
 
-        case a[:type]
-        when :splat
-          str << " #{name}..."
-        when :optional
-          str << " [#{name}]"
+        if a[:type] == :splat
+          args << "#{name}..."
+        elsif a[:type] == :optional || input.key?(:default) || \
+                input.key?(:interact)
+          args << "[#{name}]"
         else
-          str << " #{name}"
+          args << name
         end
       end
 
-      str
+      args.join(" ")
     end
 
     def invoke(inputs = {}, given = {}, global = {})
@@ -82,8 +86,8 @@ class Mothership
       res
     end
 
-    def add_input(name, options = {}, &default)
-      options[:default] = default if default
+    def add_input(name, options = {}, &interact)
+      options[:interact] = interact if interact
       options[:description] = options.delete(:desc) if options.key?(:desc)
 
       @flags["--#{name.to_s.gsub("_", "-")}"] = name

data/lib/mothership/errors.rb

@@ -9,7 +9,7 @@ class Mothership
     end
 
     def to_s
-      "#{@command}: missing input '#{@argument}'"
+      "#{@command.display_name}: missing input '#{@argument}'"
     end
   end
 
@@ -20,7 +20,7 @@ class Mothership
     end
 
     def to_s
-      "#{@command}: too many arguments; extra: #{@extra.join(" ")}"
+      "#{@command.display_name}: too many arguments; extra: #{@extra.join(" ")}"
     end
   end
 
@@ -32,7 +32,7 @@ class Mothership
     end
 
     def to_s
-      "#{@command}: expected #{@type} value for #{@input}"
+      "#{@command.display_name}: expected #{@type} value for #{@input}"
     end
   end
 end

data/lib/mothership/help.rb

@@ -155,7 +155,7 @@ module Mothership::Help
         short = fs.find { |x| x =~ /^-.$/ }
         fs.delete short if short
 
-        if info[:type] == :boolean && info[:default]
+        if info[:type] == :boolean && info[:default] == true
           full = "--[no-]#{flag}"
         end
 

data/lib/mothership/inputs.rb

@@ -2,6 +2,9 @@ class Mothership
   class Inputs
     attr_reader :inputs, :given, :global
 
+    # the input being processed; set during #get
+    attr_reader :current_input
+
     def initialize(
         command, context = nil,
         inputs = {}, given = {}, global = {})
@@ -47,6 +50,19 @@ class Mothership
       get(name, @context, *args)
     end
 
+    def interact(name, *args)
+      meta =
+        if @command
+          @command.inputs[name]
+        else
+          Mothership.global_option(name)
+        end
+
+      if interact = meta[:interact]
+        @context.instance_exec(*args, &interact)
+      end
+    end
+
     # search:
     # 1. cache
     # 2. cache, singular
@@ -57,6 +73,8 @@ class Mothership
     def get(name, context, *args)
       return @inputs[name] if @inputs.key?(name)
 
+      @current_input = [name, args]
+
       if @command && meta = @command.inputs[name]
         # special case so #invoke can be called with singular-named inputs
         singular = meta[:singular]
@@ -69,7 +87,13 @@ class Mothership
 
       return val if not found
 
-      @inputs[name] = convert_given(meta, context, val, *args)
+      if val == :interact && interact = meta[:interact]
+        @inputs[name] = context.instance_exec(*args, &interact)
+      else
+        @inputs[name] = convert_given(meta, context, val, *args)
+      end
+    ensure
+      @current_input = nil
     end
 
     def forget(name)
@@ -120,6 +144,8 @@ class Mothership
         else
           default
         end
+      elsif interact = meta[:interact]
+        context.instance_exec(*args, &interact)
       elsif meta[:type] == :boolean
         false
       elsif meta[:argument] == :splat

data/lib/mothership/parser.rb

@@ -41,6 +41,12 @@ class Mothership
 
         input = @command.inputs[name]
 
+        if input[:interact] && argv.first == "_"
+          @given[name] = :interact
+          argv.shift
+          next
+        end
+
         case input[:type]
         when :bool, :boolean
           if argv.first == "false" || argv.first == "true"
@@ -52,25 +58,28 @@ class Mothership
           if !argv.empty? && argv.first =~ /^[0-9]+(\.[0-9]*)?$/
             @given[name] = argv.shift.to_f
           else
-            raise TypeMismatch.new(@command.name, name, "floating")
+            raise TypeMismatch.new(@command, name, "floating")
           end
         when :integer, :number, :numeric
           if !argv.empty? && argv.first =~ /^[0-9]+$/
             @given[name] = argv.shift.to_i
           else
-            raise TypeMismatch.new(@command.name, name, "numeric")
+            raise TypeMismatch.new(@command, name, "numeric")
           end
         else
-          if argv.empty? || !argv.first.start_with?("-")
-            arg = argv.shift || ""
-
-            @given[name] =
-              if input[:argument] == :splat
-                arg.split(",")
-              else
-                arg
-              end
-          end
+          arg =
+            if argv.empty? || argv.first.start_with?("-")
+              ""
+            else
+              argv.shift
+            end
+
+          @given[name] =
+            if input[:argument] == :splat
+              arg.split(",")
+            else
+              arg
+            end
         end
       end
 
@@ -102,6 +111,8 @@ class Mothership
         name = arg[:name]
         next if @given.key? name
 
+        input = @command.inputs[name]
+
         case arg[:type]
         when :splat
           @given[name] = []
@@ -119,13 +130,13 @@ class Mothership
         else
           if val = args.shift
             @given[name] = val
-          elsif !@command.inputs[name][:default]
-            raise MissingArgument.new(@command.name, name)
+          elsif !input[:default] && !input[:interact]
+            raise MissingArgument.new(@command, name)
           end
         end
       end
 
-      raise ExtraArguments.new(@command.name, args) unless args.empty?
+      raise ExtraArguments.new(@command, args) unless args.empty?
     end
 
     private
@@ -150,6 +161,10 @@ class Mothership
 
         "--#$1"
 
+      when /^--ask-(.+)/
+        argv.unshift "_"
+        "--#$1"
+
       # --foo=bar form
       when /^--([^=]+)=(.+)/
         argv.unshift $2

data/lib/mothership/pretty.rb

@@ -62,7 +62,7 @@ module Mothership::Pretty
 
     bright = false
     color = user_colors[type]
-    if color =~ /bright-(.+)/
+    if color.to_s =~ /bright-(.+)/
       bright = true
       color = $1.to_sym
     end

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-12 00:00:00 Z
+date: 2012-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake