gitlab-mergetrain-checker 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0154e482170ce0904d20d1f45010665807562bc8842064b4b57a024dd749d844
-  data.tar.gz: 73559f786d2d546e3b30f2511392735a8b889df9bcfa4b72f7a0296022a6c6a3
+  metadata.gz: d3f0cc6f8a38c160ea6f78ab7d57755f510272fcdae1cf72ab9dfadc9cffdb94
+  data.tar.gz: 6da1e48f6974907b70ada6a5f4ac14c673f88b14e0a8931f22f029d8d27bb058
 SHA512:
-  metadata.gz: 11b7133b1c0d2940b3298f0324cb0cfd2fe0cc33ae791e327e3ad0ee9b38697ef2fee8999953ee367a564ec0eae1feb15f79499b6ca1c96f3d4ef3baf5f9d72f
-  data.tar.gz: b0a8b9d889a99a8509f561ede8bbd26b3567230d0278df9a14764d3d2abb3f3a65c68b46faabfa9ec01a959e8cc921db67a6cee36d405a12dc26065a6bf91aba
+  metadata.gz: d0f070d495c1ab9b7e7795f2795ef131e5b11cc7e4c793cb55b14ba1780cfb433cb454ceadcc2b1a10be511dcbcd44e5e94dd1592c323a47ffe37a2ca2bb702d
+  data.tar.gz: 5ee8e6509fc145d1100d0c0a2c56902b9b09daff1ea10ba054d9ae81431beccd4847c5c3ddef187432720a3dbf71b2eb8860c6b41f5a08dc0413916ce389eb5b

data/lib/mergetrain_check.rb

@@ -29,6 +29,7 @@ module MergetrainCheck
       end
 
       checker = Checker.new(config.gitlab_host, config.auth_token, config.project_id)
+      checker.max_completed = config.limit
       traintable = checker.check
 
       text_length = config.verbose ? 160: 80

data/lib/mergetrain_check/args_parser.rb

@@ -13,6 +13,9 @@ module MergetrainCheck
         opts.on("-n", "--host GITLAB-HOSTNAME", "Specify the Gitlab installation host (in case it's not gitlab.com)") do |host|
           options[:host] = host
         end
+        opts.on("-l", "--limit COUNT", "Limit completed jobs to COUNT entries (default 10)") do |limit|
+          options[:limit] = limit
+        end
         opts.on("-v", "--verbose", "Verbose output (larger table)") do |verbose|
           options[:verbose] = verbose
         end

data/lib/mergetrain_check/checker.rb

@@ -3,21 +3,44 @@ require 'json'
 
 module MergetrainCheck
   class Checker
+    def max_count
+      @max_count
+    end
+
+    def max_completed=(value)
+      @max_completed = value
+    end
+
     def initialize(host, token, id)
       @host = host
       @token = token
       @id = id
-      @uri =  URI("https://#{host}/api/v4/projects/#{id}/merge_trains?per_page=100")
+      @max_count = 10
     end
 
     def check
-      Net::HTTP.start(@uri.host, @uri.port, :use_ssl => @uri.scheme == 'https') do |http|
-      request = Net::HTTP::Get.new @uri
+      Net::HTTP.start(active_uri.host, active_uri.port, :use_ssl => active_uri.scheme == 'https') do |http|
+        get_and_parse(http, active_uri) + get_and_parse(http, completed_uri)
+      end
+    end
+
+    private
+
+    def get_and_parse(http, uri)
+      request = Net::HTTP::Get.new uri
       request['PRIVATE-TOKEN'] = @token
 
       response = http.request request
       JSON.parse response.body
-      end
+    end
+
+    def completed_uri
+      URI("https://#{@host}/api/v4/projects/#{@id}/merge_trains?per_page=#{@max_completed}&scope=complete")
+    end
+
+    def active_uri
+      URI("https://#{@host}/api/v4/projects/#{@id}/merge_trains?per_page=100&scope=active")
     end
   end
 end
+

data/lib/mergetrain_check/config.rb

@@ -47,6 +47,14 @@ module MergetrainCheck
       @tokenStorage = AuthTokenStorage.new(value)
     end
 
+    def limit
+      @config[:limit] || 10
+    end
+
+    def limit=(value)
+      @config[:limit] = value
+    end
+
     def auth_token
       @tokenStorage.password
     end

data/lib/mergetrain_check/formatter.rb

@@ -22,7 +22,12 @@ module MergetrainCheck
                    @firstname_only ? carriage['user']['name'].split.first : carriage['user']['name'],
                    truncate_string(carriage['merge_request']['title'], @max_length)]
       end
-      values.to_table
+
+      header = ''
+      if has_train_finished? body
+        header = "\n  ✋ 🚉 The train is at the station: There are currently no running merge trains!\n\n"
+      end
+       header + values.to_table
     end
 
     private
@@ -44,25 +49,30 @@ module MergetrainCheck
     def pretty_date_difference(from, to)
       (to.to_time - from.to_time).duration
     end
+
+    def has_train_finished?(data)
+      data.first['status'] != 'fresh'
+    end
   end
 end
 
 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}
     end
-    puts head = '-' * (column_sizes.inject(&:+) + (3 * column_sizes.count) + 1)
+    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))}
-      puts '| ' + row.join(' | ') + ' |'
+      output += '| ' + row.join(' | ') + ' |' + "\n"
       if idx == 0
         row = row.each_with_index.map{|v, i| v = '-' * v.to_s.length}
-        puts '| ' + row.join(' | ') + ' |'
+        output += '| ' + row.join(' | ') + ' |' + "\n"
       end
     end
-    puts head
+    output += head
   end
 
   private

data/lib/mergetrain_check/version.rb

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

metadata

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