|
1 | 1 | require 'pathname'
|
2 | 2 |
|
3 | 3 | class Task
|
4 |
| - def initialize(name, doc, block, dir, auto) |
| 4 | + def initialize(name, block, doc, dir, auto) |
5 | 5 | @name = name
|
6 |
| - @doc = doc |
7 | 6 | @block = block
|
| 7 | + @doc = doc |
8 | 8 | @dir = dir
|
9 | 9 | @auto = auto
|
10 | 10 | end
|
11 | 11 |
|
12 | 12 | def run(manager, *args)
|
13 | 13 | raise DirNotFoundError.new(@dir, self) if !File.exist?(@dir)
|
14 | 14 | Dir.chdir(@dir) do
|
| 15 | + $stderr.puts "[runx] In #{@dir}." |
15 | 16 | @block.call(*args)
|
16 | 17 | end
|
17 | 18 | end
|
@@ -113,10 +114,7 @@ def task_defined?(name)
|
113 | 114 |
|
114 | 115 | def run_task(name, *args)
|
115 | 116 | task = @tasks[name.to_s.downcase]
|
116 |
| - if task.nil? |
117 |
| - raise TaskNotFoundError.new(name) |
118 |
| - end |
119 |
| - |
| 117 | + raise TaskNotFoundError.new(name) if task.nil? |
120 | 118 | task.run(self, *args)
|
121 | 119 | end
|
122 | 120 |
|
@@ -181,7 +179,7 @@ def run(*args, &block)
|
181 | 179 | raise DuplicateTaskError.new(name)
|
182 | 180 | end
|
183 | 181 |
|
184 |
| - task = Task.new(name.to_s, @doc, block, @task_dir || @root_dir, @auto) |
| 182 | + task = Task.new(name.to_s, block, @doc, @task_dir || @root_dir, @auto) |
185 | 183 | @tasks[key] = task
|
186 | 184 |
|
187 | 185 | if @auto
|
@@ -263,15 +261,13 @@ def find_runfile
|
263 | 261 | manager = TaskManager.new
|
264 | 262 | manager.load(runfile)
|
265 | 263 |
|
266 |
| - dir = File.dirname(runfile) |
267 |
| - $stderr.puts "[runx] In #{dir}." |
268 |
| - |
269 | 264 | task_name = ARGV[0] || manager.auto_task
|
270 | 265 |
|
271 | 266 | is_help = ['-h', '--help', 'help'].include?(task_name)
|
272 | 267 | show_help = !task_name || (is_help && !manager.task_defined?(task_name))
|
273 | 268 |
|
274 | 269 | if show_help
|
| 270 | + $stderr.puts "[runx] In #{File.dirname(runfile)}." |
275 | 271 | $stderr.puts
|
276 | 272 | manager.show_help
|
277 | 273 | else
|
|
0 commit comments