acclaim 0.2.2 → 0.2.3

data/Gemfile

@@ -2,10 +2,7 @@ source :rubygems
 
 gemspec
 
-{
-  ribbon: '~/projects/ribbon',
-  rookie: '~/projects/rookie'
-}.each do |project, path|
+{ ribbon: '~/projects/ribbon', rookie: '~/projects/rookie' }.each do |project, path|
   path = File.expand_path path
   gem project.to_s, path: path if Dir.exists? path
 end

data/LICENSE.MPL2

@@ -0,0 +1,3 @@
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this file,
+You can obtain one at http://mozilla.org/MPL/2.0/.

data/acclaim.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new('acclaim') do |gem|
   gem.author = 'Matheus Afonso Martins Moreira'
   gem.email  = 'matheus.a.m.moreira@gmail.com'
 
-  gem.files       = `git ls-files`.split "\n"
+  gem.files = `git ls-files`.split "\n"
 
   gem.add_runtime_dependency 'ribbon'
 

data/lib/acclaim.rb

@@ -2,10 +2,6 @@
 module Acclaim
 end
 
-%w(
-
-command
-option
-version
-
-).each { |file| require file.prepend 'acclaim/' }
+%w(command option version).each do |file|
+  require file.prepend 'acclaim/'
+end

data/lib/acclaim/command.rb

@@ -70,7 +70,7 @@ module Acclaim
       end
 
       # Same as #option.
-      alias :opt :option
+      alias opt option
 
       # The block which is executed when this command is called. It is given 2
       # parameters; the first is an Ribbon instance which can be queried for
@@ -80,7 +80,7 @@ module Acclaim
       end
 
       # Same as #action.
-      alias :when_called :action
+      alias when_called action
 
       # Adds help subcommand and options to this command.
       def help(*args)
@@ -135,7 +135,7 @@ module Acclaim
       end
 
       # Same as #execute.
-      alias :call :execute
+      alias call execute
 
       # True if this is a top-level command.
       def root?

data/lib/acclaim/command/help.rb

@@ -7,7 +7,6 @@ module Acclaim
     # Module which adds help support to a command.
     module Help
 
-      # The class methods.
       class << self
 
         # Creates a help subcommand that inherits from the given +base+ command
@@ -63,8 +62,8 @@ module Acclaim
         # [:switches]  The switches used when creating the help option.
         def add_options_to!(*args)
           opts, command = args.extract_ribbon!, args.shift
-          switches = opts.switches? %w(-h --help)
-          description = opts.description? 'Show usage information and exit.'
+          switches = opts.switches? { %w(-h --help) }
+          description = opts.description? { 'Show usage information and exit.' }
           command.option :acclaim_help, *switches, description
         end
 

data/lib/acclaim/command/help/template.rb

@@ -8,7 +8,6 @@ module Acclaim
       # Manages help templates.
       module Template
 
-        # The class methods.
         class << self
 
           # Returns the +template+ folder relative to this directory.

data/lib/acclaim/command/version.rb

@@ -6,7 +6,6 @@ module Acclaim
     # Module which adds version query support to a command.
     module Version
 
-      # The class methods.
       class << self
 
         # Creates a <tt>version</tt> subcommand that inherits from the given
@@ -43,8 +42,8 @@ module Acclaim
         # [:switches]  The switches used when creating the version option.
         def add_options_to!(*args)
           opts, command = args.extract_ribbon!, args.shift
-          switches = opts.switches? %w(-v --version)
-          description = opts.description? 'Show version and exit.'
+          switches = opts.switches? { %w(-v --version) }
+          description = opts.description? { 'Show version and exit.' }
           command.option :acclaim_version, *switches, description
         end
 

data/lib/acclaim/option.rb

@@ -128,19 +128,18 @@ module Acclaim
 
     # Returns +true+ if this option takes no arguments.
     def flag?
-      not arity or arity == [0, 0]
+      arity and arity.none?
     end
 
     # Same as <tt>flag?</tt>
-    alias :bool? :flag?
+    alias bool? flag?
 
     # Same as <tt>flag?</tt>
-    alias :boolean? :flag?
+    alias boolean? flag?
 
     # Same as <tt>flag?</tt>
-    alias :switch? :flag?
+    alias switch? flag?
 
-    # The class methods.
     class << self
 
       # Derives a name from the given key's string representation. All
@@ -150,7 +149,7 @@ module Acclaim
       # resulting name is not a valid switch, a +NameError+ will be raised.
       def name_from(key)
         name = key.to_s
-        raise ArgumentError, "Can't derive name from empty string representation." if name.empty?
+        raise ArgumentError, "Can't derive name from empty key." if name.empty?
         name = (name.length == 1 ? '-' : '--') + name
         name.gsub! '_', '-'
         raise NameError, "Derived name is invalid: #{name}" unless name =~ Parser::Regexp::SWITCH

