clive 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/clive.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clive}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Hawxwell"]
@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
      "lib/clive/tokens.rb",
      "test/bin_test",
      "test/helper.rb",
-     "test/test_clive.rb"
+     "test/test_clive.rb",
+     "test/test_exceptions.rb"
   ]
   s.homepage = %q{http://github.com/hawx/clive}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -42,7 +43,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Imagine if optparse and gli had a son called clive.}
   s.test_files = [
     "test/helper.rb",
-     "test/test_clive.rb"
+     "test/test_clive.rb",
+     "test/test_exceptions.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/clive.rb

@@ -21,6 +21,49 @@ require 'clive/booleans'
 #
 class Clive
 
+  # general problem with input
+  class ParseError < StandardError
+    attr_accessor :args, :reason
+    
+    def initialize(*args)
+      @args = args
+      @reason = "parse error"
+    end
+    
+    def self.filter_backtrace(array)
+      unless $DEBUG
+        array = [$0]
+      end
+      array
+    end
+    
+    def set_backtrace(array)
+      super(self.class.filter_backtrace(array))
+    end
+    
+    def message
+      @reason + ': ' + args.join(' ')
+    end
+    alias_method :to_s, :message
+  
+  end
+  
+  # a flag has a missing argument
+  class MissingArgument < ParseError
+    def initialize(*args)
+      @args = args
+      @reason = "missing argument"
+    end
+  end
+  
+  # a option that wasn't defined has been found
+  class InvalidOption < ParseError
+    def initialize(*args)
+      @args = args
+      @reason = "invalid option"
+    end
+  end
+
   attr_accessor :base
   
   def initialize(&block)

data/lib/clive/commands.rb

@@ -82,6 +82,7 @@ class Clive
         when :switch
           v.run
         when :flag
+          raise MissingArgument.new(v.long||v.short) unless i[2]
           v.run(i[2])
         when :argument
           r << v
@@ -138,7 +139,7 @@ class Clive
             tokens << [:flag, flag]
             pre -= [[k, v]] unless @base
           else
-            raise "error, flag/switch '#{v}' does not exist" if @base
+            raise InvalidOption.new(v) if @base
           end
         when :word
           if tokens.last

data/test/helper.rb

@@ -1,10 +1,11 @@
-require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'rr'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'clive'
 
 class Test::Unit::TestCase
+  include RR::Adapters::TestUnit
 end

data/test/test_exceptions.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+class TestClive < Test::Unit::TestCase
+  
+  context "When given bad input" do
+  
+    should "warn of missing arguments" do
+      c = Clive.new do
+        flag(:hello) {}
+      end
+      assert_raise Clive::MissingArgument do
+        c.parse(["--hello"])
+      end
+    end
+    
+    should "warn of invalid options" do
+      c = Clive.new do
+        switch(:hello) {}
+      end
+      assert_raise Clive::InvalidOption do
+        c.parse(["--what"])
+      end
+    end
+  
+  
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clive
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Joshua Hawxwell
@@ -73,6 +73,7 @@ files:
 - test/bin_test
 - test/helper.rb
 - test/test_clive.rb
+- test/test_exceptions.rb
 has_rdoc: true
 homepage: http://github.com/hawx/clive
 licenses: []
@@ -110,3 +111,4 @@ summary: Imagine if optparse and gli had a son called clive.
 test_files: 
 - test/helper.rb
 - test/test_clive.rb
+- test/test_exceptions.rb