cri 2.0a2 → 2.0a3

data/lib/cri.rb

@@ -3,7 +3,7 @@
 module Cri
 
   # The current Cri version.
-  VERSION = '2.0a2'
+  VERSION = '2.0a3'
 
   autoload 'Command',           'cri/command'
   autoload 'CommandDSL',        'cri/command_dsl'

data/lib/cri/command.rb

@@ -76,10 +76,12 @@ module Cri
     # @todo Document
     def self.define(string=nil, &block)
       dsl = Cri::CommandDSL.new
-      if block
+      if string
+        dsl.instance_eval(string)
+      elsif block.arity == 0
         dsl.instance_eval(&block)
       else
-        dsl.instance_eval(string)
+        block.call(dsl)
       end
       dsl.command
     end
@@ -105,7 +107,11 @@ module Cri
     # @todo Document
     def modify(&block)
       dsl = Cri::CommandDSL.new(self)
-      dsl.instance_eval(&block)
+      if block.arity == 0
+        dsl.instance_eval(&block)
+      else
+        block.call(dsl)
+      end
       self
     end
 
@@ -128,7 +134,11 @@ module Cri
       # Execute DSL
       dsl = Cri::CommandDSL.new
       dsl.name name unless name.nil?
-      dsl.instance_eval(&block)
+      if block.arity == 0
+        dsl.instance_eval(&block)
+      else
+        block.call(dsl)
+      end
 
       # Create command
       cmd = dsl.command
@@ -189,7 +199,7 @@ module Cri
         if @block.nil?
           raise "No implementation available for '#{self.name}'"
         end
-        self.instance_exec(global_opts, args, &block)
+        block.call(global_opts, args, self)
       else
         # Parse up to command name
         stuff = partition(opts_and_args)
@@ -284,7 +294,7 @@ module Cri
       opts.each_pair do |key, value|
         opt_def = global_option_definitions.find { |o| o[:long] == key.to_s }
         block = opt_def[:block]
-        self.instance_exec(value, &block) if block
+        block.call(value, self) if block
       end
     end
 

data/lib/cri/command_dsl.rb

@@ -73,9 +73,9 @@ module Cri
 
     # @todo Document
     def run(&block)
-      if block.arity != 2
+      unless block.arity != 2 || block.arity != 3
         raise ArgumentError,
-          "The block given to Cri::Command#run expects exactly two args"
+          "The block given to Cri::Command#run expects two or three args"
       end
 
       @command.block = block

data/test/test_command.rb

@@ -9,16 +9,16 @@ class Cri::CommandTestCase < Cri::TestCase
       summary     'does stuff'
       description 'This command does a lot of stuff.'
 
-      option    :a, :aaa, 'opt a', :argument => :optional do |value|
-        $stdout.puts "#{name}:#{value}"
+      option    :a, :aaa, 'opt a', :argument => :optional do |value, cmd|
+        $stdout.puts "#{cmd.name}:#{value}"
       end
       required  :b, :bbb, 'opt b'
       optional  :c, :ccc, 'opt c'
       flag      :d, :ddd, 'opt d'
       forbidden :e, :eee, 'opt e'
 
-      run do |opts, args|
-        $stdout.puts "Awesome #{name}!"
+      run do |opts, args, c|
+        $stdout.puts "Awesome #{c.name}!"
 
         $stdout.puts args.join(',')
 
@@ -45,8 +45,8 @@ class Cri::CommandTestCase < Cri::TestCase
       summary     'does super stuff'
       description 'This command does super stuff.'
 
-      option    :a, :aaa, 'opt a', :argument => :optional do |value|
-        $stdout.puts "#{name}:#{value}"
+      option    :a, :aaa, 'opt a', :argument => :optional do |value, cmd|
+        $stdout.puts "#{cmd.name}:#{value}"
       end
       required  :b, :bbb, 'opt b'
       optional  :c, :ccc, 'opt c'
@@ -220,7 +220,20 @@ class Cri::CommandTestCase < Cri::TestCase
     bare_cmd.help
   end
 
-  def test_modify
+  def test_modify_with_block_argument
+    cmd = Cri::Command.define do |c|
+      c.name 'build'
+    end
+    assert_equal 'build', cmd.name
+
+    cmd.modify do |c|
+      c.name 'compile'
+    end
+
+    assert_equal 'compile', cmd.name
+  end
+
+  def test_modify_without_block_argument
     cmd = Cri::Command.define do
       name 'build'
     end
@@ -248,4 +261,38 @@ class Cri::CommandTestCase < Cri::TestCase
     assert_equal 'help', cmd.subcommands.to_a[0].name
   end
 
+  def test_define_with_block_argument
+    cmd = Cri::Command.define do |c|
+      c.name 'moo'
+    end
+
+    assert_equal 'moo', cmd.name
+  end
+
+  def test_define_without_block_argument
+    cmd = Cri::Command.define do
+      name 'moo'
+    end
+
+    assert_equal 'moo', cmd.name
+  end
+
+  def test_define_subcommand_with_block_argument
+    cmd = bare_cmd
+    cmd.define_command do |c|
+      c.name 'baresub'
+    end
+
+    assert_equal 'baresub', cmd.subcommands.to_a[0].name
+  end
+
+  def test_define_subcommand_without_block_argument
+    cmd = bare_cmd
+    cmd.define_command do
+      name 'baresub'
+    end
+
+    assert_equal 'baresub', cmd.subcommands.to_a[0].name
+  end
+
 end

data/test/test_command_dsl.rb

@@ -5,7 +5,7 @@ class Cri::CommandDSLTestCase < Cri::TestCase
   def test_create_command
     # Define
     dsl = Cri::CommandDSL.new
-    dsl.instance_eval do
+    dsl.instance_eval do 
       name        'moo'
       usage       'dunno whatever'
       summary     'does stuff'
@@ -51,8 +51,8 @@ class Cri::CommandDSLTestCase < Cri::TestCase
     dsl = Cri::CommandDSL.new
     dsl.instance_eval do
       name 'super'
-      subcommand do
-        name 'sub'
+      subcommand do |c|
+        c.name 'sub'
       end
     end
     command = dsl.command

metadata

@@ -2,7 +2,7 @@
 name: cri
 version: !ruby/object:Gem::Version 
   prerelease: 3
-  version: 2.0a2
+  version: 2.0a3
 platform: ruby
 authors: 
 - Denis Defreyne