choosy 0.4.9 → 0.4.10

data/lib/choosy/super_command.rb

@@ -1,9 +1,3 @@
-require 'choosy/errors'
-require 'choosy/parser'
-require 'choosy/base_command'
-require 'choosy/super_parser'
-require 'choosy/dsl/super_command_builder'
-
 module Choosy
   class SuperCommand < BaseCommand
     attr_accessor :metaname, :default_command
@@ -66,7 +60,7 @@ module Choosy
     def handle_help(hc)
       command_name = hc.message
 
-      if command_name == :help_option || command_name == Choosy::DSL::SuperCommandBuilder::SUPER
+      if command_name == :help || command_name == Choosy::DSL::SuperCommandBuilder::SUPER
         printer.print!(self)
       else
         builder = command_builders[command_name]

data/lib/choosy/super_parser.rb

@@ -1,9 +1,3 @@
-require 'choosy/errors'
-require 'choosy/parser'
-require 'choosy/parse_result'
-require 'choosy/verifier'
-require 'choosy/dsl/super_command_builder'
-
 module Choosy
   class SuperParser
     attr_reader :terminals, :verifier

data/lib/choosy/terminal.rb

@@ -1,6 +1,3 @@
-require 'choosy/errors'
-require 'choosy/printing/color'
-
 module Choosy
   module Terminal
     DEFAULT_LINE_COUNT = 25

data/lib/choosy/verifier.rb

@@ -1,6 +1,3 @@
-require 'choosy/errors'
-require 'choosy/dsl/option_builder'
-
 module Choosy
   class Verifier
     def verify!(result)

data/lib/choosy/version.rb

@@ -1,6 +1,4 @@
 require 'yaml'
-require 'time'
-require 'choosy/errors'
 
 module Choosy
   class Version

data/spec/choosy/argument_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/argument'
-
 module Choosy
   describe Argument do
     before :each do

data/spec/choosy/base_command_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/command'
-
 module Choosy
   describe BaseCommand do
     before :each do

data/spec/choosy/command_spec.rb

@@ -1,7 +1,3 @@
-require 'spec_helpers'
-require 'choosy/command'
-require 'choosy/printing/help_printer'
-
 module Choosy
   describe Command do
     before :each do

data/spec/choosy/converter_spec.rb

@@ -1,7 +1,3 @@
-require 'spec_helpers'
-require 'choosy/version'
-require 'choosy/converter'
-
 module Choosy
   describe Converter do
 

data/spec/choosy/dsl/argument_builder_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/dsl/argument_builder'
-
 module Choosy::DSL
   describe ArgumentBuilder do
     before :each do

data/spec/choosy/dsl/base_builder_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/dsl/base_builder'
-
 module Choosy::DSL
   class FakeBuilder
     include BaseBuilder

data/spec/choosy/dsl/base_command_builder_spec.rb

@@ -1,8 +1,3 @@
-require 'spec_helpers'
-require 'choosy/dsl/base_command_builder'
-require 'choosy/command'
-require 'choosy/super_command'
-
 module Choosy::DSL
   describe BaseCommandBuilder do
     before :each do
@@ -404,6 +399,24 @@ module Choosy::DSL
         v = @builder.version "1.0"
         v.cast_to.should eql(:boolean)
       end
+
+      it "should create a singleton method for the actual version" do
+        v = @builder.version "1.0"
+        v.version.should eql("1.0")
+      end
     end#version
+
+    describe :no_color do
+      it "should allow for a custom message" do
+        n = @builder.no_color "msg"
+        n.description.should eql("msg")
+      end
+
+      it "should turn off the printing" do
+        n = @builder.no_color "msg"
+        n.validation_step.call
+        @builder.entity.printer.color.should be_disabled
+      end
+    end
   end
 end

data/spec/choosy/dsl/commmand_builder_spec.rb

@@ -1,9 +1,3 @@
-require 'spec_helpers'
-require 'choosy/dsl/command_builder'
-require 'choosy/command'
-require 'choosy/converter'
-require 'choosy/errors'
-
 module Choosy::DSL
   class FakeExecutor
     attr_reader :options, :args

data/spec/choosy/dsl/option_builder_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy'
-
 module Choosy::DSL
   describe OptionBuilder do
     before :each do

data/spec/choosy/dsl/super_command_builder_spec.rb

