Skip to content

Commit 5a0640c

Browse files
authored
Merge pull request #91 from nwolfe/maint/remove-warning
(maint) Remove warning about missing configuration file
2 parents b9bb08e + 9a44cc4 commit 5a0640c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/vmfloaty.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Vmfloaty
2020

2121
def run # rubocop:disable Metrics/AbcSize
2222
program :version, Vmfloaty::VERSION
23-
program :description, "A CLI helper tool for Puppet's vmpooler to help you stay afloat"
23+
program :description, "A CLI helper tool for Puppet's vmpooler to help you stay afloat.\n\nConfiguration may be placed in a ~/.vmfloaty.yml file."
2424

2525
config = Conf.read_config
2626

@@ -90,6 +90,7 @@ def run # rubocop:disable Metrics/AbcSize
9090
c.option '--json', 'Prints information as JSON'
9191
c.option '--token STRING', String, 'Token for pooler service'
9292
c.option '--url STRING', String, 'URL of pooler service'
93+
c.option '--user STRING', String, 'User to authenticate with'
9394
c.action do |args, options|
9495
verbose = options.verbose || config['verbose']
9596

@@ -212,6 +213,7 @@ def run # rubocop:disable Metrics/AbcSize
212213
c.option '--json', 'Outputs hosts scheduled for deletion as JSON'
213214
c.option '--token STRING', String, 'Token for pooler service'
214215
c.option '--url STRING', String, 'URL of pooler service'
216+
c.option '--user STRING', String, 'User to authenticate with'
215217
c.action do |args, options|
216218
verbose = options.verbose || config['verbose']
217219
service = Service.new(options, config)

lib/vmfloaty/conf.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def self.read_config
88
begin
99
conf = YAML.load_file("#{Dir.home}/.vmfloaty.yml")
1010
rescue StandardError
11-
FloatyLogger.warn "WARNING: There was no config file at #{Dir.home}/.vmfloaty.yml"
11+
# ignore
1212
end
1313
conf
1414
end

0 commit comments

Comments
 (0)