gitlab-mergetrain-checker 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742447228cfb1891bc009afa8757e9796ec3d258120846fbaf869e5593bcb25c
-  data.tar.gz: 217203c1a493cb7b3bfe39b4ae808a793d9161cfa683ec92d4b658ea74108036
+  metadata.gz: 0154e482170ce0904d20d1f45010665807562bc8842064b4b57a024dd749d844
+  data.tar.gz: 73559f786d2d546e3b30f2511392735a8b889df9bcfa4b72f7a0296022a6c6a3
 SHA512:
-  metadata.gz: e28ba1f142e3ca796df90ddca5ff51d089240231b70fe8ec4080c47d29ed58ca9e7505e113ae83ac6cd45e2974e82c9e8e6c0ee4ee430196c5900871f7e13b21
-  data.tar.gz: ef8a6c888aa7a027e2ea7169bcf5dcedf412dc02832c11a014f82cba5dac23f459de60c217c9b504f2cffd96961c4c168185913936057269df8c5cb690b5fefc
+  metadata.gz: 11b7133b1c0d2940b3298f0324cb0cfd2fe0cc33ae791e327e3ad0ee9b38697ef2fee8999953ee367a564ec0eae1feb15f79499b6ca1c96f3d4ef3baf5f9d72f
+  data.tar.gz: b0a8b9d889a99a8509f561ede8bbd26b3567230d0278df9a14764d3d2abb3f3a65c68b46faabfa9ec01a959e8cc921db67a6cee36d405a12dc26065a6bf91aba

data/Gemfile.lock

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

data/lib/mergetrain_check.rb

@@ -2,13 +2,11 @@ require 'mergetrain_check/config'
 require 'mergetrain_check/args_parser'
 require 'mergetrain_check/checker'
 require 'mergetrain_check/formatter'
+require 'mergetrain_check/error'
 
 module MergetrainCheck
-  class MissingConfigError < StandardError
-    def initialize(description)
-      super(description)
-    end
-  end
+
+  class MissingConfigError < CheckerError; end
 
   class Command
     @host = "www.gitlab.com"
@@ -33,7 +31,9 @@ module MergetrainCheck
       checker = Checker.new(config.gitlab_host, config.auth_token, config.project_id)
       traintable = checker.check
 
-      formatter = TraintableFormatter.new 80, true
+      text_length = config.verbose ? 160: 80
+      first_name_only = !config.verbose
+      formatter = TraintableFormatter.new text_length, first_name_only
       puts formatter.format traintable
       config.save!
     end

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("-v", "--verbose", "Verbose output (larger table)") do |verbose|
+          options[:verbose] = verbose
+        end
         opts.on("-h", "--help", "Prints this help") do
           puts opts
           return nil

data/lib/mergetrain_check/checker.rb

@@ -7,7 +7,7 @@ module MergetrainCheck
       @host = host
       @token = token
       @id = id
-      @uri =  URI("https://#{host}/api/v4/projects/#{id}/merge_trains")
+      @uri =  URI("https://#{host}/api/v4/projects/#{id}/merge_trains?per_page=100")
     end
 
     def check

data/lib/mergetrain_check/config.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'fileutils'
 require 'keychain'
+require 'mergetrain_check/error'
 
 module MergetrainCheck
   class AuthTokenStorage
@@ -26,17 +27,21 @@ module MergetrainCheck
 
   DEFAULT_CONFIG_FILE = File.expand_path('~/.mergetraincheck')
 
-  class FileNotFoundError < StandardError
-    def initialize(description)
-      super(description)
-    end
-  end
+  class FileNotFoundError < CheckerError; end
 
   class Config
     def gitlab_host
       @config[:host] || "www.gitlab.com"
     end
 
+    def verbose
+      @config[:verbose]
+    end
+
+    def verbose=(value)
+      @confing[:verbose] = value
+    end
+
     def gitlab_host=(value)
       @config[:host] = value
       @tokenStorage = AuthTokenStorage.new(value)
@@ -75,9 +80,14 @@ module MergetrainCheck
     end
 
     def save!(file = DEFAULT_CONFIG_FILE)
-      File.open(file, 'w') { |f| f.write(@config.to_yaml) }
+            File.open(file, 'w') { |f| f.write(config_to_persist.to_yaml) }
       @tokenStorage.save!
     end
+
+    private
+    def config_to_persist
+      @config.reject { |k,v| ![:project_id, :host].include?(k) }
+    end
   end
 end
 

data/lib/mergetrain_check/error.rb

@@ -0,0 +1,6 @@
+class CheckerError < StandardError
+  def initialize(description)
+    super(description)
+  end
+end
+

data/lib/mergetrain_check/formatter.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module MergetrainCheck
   class TraintableFormatter
     def initialize(max_length, firstname_only)
@@ -6,9 +8,15 @@ module MergetrainCheck
     end
 
     def format(body)
-      values = [['St', 'MR', 'Pipe ID', 'User', 'Title']]
+      values = [['St', 'Waiting', 'Running', 'MR', 'Pipe ID', 'User', 'Title']]
       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'])
+
         values << [pipeline_status(carriage['status']),
+                   pretty_date_difference(begin_time, pipeline_begin_time),
+                   pretty_date_difference(pipeline_begin_time, end_time),
                    carriage['merge_request']['iid'],
                    carriage['pipeline']['id'],
                    @firstname_only ? carriage['user']['name'].split.first : carriage['user']['name'],
@@ -29,7 +37,13 @@ module MergetrainCheck
       "#{string[0...len]}..."
     end
 
+    def date_from_string(datestring)
+      DateTime.parse(datestring, '%Q')
+    end
 
+    def pretty_date_difference(from, to)
+      (to.to_time - from.to_time).duration
+    end
   end
 end
 
@@ -56,5 +70,19 @@ class Array
   def count_emojis(string)
     string.scan(/[\u{1F300}-\u{1F5FF}|\u{1F1E6}-\u{1F1FF}|\u{2700}-\u{27BF}|\u{1F900}-\u{1F9FF}|\u{1F600}-\u{1F64F}|\u{1F680}-\u{1F6FF}|\u{2600}-\u{26FF}]/).length
   end
+end
+
+class Numeric
+   def duration
+     rest, secs = self.divmod( 60 )  # self is the time difference t2 - t1
+     rest, mins = rest.divmod( 60 )
+     days, hours = rest.divmod( 24 )
 
+     result = []
+     result << "#{days}D " if days > 0
+     result << "#{hours}h" if hours > 0
+     result << "#{mins}m" if mins > 0
+     result << "#{secs.to_i}s" if secs.to_i > 0
+     return result.join(' ')
+    end
 end

data/lib/mergetrain_check/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mergetrain-checker
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Fabio Gallonetto
@@ -42,6 +42,7 @@ files:
 - lib/mergetrain_check/args_parser.rb
 - lib/mergetrain_check/checker.rb
 - lib/mergetrain_check/config.rb
+- lib/mergetrain_check/error.rb
 - lib/mergetrain_check/formatter.rb
 - lib/mergetrain_check/version.rb
 - mergetrain_check.gemspec