diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 13:40:26 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 13:40:26 +0530 |
| commit | c71120e29caddda295c133adfb279870733a3f81 (patch) | |
| tree | da81981de36bc146c36cae3bc73cb5020ba05919 /railties/lib/rails/vendor | |
| parent | 087b67805e3785159cb4da524ad37782bd182b93 (diff) | |
| parent | 71d67fc6bd504956bce66e274e6228dd00a814c1 (diff) | |
| download | rails-c71120e29caddda295c133adfb279870733a3f81.tar.gz rails-c71120e29caddda295c133adfb279870733a3f81.tar.bz2 rails-c71120e29caddda295c133adfb279870733a3f81.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/lib/rails/vendor')
| -rw-r--r-- | railties/lib/rails/vendor/thor-0.12.3/lib/thor/group.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/railties/lib/rails/vendor/thor-0.12.3/lib/thor/group.rb b/railties/lib/rails/vendor/thor-0.12.3/lib/thor/group.rb index a585b37b73..eda3b52c4f 100644 --- a/railties/lib/rails/vendor/thor-0.12.3/lib/thor/group.rb +++ b/railties/lib/rails/vendor/thor-0.12.3/lib/thor/group.rb @@ -252,10 +252,13 @@ class Thor::Group shell.padding += 1 result = if block_given? - if block.arity == 2 - block.call(self, klass) - else + case block.arity + when 3 block.call(self, klass, task) + when 2 + block.call(self, klass) + when 1 + instance_exec(klass, &block) end else invoke klass, task, *args |