mothership 0.0.2 → 0.0.3

data/lib/mothership.rb

@@ -27,7 +27,7 @@ class Mothership
     # arguments and flags can be in any order; all flags will be parsed out
     # first, and the bits left over will be treated as arguments
     def start(argv)
-      @@inputs = Inputs.new(@@global, self, {})
+      @@inputs = Inputs.new(@@global)
 
       name, *argv =
         Parser.new(@@global).parse_flags(
@@ -56,7 +56,7 @@ class Mothership
 
   # get value of global option
   def option(name, *args)
-    @@inputs[name, *args]
+    @@inputs.get(name, self, *args)
   end
 
   # test if an option was explicitly provided

data/lib/mothership/command.rb

@@ -37,7 +37,7 @@ class Mothership
       str = @name.to_s.gsub("_", "-")
 
       @arguments.each do |a|
-        name = a[:name].to_s.upcase
+        name = (a[:value] || a[:name]).to_s.upcase
 
         case a[:type]
         when :splat
@@ -111,7 +111,11 @@ class Mothership
 
         options[:argument] = type
 
-        @arguments << { :name => name, :type => type }
+        @arguments <<
+          { :name => name,
+            :type => type,
+            :value => options[:value]
+          }
       end
 
       @inputs[name] = options

data/lib/mothership/help.rb

@@ -126,36 +126,30 @@ module Mothership::Help
 
       usages = []
 
-      max_bool = 0
+      max_width = 0
       rev_flags.collect do |name, fs|
         info = cmd.inputs[name]
 
-        usage =
-          case info[:type]
-          when :boolean
-            fs.sort.join(", ")
-          else
-            fs.sort.collect { |f| "#{f} #{name.to_s.upcase}" }.join(", ")
-          end
+        flag = name.to_s.gsub("_", "-")
 
-        say_no =
-          if info[:type] == :boolean
-            max_bool = usage.size if usage.size > max_bool
-            "--no-#{name.to_s.gsub("_", "-")}"
-          end
+        full = fs.delete "--#{flag}"
 
-        usages << [usage, info[:description], say_no]
-      end
+        short = fs.find { |x| x =~ /^-.$/ }
+        fs.delete short if short
 
-      max_width = 0
-      usages.collect! do |usage, desc, bool_no|
-        if bool_no
-          usage = usage.ljust(max_bool) + "   #{bool_no}"
+        if info[:type] == :boolean && info[:default]
+          full = "--[no-]#{flag}"
+        end
+
+        usage = "#{short ? short + "," : "   "} #{([full] + fs).join ", "}"
+
+        unless info[:type] == :boolean
+          usage << " #{(info[:value] || name).to_s.upcase}"
         end
 
         max_width = usage.size if usage.size > max_width
 
-        [usage, desc]
+        usages << [usage, info[:description]]
       end
 
       usages.sort! { |a, b| a.first <=> b.first }

data/lib/mothership/inputs.rb

@@ -2,7 +2,7 @@ class Mothership
   class Inputs
     attr_reader :inputs
 
-    def initialize(command, context, inputs = {})
+    def initialize(command, context = nil, inputs = {})
       @command = command
       @context = context
       @inputs = inputs
@@ -31,7 +31,12 @@ class Mothership
     end
 
     def [](name, *args)
+      get(name, @context, *args)
+    end
+
+    def get(name, context, *args)
       return @inputs[name] if @inputs.key?(name) && @inputs[name] != []
+
       return @cache[name] if @cache.key? name
 
       meta = @command.inputs[name]
@@ -40,7 +45,11 @@ class Mothership
 
       val =
         if meta[:default].respond_to? :to_proc
-          @context.instance_exec(*args, &meta[:default])
+          unless context
+            raise "no context for input request"
+          end
+
+          context.instance_exec(*args, &meta[:default])
         elsif meta[:default]
           meta[:default]
         elsif meta[:type] == :boolean

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 Z
+date: 2012-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake