cp 0.0.1 → 0.0.2

data/cp.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "cp/version"
 
@@ -10,12 +9,14 @@ Gem::Specification.new do |s|
   s.email       = ["fletch@pobox.com"]
   s.homepage    = "https://github.com/baseballdb/cp"
   s.summary     = %q{An alternative API for CmdParse}
-  s.description = %q{CP provides a less verbose API for the CmdParse gem.}
+  s.description = s.summary
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<cmdparse>, [">= 2.0.2"])
+  s.add_runtime_dependency "cmdparse",  "~> 2.0.2"
+  s.add_runtime_dependency "highline",  "~> 1.6.2"
+  s.add_runtime_dependency "json_pure", "~> 1.5.1"
 end

data/examples/net.rb

@@ -32,8 +32,8 @@ command :ipaddr do |c|
   c.command( :add ) do |s|
     s.summary = "Add an IP address"
 
-    s.execute do |opts, args|
-      puts "Adding IP addresses: #{args.join(', ')}" if $verbose
+    s.action do |opts, args|
+      say "Adding IP addresses: #{args.join(', ')}" if $verbose
       $ipaddrs += args
     end
   end
@@ -44,11 +44,11 @@ command :ipaddr do |c|
 
     s.option( "-a", "--all", "Delete all IP addresses" ){ $deleteAll = true }
 
-    s.execute do |opts, args|
+    s.action do |opts, args|
       if $deleteAll
         $ipaddrs = []
       else
-        puts "Deleting IP addresses: #{args.join(', ')}" if $verbose
+        say "Deleting IP addresses: #{args.join(', ')}" if $verbose
         args.each { |ip| $ipaddrs.delete( ip ) }
       end
     end
@@ -59,9 +59,9 @@ command :ipaddr do |c|
     s.default = true
     s.summary = "List all IP addresses"
 
-    s.execute do |*args|
-      puts "Listing IP addresses:" if $verbose
-      puts $ipaddrs.to_yaml
+    s.action do |*args|
+      say "Listing IP addresses:" if $verbose
+      say $ipaddrs.to_yaml
     end
   end
 
@@ -70,15 +70,16 @@ command :ipaddr do |c|
     s.summary = "Show network statistics"
     s.description = "This command shows very useful network statistics - eye catching!!!"
 
-    s.execute do |opts, args|
-      puts "Showing network statistics" if $verbose
-      puts
-      puts "Yeah, I will do something now..."
-      puts
+    s.action do |opts, args|
+      if $verbose
+        say "Showing network statistics"
+        say
+      end
+      say "Yeah, I will do something now..."
+      say
       1.upto(10) do |row|
-        puts " "*(20-row) + "#"*(row*2 - 1)
+        say " "*(20-row) + "#"*(row*2 - 1)
       end
-      puts
     end
   end
 end

data/lib/cp.rb

@@ -1,9 +1,17 @@
 require "rubygems"
+
 require "cmdparse"
+require "highline"
+require "json"
 require "optparse"
+require "terminal-table"
+require "yaml"
+
+require "ext/core"
 
 require "cp/has/commands"
 require "cp/has/options"
+require "cp/highline"
 
 require "cp/app"
 require "cp/command"
@@ -28,7 +36,7 @@ module CP
     at_exit { CP::App.run } if is_main
   end
 
-  [:app, :command, :option].each do |method|
+  CP::App.exported_methods.each do |method|
     define_method( method ) { |*args, &block|
       CP::App.instance.send( method, *args, &block )
     }

data/lib/cp/app.rb

@@ -12,6 +12,8 @@ module CP
     def initialize
       self.name = File.basename( $0 )
       self.runner = CP::Runners::CmdParse
+
+      define_builtin_options
     end
 
     def app( attr, value )
@@ -22,6 +24,15 @@ module CP
       end
     end
 
+    def define_builtin_options
+      option( "-f", "--format FORMAT", "Output format" ) do |o|
+        o.allowed = [:json, :table, :yaml]
+        o.action = lambda { |value|
+          CP::HighLine.instance.format = value
+        }
+      end
+    end
+
     def fatal( msg )
       self.error( msg )
       exit 1
@@ -31,6 +42,10 @@ module CP
       $stderr.puts "#{self.name}: #{msg}.  See `#{self.name} --help`."
     end
 
+    def self.exported_methods
+      [:app, :command, :option]
+    end
+
     def run( *args )
       CP::App.instance.runner.new( CP::App.instance ).run( *args )
     end

data/lib/cp/command.rb

@@ -3,7 +3,7 @@ module CP
     include CP::Has::Commands
     include CP::Has::Options
 
-    attr_reader :block, :name, :parent
+    attr_reader :name, :parent
     attr_accessor :default, :description, :summary
 
     def initialize( name, parent=nil )
@@ -17,38 +17,54 @@ module CP
       yield self if block_given?
     end
 
-    def execute( &block )
-      @block = lambda { |args|
-        begin
-          opts = gather_options
-        rescue CP::MissingOptionError => e
-          CP::App.instance.fatal( "'#{e}' is required" )
-        end
+    def action( &block )
+      if !block_given?
+        @action
+      else
+        @action = lambda { |args|
+          begin
+            opts = gather_options
+          rescue CP::MissingOptionError => e
+            CP::App.instance.fatal( "'#{e}' is required" )
+          end
 
-        block.call( args, opts )
-      }
+          block.call( args, opts )
+          CP::HighLine.instance.say_buffer
+        }
+      end
     end
 
-  private
+    def action=( block )
+      action( &block )
+    end
 
-    def gather_options
-      options = []
+  private
 
-      current = self
-      begin
-        options += current.options
-        current = current.respond_to?( :parent ) ? current.parent : nil
-      end while current && current.respond_to?( :options )
+    # get ancestor commands [child, parent, grandparent]
+    def ancestors
+      commands = [self]
+      while commands.last.respond_to?( :parent ) && commands.last.parent
+        commands << commands.last.parent
+      end
+      commands
+    end
 
-      option_names = options.map { |o|
-        raise CP::MissingOptionError.new( o.switches.last ) if o.required? && o.value.nil?
-        o.name
-      }.sort.uniq
+    def gather_options
+      options = ancestors.reverse.inject( {} ) do |o, command|
+        o.merge( command.options )
+      end
 
-      struct = CP::OptionsStruct.new( *option_names )
+      validate_options( options )
 
-      options.reverse.each { |o| struct[o.name] = o.value }
+      struct = CP::OptionsStruct.new( *options.keys )
+      options.each { |k, v| struct[k] = v.value }
       struct
     end
+
+    def validate_options( opts )
+      opts.each do |k, v|
+        raise CP::MissingOptionError.new( v.switches.last ) if v.required? && v.value.nil?
+      end
+    end
   end
 end

data/lib/cp/has/commands.rb

@@ -2,17 +2,17 @@ module CP
   module Has
     module Commands
       def commands
-        @commands ||= []
+        @commands ||= {}
         @commands
       end
 
       def command( name )
         cmd = name.to_s.split( " " ).inject( self ) do |parent, name|
-          subcommand = parent.commands.find { |c| c.name === name.to_sym }
+          subcommand = parent.commands[name.to_sym]
 
           if subcommand.nil?
             subcommand = CP::Command.new( name, parent )
-            parent.commands << subcommand
+            parent.commands[subcommand.name] = subcommand
           end
 
           subcommand
@@ -21,7 +21,7 @@ module CP
         yield cmd if block_given?
 
         if cmd.default
-          default_cmd = commands.find{ |c| c.default }
+          default_cmd = commands.values.find{ |c| c.default && c != cmd }
           if default_cmd
             raise CP::CommandError.new( "only one default command is allowed: #{default_cmd.name}, #{cmd.name}" )
           end

