From f043830bc49497a1b0616d86e54b6b00680c8f83 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Mon, 15 Apr 2019 09:52:06 -0700 Subject: [PATCH 1/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e8cf4d0..86c71b89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### ⚡️ Added + +* Jenkins now supports coloured balls, [#358](https://github.com/wtfutil/wtf/issues/358) by [@rudolphjacksonm](https://github.com/rudolphjacksonm) + ## 0.6.0 ### ⚡️ Added From a89e32141f87a6b00b109737b9c1f9208db8c50f Mon Sep 17 00:00:00 2001 From: Jack Morris Date: Wed, 17 Apr 2019 10:24:39 +0100 Subject: [PATCH 2/3] Allow users to filter jenkins jobs by regex Allows users to filter the Jenkins jobs shown in the widget by providing a regular expression in the config file. The regex should be specified in the config like so: ``` jobNameRegex: ^[a-z]+.$ ``` Another example: ``` jobNameRegex^[a-z]+\[[0-9]+\]$ ``` --- modules/jenkins/widget.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/jenkins/widget.go b/modules/jenkins/widget.go index c4446744..df687bfd 100644 --- a/modules/jenkins/widget.go +++ b/modules/jenkins/widget.go @@ -95,15 +95,19 @@ func (widget *Widget) apiKey() string { func (widget *Widget) contentFrom(view *View) string { var str string for idx, job := range view.Jobs { - str = str + fmt.Sprintf( - `["%d"][""][%s] [%s]%-6s[white]`, - idx, - widget.rowColor(idx), - widget.jobColor(&job), - job.Name, - ) + regex := wtf.Config.UString("wtf.mods.jenkins.jobNameRegex", ".*") + var validID = regexp.MustCompile(regex) + if validID.MatchString(job.Name) { + str = str + fmt.Sprintf( + `["%d"][""][%s] [%s]%-6s[white]`, + idx, + widget.rowColor(idx), + widget.jobColor(&job), + job.Name, + ) - str = str + "\n" + str = str + "\n" + } } return str From 9f878c9e1284e51d4fef41ed386210b948b07b12 Mon Sep 17 00:00:00 2001 From: Jack Morris Date: Wed, 17 Apr 2019 10:43:24 +0100 Subject: [PATCH 3/3] import regexp Adding in regexp import --- modules/jenkins/widget.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/jenkins/widget.go b/modules/jenkins/widget.go index df687bfd..25ddfdbe 100644 --- a/modules/jenkins/widget.go +++ b/modules/jenkins/widget.go @@ -2,6 +2,7 @@ package jenkins import ( "fmt" + "regexp" "github.com/gdamore/tcell" "github.com/rivo/tview" "github.com/wtfutil/wtf/wtf"