clean up the run before stuff

This commit is contained in:
John Bintz 2011-06-16 10:48:34 -04:00
parent 10974db664
commit 2bde8becac

View File

@ -22,14 +22,14 @@ module Guard
def run_all def run_all
UI.info "Guard::JasmineHeadlessWebkit running all specs..." UI.info "Guard::JasmineHeadlessWebkit running all specs..."
JasmineHeadlessWebkitRunner.run if run_before and run_rails_assets and run_jammit JasmineHeadlessWebkitRunner.run if run_all_things_before
@ran_before = false @ran_before = false
end end
def run_on_change(paths) def run_on_change(paths)
paths = filter_paths(paths) paths = filter_paths(paths)
@ran_before = false @ran_before = false
if run_before and run_rails_assets and run_jammit if run_all_things_before
@ran_before = true @ran_before = true
if !paths.empty? if !paths.empty?
UI.info "Guard::JasmineHeadlessWebkit running the following: #{paths.join(' ')}" UI.info "Guard::JasmineHeadlessWebkit running the following: #{paths.join(' ')}"
@ -70,6 +70,10 @@ module Guard
end end
end end
def run_all_things_before
run_before and run_rails_assets and run_jammit
end
def run_program(name, command = nil) def run_program(name, command = nil)
command ||= name command ||= name
UI.info "Guard::JasmineHeadlessWebkit running #{name}..." UI.info "Guard::JasmineHeadlessWebkit running #{name}..."