choosy 0.4.9 → 0.4.10

data/lib/choosy/command.rb

@@ -1,9 +1,3 @@
-require 'choosy/errors'
-require 'choosy/base_command'
-require 'choosy/dsl/command_builder'
-require 'choosy/parser'
-require 'choosy/verifier'
-
 module Choosy
   class Command < BaseCommand
     attr_accessor :executor, :arguments

data/lib/choosy/converter.rb

@@ -1,8 +1,3 @@
-require 'choosy/errors'
-require 'time'
-require 'date'
-require 'yaml'
-
 module Choosy
   class Converter
     CONVERSIONS = {

data/lib/choosy/dsl/argument_builder.rb

@@ -1,8 +1,3 @@
-require 'choosy/errors'
-require 'choosy/argument'
-require 'choosy/converter'
-require 'choosy/dsl/base_builder'
-
 module Choosy::DSL
   class ArgumentBuilder
     include BaseBuilder

data/lib/choosy/dsl/base_builder.rb

@@ -1,5 +1,3 @@
-require 'choosy/errors'
-
 module Choosy::DSL
   # Must have entity attribute
   module BaseBuilder

data/lib/choosy/dsl/base_command_builder.rb

@@ -1,10 +1,3 @@
-require 'choosy/errors'
-require 'choosy/dsl/option_builder'
-require 'choosy/dsl/base_builder'
-require 'choosy/printing/manpage_printer'
-require 'choosy/printing/erb_printer'
-require 'choosy/printing/formatting_element'
-
 module Choosy::DSL
   class BaseCommandBuilder
     include BaseBuilder
@@ -76,31 +69,28 @@ module Choosy::DSL
       evaluate_option_builder!(builder, &block)
     end
 
-    def self.create_conversions
-      Choosy::Converter::CONVERSIONS.keys.each do |method|
-        next if method == :boolean || method == :bool
+    Choosy::Converter::CONVERSIONS.keys.each do |method|
+      next if method == :boolean || method == :bool
 
-        self.class_eval <<-EOF
-          def #{method}(sym, desc, config=nil, &block)
-            simple_option(sym, desc, true, :one, :#{method}, nil, config, &block)
-          end
+      self.class_eval <<-EOF, __FILE__, __LINE__
+        def #{method}(sym, desc, config=nil, &block)
+          simple_option(sym, desc, true, :one, :#{method}, nil, config, &block)
+        end
 
-          def #{method}s(sym, desc, config=nil, &block)
-            simple_option(sym, desc, true, :many, :#{method}, nil, config, &block)
-          end
+        def #{method}s(sym, desc, config=nil, &block)
+          simple_option(sym, desc, true, :many, :#{method}, nil, config, &block)
+        end
 
-          def #{method}_(sym, desc, config=nil, &block)
-            simple_option(sym, desc, false, :one, :#{method}, nil, config, &block)
-          end
+        def #{method}_(sym, desc, config=nil, &block)
+          simple_option(sym, desc, false, :one, :#{method}, nil, config, &block)
+        end
 
-          def #{method}s_(sym, desc, config=nil, &block)
-            simple_option(sym, desc, false, :many, :#{method}, nil, config, &block)
-          end
-        EOF
-      end
+        def #{method}s_(sym, desc, config=nil, &block)
+          simple_option(sym, desc, false, :many, :#{method}, nil, config, &block)
+        end
+      EOF
     end
 
-    create_conversions
     alias :single :string
     alias :single_ :string_
 
@@ -127,34 +117,56 @@ module Choosy::DSL
     # Additional helpers
     
     def help(msg=nil, &block)
-      h = OptionBuilder.new(OptionBuilder::HELP)
-      h.short '-h'
-      h.long '--help'
       msg ||= "Show this help message"
-      h.desc msg
 
-      h.validate do
-        raise Choosy::HelpCalled.new(:help_option)
-      end 
+      h = OptionBuilder.new(OptionBuilder::HELP) do
+        short '-h'
+        long '--help'
+        desc msg
+        validate do
+          raise Choosy::HelpCalled.new(:help)
+        end 
+      end
 
       evaluate_option_builder!(h, &block)
     end
 
     def version(msg, &block)
-      v = OptionBuilder.new(OptionBuilder::VERSION)
-      v.long '--version'
-      v.desc "The version number"
-      # TODO: research how this should be refactored, used with manpage
-      # v.default msg
-      v.cast :boolean
-
-      v.validate do
-        raise Choosy::VersionCalled.new(msg)
+      v = OptionBuilder.new(OptionBuilder::VERSION) do
+        long '--version'
+        desc "The version number"
+        cast :boolean
+        validate do
+          raise Choosy::VersionCalled.new(msg)
+        end
+      end
+
+      option_eigenclass = class << v.entity; self; end
+      option_eigenclass.send :define_method, :version do
+        msg
       end
 
       evaluate_option_builder!(v, &block)
     end
 
+    def no_color(msg, &block)
+      msg ||= "Disable the color"
+      cmd = entity
+
+      n = OptionBuilder.new(:no_color) do
+        long "--no-color"
+        desc msg
+        cast :boolean
+        validate do |args, options|
+          if cmd.printer.respond_to?(:color)
+            cmd.printer.color.disable!
+          end
+        end
+      end
+
+      evaluate_option_builder!(n, &block)
+    end
+
     protected
     def evaluate_option_builder!(builder, &block)
       builder.evaluate!(&block)

data/lib/choosy/dsl/command_builder.rb

@@ -1,9 +1,3 @@
-require 'choosy/errors'
-require 'choosy/dsl/base_command_builder'
-require 'choosy/dsl/option_builder'
-require 'choosy/dsl/argument_builder'
-require 'choosy/printing/help_printer'
-
 module Choosy::DSL
   class CommandBuilder < BaseCommandBuilder
     def executor(exec=nil, &block)

data/lib/choosy/dsl/option_builder.rb

@@ -1,16 +1,14 @@
-require 'choosy/option'
-require 'choosy/errors'
-require 'choosy/converter'
-require 'choosy/dsl/argument_builder'
-
 module Choosy::DSL
   class OptionBuilder < ArgumentBuilder
     HELP = :__help__
     VERSION = :__version__
 
-    def initialize(name)
+    def initialize(name, &block)
       super()
       @name = name
+      if block_given?
+        self.instance_eval(&block)
+      end
     end
 
     def entity

data/lib/choosy/dsl/super_command_builder.rb

@@ -1,7 +1,3 @@
-require 'choosy/errors'
-require 'choosy/dsl/base_command_builder'
-require 'choosy/command'
-
 module Choosy::DSL
   class SuperCommandBuilder < BaseCommandBuilder
     HELP = :help

data/lib/choosy/errors.rb

@@ -3,11 +3,19 @@ module Choosy
 
   ConfigurationError = Class.new(Choosy::Error)
   ValidationError    = Class.new(Choosy::Error)
-  HelpCalled         = Class.new(Choosy::Error)
-  VersionCalled      = Class.new(Choosy::Error)
   ConversionError    = Class.new(Choosy::Error)
   ParseError         = Class.new(Choosy::Error)
   SuperParseError    = Class.new(Choosy::Error)
   VersionError       = Class.new(Choosy::Error)
   ClientExecutionError = Class.new(Choosy::Error)
+
+  class HelpCalled < Choosy::Error
+    def initialize(m); @m = m; end
+    def message; @m; end
+  end
+
+  class VersionCalled < Choosy::Error
+    def initialize(m); @m = m; end
+    def message; @m; end
+  end
 end

data/lib/choosy/option.rb

@@ -1,6 +1,3 @@
-require 'choosy/errors'
-require 'choosy/argument'
-
 module Choosy
   class Option < Argument
     attr_accessor :name, :description

data/lib/choosy/parse_result.rb

@@ -1,5 +1,3 @@
-require 'choosy/verifier'
-
 module Choosy
   class BaseParseResult
     attr_reader :command, :options, :unparsed

data/lib/choosy/parser.rb

@@ -1,7 +1,3 @@
-require 'choosy/errors'
-require 'choosy/parse_result'
-require 'choosy/dsl/option_builder'
-
 module Choosy
   class Parser
     attr_reader :flags, :terminals, :command

data/lib/choosy/printing/base_printer.rb

@@ -1,6 +1,3 @@
-require 'choosy/errors'
-require 'choosy/terminal'
-
 module Choosy::Printing
   class BasePrinter
     include Choosy::Terminal

data/lib/choosy/printing/color.rb

@@ -1,5 +1,3 @@
-require 'choosy/errors'
-
 module Choosy::Printing
   class Color
     # Extrapolated from:
@@ -27,8 +25,10 @@ module Choosy::Printing
       :normal    => 22
     }
 
-    FOREGROUND = 30
-    BACKGROUND = 40
+    KINDS = {
+      :foreground => 30,
+      :background => 40
+    }
 
     def initialize
       begin
@@ -62,7 +62,7 @@ module Choosy::Printing
       originally_nil = str.nil?
       styles.each do |style|
         if color?(style)
-          str = bedazzle(COLORS[style] + FOREGROUND, str, originally_nil)
+          str = bedazzle(COLORS[style] + KINDS[:foreground], str, originally_nil)
         elsif effect?(style)
           str = bedazzle(EFFECTS[style], str, originally_nil)
         end
@@ -70,42 +70,30 @@ module Choosy::Printing
       str
     end
 
-    def respond_to?(method)
-      color?(method) || effect?(method)
-    end
+    COLORS.each do |color, number|
+      define_method color do |*args|
+        raise ArgumentError, "Too many arguments, (max 2)" if args.length > 2
 
-    # Dynamically handle colors and effects
-    def method_missing(method, *args, &block)  
-      if disabled?
-        return args[0] || "" 
-      end
+        return args[0] || "" if disabled?
+        kind = args[1]
+        if kind && !KINDS.has_key?(kind)
+          raise ArgumentError, "Unrecognized format, only :foreground or :background supported"
+        end
 
-      if color?(method)
-        raise ArgumentError.new("too many arguments to Color##{method} (max 2)") if args.length > 2
-        offset = find_state(method, args[1])
-        bedazzle(COLORS[method] + offset, args[0])
-      elsif effect?(method)
-        raise ArgumentError.new("too many arguments to Color##{method} (max 1)") if args.length > 1
-        bedazzle(EFFECTS[method], args[0])
-      else
-        raise NoMethodError.new("undefined method '#{method}' for Color")
+        bedazzle(number + KINDS[(kind || :foreground)], args[0])
       end
     end
 
-    private
-    def find_state(method, state)
-      case state
-      when nil
-        FOREGROUND
-      when :foreground
-        FOREGROUND
-      when :background
-        BACKGROUND
-      else
-        raise ArgumentError.new("unrecognized state for Color##{method}, :foreground or :background only")
+    EFFECTS.each do |color, number|
+      define_method color do |*args|
+        raise ArgumentError, "Too many arguments, (max 1)" if args.length > 1
+
+        return args[0] || "" if disabled?
+        bedazzle(number, args[0])
       end
     end
 
+    private
     def bedazzle(number, str, keep_open=nil)
       prefix = "\e[#{number}m"
       if str.nil?

data/lib/choosy/printing/erb_printer.rb

@@ -1,5 +1,3 @@
-require 'choosy/errors'
-require 'choosy/printing/help_printer'
 require 'erb'
 
 module Choosy::Printing

data/lib/choosy/printing/formatting_element.rb

@@ -1,5 +1,3 @@
-require 'choosy/errors'
-
 module Choosy::Printing
   class FormattingElement
     attr_reader :value, :styles, :kind

data/lib/choosy/printing/help_printer.rb

@@ -1,6 +1,3 @@
-require 'choosy/errors'
-require 'choosy/printing/base_printer'
-
 module Choosy::Printing
   class HelpPrinter < BasePrinter
     attr_reader :buffer, :usage, :line_count

data/lib/choosy/printing/manpage.rb

@@ -1,5 +1,3 @@
-require 'choosy/errors'
-
 module Choosy::Printing
   class ManpageFormatter
     def bold(line=nil)
@@ -34,6 +32,7 @@ module Choosy::Printing
   class Manpage
     attr_accessor :name, :section, :date, :version, :manual
     attr_reader :format, :buffer
+    attr_accessor :column_width
 
     def initialize
       @buffer = []
@@ -176,6 +175,10 @@ module Choosy::Printing
       io << "'\\\" t\n"
       io << frame_outline << NEWLINE
       io << PREFACE
+      if column_width
+        io << ".ll " << column_width.to_s << NEWLINE
+      end
+
       @buffer.each do |line|
         io << line
         io << NEWLINE

data/lib/choosy/printing/manpage_printer.rb

@@ -1,9 +1,3 @@
-require 'choosy/errors'
-require 'choosy/option'
-require 'choosy/dsl/option_builder'
-require 'choosy/printing/base_printer'
-require 'choosy/printing/manpage'
-
 module Choosy::Printing
   class ManpagePrinter < BasePrinter
     attr_reader :manpage, :name, :synopsis
@@ -33,6 +27,7 @@ module Choosy::Printing
     end
 
     def format_prologue(command)
+      @manpage.column_width = columns
       @manpage.name = command_name(command)
       version_option = command.option_builders[Choosy::DSL::OptionBuilder::VERSION]
       if version_option && @manpage.version.nil?

data/lib/choosy/rake.rb

@@ -40,48 +40,50 @@ module SH
   end
 end
 
-#########################################################################
-# Version
-require 'choosy/version'
-
-desc "Shows the current version number."
-task :version => ['version:load'] do
-  puts "Current version: #{$version.to_s}"
-end
+namespace :choosy do
+  #########################################################################
+  # Version
+  require 'choosy/version'
+
+  desc "Shows the current version number."
+  task :version => ['version:load'] do
+    puts "Current version: #{$version.to_s}"
+  end
 
-namespace :version do
-  task :load do
-    puts Dir.pwd
-    if ENV['VERSION_FILE']
-      $version = Choosy::Version.new(ENV['VERSION_FILE'])
-    else
-      $version = Choosy::Version.load_from_lib Dir.pwd
+  namespace :version do
+    task :load do
+      puts Dir.pwd
+      if ENV['VERSION_FILE']
+        $version = Choosy::Version.new(ENV['VERSION_FILE'])
+      else
+        $version = Choosy::Version.load_from_lib Dir.pwd
+      end
     end
-  end
 
-  [:tiny, :minor, :major].each do |type|
-    desc "Bumps the #{type} revision number."
-    task type => :load do
-      old = $version.to_s
-      $version.version!(type)
-      puts "Bumped version: #{old} -> #{$version}"
+    [:tiny, :minor, :major].each do |type|
+      desc "Bumps the #{type} revision number."
+      task type => :load do
+        old = $version.to_s
+        $version.version!(type)
+        puts "Bumped version: #{old} -> #{$version}"
+      end
     end
   end
-end
 
-#########################################################################
-# Release
-desc "Tags the current release in git, builds the gemspec, and pushes the gem"
-task :release => ['gem:clean', 'git:diff', 'gem:push', 'git:tag', 'git:push']
+  #########################################################################
+  # Release
+  desc "Tags the current release in git, builds the gemspec, and pushes the gem"
+  task :release => ['gem:clean', 'git:diff', 'gem:push', 'git:tag', 'git:push']
+end
 
 #########################################################################
 # Git
 namespace :git do
-  task :diff => ['version:load'] do
+  task :diff => ['choosy:version:load'] do
     SH.attempt "git diff --exit-code", :error => "git diff: Your work doesn't seem to be checked in!", :quiet => true
   end
 
-  task :tag => [:diff, 'version:load'] do
+  task :tag => [:diff, 'choosy:version:load'] do
     puts "Tagging version #{$version}"
     SH.attempt "git tag -a -m \"Tagging release #{$version}\" v#{$version}" do |code, contents|
       puts contents
@@ -90,7 +92,7 @@ namespace :git do
     end
   end
 
-  task :push => [:diff, 'version:load'] do
+  task :push => [:diff, 'choosy:version:load'] do
     SH.attempt "git push"
     SH.attempt "git push --tags"
   end
@@ -103,7 +105,7 @@ task :gem => ['gem:build']
 
 namespace :gem do
   desc "Builds the current gemspec."
-  task :build => ['version:load'] do
+  task :build => ['choosy:version:load'] do
     SH.files('gemspec') do |gemspec|
       puts "  Building gemspec: #{gemspec}"
       SH.attempt "gem build #{gemspec}"