diff options
| author | Tim Smith <tsmith84@gmail.com> | 2019-11-04 14:15:19 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2019-11-04 14:15:19 -0800 |
| commit | 950f7f127d585eff203db8bd0b4904ca9282b6fd (patch) | |
| tree | 32a58e2a98959497f26488c2f387c5800cdf54c1 /lib/chef/knife | |
| parent | 72352921c1b03957fdf39794737f45c88a9346ba (diff) | |
| download | chef-950f7f127d585eff203db8bd0b4904ca9282b6fd.tar.gz | |
Updates for Chefstyle with Rubocop 0.75.1
This update found a few things that should have been triggering before.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef/knife')
| -rw-r--r-- | lib/chef/knife/configure.rb | 2 | ||||
| -rw-r--r-- | lib/chef/knife/core/status_presenter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb index 739428d5e3..888b4290dd 100644 --- a/lib/chef/knife/configure.rb +++ b/lib/chef/knife/configure.rb @@ -120,7 +120,7 @@ class Chef @admin_client_key = config[:admin_client_key] || ask_question("Please enter the location of the existing admin's private key: ", default: "#{Chef::Dist::SERVER_CONF_DIR}/admin.pem") @admin_client_key = File.expand_path(@admin_client_key) else - @new_client_name = config[:node_name] || ask_question("Please enter an existing username or clientname for the API: ", default: Etc.getlogin) + @new_client_name = config[:node_name] || ask_question("Please enter an existing username or clientname for the API: ", default: Etc.getlogin) end @new_client_key = config[:client_key] || File.join(chef_config_path, "#{@new_client_name}.pem") diff --git a/lib/chef/knife/core/status_presenter.rb b/lib/chef/knife/core/status_presenter.rb index 562bd7b0e9..9042350295 100644 --- a/lib/chef/knife/core/status_presenter.rb +++ b/lib/chef/knife/core/status_presenter.rb @@ -112,7 +112,7 @@ class Chef if node["ohai_time"] hours, minutes, seconds = time_difference_in_hms(node["ohai_time"]) - hours_text = "#{hours} hour#{hours == 1 ? " " : "s"}" + hours_text = "#{hours} hour#{hours == 1 ? " " : "s"}" minutes_text = "#{minutes} minute#{minutes == 1 ? " " : "s"}" seconds_text = "#{seconds} second#{seconds == 1 ? " " : "s"}" if hours > 24 |