amp-front 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/amp-front/dispatch/commands/base.rb

@@ -104,8 +104,9 @@ module Amp
 
       # Specifies the block to run, or returns the block.
       def self.on_call(&block)
-        @on_call = block if block_given?
-        @on_call
+        if block_given?
+          define_method :call_without_args, &block
+        end
       end
       
       def self.desc(*args)
@@ -120,17 +121,17 @@ module Amp
       def self.opt(*args)
         self.options << args
       end
-      
+
       # Runs the command with the provided options and arguments.
-      def call(options, arguments)
-        self.options = options
-        self.arguments = arguments
-        instance_eval(&self.class.on_call)
+      def call(opts, args)
+        self.options = opts
+        self.arguments = args
+        call_without_args
       end
       
       # Collects the options specific to this command and returns them.
-      def collect_options(arguments)
-        args = arguments.dup
+      def collect_options(input_args)
+        args = input_args.dup
         base_options = self.class.options  # Trollop::options uses instance_eval
         @parser, hash = Trollop::options(args) do
           base_options.each do |option|

data/spec/command_specs/base_spec.rb

@@ -45,13 +45,6 @@ describe Amp::Command::Base do
       @klass.new.call(nil, nil)
       flag.should be_true
     end
-    
-    it 'returns the current handler if no block is given' do
-      @klass.on_call.should == nil
-      @klass.on_call { puts 'hello' }
-      @klass.on_call.should_not == nil
-      @klass.on_call.should respond_to(:call)
-    end
   end
   
   describe '#opt' do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Edgar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2010-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency