From a4ca79d7a3a6e0a992c9710cbf6c7445534cad44 Mon Sep 17 00:00:00 2001 From: Joel Handwell Date: Tue, 25 Aug 2015 16:07:23 -0400 Subject: Human friendly elapsed time in log --- lib/chef/formatters/doc.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb index 614cc44e6d..deeb5d3e96 100644 --- a/lib/chef/formatters/doc.rb +++ b/lib/chef/formatters/doc.rb @@ -26,7 +26,15 @@ class Chef end def elapsed_time - end_time - start_time + time = end_time - start_time + if time < 60 then + message = Time.at(time).utc.strftime("%S seconds") + elsif time < 3600 then + message = Time.at(time).utc.strftime("%M minutes %S seconds") + else + message = Time.at(time).utc.strftime("%H hour %M minutes %S seconds") + end + message end def run_start(version) @@ -66,7 +74,7 @@ class Chef if Chef::Config[:why_run] puts_line "Chef Client finished, #{@updated_resources}/#{total_resources} resources would have been updated" else - puts_line "Chef Client finished, #{@updated_resources}/#{total_resources} resources updated in #{elapsed_time} seconds" + puts_line "Chef Client finished, #{@updated_resources}/#{total_resources} resources updated in #{elapsed_time}" if total_audits > 0 puts_line " #{successful_audits}/#{total_audits} controls succeeded" end @@ -78,7 +86,7 @@ class Chef if Chef::Config[:why_run] puts_line "Chef Client failed. #{@updated_resources} resources would have been updated" else - puts_line "Chef Client failed. #{@updated_resources} resources updated in #{elapsed_time} seconds" + puts_line "Chef Client failed. #{@updated_resources} resources updated in #{elapsed_time}" if total_audits > 0 puts_line " #{successful_audits} controls succeeded" end -- cgit v1.2.1 From f2de463a69508cb91e952f3034f7e951c9ab1af7 Mon Sep 17 00:00:00 2001 From: Joel Handwell Date: Tue, 25 Aug 2015 18:08:16 -0400 Subject: Add unit tests for elapsed_time --- lib/chef/formatters/doc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb index deeb5d3e96..93039d6171 100644 --- a/lib/chef/formatters/doc.rb +++ b/lib/chef/formatters/doc.rb @@ -32,7 +32,7 @@ class Chef elsif time < 3600 then message = Time.at(time).utc.strftime("%M minutes %S seconds") else - message = Time.at(time).utc.strftime("%H hour %M minutes %S seconds") + message = Time.at(time).utc.strftime("%H hours %M minutes %S seconds") end message end -- cgit v1.2.1 From 850bded619ac14e62bed15b85cc34d6ef3b99202 Mon Sep 17 00:00:00 2001 From: Joel Handwell Date: Mon, 31 Aug 2015 08:31:55 -0400 Subject: Keep elapsed_time and add pretty_elapsed_time --- lib/chef/formatters/doc.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb index 93039d6171..2b0161667b 100644 --- a/lib/chef/formatters/doc.rb +++ b/lib/chef/formatters/doc.rb @@ -26,7 +26,11 @@ class Chef end def elapsed_time - time = end_time - start_time + end_time - start_time + end + + def pretty_elapsed_time + time = elapsed_time if time < 60 then message = Time.at(time).utc.strftime("%S seconds") elsif time < 3600 then @@ -74,7 +78,7 @@ class Chef if Chef::Config[:why_run] puts_line "Chef Client finished, #{@updated_resources}/#{total_resources} resources would have been updated" else - puts_line "Chef Client finished, #{@updated_resources}/#{total_resources} resources updated in #{elapsed_time}" + puts_line "Chef Client finished, #{@updated_resources}/#{total_resources} resources updated in #{pretty_elapsed_time}" if total_audits > 0 puts_line " #{successful_audits}/#{total_audits} controls succeeded" end @@ -86,7 +90,7 @@ class Chef if Chef::Config[:why_run] puts_line "Chef Client failed. #{@updated_resources} resources would have been updated" else - puts_line "Chef Client failed. #{@updated_resources} resources updated in #{elapsed_time}" + puts_line "Chef Client failed. #{@updated_resources} resources updated in #{pretty_elapsed_time}" if total_audits > 0 puts_line " #{successful_audits} controls succeeded" end -- cgit v1.2.1 From 51e98c798e455c9e758d9ace22d1391b7aad596c Mon Sep 17 00:00:00 2001 From: Joel Handwell Date: Tue, 1 Sep 2015 17:32:16 -0400 Subject: Remove Timecop dependency --- lib/chef/formatters/doc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb index 2b0161667b..70108f547b 100644 --- a/lib/chef/formatters/doc.rb +++ b/lib/chef/formatters/doc.rb @@ -33,7 +33,7 @@ class Chef time = elapsed_time if time < 60 then message = Time.at(time).utc.strftime("%S seconds") - elsif time < 3600 then + elsif time < 3600 then message = Time.at(time).utc.strftime("%M minutes %S seconds") else message = Time.at(time).utc.strftime("%H hours %M minutes %S seconds") -- cgit v1.2.1