bitbar_gitlab 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5cef9525f39ce9bc6313fee1dd095756ae43c0
-  data.tar.gz: 9f55f2a1e70b237f2c8c80f011b917e8a2e572c8
+  metadata.gz: f319aadfd9c3e462a7aadaf90ed2e2ce9f5a2967
+  data.tar.gz: 8dd4e9cbc1f4f1a7ae7154e4f7cd28905f9e8664
 SHA512:
-  metadata.gz: 52a85779e7775d76528fea1e7fd27422b9dc4dc2b7bc42a2d332b869d1b84e6a417871f9985ed9c4f9eafd1349d87f05bb9d15a4f975a9a8d17b6549b5233574
-  data.tar.gz: a4d05b8736384036635562e88abb0131d05d0643f44445904b395bf14a1c82461f62a984052e636ae1a53a81ffe894905e16febe7c0382ae10f115f7270657bf
+  metadata.gz: 0fc286d5ddb18e51b031622f705c8abb4312e384ff50ad517b7b0b0b2fe432bda504e655a2739d60dd3d5358a901536173fecdc50f266c064fd87588bc600fe0
+  data.tar.gz: cf1a5ecf6bf88c32d8514e5337465bae884b17a83d283424ae5b5b5e78f8f2e5847ed4ba9fa85f7a9aa08d97f9e5d4391507b4ab982e794b78285e6f158b02df

data/Gemfile

@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in bitbar_gitlab.gemspec
 gemspec
+

data/README.md

@@ -2,6 +2,18 @@
 
 BitBar GitLab Plugin, giving access to issues and pipelines.
 
+## Features
+
+- Browse project issues
+- Focus project issues
+- Copy issue title to pasteboard
+- New issue in project
+- Show/hide starred projects
+- Show/hide all projects
+- Focus project pipelines
+- Show pipeline status
+- Notify when pipeline has finished
+
 ## Requirements
 
 - macOS
@@ -35,6 +47,8 @@ When finished without problems start BitBar or refresh plugins.
 
 The menu's should be self explaining
 
+![image](assets/screenie.png)
+
 ## macOS notifications for GitLab CI jobs
 
 If you like to have macOS notifications you must install terminal-notifier with brew.

data/bitbar_gitlab.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-#    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "https://github.com/mipmip/bitbar_gitlab"
-    spec.metadata["changelog_uri"] = "https://github.com/mipmip/mipmip-bitbar_gitlab/blob/master/CHANGELOG.md"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+#  if spec.respond_to?(:metadata)
+##    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+#
+#    spec.metadata["homepage_uri"] = spec.homepage
+#    spec.metadata["source_code_uri"] = "https://github.com/mipmip/bitbar_gitlab"
+#    spec.metadata["changelog_uri"] = "https://github.com/mipmip/mipmip-bitbar_gitlab/blob/master/CHANGELOG.md"
+#  else
+#    raise "RubyGems 2.0 or newer is required to protect against " \
+#      "public gem pushes."
+#  end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
 
   spec.add_runtime_dependency "gitlab", "~> 4.5"
+  spec.add_runtime_dependency "relative_time"
 end

data/lib/bitbar_gitlab/gitlab_bitbar_lib_main.rb

@@ -1,6 +1,7 @@
 def run_main
 
