optitron 0.1.9 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    optitron (0.1.8)
+    optitron (0.1.9)
       callsite (~> 0.0.4)
       ruby2ruby (~> 1.2.4)
       ruby_parser (~> 2.0)

data/README.rdoc

@@ -168,6 +168,8 @@ This allows you to force an option to be required. False by default.
 
 This allows you to specify the type. Acceptable options are <tt>:numeric</tt>, <tt>:array</tt>, <tt>:hash</tt>, <tt>:string</tt> or <tt>:boolean</tt>.
 
+With boolean type, you can additionally supply <tt>:use_no => true</tt> to be able to use --no-option style options.
+
 == Stand alone usage
 
 You can create parsers and parse using them.

data/lib/optitron/dsl.rb

@@ -84,7 +84,7 @@ class Optitron
 
       def help(desc = "Print help message")
         configure_with {
-          opt 'help', desc, :short_name => '?', :run => proc{ |value, response|
+          opt 'help', desc, :short_name => '?', :suppress_no => true, :run => proc{ |value, response|
             if value
               puts @target.help
               exit(0)

data/lib/optitron/help.rb

@@ -19,7 +19,7 @@ class Optitron
 
     def help_line_for_opt(opt)
       opt_line = ''
-      opt_line << [opt.short_name ? "-#{opt.short_name}" : nil, "--#{opt.name}"].compact.join('/')
+      opt_line << [opt.short_name ? "-#{opt.short_name}" : nil, opt.boolean? && opt.use_no ? "--(no-)#{opt.name}" : "--#{opt.name}"].compact.join('/')
       opt_line << "=[#{help_line_for_opt_value(opt)}]" unless opt.boolean?
       [opt_line, opt.desc]
     end

data/lib/optitron/option.rb

@@ -102,7 +102,7 @@ class Optitron
     end
 
     class Opt < Option
-      attr_accessor :short_name, :run, :parent_cmd, :include_in_params
+      attr_accessor :short_name, :run, :parent_cmd, :include_in_params, :use_no
       alias_method :include_in_params?, :include_in_params
       def initialize(name, desc = nil, opts = nil)
         if desc.is_a?(Hash)
@@ -115,15 +115,16 @@ class Optitron
         self.inclusion_test = opts[:in] if opts && opts[:in]
         self.required = opts && opts.key?(:required) ? opts[:required] : false
         self.default = opts && opts.key?(:default) ? opts[:default] : (@type == :boolean ? false : nil)
+        self.use_no = opts && opts.key?(:use_no) ? opts[:use_no] : false
       end
 
       def match?(tok)
-        tok.respond_to?(:name) and [name, short_name].include?(tok.name)
+        tok.respond_to?(:name) && (!use_no ? [name, short_name] : [name, short_name, "no-#{name}"]).include?(tok.name)
       end
 
       def find_matching_token(tokens)
         tokens.find do |t|
-          if t.respond_to?(:name) and (t.name == name or t.name == short_name)
+          if t.respond_to?(:name) and (t.name == name or t.name == short_name or t.name == "no-#{name}")
             t.respond_to?(:value) ^ (t.name == short_name)
           end
         end
@@ -135,7 +136,9 @@ class Optitron
           tokens.delete_at(opt_tok_index)
           case @type
           when :boolean
-            value = if opt_tok.respond_to?(:value)
+            value = if opt_tok.name == "no-#{name}"
+              default
+            elsif opt_tok.respond_to?(:value)
               opt_tok.value
             elsif opt_tok.name == short_name and tokens[opt_tok_index].respond_to?(:lit) and BOOLEAN_VALUES.include?(tokens[opt_tok_index].lit)
               tokens.delete_at(opt_tok_index).lit

data/lib/optitron/version.rb

@@ -1,3 +1,3 @@
 class Optitron
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/spec/help_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Optitron::Parser help" do
   it "generate help for command parsers" do
     @parser = Optitron.new {
-      opt 'verbose', "Be very loud"
+      opt 'verbose', "Be very loud", :use_no => true
       cmd "install", "This installs things" do
         arg "file", "The file to install"
       end
@@ -20,7 +20,7 @@ describe "Optitron::Parser help" do
         arg "thing", "Stuff to join", :type => :greedy, :required => true
       end
     }
-    @parser.help.should == "Commands\n\ninstall [file]                 # This installs things\n                               #   file -- The file to install\nshow [first] <second>          # This shows things\n                               #   first -- The first thing to show\n                               #   second -- The second optional thing to show\nkill                           # This kills things\n  -p/--pids=[ARRAY]            # A list of pids to kill\n  -P/--pid=[NUMERIC]           # A pid to kill\n  -n/--names=[HASH]            # Some sort of hash\njoin [thing1 thing2 ...]       # This joins things\n                               #   thing -- Stuff to join\n\nGlobal options\n\n-v/--verbose                   # Be very loud"
+    @parser.help.should == "Commands\n\ninstall [file]                 # This installs things\n                               #   file -- The file to install\nshow [first] <second>          # This shows things\n                               #   first -- The first thing to show\n                               #   second -- The second optional thing to show\nkill                           # This kills things\n  -p/--pids=[ARRAY]            # A list of pids to kill\n  -P/--pid=[NUMERIC]           # A pid to kill\n  -n/--names=[HASH]            # Some sort of hash\njoin [thing1 thing2 ...]       # This joins things\n                               #   thing -- Stuff to join\n\nGlobal options\n\n-v/--(no-)verbose              # Be very loud"
   end
 
   it "generate help for non-command parsers" do

data/spec/option_spec.rb

@@ -28,7 +28,7 @@ describe "Optitron::Parser options" do
   context "boolean long names vs short names" do
     before(:each) do
       @parser = Optitron.new {
-        opt "verbose"
+        opt "verbose", :use_no => true
       }
     end
     
@@ -36,6 +36,11 @@ describe "Optitron::Parser options" do
       @parser.parse(%w(-v true)).valid?.should be_true
     end
 
+    it "should parse '--no-verbose'" do
+      @parser.parse(%w(--no-verbose)).valid?.should be_true
+      @parser.parse(%w(--no-verbose)).params['verbose'].should be_false
+    end
+
     it "shouldn't parse '-v that'" do
       @parser.parse(%w(-v that)).valid?.should be_false
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optitron
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 -07:00
+date: 2010-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency