clive 1.2.0 → 1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 91b3667e70d3210280746c68a18588e387e1ecf2
+  data.tar.gz: a253732d58c0b2cd45f8b8f715418938a489cef8
+SHA512:
+  metadata.gz: 67f7ae4f03fe3531cebe93da7e9c0527d450e1c290c7cdec3603821505577ee655367676a611ff7c17dcd5d2fe6313f6cf0379365b527f0fb1408b0c16afa679
+  data.tar.gz: 6348de02dacec424fb5fabcbc55cc893b2b2a26fff74d965a03231de1e25222ed80b96267935b0a456dd5e13d544eae4e180c4d62f7e299d5188b6b8b59af56c

data/lib/clive/parser.rb

@@ -24,18 +24,18 @@ class Clive
       @config = DEFAULTS.merge(config)
     end
 
-    # The parser should work how you expect. It allows you to put global options 
-    # before and after a command section (if it exists, which it doesn't), so 
+    # The parser should work how you expect. It allows you to put global options
+    # before and after a command section (if it exists, which it doesn't), so
     # you have something like.
     #
     #    app [global] [command] [global]
     #
-    # Where the [global] sections are made of options and arguments and 
+    # Where the [global] sections are made of options and arguments and
     # [command] is made of
     #
     #    [command] [options/args]
     #
-    # Only one command can be run, if you attempt to use two the other will be 
+    # Only one command can be run, if you attempt to use two the other will be
     # caught as an argument.
     #
     # @param argv [Array]
@@ -82,8 +82,33 @@ class Clive
             args = []
 
             until ended?
-              if found.has?(curr)
+              # it's a no- option
+              if curr[0..4] == '--no-' && found.has?("--#{curr[5..-1]}") && found.find("--#{curr[5..-1]}").config[:boolean] == true
+                found.find("--#{curr[5..-1]}").run @state, [false], found
+
+              # it's one (or more) short options
+              elsif curr[0..0] == '-' && curr.size > 2 && found.has?("-#{curr[1..1]}")
+                currs = curr[1..-1].split('').map {|i| "-#{i}" }
+
+                currs.each do |c|
+                  opt = found.find(c)
+                  raise MissingOptionError.new(c) unless opt
+
+                  if c == currs.last
+                    run_option opt, found
+                  else
+                    # can't take any arguments as an option is next to it
+                    if opt.args.min > 0
+                      raise MissingArgumentError.new(opt, [], opt.args)
+                    else
+                      opt.run @state, [true], found
+                    end
+                  end
+                end
+
+              elsif found.has?(curr)
                 run_option found.find(curr), found
+
               else
                 break unless found.args.possible?(args + [curr])
                 args << curr
@@ -100,7 +125,7 @@ class Clive
           end
 
         # it's a no- option
-        elsif curr[0..4] == '--no-' && @base.find("--#{curr[5..-1]}").config[:boolean] == true
+        elsif curr[0..4] == '--no-' && @base.has?("--#{curr[5..-1]}") && @base.find("--#{curr[5..-1]}").config[:boolean] == true
           @base.find("--#{curr[5..-1]}").run @state, [false]
 
         # it's one (or more) short options

data/lib/clive/version.rb

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

data/spec/clive/a_cli_spec.rb

@@ -43,6 +43,8 @@ describe 'A CLI' do
         # implicit arg as "<choice>", also added default
         opt :T, :type, :in => %w(post page blog), :default => :page, :as => Symbol
 
+        bool :a, :all
+
         action do |dir|
           puts "Creating #{get :type} in #{dir}" if dir
         end
@@ -244,4 +246,16 @@ describe 'A CLI' do
       subject.run %w(-vsa 2.45)
     }.must_raise Clive::Parser::MissingArgumentError
   end
+
+  it 'should be able to do combined short switches in a command' do
+    r = subject.run s 'new -aT blog'
+
+    r[:new].to_h.must_equal :all => true, :type => :blog, :something => []
+  end
+
+  it 'should be able to do --no switches in a command' do
+    r = subject.run s 'new --no-all'
+
+    r[:new].to_h.must_equal :all => false, :something => []
+  end
 end

data/spec/clive/parser_spec.rb

@@ -16,10 +16,10 @@ Usage: ... [command] [options]
 
   Commands:
     new
-    help [<command>]      \e[90m# \e[0m\e[90mDisplay help\e[0m
+    help [<command>]            \e[90m# \e[0m\e[90mDisplay help\e[0m
 
   Options:
-    -h, --help            \e[90m# \e[0m\e[90mDisplay this help message\e[0m
+    -h, --help                  \e[90m# \e[0m\e[90mDisplay this help message\e[0m
 EOS
       end
     end
@@ -34,7 +34,7 @@ Usage: ... new [options]
 
   Options:
     -f, --force
-    -h, --help        \e[90m# \e[0m\e[90mDisplay this help message\e[0m
+    -h, --help                  \e[90m# \e[0m\e[90mDisplay this help message\e[0m
 EOS
       end
 
@@ -143,33 +143,33 @@ EOS
       r.must_have :auto
     end
   end
-  
+
   describe 'Infinite arguments' do
     subject {
       Clive.new { opt :items, :arg => '<item>...' }
     }
-    
+
     it 'requires at least one argument' do
       this {
         subject.run s '--items'
       }.must_raise Clive::Parser::MissingArgumentError
     end
-    
+
     it 'takes infinite arguments' do
       r = subject.run s '--items a b c d e f g h'
       r.items.must_equal %w(a b c d e f g h)
     end
   end
-  
+
   describe 'Optional infinite arguments' do
     subject {
       Clive.new { opt :items, :arg => '[<item>...]' }
     }
-    
+
     it 'does not require an argument' do
       subject.run s '--items'
     end
-    
+
     it 'takes infinite arguments' do
       r = subject.run s '--items a b c d e f g h'
       r.items.must_equal %w(a b c d e f g h)

metadata

@@ -1,51 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: clive
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Joshua Hawxwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   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"
+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"
 email: m@hawx.me
 executables: []
 extensions: []
@@ -53,83 +48,83 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
-- lib/clive/argument.rb
+- lib/clive/type/definitions.rb
+- lib/clive/type/lookup.rb
+- lib/clive/parser.rb
+- lib/clive/type.rb
+- lib/clive/command.rb
+- lib/clive/struct_hash.rb
+- lib/clive/option.rb
 - lib/clive/arguments/parser.rb
+- lib/clive/argument.rb
+- lib/clive/output.rb
+- lib/clive/option/runner.rb
+- lib/clive/version.rb
+- lib/clive/formatter/colour.rb
+- lib/clive/formatter/plain.rb
 - lib/clive/arguments.rb
 - lib/clive/base.rb
-- lib/clive/command.rb
 - lib/clive/error.rb
-- lib/clive/formatter/colour.rb
-- lib/clive/formatter/plain.rb
 - lib/clive/formatter.rb
-- lib/clive/option/runner.rb
-- lib/clive/option.rb
-- lib/clive/output.rb
-- lib/clive/parser.rb
-- lib/clive/struct_hash.rb
-- lib/clive/type/definitions.rb
-- lib/clive/type/lookup.rb
-- lib/clive/type.rb
-- lib/clive/version.rb
 - lib/clive.rb
-- spec/clive/a_cli_spec.rb
-- spec/clive/argument_spec.rb
+- spec/helper.rb
+- spec/clive_spec.rb
+- spec/extras/focus.rb
+- spec/extras/expectations.rb
+- spec/clive/type/definitions_spec.rb
+- spec/clive/output_spec.rb
+- spec/clive/type_spec.rb
 - spec/clive/arguments/parser_spec.rb
+- spec/clive/argument_spec.rb
 - spec/clive/arguments_spec.rb
-- spec/clive/command_spec.rb
+- spec/clive/struct_hash_spec.rb
+- spec/clive/option/runner_spec.rb
 - spec/clive/formatter/colour_spec.rb
 - spec/clive/formatter/plain_spec.rb
-- spec/clive/option/runner_spec.rb
+- spec/clive/command_spec.rb
 - spec/clive/option_spec.rb
-- spec/clive/output_spec.rb
 - spec/clive/parser_spec.rb
-- spec/clive/struct_hash_spec.rb
-- spec/clive/type/definitions_spec.rb
-- spec/clive/type_spec.rb
-- spec/clive_spec.rb
-- spec/extras/expectations.rb
-- spec/extras/focus.rb
-- spec/helper.rb
+- spec/clive/a_cli_spec.rb
 homepage: http://github.com/hawx/clive
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A DSL for building command line interfaces.
 test_files:
-- spec/clive/a_cli_spec.rb
-- spec/clive/argument_spec.rb
+- spec/helper.rb
+- spec/clive_spec.rb
+- spec/extras/focus.rb
+- spec/extras/expectations.rb
+- spec/clive/type/definitions_spec.rb
+- spec/clive/output_spec.rb
+- spec/clive/type_spec.rb
 - spec/clive/arguments/parser_spec.rb
+- spec/clive/argument_spec.rb
 - spec/clive/arguments_spec.rb
-- spec/clive/command_spec.rb
+- spec/clive/struct_hash_spec.rb
+- spec/clive/option/runner_spec.rb
 - spec/clive/formatter/colour_spec.rb
 - spec/clive/formatter/plain_spec.rb
-- spec/clive/option/runner_spec.rb
+- spec/clive/command_spec.rb
 - spec/clive/option_spec.rb
-- spec/clive/output_spec.rb
 - spec/clive/parser_spec.rb
-- spec/clive/struct_hash_spec.rb
-- spec/clive/type/definitions_spec.rb
-- spec/clive/type_spec.rb
-- spec/clive_spec.rb
-- spec/extras/expectations.rb
-- spec/extras/focus.rb
-- spec/helper.rb
+- spec/clive/a_cli_spec.rb
+has_rdoc: