clive 1.1.0 → 1.2.0

data/lib/clive/error.rb

@@ -1,8 +1,12 @@
+unless defined?(KeyError)
+  class KeyError < IndexError; end
+end
+
 class Clive
 
-  # For general errors with Clive. It stripts most of the backtrace which 
+  # For general errors with Clive. It stripts most of the backtrace which
   # you don't really want, and allows you to set nice error messages
-  # using {.reason}. Arguments can be passed and then used in messages by 
+  # using {.reason}. Arguments can be passed and then used in messages by
   # referencing with +#n+ tokens, where +n+ is the index of the argument.
   #
   # A lot of this is pulled from OptionParser::ParseError see
@@ -18,13 +22,13 @@ class Clive
   #
   class Error < StandardError
     attr_accessor :args
-    
+
     # @param args
     #   Arguments that can be accessed with '#n' in {.reason}.
     def initialize(*args)
       @args = args
     end
-    
+
     # Removes all references to files which are not the file being run
     # unless in $DEBUG mode.
     def self.filter_backtrace(array)
@@ -33,22 +37,22 @@ class Clive
       end
       array
     end
-    
+
     # Set the reason for the error class.
     # @param str [String]
     def self.reason(str)
       @reason = str
     end
-    
+
     # Accessor for the reason set with {.reason}.
     def self._reason
       @reason
     end
-    
+
     def set_backtrace(array)
       super(self.class.filter_backtrace(array))
     end
-    
+
     # Build the message by substituting the arguments into the reason.
     def message
       self.class._reason.gsub(/#\d/) do |i|
@@ -61,6 +65,6 @@ class Clive
       end
     end
     alias_method :to_s, :message
-    
+
   end
-end
+end

data/lib/clive/option/runner.rb

@@ -1,9 +1,11 @@
 class Clive
 
   # Methods for modifying a state object. Requires that the instance variable
-  # +@state+ exists and that it responds to +#fetch+, +#store+ and +#key?+.
+  # +@state+ exists and that it responds to +#[]+, +#store+ and +#key?+.
   module StateActions
 
+    # Gets the value for the key, returns nil if the key does not exist.
+    #
     # @param key [Symbol]
     #
     # @example
@@ -13,9 +15,23 @@ class Clive
     #   end
     #
     def get(key)
-      @state.fetch key
+      @state[key]
+    end
+
+    # Gets the value for the key, raises an error if the key does not exist.
+    #
+    # @param key [Symbol]
+    # @raise [KeyError]
+    def get!(key)
+      if has?(key)
+        get(key)
+      else
+        raise KeyError, "key not found: #{key}"
+      end
     end
 
+    # Sets the key to the value given.
+    #
     # @param key [Symbol]
     # @param value [Object]
     #

data/lib/clive/struct_hash.rb

@@ -45,13 +45,13 @@ class Clive
       @data[keys.first] = val
     end
 
-    # Gets the value from the StructHash corresponding to the key given.
+    # Gets the value from the StructHash corresponding to the key given. Returns
+    # nil if the key given does not exist.
     #
     # @param key [Symbol]
-    def fetch(key)
-      @data.fetch @aliases[key]
+    def [](key)
+      @data[@aliases[key]]
     end
-    alias_method :[], :fetch
 
     # Checks whether the StructHash contains an entry for the key given.
     def key?(key)
@@ -87,7 +87,7 @@ class Clive
     # Otherwise calls super.
     def method_missing(sym, *args, &block)
       if key?(sym)
-        fetch sym
+        self[sym]
       elsif sym.to_s[-1..-1] == "?"
         key? sym.to_s[0..-2].to_sym
       else

data/lib/clive/type/definitions.rb

@@ -158,8 +158,9 @@ class Clive
 
       def typecast(arg)
         parts = arg.split('/')
-        mods = parts.pop
-        arg = parts.join('')
+        parts << '' if parts.size < 3
+
+        _, arg, mods = parts
         mods = mods.split('').map {|a| OPTS[a] }.inject{|a,e| a | e }
 
         ::Regexp.new arg, mods

data/lib/clive/version.rb

@@ -1,3 +1,3 @@
 class Clive
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/clive/option/runner_spec.rb

@@ -14,9 +14,29 @@ describe Clive::Option::Runner do
 
   describe '#get' do
     it 'gets a value from state' do
+      r = nil
+      subject._run({}, {:a => 1}, proc { r = get(:a) })
+      r.must_equal 1
+    end
+
+    it 'returns nil if key does not exist' do
+      r = true
+      subject._run({}, {:a => 1}, proc { r = get(:b) })
+      r.must_equal nil
+    end
+  end
+
+  describe '#get!' do
+    it 'gets a value from the state' do
+      r = nil
+      subject._run({}, {:a => 1}, proc { r = get!(:a) })
+      r.must_equal 1
+    end
+
+    it 'raises an error if key does not exist' do
       this {
-        subject._run({}, {:a => 1}, proc { puts get(:a) })
-      }.must_output "1\n"
+        subject._run({}, {:a => 1}, proc { r = get!(:b) })
+      }.must_raise KeyError
     end
   end
 

data/spec/clive/struct_hash_spec.rb

@@ -6,9 +6,14 @@ describe Clive::StructHash do
   subject { Clive::StructHash }
 
   describe '#[]' do
+    let(:s) { subject.new(:a => 1) }
+
     it 'gets the value' do
-      sh = subject.new(:a => 1)
-      sh[:a].must_equal 1
+      s[:a].must_equal 1
+    end
+
+    it 'returns nil if key does not exist' do
+      s[:b].must_equal nil
     end
   end
 

data/spec/clive/type/definitions_spec.rb

@@ -305,6 +305,9 @@ describe Clive::Type::Regexp do
 
   describe '#typecast' do
     it 'returns a Regexp' do
+      subject.typecast('/a|b/').must_be_kind_of Regexp
+      subject.typecast('/a|b/').must_equal /a|b/
+
       subject.typecast('/a/i').must_be_kind_of Regexp
       subject.typecast('/a/ix').must_equal /a/ix
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clive
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152595180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2152595180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152592780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *2152592780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: ! "    Clive provides a DSL for building command line interfaces. It
   allows \n    you to define commands and options, which can also take arguments,
   \n    and then runs the correct stuff!\n"
@@ -100,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A DSL for building command line interfaces.
@@ -123,4 +133,3 @@ test_files:
 - spec/extras/expectations.rb
 - spec/extras/focus.rb
 - spec/helper.rb
-has_rdoc: