whitespace/indentation

bug/bundler_fix
Brent Cook 2016-12-06 16:37:22 -06:00
parent ce23c2db53
commit d091a32be8
3 changed files with 310 additions and 320 deletions

View File

@ -1,22 +1,15 @@
# -*- coding: binary -*-
#
# Rex
#
require 'rex/ui/text/output/buffer/stdout'
module Msf
module Ui
module Console
module CommandDispatcher
module Ui
module Console
module CommandDispatcher
#
# {CommandDispatcher} for commands related to background jobs in Metasploit Framework.
#
class Jobs
include Msf::Ui::Console::CommandDispatcher
@@jobs_opts = Rex::Parser::Arguments.new(
@ -25,7 +18,8 @@ module CommandDispatcher
"-K" => [ false, "Terminate all running jobs." ],
"-i" => [ true, "Lists detailed information about a running job."],
"-l" => [ false, "List all running jobs." ],
"-v" => [ false, "Print more detailed info. Use with -i and -l" ])
"-v" => [ false, "Print more detailed info. Use with -i and -l" ]
)
def commands
{
@ -90,7 +84,7 @@ module CommandDispatcher
print_line "Usage: jobs [options]"
print_line
print_line "Active job manipulation and interaction."
print @@jobs_opts.usage()
print @@jobs_opts.usage
end
#
@ -162,7 +156,7 @@ module CommandDispatcher
show_options(mod) if mod.options.has_options?
if verbose
mod_opt = Serializer::ReadableText.dump_advanced_options(mod,' ')
mod_opt = Serializer::ReadableText.dump_advanced_options(mod, ' ')
if mod_opt && mod_opt.length > 0
print_line("\nModule advanced options:\n\n#{mod_opt}\n")
end
@ -185,7 +179,7 @@ module CommandDispatcher
return @@jobs_opts.fmt.keys
end
if words.length == 2 and (@@jobs_opts.fmt[words[1]] || [false])[0]
if words.length == 2 && (@@jobs_opts.fmt[words[1]] || [false])[0]
return framework.jobs.keys
end
@ -196,7 +190,7 @@ module CommandDispatcher
print_line "Usage: kill <job1> [job2 ...]"
print_line
print_line "Equivalent to 'jobs -k job1 -k job2 ...'"
print @@jobs_opts.usage()
print @@jobs_opts.usage
end
def cmd_kill(*args)
@ -215,8 +209,7 @@ module CommandDispatcher
framework.jobs.keys
end
end
end
end
end
end
end
end
end

View File

@ -1,12 +1,7 @@
# -*- coding: binary -*-
#
# Rex
#
require 'rex/ui/text/output/buffer/stdout'
module Msf
module Ui
module Console

View File

@ -3,16 +3,15 @@
require 'rex/parser/arguments'
module Msf
module Ui
module Console
module CommandDispatcher
module Ui
module Console
module CommandDispatcher
###
#
# Payload module command dispatcher.
#
###
class Payload
class Payload
include Msf::Ui::Console::ModuleCommandDispatcher
@ -136,6 +135,9 @@ class Payload
end
end
end
end end end end
end
end
end
end