Merge branch 'duration' into 'master'

Fix duration visualisation

https://dev.gitlab.org/gitlab/gitlab-ci/issues/174

https://github.com/gitlabhq/gitlab-ci/issues/565

See merge request !78

1 files changed, 21 insertions, 0 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 32d64fb..069005f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -126,4 +126,25 @@ module ApplicationHelper
 
     [namespace, controller.controller_name, controller.action_name].compact.join(":")
   end
+
+  def duration_in_words(finished_at, started_at)
+    if finished_at && started_at
+      interval_in_seconds = finished_at.to_i - started_at.to_i
+    elsif started_at
+      interval_in_seconds = Time.now.to_i - started_at.to_i
+    end
+
+    time_interval_in_words(interval_in_seconds)
+  end
+
+  def time_interval_in_words(interval_in_seconds)
+    minutes = interval_in_seconds / 60
+    seconds = interval_in_seconds - minutes * 60
+
+    if minutes >= 1
+      "#{pluralize(minutes, "minute")} #{pluralize(seconds, "second")}"
+    else
+      "#{pluralize(seconds, "second")}"
+    end
+  end
 end