1
1
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-09-17 14:57:22 +03:00

boot/init: fulfilled -> fulfilled?

This commit is contained in:
Samuel Dionne-Riel 2019-12-23 14:46:06 -05:00
parent 555548d3f4
commit 971a7241f6
2 changed files with 10 additions and 10 deletions

View File

@ -1,6 +1,6 @@
module Dependencies
class BaseDependency
def fulfilled()
def fulfilled?()
true
end
@ -17,11 +17,11 @@ module Dependencies
@instance = instance
end
def fulfilled()
def fulfilled?()
if @instance.ran
true
else
$logger.debug(" -> Dependency #{name} unfulfilled (task #{@instance.inspect} hasn't run yet)")
$logger.debug(" -> Dependency #{name} unfulfilled? (task #{@instance.inspect} hasn't run yet)")
false
end
end
@ -32,11 +32,11 @@ module Dependencies
@symbol = symbol
end
def fulfilled()
def fulfilled?()
if Tasks.const_get(@symbol).instance.ran
true
else
$logger.debug(" -> Dependency #{name} unfulfilled (task #{@symbol} hasn't run yet)")
$logger.debug(" -> Dependency #{name} unfulfilled? (task #{@symbol} hasn't run yet)")
false
end
end
@ -47,7 +47,7 @@ module Dependencies
@patterns = *patterns
end
def fulfilled()
def fulfilled?()
if @patterns.all? { |pattern| Dir.glob(pattern).count > 0 }
true
else
@ -56,7 +56,7 @@ module Dependencies
Dir.glob(pattern).count > 0
end.join(", ")
" -> Dependency #{name} unfulfilled (Pattern #{patterns} does not match paths)"
" -> Dependency #{name} unfulfilled? (Pattern #{patterns} does not match paths)"
end
false
end

View File

@ -60,15 +60,15 @@ class Task
dependencies << Dependencies.const_get(kind.to_sym).new(*args)
end
def dependencies_fulfilled()
dependencies.all?(&:fulfilled)
def dependencies_fulfilled?()
dependencies.all?(&:fulfilled?)
end
# Internal actual way to run the task
# This runs the `#run` method.
def _try_run_task()
$logger.debug("Looking to run task #{name}...")
return unless dependencies_fulfilled
return unless dependencies_fulfilled?
unless @ran
$logger.info("Running #{name}...")
run()