climate 0.3.0 → 0.4.0

data/lib/climate/parser.rb

@@ -32,6 +32,7 @@ module Climate
 
     def optional? ; spec.has_key?(:default) ; end
     def required? ; ! optional?             ; end
+    def multi?    ; spec[:multi]            ; end
 
     def spec ; @specs ||= parser.specs[@name] ; end
 
@@ -44,7 +45,7 @@ module Climate
     end
 
     def short_usage
-      short && (type == :flag ? "-#{short}" : "-#{short}<#{type}>")
+      short && (type == :flag ? "-#{short}" : "-#{short} <#{name}>")
     end
 
     def usage(options={})
@@ -56,6 +57,8 @@ module Climate
 
       if optional? && !options.fetch(:hide_optional, false)
         "[#{help}]"
+      elsif multi? && !options.fetch(:hide_optional, false)
+        "[#{help}...]"
       else
         help
       end
@@ -170,7 +173,7 @@ module Climate
         elsif (m = /option (.+) must be specified/.match(e.message))
           raise MissingArgumentError.new(m[1], command)
         else
-          raise
+          raise CommandError.new(e.message, command)
         end
       end
 

data/lib/climate/version.rb

@@ -1,3 +1,3 @@
 module Climate
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/climate.rb

@@ -22,6 +22,10 @@ module Climate
       $stderr.puts("Missing argument: #{e.message}")
       print_usage(e.command_class)
       exit(1)
+    rescue CommandError => e
+      $stderr.puts(e.message)
+      print_usage(e.command_class)
+      exit(1)
     rescue => e
       $stderr.puts("Unexpected error: #{e.class.name} - #{e.message}")
       $stderr.puts(e.backtrace)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: climate
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Nick Griffiths
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-08 00:00:00 Z
+date: 2012-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: trollop