@@ -5,10 +5,6 @@ load 'dofile' class Doer class << self - def cd_here(who, cmd) - "cd #{HERE}/#{who} && #{cmd}" - end - def run(who, what, args) command = find_cmd(who, what) templates, replacements = normalize_cmd(who, command) @@ -24,6 +20,11 @@ class Doer exit end + private + def cd_here(who, cmd) + "cd #{HERE}/#{who} && #{cmd}" + end + def normalize_cmd(project, command) commands = [] replacements = [] @@ -36,7 +37,7 @@ class Doer replacements += ref_replacements elsif token.class == Array - replacements << token + replacements += token elsif token.class == String commands << token do @@ -43,9 +43,7 @@ PROJECTS = { :start => "thin -s1 -C thin/development_config.yml --rackup thin/config.ru start", :stop => "thin -s1 -C thin/development_config.yml --rackup thin/config.ru stop", :cleanup => :stop, - :status => Proc.new{ - check_running('localhost:8081', 'Apache Server').call - check_running('localhost:4567', 'Sinatra Service').call + :status => [check_running('localhost:8081', 'Apache Server'), check_running('localhost:4567', 'Sinatra Service')] } }, :assets => { dofile_sample caaacf3fcd312b5b00072347cbc7c75f07ecd220 Maxim Chernyak max@bitsonnet.com http://github.com/maxim/doer/commit/398cc1142b19a911b53b428d6ed9d72dddea2fbe 398cc1142b19a911b53b428d6ed9d72dddea2fbe 2008-12-22T21:07:00-08:00 2008-12-22T21:07:00-08:00 Fix small bug with interpolations. Remove unnecessary Proc from sample. 28cdf4b970f9fe5356b485f3530209e51e370241 Maxim Chernyak max@bitsonnet.com