lib/travis/tools/formatter.rb in travis-1.11.1 vs lib/travis/tools/formatter.rb in travis-1.12.0

@@ -1,50 +1,56 @@
+# frozen_string_literal: true
+
 require 'time'
 
 module Travis
   module Tools
     class Formatter
       DAY         = 24 * 60 * 60
-      TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
-      CONFIG_KEYS = ['rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala', 'compiler', 'os']
+      TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+      CONFIG_KEYS = %w[rvm gemfile env jdk otp_release php node_js perl python scala
+                       compiler os].freeze
 
       def duration(seconds, suffix = nil)
-        return "none" if seconds.nil?
+        return 'none' if seconds.nil?
+
         seconds          = (Time.now - seconds).to_i if seconds.is_a? Time
         output           = []
         minutes, seconds = seconds.divmod(60)
         hours, minutes   = minutes.divmod(60)
-        output << "#{hours  } hrs" if hours > 0
-        output << "#{minutes} min" if minutes > 0
-        output << "#{seconds} sec" if seconds > 0 or output.empty?
+        output << "#{hours} hrs" if hours.positive?
+        output << "#{minutes} min" if minutes.positive?
+        output << "#{seconds} sec" if seconds.positive? || output.empty?
         output << suffix           if suffix
-        output.join(" ")
+        output.join(' ')
       end
 
-      def file_size(input, human = true)
+      def file_size(input, human: true)
         return "#{input} B" unless human
-        format = "B"
+
+        format = 'B'
         iec    = %w[KiB MiB GiB TiB PiB EiB ZiB YiB]
-        while human and input > 512 and iec.any?
+        while human && (input > 512) && iec.any?
           input /= 1024.0
           format = iec.shift
         end
         input = input.round(2) if input.is_a? Float
         "#{input} #{format}"
       end
 
       def time(time)
-        return "not yet" if time.nil? # or time > Time.now
-        #return duration(time, "ago") if Time.now - time < DAY
+        return 'not yet' if time.nil? # or time > Time.now
+
+        # return duration(time, "ago") if Time.now - time < DAY
         time.localtime.strftime(TIME_FORMAT)
       end
 
       def job_config(config)
         output = []
         config.each_pair do |key, value|
           output << "#{key}: #{value}" if CONFIG_KEYS.include? key
         end
-        output.join(", ")
+        output.join(', ')
       end
     end
   end
-end
\ No newline at end of file
+end