mothership 0.0.9 → 0.0.10

data/lib/mothership/inputs.rb

@@ -10,17 +10,21 @@ class Mothership
     end
 
     def given?(name)
-      @given.key?(name)
+      @inputs.key?(name) || @given.key?(name)
     end
 
     def given(name)
-      @given[name]
+      @inputs[name] || @given[name]
     end
 
     def merge(inputs)
       self.class.new(@command, @context, @given, @inputs.merge(inputs))
     end
 
+    def merge_given(inputs)
+      self.class.new(@command, @context, @given.merge(inputs), @inputs)
+    end
+
     def without(*names)
       given = @given.dup
       inputs = @inputs.dup
@@ -46,6 +50,7 @@ class Mothership
       return @inputs[name] = [@inputs[singular]] if @inputs.key?(singular)
 
       given = @given[name] if @given.key?(name)
+      given ||= [@given[singular]] if @given.key?(singular)
 
       # value given; convert if needed
       if given && given != []

data/lib/mothership/parser.rb

@@ -25,7 +25,7 @@ class Mothership
         unless name
           # assume first argument is subcommand
           if args.empty? && find_in && !local
-            local = find_in[flag.to_sym]
+            local = find_in[flag.gsub("-", "_").to_sym]
           end
 
           args << flag

data/lib/mothership/pretty.rb

@@ -71,12 +71,15 @@ module Mothership::Pretty
 
     return str unless color
 
-    "\e[#{bright ? 9 : 3}#{COLOR_CODES[color]}m#{str}\e[0m"
+    code = "\e[#{bright ? 9 : 3}#{COLOR_CODES[color]}m"
+    "#{code}#{str.gsub("\e[0m", "\e[0m#{code}")}\e[0m"
   end
 
   # bold text
   def b(str)
     return str unless color?
-    "\e[1m#{str}\e[0m"
+
+    code = "\e[1m"
+    "#{code}#{str.gsub("\e[0m", "\e[0m#{code}")}\e[0m"
   end
 end

data/lib/mothership/version.rb

@@ -1,3 +1,3 @@
 class Mothership
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mothership
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake