commando 0.0.0 → 0.0.1

data/Rakefile

@@ -10,7 +10,8 @@ begin
     gem.email = "geemus@gmail.com"
     gem.homepage = "http://github.com/geemus/commando"
     gem.authors = ["Wesley Beary"]
-    gem.add_development_dependency "shindo", ">= 0"
+    gem.add_development_dependency "shindo", ">=0"
+    gem.add_dependency 'formatador', ">=0.0.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/commando.gemspec

@@ -5,21 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commando}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wesley Beary"]
-  s.date = %q{2009-11-22}
+  s.date = %q{2009-12-01}
   s.description = %q{Tools for command line interfacing}
   s.email = %q{geemus@gmail.com}
   s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
-     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -40,11 +38,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shindo>, [">= 0"])
+      s.add_runtime_dependency(%q<formatador>, [">= 0.0.1"])
     else
       s.add_dependency(%q<shindo>, [">= 0"])
+      s.add_dependency(%q<formatador>, [">= 0.0.1"])
     end
   else
     s.add_dependency(%q<shindo>, [">= 0"])
+    s.add_dependency(%q<formatador>, [">= 0.0.1"])
   end
 end
 

data/lib/commando.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'formatador'
+
 class Commando
 
   def self.commands(&block)
@@ -7,6 +10,7 @@ class Commando
   def initialize(&block)
     @commands = []
     @descriptions = {}
+    @formatador = Formatador.new
     if block_given?
       instance_eval(&block)
     end
@@ -30,30 +34,18 @@ class Commando
     @descriptions[command.join(' ').squeeze(' ')] = description
   end
 
-  def call(*args)
-    request = args.join(' ').squeeze(' ').strip
+  def call(request = ARGV.join(' ').squeeze(' ').strip)
     for command in @commands
       if match = command[0].match(request)
         response = command[1].call(*match.captures)
         break
       end
     end
-    unless response
-      response = available_commands
-    end
-    display(response)
-  end
-
-  def available_commands
-    display("\nAvailable Commands:\n")
-
-    data = []
-
-    for command, description in @descriptions
-      data << ["/#{command}/", ' - ', "#{description}"]
+    if match
+      @formatador.display_line(response)
+    else
+      display_available_commands
     end
-    
-    columns(data)
   end
 
   def columns(data)
@@ -65,21 +57,36 @@ class Commando
       end
     end
 
-    table = ''
+    lines = []
     data.length.times do |row|
-      string = '  '
+      string = ''
       data[row].length.times do |column|
         value = data[row][column]
         string << "#{value}#{(' ' * (widths[column] - value.length))}"
       end
-      table << string << "\n\n"
+      lines << string
+      lines << ''
     end
 
-    table.chop!
+    lines
   end
 
-  def display(string)
-    print(string << "\n")
+  def display_available_commands
+    @formatador.display_line('')
+    @formatador.display_line("[bold]OPTIONS[/]")
+    @formatador.display_line('')
+
+    data = []
+
+    for command, description in @descriptions
+      data << ["/#{command}/", ' - ', "#{description}"]
+    end
+
+    @formatador.indent do
+      for column in columns(data)
+        @formatador.display_line(column)
+      end
+    end
   end
 
 end

data/tests/commando_tests.rb

@@ -1,8 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '/tests_helper')
+require_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'commando'))
+
+commands = Tempfile.new('commands')
+commands << <<-COMMANDS
+#!/usr/bin/env ruby
+require '#{require_path}'
+commando = Commando.commands do
+  command('no_params', 'prints no_params') { "no_params" }
+  command(['param', /(\\d*)/], 'echos param') {|param| param.to_s}
+end
+commando.call
+COMMANDS
+commands.close
+File.chmod(0755, commands.path)
 
 Shindo.tests("Commando") do
-  test("fails") do
-    "hey buddy, you should probably rename this file and start specing for real"
-    false
+  tests("matching commands") do
+    test("basics") { `#{commands.path} no_params` == "  no_params\n" }
+    test("with param") { `#{commands.path} param 23` == "  23\n" }
   end
+  test("no matching commands") { `#{commands.path} undefined`.include?('OPTIONS') }
 end

data/tests/tests_helper.rb

@@ -3,3 +3,4 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'commando'
 require 'rubygems'
 require 'shindo'
+require 'tempfile'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: commando
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Wesley Beary
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -08:00
+date: 2009-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: formatador
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1
+    version: 
 description: Tools for command line interfacing
 email: geemus@gmail.com
 executables: []
@@ -29,12 +39,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
 - .document
 - .gitignore
-- LICENSE
 - README.rdoc
 - Rakefile
 - VERSION

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Wesley Beary
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.