@@ -1,7 +1,3 @@
-require 'spec_helpers'
-require 'choosy/super_command'
-require 'choosy/dsl/super_command_builder'
-
 module Choosy::DSL
   describe SuperCommandBuilder do
     before :each do

data/spec/choosy/option_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/option'
-
 module Choosy
   describe Option do
     before :each do

data/spec/choosy/parser_spec.rb

@@ -1,8 +1,3 @@
-require 'spec_helpers'
-require 'choosy/parser'
-require 'choosy/command'
-require 'choosy/dsl/command_builder'
-
 module Choosy
   class ParserBuilder
     attr_reader :command, :lazy

data/spec/choosy/printing/base_printer_spec.rb

@@ -1,8 +1,3 @@
-require 'spec_helpers'
-require 'choosy/printing/base_printer'
-require 'choosy/command'
-require 'choosy/super_command'
-
 module Choosy::Printing
   describe BasePrinter do
     before :each do

data/spec/choosy/printing/color_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/printing/color'
-
 module Choosy::Printing
   describe Color do
     before :each do
@@ -42,7 +39,7 @@ module Choosy::Printing
     it "should fail on too many arguments" do
       attempting {
         @c.red("string", :foreground, "extra")
-      }.should raise_error(ArgumentError, /Color#red/)
+      }.should raise_error(ArgumentError, /max 2/)
     end
 
     it "should fail when setting a style not foreground or background" do

data/spec/choosy/printing/help_printer_spec.rb

@@ -1,8 +1,3 @@
-require 'spec_helpers'
-require 'choosy/command'
-require 'choosy/super_command'
-require 'choosy/printing/help_printer'
-
 module Choosy::Printing
   describe HelpPrinter do
     before :each do

data/spec/choosy/printing/manpage_printer_spec.rb

@@ -1,7 +1,3 @@
-require 'spec_helpers'
-require 'choosy/command'
-require 'choosy/printing/manpage_printer'
-
 module Choosy::Printing
   describe ManpagePrinter do
     before :each do

data/spec/choosy/printing/manpage_spec.rb

@@ -1,6 +1,3 @@
-require 'choosy/printing/manpage'
-require 'spec_helpers'
-
 module Choosy::Printing
   describe ManpageFormatter do
     before :each do 
@@ -184,6 +181,7 @@ module Choosy::Printing
         @man.name = "blah"
         @man.date = 'today'
 
+        @man.column_width = 100
         @man.section_heading('description')
         @man.paragraph('this is a line of text')
 
@@ -196,6 +194,7 @@ module Choosy::Printing
 .nh
 .\\" disable justification (adjust text to left margin only)
 .ad l
+.ll 100
 .SH "DESCRIPTION"
 .P
 this is a line of text

data/spec/choosy/super_command_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/super_command'
-
 module Choosy
   describe SuperCommand do
     before :each do 

data/spec/choosy/super_parser_spec.rb

@@ -1,8 +1,3 @@
-require 'spec_helpers'
-require 'choosy/super_parser'
-require 'choosy/super_command'
-require 'choosy/dsl/super_command_builder'
-
 module Choosy
   class SuperParserBuilder
     attr_reader :super

data/spec/choosy/terminal_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helpers'
-require 'choosy/terminal'
-
 module Choosy
   class TerminalTest
     include Terminal

data/spec/choosy/verifier_spec.rb

@@ -1,11 +1,4 @@
-require 'spec_helpers'
-require 'choosy/verifier'
-require 'choosy/errors'
-require 'choosy/parser'
-require 'choosy/command'
-
 module Choosy
-
   module VerifierHelper
     def reset!
       @c = Command.new(:verifier)

data/spec/choosy/version_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helpers'
 require 'tempfile'
-require 'choosy/version'
 
 module Choosy
   describe Version do

metadata

@@ -1,184 +1,190 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: choosy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 9
-  version: 0.4.9
+version: !ruby/object:Gem::Version
+  version: 0.4.10
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gabe McArthur
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-07 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: autotest-notification
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest-notification
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is a DSL for creating more complicated command line tools.
-email: 
+email:
 - madeonamac@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- TODO.md
+files:
+- CHANGELOG.md
 - Gemfile
-- README.markdown
 - Gemfile.lock
-- CHANGELOG.md
 - LICENSE
 - Rakefile