-  puts "GitLab"
+  puts "| templateImage=iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAA/ZJREFUWAm1lsmPTFEUxp82dwwhSFiIIWgSTUxhR6TpGBckhrDBhoUpbBA7O0PC32AIVoZIhJAYEiKmhWGnJcQ8RczT93t1vsrt6iqlOvElX91zz/nOOffed9/rzrK26JC4Ujtx12SmNVK7bJGO4d2gcV3Y9pVNqOJ07lrpNtZS77nEjyOh6qpDV25w7iMFX5YTpD6vdrKcv4PjQlCXCv/Rdk5j1KLmlMh1r8wi/LYXhohhftiOJaGqpnNcgwTXdqxVER/XHXl9AtdD4VirhCoTN7mW1LtbqZ7FHDnNfwWxR4vAmsLs77/WNkjmzfwMe3yk5o/BQo8+rh8SQTC3MLRrAc79rhosACwoDFmrU/WEI2fFXgD25UjwImP618HaS1KV1rsRme5Z3BlH7eNKHwGLGR5JLhzTsoM1wxRl59RM6zEfI4I6xE5ozl1Z9lkjxwWxeVazRNBV7FSFaECTiLa0HjH3ynt7AfcU8AmUjrfJqhG3pC+t4/n9qFXn5zBYjh3hxIfQ4AQ+ijfFLmIa07QNyP8mThB7iJyk+8gs5u+S3YIDbBP35FblnyMKeQfVxqOVy+SR3frdnmouaELRZeHsrtHPulv4ZmpE80XkcpUjMTQ8f0Cu61ATLBHRXBRzDNHvVxEnRRtEQCLw8dXLfiKi41gZU9r3VH60wLmuNUo+epBHz6FcwDkiz5bVIzwhdhZ5/Ygjxv9JPCsCXqtS2IcGLTnkUoNars1IL3rSOzsnIkTkkzgmG3ABAUmALyVa7wLbtM9/cJzjGkdDSw96kXdezHeTFuUGM99KUOA0fJQ9ZT8XifvIU/uF/L1EQA65YIuIzrW9WHzZ+ghakH61ZiAQKOSdHJSNNi1i+5D8AK2bT5eN3nW9CHwbxBxT9dsiurALvpVvQK4ofAUxF4nWMab2YgSCv4b9Zb8RrXHdx/JNE3N4pbwy7MBFuUjYV0Xgx9BH9muRmHeFTaO+IrD2imxiroV9WPSr7d7FS6ZYtkr0SvkCknRABE7kkuJHZ+1x2cCa/bLRuAYXb7Vo+JJ6nr8udo6Q96ZIAX9cVhaVWbY0YukClifxFRF3Ln8XRkacHryaFVE8Fin2iiwCcnkaRTBQfC869kH2IBGMFf06E9+HM5DWtq/s6BtPkP9qXooUeyjWi+Ck6AWcyj1Zxuf2QfjJmRd+hrRm4q5scpG84n6yaUJDN+OueAFrZAMv6rRs3gBADV/K3FHrjxdB3iaRpjuZCFwsPkhgh0hsM5NAmmtfu0YujS/ORNmvxGaRnZ4RZ4v4Jokg1Rc8FX5rPRp2xM3vLbJTLiN4JnJh34nWyPw/8KtK9aagO6Ux+/7LyBGnp4ftR1RTwz+EnjyMz43L0gAAAABJRU5ErkJggg=="
+
   puts "---"
 
   puts "Refresh | refresh=true"

data/lib/bitbar_gitlab/gitlab_bitbar_lib_menu_utils.rb

@@ -1,3 +1,5 @@
+require 'relative_time'
+
 def shellwrap
   "#{$conf.get_key :exe_util_dir}/shellwrap.sh"
 end
@@ -42,17 +44,50 @@ def project_menu pr, level, in_focus = false
   end
 end
 
+def pipeline_color status
+  if status == 'failed'
+    'color=red'
+  elsif status == 'success'
+    'color=green'
+  elsif status == 'running'
+    'color=blue'
+  else
+    'color=black'
+  end
+end
+
+def pipeline_text status
+  if status == 'success'
+    'passed'
+  elsif status == 'running'
+    'is running'
+  else
+    status
+  end
+end
+
 def pipeline_focus_menu pr, level, in_focus = false
 
+  require "pp"
     data = []
     labels = ['id','status','web_url']
     $gitlab.pipelines(pr.to_hash['id'].to_s,{per_page:3, page:1, state: 'running'}).collect do |iss|
 
