choosy 0.1.0 → 0.2.0

data/spec/choosy/printing/terminal_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helpers'
+require 'choosy/printing/terminal'
+
+module Choosy::Printing
+  class TerminalTest
+    include Terminal
+  end
+
+  describe Terminal do
+    before :each do
+      @t = TerminalTest.new
+    end
+
+    it "should know the width of the screen, if possible, or set a default [COULD BREAK ON YOUR MACHINE]" do
+      @t.columns.should satisfy {|c| c >= Terminal::DEFAULT_COLUMN_COUNT }
+    end
+
+    it "should know the lenght the screen, if possible, or set a default [COULD BREAK ON YOUR MACHINE]" do
+      @t.lines.should satisfy {|l| l >= Terminal::DEFAULT_LINE_COUNT }
+    end
+
+    it "should allow for setting the column width" do
+      @t.columns = 40
+      @t.columns.should eql(40)
+    end
+  end
+end

data/spec/choosy/super_command_spec.rb

@@ -9,8 +9,8 @@ module Choosy
 
     describe :parse! do
       it "should be able to print out the version number" do
-        @c.alter do |c|
-          c.version "superblah"
+        @c.alter do
+          version "superblah"
         end
 
         o = capture :stdout do
@@ -21,27 +21,27 @@ module Choosy
       end
 
       it "should print out the supercommand help message" do
-        @c.alter do |c|
-          c.help
+        @c.alter do
+          help
         end
 
         o = capture :stdout do
           @c.parse!([])
         end
 
-        o.should match(/USAGE:/)
+        o.should match(/Usage:/)
       end
 
       it "should print out a subcommand help message" do
-        @c.alter do |c|
-          c.help
-          c.command :bar do |bar|
-            bar.boolean :count, "The count"
+        @c.alter do
+          help
+          command :bar do
+            boolean :count, "The count"
           end
         end
 
         o = capture :stdout do
-          @c.parse!(['help', 'bar'])
+          @c.parse! ['help', 'bar'] 
         end
 
         o.should match(/--count/)
@@ -50,9 +50,9 @@ module Choosy
 
     describe :execute! do
       it "should fail when no executor is present" do
-        @c.alter do |c|
-          c.command :bar do |bar|
-            bar.boolean :count, "The count"
+        @c.alter do
+          command :bar do
+            boolean :count, "The count"
           end
         end
 
@@ -63,10 +63,10 @@ module Choosy
 
       it "should call the executors" do
         count = 0
-        @c.alter do |c|
-          c.command :bar do |bar|
-            bar.integer :count, "The count"
-            bar.executor do |opts, args|
+        @c.alter do
+          command :bar do
+            integer :count, "The count"
+            executor do |opts, args|
               count = opts[:count]
             end
           end

data/spec/choosy/super_parser_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helpers'
 require 'choosy/super_parser'
 require 'choosy/super_command'
+require 'choosy/dsl/super_command_builder'
 
 module Choosy
   class SuperParserBuilder
@@ -8,12 +9,11 @@ module Choosy
     
     def initialize
       @super = Choosy::SuperCommand.new :super
-      @parsimonious = false
     end
 
     def command(name)
-      @super.alter do |a|
-        a.command name do |c|
+      @super.alter do
+        command name do |c|
           yield c if block_given?
         end
       end
@@ -21,8 +21,8 @@ module Choosy
     end
 
     def single(name)
-      @super.alter do |a|
-        a.single name, name.to_s
+      @super.alter do
+        single name, name.to_s
       end
       self
     end
@@ -33,11 +33,13 @@ module Choosy
     end
 
     def parsimonious!
-      @parsimonious = true
-    end 
+      @super.alter do
+        parsimonious
+      end
+    end
 
     def build
-      SuperParser.new(@super, @parsimonious)
+      SuperParser.new(@super)
     end
   end
 
@@ -69,7 +71,7 @@ module Choosy
         @p.super.builder.help
         attempting {
           @p.parse!()
-        }.should raise_error(Choosy::HelpCalled, :super)
+        }.should raise_error(Choosy::HelpCalled, Choosy::DSL::SuperCommandBuilder::SUPER)
       end
     end
 
@@ -88,7 +90,15 @@ module Choosy
         end
           
         it "should collect other names of commands as arguments" do
-          @p.command(:bar).command(:baz).parse!('bar', 'baz').subresults.should have(1).item
+          @p.command(:bar) do |c|
+            c.arguments
+          end.command(:baz).parse!('bar', 'baz').subresults.should have(1).item
+        end
+
+        it "should fail when the first command doesn't take arguments" do
+          attempting {
+            @p.command(:bar).command(:baz).parse!('bar', 'baz')
+          }.should raise_error(Choosy::ValidationError, /bar: no arguments allowed: baz/)
         end
       end
 

data/spec/choosy/verifier_spec.rb

@@ -26,30 +26,40 @@ module Choosy
 
     before :each do
       reset!
-      @res = ParseResult.new(@c)
+      @res = ParseResult.new(@c, false)
     end
 
-    describe :verify_options! do
+    describe :verify! do
       it "should not try to validate arguments if not set" do
         b.boolean :debug, "Debug"
+        b.arguments do
+          count 0..10
+        end
+
         @res.args << "a"
         attempting {
-          v.verify_options!(@res)
+          v.verify!(@res)
         }.should_not raise_error
       end
     end
 
-    describe :verify_arguments! do
-      it "should validate arguments if asked" do
-        b.arguments do |args|
-          raise RuntimeError.new('Called!')
+    describe :required? do
+      it "should fail when an option is required but not provided" do
+        o = b.string :str, "String" do
+          required
         end
+        attempting {
+          v.required?(o, @res)
+        }.should raise_error(Choosy::ValidationError, /required/)
+      end
 
+      it "should succeed when nothing is required" do
+        o = b.string :str, "String"
         attempting {
-          v.verify_arguments!(@res)
-        }.should raise_error(RuntimeError, 'Called!')
+          v.required?(o, @res)
+        }.should_not raise_error
       end
-    end
+    end#required?
 
     describe :populate! do
       it "should fill in default boolean values to false if unset" do
@@ -93,13 +103,66 @@ module Choosy
         v.populate!(o, @res)
         @res.options.should be_empty
       end
-    end#populate_defaults!
+    end#populate!
+
+    describe :convert! do
+      it "should convert files" do
+        o = b.file :afile, "A File"
+        @res[:afile] = __FILE__
+        v.convert!(o, @res)
+        @res[:afile].path.should eql(__FILE__)
+      end
+
+      class CustomConverter
+        def convert(value)
+          value.to_i
+        end
+      end
+
+      it "should convert a custom type" do
+        o = b.single :an_int, "An int" do
+          cast CustomConverter.new
+        end
+        @res[:an_int] = "1"
+
+        v.convert!(o, @res)
+        @res[:an_int].should eql(1)
+      end
+    end#convert!
+
+    describe :restricted? do
+      it "should verify that arguments are restricted to a certain subset for a single valued option" do
+        o = b.option :value do
+          flags '-v', '--value', 'VALUE'
+          desc "Description"
+          cast :symbol
+          only :a, :b, :c
+        end
+
+        @res[:value] = :d
+        attempting {
+          v.restricted?(o, @res)
+        }.should raise_error(Choosy::ValidationError, "unrecognized value (only 'a', 'b', 'c' allowed): 'd'")
+      end
+
+      it "should verify that all arguments are restricted for a muli-valued option" do
+        o = b.option :value do
+          long '--value', 'VALUES+'
+          only :a, :b, :c
+        end
+
+        @res[:value] = [:a, :b, :c, :d]
+        attempting {
+          v.restricted?(o, @res)
+        }.should raise_error(Choosy::ValidationError, "unrecognized value (only 'a', 'b', 'c' allowed): 'd'")
+      end
+    end
 
     describe :validate! do
       it "should call the validate proc associated with each option" do
-        o = b.string :line, "Line" do |l|
-          l.validate do |arg|
-            l.fail "Validated!"
+        o = b.string :line, "Line" do
+          validate do |arg, options|
+            die "Validated!"
           end
         end
         @res[:line] = "line"
@@ -110,9 +173,9 @@ module Choosy
       end
 
       it "should not call the proc on empty arguments" do