data/lib/acclaim/option/arity.rb

@@ -12,7 +12,7 @@ module Acclaim
       attr_accessor :optional
 
       # Same as +minimum+.
-      alias :required :minimum
+      alias required minimum
 
       # Initializes this arity with a number of required parameters and a number
       # of optional parameters. If the latter is less than zero, then it means
@@ -27,6 +27,11 @@ module Acclaim
         optional.zero? and minimum == n
       end
 
+      # Returns +true+ if the option takes no parameters.
+      def none?
+        only? 0
+      end
+
       # Returns +true+ if the option can take an infinite number of arguments.
       def unlimited?
         optional < 0
@@ -52,10 +57,10 @@ module Acclaim
       end
 
       # Same as +to_a+.
-      alias :to_ary   :to_a
+      alias to_ary   to_a
 
       # Same as +to_a+.
-      alias :to_array :to_a
+      alias to_array to_a
 
       # Equivalent to <tt>to_a.hash</tt>.
       def hash
@@ -72,10 +77,10 @@ module Acclaim
       end
 
       # Same as <tt>==</tt>
-      alias :eql? :==
+      alias eql? ==
 
       # Same as <tt>==</tt>
-      alias :===  :==
+      alias ===  ==
 
       # Returns a string in the following format:
       #

data/lib/acclaim/option/parser.rb

@@ -1,3 +1,4 @@
+require 'acclaim/option/parser/error'
 require 'acclaim/option/parser/regexp'
 require 'ribbon'
 
@@ -9,34 +10,6 @@ module Acclaim
 
       include Parser::Regexp
 
-      # Errors raised by the parser.
-      class Error < StandardError
-
-        # Raises an Error with the following error message:
-        #
-        #   Wrong number of arguments (#{actual} for #{minimum})
-        def self.raise_wrong_arg_number(actual, minimum, optional)
-          raise self, "Wrong number of arguments (#{actual} for #{minimum})"
-        end
-
-        # Raises an Error with the following error message:
-        #
-        #   Missing required argument (#{option.names.join '|'})
-        def self.raise_missing_required(option)
-          names = option.names.join '|'
-          raise self, "Missing required argument (#{names})"
-        end
-
-        # Raises an error with the following error message:
-        #
-        #   Multiple instances of [#{options.names.join ''}] encountered
-        def self.raise_multiple(option)
-          names = option.names.join '|'
-          raise self, "Multiple instances of [#{names}] encountered"
-        end
-
-      end
-
       # The argument array to parse.
       attr_accessor :argv
 

data/lib/acclaim/option/parser/error.rb

@@ -0,0 +1,35 @@
+module Acclaim
+  class Option
+    class Parser
+
+      # Errors raised by the parser.
+      class Error < StandardError
+
+        # Raises an Error with the following error message:
+        #
+        #   Wrong number of arguments (#{actual} for #{minimum})
+        def self.raise_wrong_arg_number(actual, minimum, optional)
+          raise self, "Wrong number of arguments (#{actual} for #{minimum})"
+        end
+
+        # Raises an Error with the following error message:
+        #
+        #   Missing required argument (#{option.names.join '|'})
+        def self.raise_missing_required(option)
+          names = option.names.join '|'
+          raise self, "Missing required argument (#{names})"
+        end
+
+        # Raises an error with the following error message:
+        #
+        #   Multiple instances of [#{options.names.join ''}] encountered
+        def self.raise_multiple(option)
+          names = option.names.join '|'
+          raise self, "Multiple instances of [#{names}] encountered"
+        end
+
+      end
+
+    end
+  end
+end

data/lib/acclaim/option/parser/regexp.rb

@@ -12,6 +12,8 @@ module Acclaim
         # <tt>'-mult'</tt> should match MULTIPLE_SHORT_SWITCHES, and will be
         # split into <tt>%w(-m -u -l -t)</tt>, which in turn should match this
         # regular expression.
+        #
+        # \w is not used because it matches digits.
         SHORT_SWITCH = /\A-[a-zA-Z_]\Z/.freeze
 
         # Regular expression for a long option switch.
@@ -24,6 +26,8 @@ module Acclaim
         # switch.
         #
         # Examples: <tt>-xvf; -abc; -de_f</tt>
+        #
+        # \w is not used because it matches digits.
         MULTIPLE_SHORT_SWITCHES = /\A-[a-zA-Z_]{2,}\Z/.freeze
 
         # Regular expression for a long switch connected to its parameters with

data/lib/acclaim/option/type.rb

@@ -59,9 +59,6 @@ module Acclaim
   end
 end
 
-require 'acclaim/option/type/date'
-require 'acclaim/option/type/date_time'
-require 'acclaim/option/type/string'
-require 'acclaim/option/type/symbol'
-require 'acclaim/option/type/time'
-require 'acclaim/option/type/uri'
+%w(date date_time string symbol time uri).each do |type|
+  require type.prepend 'acclaim/option/type/'
+end

data/lib/acclaim/version.rb

@@ -16,7 +16,7 @@ module Acclaim
     # Patch version.
     #
     # Increments denote changes in implementation.
-    PATCH = 2
+    PATCH = 3
 
     # Build version.
     #

data/spec/acclaim/option/arity_spec.rb

@@ -24,6 +24,12 @@ describe Acclaim::Option::Arity do
       end
     end
 
+    describe '#none?' do
+      it 'should return true' do
+        subject.none?.should be_true
+      end
+    end
+
     describe '#unlimited?' do
       it 'should return false' do
         subject.unlimited?.should be_false
@@ -61,6 +67,12 @@ describe Acclaim::Option::Arity do
         end
       end
 
+      describe '#none?' do
+        it 'should return false' do
+          subject.none?.should be_false
+        end
+      end
+
       describe '#unlimited?' do
         it 'should return false' do
           subject.unlimited?.should be_false
@@ -99,6 +111,12 @@ describe Acclaim::Option::Arity do
         end
       end
 
+      describe '#none?' do
+        it 'should return false' do
+          subject.none?.should be_false
+        end
+      end
+
       describe '#unlimited?' do
         it 'should return true' do
           subject.unlimited?.should be_true
@@ -138,6 +156,12 @@ describe Acclaim::Option::Arity do
       end
     end
 
+    describe '#none?' do
+      it 'should return false' do
+        subject.none?.should be_false
+      end
+    end
+
     describe '#unlimited?' do
       it 'should return false' do
         subject.unlimited?.should be_false
@@ -175,6 +199,12 @@ describe Acclaim::Option::Arity do
         end
       end
 
+      describe '#none?' do
+        it 'should return false' do
+          subject.none?.should be_false
+        end
+      end
+
       describe '#unlimited?' do
         it 'should return false' do
           subject.unlimited?.should be_false
@@ -213,6 +243,12 @@ describe Acclaim::Option::Arity do
         end
       end
 
+      describe '#none?' do
+        it 'should return false' do
+          subject.none?.should be_false
+        end
+      end
+
       describe '#unlimited?' do
         it 'should return true' do
           subject.unlimited?.should be_true

data/spec/acclaim/option_spec.rb

@@ -18,7 +18,7 @@ describe Acclaim::Option do
     context 'when given multiple strings' do
       let(:switches) { %w(-s --switch) }
       let(:description) { 'Description' }
-      let(:args) { [switches, description].flatten! }
+      let(:args) { [*switches, description] }
 
       it 'should find the switches' do
         subject.names.should == switches
@@ -126,7 +126,7 @@ describe Acclaim::Option do
       let(:block) { proc { |*args| p args } }
 
       it 'should have a custom handler' do
-        subject.handler.should be_a(Proc)
+        subject.handler.should respond_to(:call)
       end
     end
   end
@@ -140,7 +140,7 @@ describe Acclaim::Option do
       let!(:params) { %w(a b c d) }
 
       it 'should convert the parameters to strings' do
-        converted.should == params.map(&:to_s)
+        converted.should == params
       end
     end
 
@@ -149,7 +149,7 @@ describe Acclaim::Option do
       let(:params) { %w(a b c d) }
 
       it 'should convert the parameters to strings' do
-        converted.should == params.map(&:to_s)
+        converted.should == params
       end
     end
 
@@ -157,7 +157,7 @@ describe Acclaim::Option do
       let(:type) { Symbol }
       let(:params) { %w(a b c d) }
 
-      it 'should convert the parameters to strings' do
+      it 'should convert the parameters to symbols' do
         converted.should == params.map(&:to_sym)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acclaim
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ribbon
-  requirement: &11055320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11055320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11054640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11054640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rookie
-  requirement: &11053820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11053820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Command-line option parser and command interface.
 email: matheus.a.m.moreira@gmail.com
 executables: []
@@ -53,7 +68,7 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
-- LICENSE.GPLv3
+- LICENSE.MPL2
 - README.markdown
 - Rakefile
 - acclaim.gemspec
@@ -67,6 +82,7 @@ files:
 - lib/acclaim/option.rb
 - lib/acclaim/option/arity.rb
 - lib/acclaim/option/parser.rb
+- lib/acclaim/option/parser/error.rb
 - lib/acclaim/option/parser/regexp.rb
 - lib/acclaim/option/type.rb
 - lib/acclaim/option/type/date.rb
@@ -95,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2150306043143248332
+      hash: -3961771875420064857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,10 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2150306043143248332
+      hash: -3961771875420064857
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Command-line option parser and command interface.

data/LICENSE.GPLv3

@@ -1,14 +0,0 @@
-Copyright © 2011 Matheus Afonso Martins Moreira
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.