Skip to content

Commit

Permalink
Fixed marklogic-community#376: --no-prompt param suppresses user queries
Browse files Browse the repository at this point in the history
  • Loading branch information
grtjn committed Feb 23, 2015
1 parent 680e6f6 commit 71e359c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
6 changes: 5 additions & 1 deletion deploy/lib/ml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ def need_help?
end
end

@no_prompt = find_arg(['-n', '--no-prompt'])

@logger = Logger.new(STDOUT)
@logger.level = find_arg(['-v', '--verbose']) ? Logger::DEBUG : Logger::INFO
@logger.formatter = proc { |severity, datetime, progname, msg|
Expand Down Expand Up @@ -120,6 +122,7 @@ def need_help?
Help.doHelp(@logger, command)
else
ServerConfig.logger = @logger
ServerConfig.no_prompt = @no_prompt
ServerConfig.send command
end
break
Expand All @@ -144,7 +147,8 @@ def need_help?
@s = ServerConfig.new(
:config_file => File.expand_path(@properties["ml.config.file"], __FILE__),
:properties => @properties,
:logger => @logger
:logger => @logger,
:no_prompt => @no_prompt
).send(command)
else
Help.doHelp(@logger, :usage, "Unknown command #{command}!")
Expand Down
12 changes: 9 additions & 3 deletions deploy/lib/server_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,17 @@ class ServerConfig < MLClient
@@path = @@is_jar ? "./deploy" : "../.."
@@context = @@is_jar ? Dir.pwd : __FILE__

def ServerConfig.no_prompt=(no_prompt)
@@no_prompt = no_prompt
end

def self.path
@@path
end

def initialize(options)
@options = options

@properties = options[:properties]
@environment = @properties["environment"]
@config_file = @properties["ml.config.file"]
Expand Down Expand Up @@ -94,6 +98,8 @@ def initialize(options)
else
@qconsole_port = @bootstrap_port
end

@@no_prompt = options[:no_prompt]
end

def get_properties
Expand Down Expand Up @@ -269,7 +275,7 @@ def self.prompt_server_version
puts 'Required option --server-version=[version] not specified with valid value.
What is the version number of the target MarkLogic server? [5, 6, 7, or 8]'
server_version = $stdin.gets.chomp.to_i
server_version = $stdin.gets.chomp.to_i unless @@no_prompt
server_version = 7 if server_version == 0
server_version
end
Expand Down Expand Up @@ -480,7 +486,7 @@ def wipe
In order to proceed please type: #{expected_response}
:> }
response = $stdin.gets.chomp
response = $stdin.gets.chomp unless @@no_prompt
if response != expected_response
logger.info "\nAborting wipe on #{@environment}"
return
Expand Down

0 comments on commit 71e359c

Please sign in to comment.