-        o = b.strings :line, "Line" do |l|
-          l.validate do |arg|
-            l.fail "Validated!"
+        o = b.strings :line, "Line" do
+          validate do |arg|
+            die "Validated!"
           end
         end
         @res[:line] = []
@@ -124,7 +187,7 @@ module Choosy
       it "should not call the proc when the arguments are null" do
         o = b.string :line, "Line" do |l|
           l.validate do |arg|
-            l.fail "Validated!"
+            die "Validated!"
           end
         end
         @res[:line] = nil
@@ -132,49 +195,76 @@ module Choosy
         v.validate!(o, @res)
         @res[:line].should be(nil)
       end
-    end#validate!
 
-    describe :required? do
-      it "should fail when an option is required but not provided" do
-        o = b.string :str, "String" do |s|
-          s.required
+      it "should call the proc with the additional option param" do
+        o = b.string :line, "Line" do
+          validate do |arg, options|
+            options[:populated] = arg
+            options[:line] = "this"
+          end
         end
-        attempting {
-          v.required?(o, @res)
-        }.should raise_error(Choosy::ValidationError, /Required/)
+        @res[:line] = 'blah' 
+        
+        v.validate!(o, @res)
+        @res[:populated].should eql('blah')
+        @res[:line].should eql("this")
       end
+    end#validate!
+
+    describe :verify_arguments! do
+      it "should validate arguments if asked" do
+        b.arguments do
+          validate do |args, option|
+            raise RuntimeError.new('Called!')
+          end
+        end
+        @res.args << 'a'
 
-      it "should succeed when nothing is required" do
-        o = b.string :str, "String"
         attempting {
-          v.required?(o, @res)
-        }.should_not raise_error
+          v.verify_arguments!(@res)
+        }.should raise_error(RuntimeError, 'Called!')
       end
-    end
 
-    describe :convert! do
-      it "should convert files" do
-        o = b.file :afile, "A File"
-        @res[:afile] = __FILE__
-        v.convert!(o, @res)
-        @res[:afile].path.should eql(__FILE__)
+      it "should validate that the argument count isn't too few" do
+        b.arguments do
+          count 2
+        end
+        @res.args << "a"
+        
+        attempting {
+          v.verify_arguments!(@res)
+        }.should raise_error(Choosy::ValidationError, /too few arguments/)
       end
 
-      class CustomConverter
-        def convert(value)
-          value.to_i
+      it "should validate that the argument count isn't too many" do
+        b.arguments do
+          count 1
         end
+        @res.args << "a"
+        @res.args << "b"
+
+        attempting {
+          v.verify_arguments!(@res)
+        }.should raise_error(Choosy::ValidationError, /too many arguments/)
       end
 
-      it "should convert a custom type" do
-        o = b.single :an_int, "An int" do |i|
-          i.cast CustomConverter.new
+      it "should succed when the argument count is in an acceptable range" do
+        b.arguments do
+          count 1..3
         end
-        @res[:an_int] = "1"
+        @res.args << "1"
 
-        v.convert!(o, @res)
-        @res[:an_int].should eql(1)
+        attempting {
+          v.verify_arguments!(@res)
+        }.should_not raise_error
       end
-    end#convert!
+
+      it "should fail when no arguments are allowed" do
+        @res.args << 'a'
+        attempting {
+          v.verify_arguments!(@res)
+        }.should raise_error(Choosy::ValidationError, /no arguments allowed/)
+      end
+    end
   end
 end

data/spec/integration/command-A_spec.rb

@@ -4,11 +4,11 @@ require 'choosy'
 describe "Command A" do
   
   before :each do
-    @cmd = Choosy::Command.new :A do |a|
-      a.integer :count, "The count"
-      a.boolean :bold, "Bold the output"
-      a.version "blah"
-      a.help
+    @cmd = Choosy::Command.new :A do
+      integer :count, "The count"
+      boolean :bold, "Bold the output"
+      version "blah"
+      help
     end
   end
 
@@ -17,7 +17,7 @@ describe "Command A" do
       @cmd.parse! ['--help']
     end
 
-    o.should match /USAGE:/
+    o.should match /Usage:/
   end
 
   it "should handle multiple arguments" do