-- lib/choosy.rb
-- lib/VERSION.yml
-- lib/choosy/errors.rb
-- lib/choosy/printing.rb
-- lib/choosy/rake.rb
-- lib/choosy/converter.rb
-- lib/choosy/parse_result.rb
-- lib/choosy/verifier.rb
+- README.md
+- TODO.md
 - lib/choosy/argument.rb
-- lib/choosy/version.rb
-- lib/choosy/option.rb
+- lib/choosy/base_command.rb
 - lib/choosy/command.rb
-- lib/choosy/terminal.rb
-- lib/choosy/super_command.rb
+- lib/choosy/converter.rb
 - lib/choosy/dsl/argument_builder.rb
-- lib/choosy/dsl/super_command_builder.rb
 - lib/choosy/dsl/base_builder.rb
+- lib/choosy/dsl/base_command_builder.rb
 - lib/choosy/dsl/command_builder.rb
 - lib/choosy/dsl/option_builder.rb
-- lib/choosy/dsl/base_command_builder.rb
+- lib/choosy/dsl/super_command_builder.rb
+- lib/choosy/errors.rb
+- lib/choosy/option.rb
 - lib/choosy/parser.rb
-- lib/choosy/base_command.rb
-- lib/choosy/printing/manpage_printer.rb
+- lib/choosy/parse_result.rb
 - lib/choosy/printing/base_printer.rb
-- lib/choosy/printing/formatting_element.rb
-- lib/choosy/printing/manpage.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/manpage.rb
+- lib/choosy/printing/manpage_printer.rb
+- lib/choosy/rake.rb
+- lib/choosy/super_command.rb
 - lib/choosy/super_parser.rb
-- spec/integration/command-A_spec.rb
-- spec/integration/supercommand-C_spec.rb
-- spec/integration/command-B_spec.rb
-- spec/integration/supercommand-B_spec.rb
-- spec/integration/supercommand-A_spec.rb
-- spec/integration/command-C_spec.rb
-- spec/choosy/converter_spec.rb
-- spec/choosy/option_spec.rb
-- spec/choosy/version_spec.rb
+- lib/choosy/terminal.rb
+- lib/choosy/verifier.rb
+- lib/choosy/version.rb
+- lib/choosy.rb
+- lib/VERSION.yml
 - spec/choosy/argument_spec.rb
 - spec/choosy/base_command_spec.rb
-- spec/choosy/version.yml
-- spec/choosy/terminal_spec.rb
 - spec/choosy/command_spec.rb
-- spec/choosy/dsl/super_command_builder_spec.rb
-- spec/choosy/dsl/option_builder_spec.rb
-- spec/choosy/dsl/base_builder_spec.rb
+- spec/choosy/converter_spec.rb
 - spec/choosy/dsl/argument_builder_spec.rb
-- spec/choosy/dsl/commmand_builder_spec.rb
+- spec/choosy/dsl/base_builder_spec.rb
 - spec/choosy/dsl/base_command_builder_spec.rb
-- spec/choosy/super_command_spec.rb
-- spec/choosy/super_parser_spec.rb
-- spec/choosy/verifier_spec.rb
-- spec/choosy/printing/help_printer_spec.rb
+- spec/choosy/dsl/commmand_builder_spec.rb
+- spec/choosy/dsl/option_builder_spec.rb
+- spec/choosy/dsl/super_command_builder_spec.rb
+- spec/choosy/option_spec.rb
+- spec/choosy/parser_spec.rb
 - spec/choosy/printing/base_printer_spec.rb
-- spec/choosy/printing/manpage_printer_spec.rb
 - spec/choosy/printing/color_spec.rb
+- spec/choosy/printing/help_printer_spec.rb
+- spec/choosy/printing/manpage_printer_spec.rb
 - spec/choosy/printing/manpage_spec.rb
-- spec/choosy/parser_spec.rb
+- spec/choosy/super_command_spec.rb
+- spec/choosy/super_parser_spec.rb
+- spec/choosy/terminal_spec.rb
+- spec/choosy/verifier_spec.rb
+- spec/choosy/version.yml
+- spec/choosy/version_spec.rb
+- spec/integration/command-B_spec.rb
+- spec/integration/command-C_spec.rb
+- spec/integration/supercommand-A_spec.rb
+- spec/integration/supercommand-B_spec.rb
+- spec/integration/supercommand-C_spec.rb
 - spec/spec_helpers.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 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Yet another option parsing library.
 test_files: []
-