gitlab-mergetrain-checker 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f0cc6f8a38c160ea6f78ab7d57755f510272fcdae1cf72ab9dfadc9cffdb94
-  data.tar.gz: 6da1e48f6974907b70ada6a5f4ac14c673f88b14e0a8931f22f029d8d27bb058
+  metadata.gz: e3f9600ce5c4210097672df6ad948d3e3f306f377af6afc23a3608491470c534
+  data.tar.gz: 40fe51f46cf4804ffb7d22807fde79c3e0711e07d088d5d3b114e075c79ecf91
 SHA512:
-  metadata.gz: d0f070d495c1ab9b7e7795f2795ef131e5b11cc7e4c793cb55b14ba1780cfb433cb454ceadcc2b1a10be511dcbcd44e5e94dd1592c323a47ffe37a2ca2bb702d
-  data.tar.gz: 5ee8e6509fc145d1100d0c0a2c56902b9b09daff1ea10ba054d9ae81431beccd4847c5c3ddef187432720a3dbf71b2eb8860c6b41f5a08dc0413916ce389eb5b
+  metadata.gz: 0faac35a9290ff4ad613815acd19ce6f5668eb9ca9a678616f63a12e8043f93c87478e3be077e94fedf1f755bb53913dfead06c07efb52822605707c2fc7133f
+  data.tar.gz: 72816513e657e521c77d1fbcc3863ef2f7a258bea59f481a1dcc93db582ba84a6033a909e7402583e836f9b644d328e4721c675112c2eea3792fecb7cc95e308

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-mergetrain-checker (1.1.0)
+    gitlab-mergetrain-checker (1.2.1)
       ruby-keychain (~> 0.3.2)
 
 GEM

data/lib/mergetrain_check/checker.rb

@@ -39,7 +39,7 @@ module MergetrainCheck
     end
 
     def active_uri
-      URI("https://#{@host}/api/v4/projects/#{@id}/merge_trains?per_page=100&scope=active")
+      URI("https://#{@host}/api/v4/projects/#{@id}/merge_trains?per_page=100&scope=active&sort=asc")
     end
   end
 end

data/lib/mergetrain_check/formatter.rb

@@ -9,11 +9,18 @@ module MergetrainCheck
 
     def format(body)
       values = [['St', 'Waiting', 'Running', 'MR', 'Pipe ID', 'User', 'Title']]
+      values << spacer = nil
+
+      previous_state = body.first['status']
       body.each do |carriage|
         begin_time = date_from_string carriage['created_at']
         pipeline_begin_time = date_from_string carriage['pipeline']['created_at']
         end_time = carriage['merged_at'].nil? ? DateTime.now : date_from_string(carriage['merged_at'])
 
+        is_finished_section = previous_state != carriage['status']
+        previous_state = carriage['status']
+        values << spacer if is_finished_section
+
         values << [pipeline_status(carriage['status']),
                    pretty_date_difference(begin_time, pipeline_begin_time),
                    pretty_date_difference(pipeline_begin_time, end_time),
@@ -60,15 +67,20 @@ class Array
   def to_table
     output = ''
     column_sizes = self.reduce([]) do |lengths, row|
-      row.each_with_index.map{|iterand, index| [lengths[index] || 0, iterand.to_s.length + count_emojis(iterand.to_s)].max}
+      if row.nil?
+        lengths
+      else
+        row.each_with_index.map{|iterand, index| [lengths[index] || 0, iterand.to_s.length + count_emojis(iterand.to_s)].max}
+      end
     end
     output += head = '-' * (column_sizes.inject(&:+) + (3 * column_sizes.count) + 1) + "\n"
     self.each_with_index do |row, idx|
-      row = row.fill(nil, row.size..(column_sizes.size - 1))
-      row = row.each_with_index.map{|v, i| v = v.to_s + ' ' * (column_sizes[i] - v.to_s.length - count_emojis(v.to_s))}
-      output += '| ' + row.join(' | ') + ' |' + "\n"
-      if idx == 0
-        row = row.each_with_index.map{|v, i| v = '-' * v.to_s.length}
+      if row.nil?
+        row = column_sizes.map { |l| '-' * l }
+        output += '| ' + row.join(' | ') + ' |' + "\n"
+      else
+        row = row.fill(nil, row.size..(column_sizes.size - 1))
+        row = row.each_with_index.map{|v, i| v = v.to_s + ' ' * (column_sizes[i] - v.to_s.length - count_emojis(v.to_s))}
         output += '| ' + row.join(' | ') + ' |' + "\n"
       end
     end

data/lib/mergetrain_check/version.rb

@@ -1,3 +1,3 @@
 module MergetrainCheck
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mergetrain-checker
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Fabio Gallonetto