data/lib/cp/has/options.rb

@@ -2,14 +2,23 @@ module CP
   module Has
     module Options
       def options
-        @options ||= []
+        @options ||= {}
         @options
       end
 
       def option( *args )
         opt = CP::Option.new( *args )
         yield opt if block_given?
-        options << opt
+
+        if( respond_to?( :ancestors, true ) )
+          parent_opt = ancestors[1..-1].reverse.inject( {} ) { |opts, c|
+            opts.merge( c.options )
+          }[opt.name]
+
+          opt = parent_opt.merge( opt ) if parent_opt
+        end
+
+        options[opt.name] = opt
         opt
       end
     end

data/lib/cp/highline.rb

@@ -0,0 +1,41 @@
+require "forwardable"
+require "singleton"
+
+module CP
+  class HighLine < HighLine
+    include ::Singleton
+
+    attr_reader :format
+
+    def format=( format )
+      @format = format
+      @buffer = @format.nil? ? nil : []
+    end
+
+    def say( statement="" )
+      @output = $stdout # because we override $stdout for testing
+
+      if !@buffer.nil?
+        @buffer << statement
+      else
+        formatter = "to_#{format}".to_sym
+        statement = statement.respond_to?( formatter ) ? statement.send( formatter ) : statement.to_s
+        super( statement )
+      end
+    end
+
+    def say_buffer
+      if !@buffer.nil? && @buffer.size > 0
+        statement = @buffer
+        @buffer = nil
+        say( statement.size === 1 ? statement.first : statement )
+        @buffer = []
+      end
+    end
+  end
+end
+
+module Kernel
+  extend Forwardable
+  def_delegators :"CP::HighLine.instance", :agree, :ask, :choose, :say
+end

data/lib/cp/option.rb

@@ -3,7 +3,7 @@ require "optparse"
 module CP
   class Option
     attr_accessor :allowed, :default, :description, :type
-    attr_reader :arg, :block, :short, :long
+    attr_reader :arg, :short, :long
 
     # see: OptionsParser#make_switch
     def initialize( *args )
@@ -20,11 +20,21 @@ module CP
       end
     end
 
-    def block=( block=nil )
-      @block = lambda { |value|
-        @value = value
-        block.call( *( block.arity === 0 ? [] : [value] ) ) if block
-      }
+    def action( &block )
+      save_value = lambda { |value| @value = value }
+
+      if !block_given?
+        @action || save_value
+      else
+        @action = lambda { |value|
+          save_value.call( value )
+          block.call( *( block.arity === 0 ? [] : [value] ) ) if block
+        }
+      end
+    end
+
+    def action=( block )
+      action( &block )
     end
 
     def long=( val )
@@ -40,6 +50,17 @@ module CP
       name.gsub( "-", "_" ).to_sym
     end
 
+    def merge( opt )
+      new_opt = self.dup
+      new_opt.action = @action
+      [:allowed, :default, :description, :type, :short, :long].each { |attr|
+        val = opt.send( :"#{attr}" )
+        new_opt.send( :"#{attr}=", val.dup ) unless val.nil?
+      }
+
+      new_opt
+    end
+
     def required=( val )
       @required = !!val
     end
@@ -63,7 +84,7 @@ module CP
     end
 
     def to_option_parser_args
-      args = self.switches + [self.type, self.allowed, self.description, self.block]
+      args = self.switches + [self.type, self.allowed, self.description, self.action]
       args.find_all { |a| !a.nil? }
     end
 
@@ -81,7 +102,7 @@ module CP
         self.allowed = args.find { |a| a.is_a?( Hash ) || a.is_a?( Array ) }
         self.type = args.find { |a| a.is_a?( Class ) }
         self.description = switch.desc.first rescue nil
-        self.block = switch.block
+        self.action = switch.block
         self.long = switch
         self.short = switch
       end
@@ -100,7 +121,8 @@ module CP
       end
 
       @arg = switch.arg
-      instance_variable_set( :"@#{which}", switch.send( which ).first )
+      switch = switch.send( which )
+      instance_variable_set( :"@#{which}", switch.first ) unless switch.nil?
     end
   end
 end

data/lib/cp/runners/cmd_parse.rb

@@ -17,12 +17,12 @@ module CP
 
         rescue ::CmdParse::InvalidCommandError => e
           command_name << e.message.gsub( /^.*: /, '' )
-          CP::App.instance.fatal( "'#{command_name}' is not a #{CP::App.instance.name} command." )
+          CP::App.instance.fatal( "'#{command_name}' is not a #{CP::App.instance.name} command" )
 
         rescue ::CmdParse::InvalidOptionError,
                ::OptionParser::InvalidOption => e
           switch = e.message.gsub( /^.*: /, '' )
-          CP::App.instance.fatal( "'#{switch}' is not a valid option." )
+          CP::App.instance.fatal( "'#{switch}' is not a valid option" )
         end
       end
 
@@ -34,8 +34,8 @@ module CP
         add_options( runner, @app.options )
         add_commands( runner, @app.commands )
 
-        unless @app.commands.find { |c| c.name === :help }
-          has_default_command = @app.commands.find { |c| c.default }
+        unless @app.commands[:help]
+          has_default_command = @app.commands.values.find { |c| c.default }
           runner.add_command( ::CmdParse::HelpCommand.new, !has_default_command )
         end
 
@@ -48,20 +48,20 @@ module CP
         unless options.empty?
           target.options = ::CmdParse::OptionParserWrapper.new do |o|
             o.separator "Global Options:"
-            options.each { |opt| o.on( *opt.to_option_parser_args ) }
+            options.values.each { |opt| o.on( *opt.to_option_parser_args ) }
           end
         end
       end
 
       def add_commands( target, commands )
         unless commands.empty?
-          commands.each do |c|
+          commands.values.each do |c|
             cmd = ::CmdParse::Command.new( c.name.to_s, !c.commands.empty? )
             cmd.description = c.description
             cmd.short_desc = c.summary
 
             cmd.set_execution_block do |args|
-              c.block.call( args )
+              c.action.call( args )
             end
 
             add_options( cmd, c.options )

data/lib/cp/version.rb

@@ -1,3 +1,3 @@
 module CP
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ext/core.rb

@@ -0,0 +1,25 @@
+class Array
+  def to_table
+    if self.first.is_a?( Hash )
+      headings = self.first.keys
+      Terminal::Table.new(
+        :headings => headings,
+        :rows => self.map { |r| headings.map { |h| r[h] } }
+      ).to_s
+    else
+      Terminal::Table.new( :rows => self.map { |r| r.is_a?( Array ) ? r : [r] } ).to_s
+    end
+  end
+end
+
+class Hash
+  def to_table
+    Terminal::Table.new( :headings => self.keys, :rows => [self.values] ).to_s
+  end
+end
+
+class Object
+  def to_table
+    Terminal::Table.new( :rows => [[self]] ).to_s
+  end
+end

data/spec/app_spec.rb

@@ -3,6 +3,7 @@ require File.join( File.dirname( __FILE__ ), "support", "spec_helper" )
 describe CP::App do
   before( :each ) do
     @target = CP::App.instance
+    @result = { :foo => "bar" }
   end
 
   it_should_behave_like "it accepts commands"
@@ -38,6 +39,71 @@ describe CP::App do
     end
   end
 
+  describe "built-in options" do
+    describe "--format" do
+      it "should exist" do
+        @target.options[:format].should_not be_nil
+      end
+
+      it "should default to unformatted" do
+        run( "test" ).output.should === "#{@result}\n"
+      end
+
+      it "should accept 'json'" do
+        run( "--format", "json", "test" ).output.should === "#{@result.to_json}\n"
+      end
+
+      it "should accept 'table'" do
+        run( "--format", "table", "test" ).output.should === @result.to_table
+      end
+
+      it "should accept 'yaml'" do
+        run( "--format", "yaml", "test" ).output.should === @result.to_yaml
+      end
+
+      it "should buffer output for non-default formats" do
+        @result = [1,2,3]
+        run( "--format", "yaml", "test" ) do |app|
+          app.command( :test ) { @result.each { |line| say line } }
+        end.output.should === @result.to_yaml
+      end
+    end
+  end
+
+  describe "per-command options" do
+    before( :each ) do
+      @target.option( "--opt" ) do |o|
+        o.description = "does something optional"
+        o.default = "foo"
+      end
+      @target.command( :test ) do |c|
+        c.option( "--opt" ) { |o| o.default = "subfoo" }
+        c.command( :subtest ) do |s|
+          s.option( "--opt" )
+        end
+      end
+      @parent_opt = @target.options[:opt]
+      @child_opt = @target.commands[:test].options[:opt]
+    end
+
+    it "should be a copy of the parent Option" do
+      @child_opt.should_not === @parent_opt
+    end
+
+    it "should extend the parent option of the same name" do
+      @child_opt.description.should === @parent_opt.description
+    end
+
+    it "should cascade down to any level of commands" do
+      @child_opt = @target.commands[:test].commands[:subtest].options[:opt]
+      @child_opt.description.should === @parent_opt.description
+    end
+
+    it "should not alter the parent option" do
+      @parent_opt.default.should_not === @child_opt.default
+    end
+  end
+
   describe "properties" do
     [:name, :version].each do |prop|
       it "should accept a #{prop} property" do

data/spec/command_spec.rb

@@ -7,6 +7,19 @@ describe CP::Command do
 
   it_should_behave_like "it accepts commands"
   it_should_behave_like "it accepts options"
+  it_should_behave_like "it has an action"
+
+  it "has HighLine integration" do
+    create_test_app do |app|
+      app.command( :test ) do |c|
+        c.action do
+          [:agree, :ask, :choose, :say].inject( true ) { |b, method|
+            b && respond_to?( method )
+          }.should be_true
+        end
+      end
+    end.run "test"
+  end
 
   describe "attributes" do
     [
@@ -38,8 +51,8 @@ describe CP::Command do
 
     it "saves the block as #block" do
       block_ran = false
-      @target.execute { block_ran = true }
-      @target.block.call( nil )
+      @target.action { block_ran = true }
+      @target.action.call( nil )
       block_ran.should be_true
     end
 

data/spec/option_spec.rb

@@ -5,6 +5,7 @@ describe CP::Option do
     @target = CP::Option.new( "-x" )
   end
 
+  it_should_behave_like "it has an action"
 
   describe "attributes" do
     [
@@ -37,19 +38,11 @@ describe CP::Option do
     end
   end
 
-  describe "#block" do
+  describe "#action" do
     it "should save the value" do
-      block = lambda {}
-      @target.block.call( "foo" )
+      @target.action.call( "foo" )
       @target.value.should === "foo"
     end
-
-    it "should call the use's block" do
-      called = false
-      @target.block = lambda { |val| called = true }
-      @target.block.call( "value" )
-      called.should be_true
-    end
   end
 
   describe "#default" do
@@ -128,7 +121,7 @@ describe CP::Option do
     end
     it "sets the block from arguments" do
       ran = false
-      CP::Option.new( "-s", lambda{ ran = true } ).block.call( nil )
+      CP::Option.new( "-s", lambda{ ran = true } ).action.call( nil )
       ran.should be_true
     end
 

data/spec/support/lib/test_app_runner.rb

@@ -1,7 +1,8 @@
 class TestAppRunner
   attr_reader :errors, :exit_status, :output
 
-  def run( *args )
+  def run( *args, result )
+    @result = result
     @errors, @output = trap_output do
       app = create_test_app
       yield app if block_given?

data/spec/support/shared_examples/action_examples.rb

@@ -0,0 +1,19 @@
+shared_examples_for "it has an action" do
+  describe "#action" do
+    it "accepts a block as #action" do
+      called = false
+      @target.action { |*args| called = true }
+      args = [nil] * @target.action.arity
+      @target.action.call( *args )
+      called.should be_true
+    end
+
+    it "accepts a Proc as #action=" do
+      called = false
+      @target.action = lambda { |*args| called = true }
+      args = [nil] * @target.action.arity
+      @target.action.call( *args )
+      called.should be_true
+    end
+  end
+end

data/spec/support/shared_examples/commands_examples.rb

@@ -28,8 +28,8 @@ shared_examples_for "it accepts commands" do
   end
 
   describe "#commands" do
-    it "should return an array" do
-      @target.commands.should be_an_instance_of( Array )
+    it "should return a hash" do
+      @target.commands.should be_an_instance_of( Hash )
     end
 
     it "should increase with each defined command" do
@@ -39,12 +39,13 @@ shared_examples_for "it accepts commands" do
     end
 
     it "should include each defined command" do
-      @target.commands.include?( @target.command( :test ) ).should be_true
+      cmd = @target.command( :test )
+      @target.commands.values.include?( cmd ).should be_true
     end
 
     it "should only allow one default command" do
+      @target.command( :test ) { |c| c.default = true }
       lambda {
-        @target.command( :test ) { |c| c.default = true }
         @target.command( :test2 ) { |c| c.default = true }
       }.should raise_error( CP::CommandError, /only one/ )
     end

data/spec/support/shared_examples/options_examples.rb

@@ -6,18 +6,19 @@ shared_examples_for "it accepts options" do
   end
 
   describe "#options" do
-    it "should return an array" do
-      @target.options.should be_an_instance_of( Array )
+    it "should return a hash" do
+      @target.options.should be_an_instance_of( Hash )
     end
 
     it "should increase with each defined option" do
       lambda {
         @target.option( "-s" )
-      }.should change(){ @target.options.length}.by( 1 )
+      }.should change(){ @target.options.length }.by( 1 )
     end
 
     it "should include each defined option" do
-      @target.options.include?( @target.option( "-s" ) ).should be_true
+      opt = @target.option( "-s" )
+      @target.options.values.include?( opt ).should be_true
     end
   end
 end

data/spec/support/shared_examples/runner_examples.rb

@@ -11,7 +11,7 @@ shared_examples_for "it is a runner" do
 
       run( "test", "foo", "bar" ) do |app|
         app.command( :test ) { |c|
-          c.execute { |args, opts| passed_args = args }
+          c.action { |args, opts| passed_args = args }
         }
       end
 
@@ -40,7 +40,7 @@ shared_examples_for "it is a runner" do
 
         run( "help" ) do |app|
           app.command( :help ) do |c|
-            c.execute { custom_help_ran  = true }
+            c.action { custom_help_ran  = true }
           end
         end
 
@@ -58,7 +58,7 @@ shared_examples_for "it is a runner" do
           run( "test" ) do |app|
             app.command( :test ) { |c|
               c.option( "--[no-]option" ) { |o| o.default = true }
-              c.execute { |args, opts| passed_value = opts.option }
+              c.action { |args, opts| passed_value = opts.option }
             }
           end
 
@@ -71,7 +71,7 @@ shared_examples_for "it is a runner" do
           run( "test", "--no-option" ) do |app|
             app.command( :test ) { |c|
               c.option( "--[no-]option" ) { |o| o.default = true }
-              c.execute { |args, opts| passed_value = opts.option }
+              c.action { |args, opts| passed_value = opts.option }
             }
           end
 
@@ -87,7 +87,7 @@ shared_examples_for "it is a runner" do
         run( "test" ) do |app|
           app.command( :test ) { |c|
             c.option( "--option VAL" ) { |o| o.default = "foo" }
-            c.execute { |args, opts| passed_value = opts.option }
+            c.action { |args, opts| passed_value = opts.option }
           }
         end
 
@@ -111,7 +111,7 @@ shared_examples_for "it is a runner" do
           @result = run( "test" ) do |app|
             app.command( :test ) { |c|
               c.option( "--option" ) { |o| o.required = true }
-              c.execute { |args, opts| }
+              c.action { |args, opts| }
             }
           end
         end
@@ -132,7 +132,7 @@ shared_examples_for "it is a runner" do
 
         run( "test", "foo", "bar" ) do |app|
           app.command( :test ) { |c|
-            c.execute { |args, opts| opts_struct = opts }
+            c.action { |args, opts| opts_struct = opts }
           }
         end
 
@@ -145,7 +145,7 @@ shared_examples_for "it is a runner" do
         run( "test", "--option", "foo" ) do |app|
           app.command( :test ) { |c|
             c.option( "--option FOO" )
-            c.execute { |args, opts| passed_value = opts.option }
+            c.action { |args, opts| passed_value = opts.option }
           }
         end
 
@@ -160,7 +160,7 @@ shared_examples_for "it is a runner" do
             cmd.command( :sub1 ) { |sub1|
               sub1.option( "--option FOO" )
               sub1.command( :sub2 ) { |sub2|
-                sub2.execute { |args, opts| passed_value = opts.option }
+                sub2.action { |args, opts| passed_value = opts.option }
               }
             }
           }

data/spec/support/spec_helper.rb

@@ -30,8 +30,8 @@ def create_test_app
   a.command( :test ) do |c|
     c.summary = "test summary"
     c.option "-v", "--verbose", "verbose description"
-    c.execute do |args|
-      "test #{args.join( ", " )}"
+    c.action do |args|
+      say( @result || "test #{args.join( ", " )}" )
     end
   end
 
@@ -42,7 +42,7 @@ end
 
 def run *args, &block
   runner = TestAppRunner.new
-  runner.run( *args, &block )
+  runner.run( *args, @result, &block )
   runner
 end
 

metadata

@@ -2,7 +2,7 @@
 name: cp
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Rick Fletcher
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 Z
+date: 2011-07-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse
@@ -18,12 +18,34 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 2.0.2
   type: :runtime
   version_requirements: *id001
-description: CP provides a less verbose API for the CmdParse gem.
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.2
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.1
+  type: :runtime
+  version_requirements: *id003
+description: An alternative API for CmdParse
 email: 
 - fletch@pobox.com
 executables: []
@@ -45,10 +67,12 @@ files:
 - lib/cp/errors.rb
 - lib/cp/has/commands.rb
 - lib/cp/has/options.rb
+- lib/cp/highline.rb
 - lib/cp/option.rb
 - lib/cp/options_struct.rb
 - lib/cp/runners/cmd_parse.rb
 - lib/cp/version.rb
+- lib/ext/core.rb
 - spec/app_spec.rb
 - spec/command_spec.rb
 - spec/cp_spec.rb
@@ -58,6 +82,7 @@ files:
 - spec/options_struct_spec.rb
 - spec/runners/cmd_parse_spec.rb
 - spec/support/lib/test_app_runner.rb
+- spec/support/shared_examples/action_examples.rb
 - spec/support/shared_examples/commands_examples.rb
 - spec/support/shared_examples/options_examples.rb
 - spec/support/shared_examples/runner_examples.rb
@@ -100,6 +125,7 @@ test_files:
 - spec/options_struct_spec.rb
 - spec/runners/cmd_parse_spec.rb
 - spec/support/lib/test_app_runner.rb
+- spec/support/shared_examples/action_examples.rb
 - spec/support/shared_examples/commands_examples.rb
 - spec/support/shared_examples/options_examples.rb
 - spec/support/shared_examples/runner_examples.rb