+      more = $gitlab.pipeline(pr.to_hash['id'].to_s,iss.to_hash['id'] )
+
+      #PP.pp (Time.now - Time.parse(more.to_hash['finished_at'])).to_i
+
       d = []
       labels.each do |l|
         d << iss.to_hash[l].to_s
       end
 
+      if more.to_hash['finished_at']
+        d << RelativeTime.in_words(Time.now - (Time.now - Time.parse(more.to_hash['finished_at'])).to_i)
+      else
+        d << ''
+      end
+
       data << d
     end
 
@@ -61,11 +96,11 @@ def pipeline_focus_menu pr, level, in_focus = false
     data.each do |d|
       if i == 0
         if $conf.get_key(:last_job_id) == d[0] and $conf.get_key(:last_job_status) != d[1]
-            if d[1] == 'success'
-              notify "-title 'GitLab Pipeline Passed' -message '#{d[0]} passed' -open '#{d[2]}'"
-            elsif d[1] == 'failed'
-              notify "-title 'GitLab Pipeline Failed' -message '#{d[0]} failed' -open '#{d[2]}'"
-            end
+          if d[1] == 'success'
+            notify "-title 'GitLab Pipeline Passed' -message '#{d[0]} passed' -open '#{d[2]}'"
+          elsif d[1] == 'failed'
+            notify "-title 'GitLab Pipeline Failed' -message '#{d[0]} failed' -open '#{d[2]}'"
+          end
         end
 
         $conf.set_key :last_job_id, d[0]
@@ -75,21 +110,20 @@ def pipeline_focus_menu pr, level, in_focus = false
 
       i+=1
 
-      puts "#{indent level}#{d[0]} #{d[1]} | href=#{d[2]}"
+      puts "#{indent level}job #{d[0]} #{pipeline_text d[1]} #{d[3]}| href=#{d[2]} #{pipeline_color d[1]}"
     end
 end
 
 def pipeline_menu pr, level, in_focus = false
 
+    project_info = $gitlab.project(pr.to_hash['id'].to_s)
+    return unless project_info.to_hash['jobs_enabled']
+
     data = []
-    labels = ['id', 'status','web_url']
-    $gitlab.pipelines(pr.to_hash['id'].to_s,{per_page:3, page:1, state: 'running'}).collect do |iss|
 
-      d = []
-      labels.each do |l|
-        d << iss.to_hash[l].to_s
-      end
 
+    $gitlab.pipelines(pr.to_hash['id'].to_s,{per_page:3, page:1, state: 'running'}).collect do |iss|
+      d = []
       data << d
     end
 
@@ -105,7 +139,7 @@ def pipeline_menu pr, level, in_focus = false
     data.each do |d|
       i+=1
 
-      puts "#{indent level}#{d[0]} #{d[1]} | href=#{d[2]}"
+      puts "#{indent level}#{d[0]} #{d[1]} | href=#{d[2]} #{pipeline_color d[1]}"
     end
 end
 

data/lib/bitbar_gitlab/version.rb

@@ -1,3 +1,3 @@
 module BitbarGitlab
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitbar_gitlab
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Pim Snel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
+- !ruby/object:Gem::Dependency
+  name: relative_time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: BitBar GitLab Plugin, giving access to issues and pipelines.
 email:
 - pim@lingewoud.nl
@@ -83,6 +97,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- assets/screenie.png
 - bin/console
 - bin/setup
 - bitbar_gitlab.gemspec
@@ -98,10 +113,7 @@ files:
 homepage: https://github.com/mipmip/bitbar_gitlab
 licenses:
 - MIT
-metadata:
-  homepage_uri: https://github.com/mipmip/bitbar_gitlab
-  source_code_uri: https://github.com/mipmip/bitbar_gitlab
-  changelog_uri: https://github.com/mipmip/mipmip-bitbar_gitlab/blob/master/CHANGELOG.md
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths: