choosy 0.1.0 → 0.2.0

data/spec/integration/command-B_spec.rb

@@ -0,0 +1,45 @@
+require 'choosy'
+require 'spec_helpers'
+
+describe "Command B" do
+  before :each do
+    @c = Choosy::Command.new :foo do
+      strings :many_args, "The many arguments"
+      help
+
+      arguments do
+        required
+        count 2..3
+        validate do |args, options|
+          if !args.include?("here")
+            die("Should have found 'here'")
+          end
+        end
+      end
+    end
+  end
+
+  it "should succeed when there are exactly three arguments" do
+    attempting {
+      @c.parse! ['this', 'is', 'here'], true
+    }.should_not raise_error
+  end
+
+  it "should fail when 'here' isn't in the argument list" do
+    attempting {
+      @c.parse! ['this', "isn't", 'happening'], true
+    }.should raise_error(Choosy::ValidationError, /'here'/)
+  end
+
+  it "should fail when there are too few arguments" do
+    attempting {
+      @c.parse! ['here'], true
+    }.should raise_error(Choosy::ValidationError, /too few/)
+  end
+
+  it "should fail when there are too many arguments" do
+    attempting {
+      @c.parse! ['here', 'is', 'a', 'list'], true
+    }.should raise_error(Choosy::ValidationError, /too many/)
+  end
+end

data/spec/integration/supercommand-A_spec.rb

@@ -1,39 +1,44 @@
 require 'spec_helpers'
 require 'choosy'
 
+notes = {:this => 'here'}
+
 describe "SuperCommand A" do
   before :each do
-    @cmd = Choosy::SuperCommand.new :superfoo do |foo|
-      foo.desc "This is a supercommand of a definite size"
-      foo.separator 'Commands:'
+    @cmd = Choosy::SuperCommand.new :superfoo do
+      para "This is a supercommand of a definite size"
+      header 'Commands:'
       
-      foo.command :bar do |bar|
-        bar.summary "This command is a bar"
-        bar.desc "This is a description of this subcommand"
-        bar.string :favorite_pet, "Your favorite pet."
-        bar.boolean :Fuzzy, "Is your pet fuzzy?"
+      command :bar do
+        summary notes[:this]
+        para "This is a description of this subcommand"
+        string :favorite_pet, "Your favorite pet."
+        boolean :Fuzzy, "Is your pet fuzzy?"
       end
 
-      foo.command :baz do |baz|
-        baz.summary "This is a baz command"
-        baz.desc "This is a description of baz"
-        baz.boolean :accountant, "Your accountant who helps you cheat on your taxes"
-        baz.integer :amount, "How much money do you save?"
+      command :baz do
+        summary "This is a baz command"
+        para "This is a description of baz"
+        boolean_ :accountant, "Your accountant who helps you cheat on your taxes"
+        integer :amount, "How much money do you save?"
       end
 
-      foo.help
+      help
 
-      foo.separator 'Options:'
-      foo.version "1.ohyeah"
+      header 'Options:'
+      integer :count, "The Count" do
+        #required
+      end
+      version "1.ohyeah"
     end
   end
-=begin
+
   it "should fail when a command is not set" do
     o = capture :stderr do
       @cmd.parse! ['blah']
     end
 
-    o.should match(/^superfoo: 'blah' is not a standard command/)
+    o.should match(/^superfoo: unrecognized command: 'blah'/)
   end
 
   it "should fail when parsing a non-existent option" do
@@ -41,21 +46,22 @@ describe "SuperCommand A" do
       @cmd.parse! ['--non-option']
     end
 
-    o.should match(/^superfoo: '--non-option' is not a standard/)
+    o.should match(/^superfoo: unrecognized option: '--non-option'/)
   end
 
   it "should print the version with the given global flag" do
-    o = capture :stdout do
-      @cmd.parse! ['--version']
-    end
-
+    o = capture { @cmd.parse! ['--version'] }
     o.should eql("1.ohyeah\n")
   end
 
   it "should correctly parse the bar command" do
-    results = @cmd.parse! ['bar', '--favorite-pet', 'Blue']
-    results.should have(1).item
-    result[0].options.should eql({:favorite_pet => 'Blue', :Fuzzy => false})
+    result = @cmd.parse! ['bar', '--favorite-pet', 'Blue', '--count', '5']
+    result.subresults.should have(1).item
+    result.subresults[0].options.should eql({:favorite_pet => 'Blue', :Fuzzy => false, :count => 5})
+  end
+
+  it "should correctly print out the results of the 'help' command" do
+    o = capture { @cmd.parse! ['help'] }
+    o.should match(/Usage:/)
   end
-=end
 end

data/spec/integration/supercommand-B_spec.rb

@@ -0,0 +1,32 @@
+require 'choosy'
+require 'spec_helpers'
+
+describe "SuperCommand B" do
+  before :each do
+    @s = Choosy::SuperCommand.new :super do
+      header 'Commands:'
+      command :bar do
+        arguments do
+          count 0..1
+        end
+      end
+      command :foo
+    end
+  end
+
+  it "should leave 'foo' as an argument to bar when not parsimonious" do
+    res = @s.parse! ['bar', 'foo']
+    res.subresults.should have(1).items
+    res.subresults[0].args.should eql(['foo'])
+  end
+
+  it "should have 2 subresults when parsimonious" do
+    @s.alter do
+      parsimonious
+    end
+
+    res = @s.parse! ['bar', 'foo']
+    res.subresults.should have(2).items
+    res.subresults[0].args.should be_empty
+  end
+end

data/spec/spec_helpers.rb

@@ -21,10 +21,13 @@ def capture(kind=nil, &block)
     $stdout = original_stdout
     $stderr = original_stderr
   end
-  res = {:stdout => fake_out.string, :stderr => fake_err.string}
-  if kind
-    res[kind]
-  else
-    res
+
+  case kind
+  when nil
+    fake_out.string
+  when :stderr
+    fake_err.string
+  when :stdout
+    fake_out.string
   end
 end

metadata

@@ -1,70 +1,86 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: choosy
-version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Gabe McArthur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-01 00:00:00.000000000 -08:00
+
+date: 2011-03-07 00:00:00 -08:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &69898880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *69898880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: autotest
-  requirement: &69898640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *69898640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: autotest-notification
-  requirement: &69898400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *69898400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &69936700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
   type: :development
-  prerelease: false
-  version_requirements: *69936700
+  version_requirements: *id004
 description: This is a DSL for creating more complicated command line tools.
-email:
+email: 
 - madeonamac@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.markdown
-files:
+files: 
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -72,9 +88,11 @@ files:
 - Rakefile
 - lib/VERSION
 - lib/choosy.rb
+- lib/choosy/argument.rb
 - lib/choosy/base_command.rb
 - lib/choosy/command.rb
 - lib/choosy/converter.rb
+- lib/choosy/dsl/argument_builder.rb
 - lib/choosy/dsl/base_command_builder.rb
 - lib/choosy/dsl/command_builder.rb
 - lib/choosy/dsl/option_builder.rb
@@ -85,7 +103,9 @@ files:
 - lib/choosy/parser.rb
 - lib/choosy/printing/color.rb
 - lib/choosy/printing/erb_printer.rb
+- lib/choosy/printing/formatting_element.rb
 - lib/choosy/printing/help_printer.rb
+- lib/choosy/printing/terminal.rb
 - lib/choosy/super_command.rb
 - lib/choosy/super_parser.rb
 - lib/choosy/verifier.rb
@@ -93,6 +113,7 @@ files:
 - spec/choosy/base_command_spec.rb
 - spec/choosy/command_spec.rb
 - spec/choosy/converter_spec.rb
+- spec/choosy/dsl/argument_builder_spec.rb
 - spec/choosy/dsl/base_command_builder_spec.rb
 - spec/choosy/dsl/commmand_builder_spec.rb
 - spec/choosy/dsl/option_builder_spec.rb
@@ -100,41 +121,58 @@ files:
 - spec/choosy/parser_spec.rb
 - spec/choosy/printing/color_spec.rb
 - spec/choosy/printing/help_printer_spec.rb
+- spec/choosy/printing/terminal_spec.rb
 - spec/choosy/super_command_spec.rb
 - spec/choosy/super_parser_spec.rb
 - spec/choosy/verifier_spec.rb
 - spec/integration/command-A_spec.rb
+- spec/integration/command-B_spec.rb
 - spec/integration/supercommand-A_spec.rb
+- spec/integration/supercommand-B_spec.rb
 - spec/spec_helpers.rb
+- examples/bar.rb
+- examples/foo.rb
+- examples/superfoo.rb
 has_rdoc: true
 homepage: http://github.com/gabemc/choosy
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Yet another option parsing library.
-test_files:
+test_files: 
+- examples/bar.rb
+- examples/foo.rb
+- examples/superfoo.rb
 - spec/choosy/base_command_spec.rb
 - spec/choosy/command_spec.rb
 - spec/choosy/converter_spec.rb
+- spec/choosy/dsl/argument_builder_spec.rb
 - spec/choosy/dsl/base_command_builder_spec.rb
 - spec/choosy/dsl/commmand_builder_spec.rb
 - spec/choosy/dsl/option_builder_spec.rb
@@ -142,9 +180,12 @@ test_files:
 - spec/choosy/parser_spec.rb
 - spec/choosy/printing/color_spec.rb
 - spec/choosy/printing/help_printer_spec.rb
+- spec/choosy/printing/terminal_spec.rb
 - spec/choosy/super_command_spec.rb
 - spec/choosy/super_parser_spec.rb
 - spec/choosy/verifier_spec.rb
 - spec/integration/command-A_spec.rb
+- spec/integration/command-B_spec.rb
 - spec/integration/supercommand-A_spec.rb
+- spec/integration/supercommand-B_spec.rb
 - spec/spec_helpers.rb