diff options
Diffstat (limited to 'sisu-install')
| -rwxr-xr-x | sisu-install | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sisu-install b/sisu-install index 2b981b94..206867fd 100755 --- a/sisu-install +++ b/sisu-install @@ -195,9 +195,9 @@ module Rant ROOT_RANTFILE = "root.rant" SUB_RANTFILE = "sub.rant" RANTFILES = [ "Rantfile", "rantfile", ROOT_RANTFILE ] - + CODE_IMPORTS = [] - + class RantAbortException < StandardError end @@ -426,7 +426,7 @@ module Rant end end end - + def valid_constraint?(obj) obj.respond_to?(:filter) && obj.respond_to?(:matches?) && @@ -911,7 +911,7 @@ module Rant class MultiFileList attr_reader :cur_list - + def initialize(rac) @rac = rac @cur_list = RacFileList.new(@rac) @@ -1162,7 +1162,7 @@ module Rant attr_accessor :rantfile attr_accessor :line_number attr_accessor :project_subdir - + def initialize @description = nil @rantfile = nil @@ -1483,7 +1483,7 @@ module Rant goto_task_home @target_files.each(&block) if @target_files end - + def file_target(*args) args.flatten! args << @name if args.empty? @@ -1493,7 +1493,7 @@ module Rant @target_files = args end end - + def invoke(opt = INVOKE_OPT) return circular_dep if @run @run = true @@ -1697,7 +1697,7 @@ module Rant mtime = File.mtime f @ts = mtime if mtime > @ts else - rac.abort_at(ch, + rac.abort_at(ch, "SourceNode: no such file -- #{f}") end else @@ -1708,7 +1708,7 @@ module Rant goto_task_home @ts = node_ts if node_ts > @ts else - rac.abort_at(ch, + rac.abort_at(ch, "SourceNode can't depend on #{node.name}") end } @@ -1982,7 +1982,7 @@ module Rant::Lib $stderr.puts "parse_caller_elem: #{elem.inspect}" { :file => elem, :ln => 0 } end - + end module_function :parse_caller_elem end # module Lib @@ -2206,7 +2206,7 @@ class Rant::RantApp "Print info instead of actually executing actions." ], [ "--tasks", "-T", GetoptLong::NO_ARGUMENT, "Show a list of all described tasks and exit." ], - + [ "--import", "-i", GetoptLong::REQUIRED_ARGUMENT, nil ], [ "--stop-after-load", GetoptLong::NO_ARGUMENT, nil ], @@ -2740,7 +2740,7 @@ class Rant::RantApp unless opt[:type] == :file && !t.file_target? matching_tasks += 1 begin - t.invoke(opt) + t.invoke(opt) rescue Rant::TaskFail => e err_task_fail(e) abort @@ -2834,7 +2834,7 @@ class Rant::RantApp end if @rootdir != old_root and fn Dir.chdir @rootdir - cmd_msg "(in #@rootdir)" + cmd_msg "(in #@rootdir)" end end if fn @@ -2970,7 +2970,7 @@ class Rant::RantApp def normalize_task_arg(targ, ch) name = nil pre = [] - + if targ.is_a? Hash if targ.empty? abort_at(ch, "Empty hash as task argument, " + |