+
+ 
+Modules: Bamboohr
+BambooHR
diff --git a/docs/posts/modules/bittrex/index.html b/docs/posts/modules/bittrex/index.html
new file mode 100644
index 00000000..8ab9753c
--- /dev/null
+++ b/docs/posts/modules/bittrex/index.html
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Module: Bittrex | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CircleCI | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Modules: Clocks | WTF - A Terminal Dashboard
-
+Clocks | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
+
+
+
+
+
+
+
+ 
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
- + Overview + +
- + Installation + +
- + Configuration + +
- + Attributes + +
- + iTerm2 + +
- + Releases + +
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/posts/modules/circleci/index.html b/docs/posts/modules/circleci/index.html
new file mode 100644
index 00000000..ba519853
--- /dev/null
+++ b/docs/posts/modules/circleci/index.html
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Module: Bittrex
+ +
+
+
+ Jun 04, 2018
+
+
+ + +
+
+ + + +
Get the last 24 hour summary of cryptocurrencies market.
+ +Source Code
+
+
+ wtf/bittrex/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+
+
+ bittrex:
+ enabled: true
+ position:
+ top: 1
+ left: 2
+ height: 1
+ width: 1
+ refreshInterval: 15
+ summary:
+ BTC:
+ displayName: Bitcoin
+ market:
+ - ETH
+ - LTC
+ ETH:
+ displayName: Ethereum
+ market:
+ - LTC
+ colors:
+ base:
+ name: red
+ displayName: grey
+ market:
+ name: red
+ field: coral
+ value: white
+
+Attributes
+ + + +
+ enabled
+
Determines whether or not this module is executed and if its data displayed onscreen.
+
Values:
+ true,
+ false.
+ position
+
Defines where in the grid this module’s widget will be displayed.
+
+
+ updateInterval
+
How often, in seconds, this module will update its data.
+
Values: A positive integer
+
Default Value: 10
+ colors
+
Sets color of texts.
+
Values: A valid color
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
-
+
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/clocks/index.html b/docs/posts/modules/clocks/index.html
index 3e2c8930..08f316a5 100644
--- a/docs/posts/modules/clocks/index.html
+++ b/docs/posts/modules/clocks/index.html
@@ -10,8 +10,8 @@
-
+
+
+
+
+ CircleCI
+ +
+
+
+
+ Jun 10, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.7.
Displays build information for your CircleCI account.
+ +
Source Code
+wtf/circleci/Required ENV Variables
+ +Key: WTF_CIRCLE_API_KEY
+Value: Your CircleCI API
+token.
Keyboard Commands
+ +None.
+ +Configuration
+circleci:
+ enabled: true
+ position:
+ top: 4
+ left: 1
+ height: 1
+ width: 2
+ refreshInterval: 900Attributes
+ +enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
+
+
+
+
+ - Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- + Overview + +
- + Installation + +
- + Configuration + +
- + Attributes + +
- + iTerm2 + +
- + Releases + +
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo diff --git a/docs/posts/modules/ipapi/index.html b/docs/posts/modules/ipapi/index.html new file mode 100644 index 00000000..a4ed8f11 --- /dev/null +++ b/docs/posts/modules/ipapi/index.html @@ -0,0 +1,183 @@ + + + + + + + + + + + + +
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Overview +
- Installation +
- Configuration +
- Attributes +
- iTerm2 +
- Releases +
- Modules +
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI +
- Clocks +
- CryptoLive +
- CmdRunner +
- Git +
- GitHub +
- Gitlab +
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins +
- Jira +
- New Relic +
- OpsGenie +
- Power +
- PrettyWeather +
- Security +
- Text File +
- Todo +
- Weather +
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo @@ -91,7 +101,7 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo diff --git a/docs/sitemap.xml b/docs/sitemap.xml index a8346fdd..dc6caed1 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -2,6 +2,56 @@
- Modules
- BambooHR +
- Bittrex +
- Blockfolio +
- CircleCI
- Clocks +
- CryptoLive
- CmdRunner
- Git -
- Github +
- GitHub +
- Gitlab
- Google Calendar +
- Google Spreadsheet +
- IP-API +
- IPInfo +
- Jenkins
- Jira
- New Relic
- OpsGenie
- Power +
- PrettyWeather
- Security
- Text File
- Todo diff --git a/gcal/.DS_Store b/gcal/.DS_Store deleted file mode 100644 index 5008ddfc..00000000 Binary files a/gcal/.DS_Store and /dev/null differ diff --git a/gcal/widget.go b/gcal/widget.go index 112be1ca..487c8daa 100644 --- a/gcal/widget.go +++ b/gcal/widget.go @@ -20,7 +20,7 @@ type Widget struct { func NewWidget() *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" 🍿 Calendar ", "gcal", false), + TextWidget: wtf.NewTextWidget(" Calendar ", "gcal", false), } return &widget @@ -29,16 +29,11 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - events, _ := Fetch() widget.UpdateRefreshedAt() - widget.View.Clear() - fmt.Fprintf(widget.View, "%s", widget.contentFrom(events)) + widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(events))) } /* -------------------- Unexported Functions -------------------- */ diff --git a/git/display.go b/git/display.go index e6fffe34..8140615b 100644 --- a/git/display.go +++ b/git/display.go @@ -9,7 +9,6 @@ import ( ) func (widget *Widget) display() { - widget.View.Clear() repoData := widget.currentData() if repoData == nil { @@ -18,7 +17,7 @@ func (widget *Widget) display() { } title := fmt.Sprintf("[green]%s[white]\n", repoData.Repository) - widget.View.SetTitle(fmt.Sprintf(" Git: %s ", title)) + widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name, title)) str := wtf.SigilStr(len(widget.Data), widget.Idx, widget.View) + "\n" str = str + " [red]Branch[white]\n" @@ -28,7 +27,7 @@ func (widget *Widget) display() { str = str + "\n" str = str + widget.formatCommits(repoData.Commits) - fmt.Fprintf(widget.View, "%s", str) + widget.View.SetText(fmt.Sprintf("%s", str)) } func (widget *Widget) formatChanges(data []string) string { diff --git a/git/git_repo.go b/git/git_repo.go index 7f82e4bd..5d3ba090 100644 --- a/git/git_repo.go +++ b/git/git_repo.go @@ -22,7 +22,7 @@ func NewGitRepo(repoPath string) *GitRepo { repo.Branch = repo.branch() repo.ChangedFiles = repo.changedFiles() repo.Commits = repo.commits() - repo.Repository = repo.repository() + repo.Repository = strings.TrimSpace(repo.repository()) return &repo } @@ -69,6 +69,19 @@ func (repo *GitRepo) repository() string { return str } +func (repo *GitRepo) pull() string { + arg := []string{repo.gitDir(), repo.workTree(), "pull"} + cmd := exec.Command("git", arg...) + str := wtf.ExecuteCommand(cmd) + return str +} + +func (repo *GitRepo) checkout(branch string) string { + arg := []string{repo.gitDir(), repo.workTree(), "checkout", branch} + cmd := exec.Command("git", arg...) + str := wtf.ExecuteCommand(cmd) + return str +} func (repo *GitRepo) gitDir() string { return fmt.Sprintf("--git-dir=%s/.git", repo.Path) diff --git a/git/widget.go b/git/widget.go index f7b3edd2..894d71b5 100644 --- a/git/widget.go +++ b/git/widget.go @@ -16,11 +16,17 @@ const HelpText = ` /: Show/hide this help window h: Previous git repository l: Next git repository + p: Pull current git repository + c: Checkout to branch arrow left: Previous git repository arrow right: Next git repository ` +const offscreen = -1000 +const modalWidth = 80 +const modalHeight = 7 + type Widget struct { wtf.TextWidget @@ -47,10 +53,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - repoPaths := wtf.ToStrs(Config.UList("wtf.mods.git.repositories")) widget.UpdateRefreshedAt() @@ -75,8 +77,79 @@ func (widget *Widget) Prev() { widget.display() } +func (widget *Widget) Pull() { + repoToPull := widget.Data[widget.Idx] + repoToPull.pull() + widget.Refresh() + +} +func (widget *Widget) Checkout() { + form := widget.modalForm("Branch to checkout:", "") + + checkoutFctn := func() { + text := form.GetFormItem(0).(*tview.InputField).GetText() + repoToCheckout := widget.Data[widget.Idx] + repoToCheckout.checkout(text) + widget.pages.RemovePage("modal") + widget.app.SetFocus(widget.View) + widget.display() + widget.Refresh() + } + + widget.addButtons(form, checkoutFctn) + widget.modalFocus(form) + +} /* -------------------- Unexported Functions -------------------- */ +func (widget *Widget) addCheckoutButton(form *tview.Form, fctn func()) { + form.AddButton("Checkout", fctn) +} +func (widget *Widget) addButtons(form *tview.Form, checkoutFctn func()) { + widget.addCheckoutButton(form, checkoutFctn) + widget.addCancelButton(form) +} +func (widget *Widget) addCancelButton(form *tview.Form) { + cancelFn := func() { + widget.pages.RemovePage("modal") + widget.app.SetFocus(widget.View) + widget.display() + } + + form.AddButton("Cancel", cancelFn) + form.SetCancelFunc(cancelFn) +} +func (widget *Widget) modalFocus(form *tview.Form) { + frame := widget.modalFrame(form) + widget.pages.AddPage("modal", frame, false, true) + widget.app.SetFocus(frame) +} + +func (widget *Widget) modalForm(lbl, text string) *tview.Form { + form := tview.NewForm(). + SetButtonsAlign(tview.AlignCenter). + SetButtonTextColor(tview.Styles.PrimaryTextColor) + + form.AddInputField(lbl, text, 60, nil, nil) + + return form +} +func (widget *Widget) modalFrame(form *tview.Form) *tview.Frame { + frame := tview.NewFrame(form).SetBorders(0, 0, 0, 0, 0, 0) + frame.SetRect(offscreen, offscreen, modalWidth, modalHeight) + frame.SetBorder(true) + frame.SetBorders(1, 1, 0, 0, 1, 1) + + drawFunc := func(screen tcell.Screen, x, y, width, height int) (int, int, int, int) { + w, h := screen.Size() + frame.SetRect((w/2)-(width/2), (h/2)-(height/2), width, height) + return x, y, width, height + } + + frame.SetDrawFunc(drawFunc) + + return frame +} func (widget *Widget) currentData() *GitRepo { if len(widget.Data) == 0 { @@ -112,6 +185,12 @@ func (widget *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey { case "l": widget.Next() return nil + case "p": + widget.Pull() + return nil + case "c": + widget.Checkout() + return nil } switch event.Key() { diff --git a/github/display.go b/github/display.go index a3732369..e9346367 100644 --- a/github/display.go +++ b/github/display.go @@ -7,7 +7,6 @@ import ( ) func (widget *Widget) display() { - widget.View.Clear() repo := widget.currentGithubRepo() if repo == nil { @@ -15,7 +14,7 @@ func (widget *Widget) display() { return } - widget.View.SetTitle(fmt.Sprintf(" Github: %s ", widget.title(repo))) + widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name, widget.title(repo))) str := wtf.SigilStr(len(widget.GithubRepos), widget.Idx, widget.View) + "\n" str = str + " [red]Stats[white]\n" @@ -27,7 +26,7 @@ func (widget *Widget) display() { str = str + " [red]My Pull Requests[white]\n" str = str + widget.displayMyPullRequests(repo, Config.UString("wtf.mods.github.username")) - fmt.Fprintf(widget.View, str) + widget.View.SetText(str) } func (widget *Widget) displayMyPullRequests(repo *GithubRepo, username string) string { diff --git a/github/widget.go b/github/widget.go index ad186310..717f1bab 100644 --- a/github/widget.go +++ b/github/widget.go @@ -51,10 +51,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - for _, repo := range widget.GithubRepos { repo.Refresh() } diff --git a/gitlab/display.go b/gitlab/display.go new file mode 100644 index 00000000..8968701b --- /dev/null +++ b/gitlab/display.go @@ -0,0 +1,75 @@ +package gitlab + +import ( + "fmt" + + "github.com/senorprogrammer/wtf/wtf" +) + +func (widget *Widget) display() { + + project := widget.currentGitlabProject() + if project == nil { + fmt.Fprintf(widget.View, "%s", " Gitlab project data is unavailable (1)") + return + } + + widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name, widget.title(project))) + + str := wtf.SigilStr(len(widget.GitlabProjects), widget.Idx, widget.View) + "\n" + str = str + " [red]Stats[white]\n" + str = str + widget.displayStats(project) + str = str + "\n" + str = str + " [red]Open Approval Requests[white]\n" + str = str + widget.displayMyApprovalRequests(project, Config.UString("wtf.mods.gitlab.username")) + str = str + "\n" + str = str + " [red]My Merge Requests[white]\n" + str = str + widget.displayMyMergeRequests(project, Config.UString("wtf.mods.gitlab.username")) + + widget.View.SetText(str) +} + +func (widget *Widget) displayMyMergeRequests(project *GitlabProject, username string) string { + mrs := project.myMergeRequests(username) + + if len(mrs) == 0 { + return " [grey]none[white]\n" + } + + str := "" + for _, mr := range mrs { + str = str + fmt.Sprintf(" [green]%4d[white] %s\n", mr.IID, mr.Title) + } + + return str +} + +func (widget *Widget) displayMyApprovalRequests(project *GitlabProject, username string) string { + mrs := project.myApprovalRequests(username) + + if len(mrs) == 0 { + return " [grey]none[white]\n" + } + + str := "" + for _, mr := range mrs { + str = str + fmt.Sprintf(" [green]%4d[white] %s\n", mr.IID, mr.Title) + } + + return str +} + +func (widget *Widget) displayStats(project *GitlabProject) string { + str := fmt.Sprintf( + " MRs: %d Issues: %d Stars: %d\n", + project.MergeRequestCount(), + project.IssueCount(), + project.StarCount(), + ) + + return str +} + +func (widget *Widget) title(project *GitlabProject) string { + return fmt.Sprintf("[green]%s [white]", project.Path) +} diff --git a/gitlab/gitlab_repo.go b/gitlab/gitlab_repo.go new file mode 100644 index 00000000..1af7e00c --- /dev/null +++ b/gitlab/gitlab_repo.go @@ -0,0 +1,113 @@ +package gitlab + +import ( + glb "github.com/xanzy/go-gitlab" +) + +type GitlabProject struct { + gitlab *glb.Client + Path string + + MergeRequests []*glb.MergeRequest + RemoteProject *glb.Project +} + +func NewGitlabProject(name string, namespace string, gitlab *glb.Client) *GitlabProject { + path := namespace + "/" + name + project := GitlabProject{ + gitlab: gitlab, + Path: path, + } + + return &project +} + +// Refresh reloads the gitlab data via the Gitlab API +func (project *GitlabProject) Refresh() { + project.MergeRequests, _ = project.loadMergeRequests() + project.RemoteProject, _ = project.loadRemoteProject() +} + +/* -------------------- Counts -------------------- */ + +func (project *GitlabProject) IssueCount() int { + if project.RemoteProject == nil { + return 0 + } + + return project.RemoteProject.OpenIssuesCount +} + +func (project *GitlabProject) MergeRequestCount() int { + return len(project.MergeRequests) +} + +func (project *GitlabProject) StarCount() int { + if project.RemoteProject == nil { + return 0 + } + + return project.RemoteProject.StarCount +} + +/* -------------------- Unexported Functions -------------------- */ + +// myMergeRequests returns a list of merge requests created by username on this project +func (project *GitlabProject) myMergeRequests(username string) []*glb.MergeRequest { + mrs := []*glb.MergeRequest{} + + for _, mr := range project.MergeRequests { + user := mr.Author + + if user.Username == username { + mrs = append(mrs, mr) + } + } + + return mrs +} + +// myApprovalRequests returns a list of merge requests for which username has been +// requested to approve +func (project *GitlabProject) myApprovalRequests(username string) []*glb.MergeRequest { + mrs := []*glb.MergeRequest{} + + for _, mr := range project.MergeRequests { + approvers, _, err := project.gitlab.MergeRequests.GetMergeRequestApprovals(project.Path, mr.IID) + if err != nil { + continue + } + for _, approver := range approvers.Approvers { + if approver.User.Username == username { + mrs = append(mrs, mr) + } + } + } + + return mrs +} + +func (project *GitlabProject) loadMergeRequests() ([]*glb.MergeRequest, error) { + state := "opened" + opts := glb.ListProjectMergeRequestsOptions{ + State: &state, + } + + mrs, _, err := project.gitlab.MergeRequests.ListProjectMergeRequests(project.Path, &opts) + + if err != nil { + return nil, err + } + + return mrs, nil +} + +func (project *GitlabProject) loadRemoteProject() (*glb.Project, error) { + projectsitory, _, err := project.gitlab.Projects.GetProject(project.Path) + + if err != nil { + return nil, err + } + + return projectsitory, nil +} diff --git a/gitlab/widget.go b/gitlab/widget.go new file mode 100644 index 00000000..35e56a91 --- /dev/null +++ b/gitlab/widget.go @@ -0,0 +1,158 @@ +package gitlab + +import ( + "os" + + "github.com/gdamore/tcell" + "github.com/olebedev/config" + "github.com/rivo/tview" + "github.com/senorprogrammer/wtf/wtf" + glb "github.com/xanzy/go-gitlab" +) + +// Config is a pointer to the global config object +var Config *config.Config + +const HelpText = ` + Keyboard commands for Gitlab: + + /: Show/hide this help window + h: Previous project + l: Next project + r: Refresh the data + + arrow left: Previous project + arrow right: Next project +` + +type Widget struct { + wtf.TextWidget + + app *tview.Application + pages *tview.Pages + + gitlab *glb.Client + + GitlabProjects []*GitlabProject + Idx int +} + +func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { + apiKey := os.Getenv("WTF_GITLAB_TOKEN") + baseURL := Config.UString("wtf.mods.gitlab.domain") + gitlab := glb.NewClient(nil, apiKey) + if baseURL != "" { + gitlab.SetBaseURL(baseURL) + } + + widget := Widget{ + TextWidget: wtf.NewTextWidget(" Gitlab ", "gitlab", true), + + app: app, + pages: pages, + + gitlab: gitlab, + + Idx: 0, + } + + widget.GitlabProjects = widget.buildProjectCollection(Config.UMap("wtf.mods.gitlab.projects")) + + widget.View.SetInputCapture(widget.keyboardIntercept) + + return &widget +} + +/* -------------------- Exported Functions -------------------- */ + +func (widget *Widget) Refresh() { + for _, project := range widget.GitlabProjects { + project.Refresh() + } + + widget.UpdateRefreshedAt() + widget.display() +} + +func (widget *Widget) Next() { + widget.Idx = widget.Idx + 1 + if widget.Idx == len(widget.GitlabProjects) { + widget.Idx = 0 + } + + widget.display() +} + +func (widget *Widget) Prev() { + widget.Idx = widget.Idx - 1 + if widget.Idx < 0 { + widget.Idx = len(widget.GitlabProjects) - 1 + } + + widget.display() +} + +/* -------------------- Unexported Functions -------------------- */ + +func (widget *Widget) buildProjectCollection(projectData map[string]interface{}) []*GitlabProject { + gitlabProjects := []*GitlabProject{} + + for name, namespace := range projectData { + project := NewGitlabProject(name, namespace.(string), widget.gitlab) + gitlabProjects = append(gitlabProjects, project) + } + + return gitlabProjects +} + +func (widget *Widget) currentGitlabProject() *GitlabProject { + if len(widget.GitlabProjects) == 0 { + return nil + } + + if widget.Idx < 0 || widget.Idx >= len(widget.GitlabProjects) { + return nil + } + + return widget.GitlabProjects[widget.Idx] +} + +func (widget *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey { + switch string(event.Rune()) { + case "/": + widget.showHelp() + return nil + case "h": + widget.Prev() + return nil + case "l": + widget.Next() + return nil + case "r": + widget.Refresh() + return nil + } + + switch event.Key() { + case tcell.KeyLeft: + widget.Prev() + return nil + case tcell.KeyRight: + widget.Next() + return nil + default: + return event + } +} + +func (widget *Widget) showHelp() { + closeFunc := func() { + widget.pages.RemovePage("help") + widget.app.SetFocus(widget.View) + } + + modal := wtf.NewBillboardModal(HelpText, closeFunc) + + widget.pages.AddPage("help", modal, false, true) + widget.app.SetFocus(modal) +} diff --git a/gspreadsheets/client.go b/gspreadsheets/client.go new file mode 100644 index 00000000..1cf16321 --- /dev/null +++ b/gspreadsheets/client.go @@ -0,0 +1,145 @@ +/* +* This butt-ugly code is direct from Google itself +* https://developers.google.com/sheets/api/quickstart/go + */ + +package gspreadsheets + +import ( + "context" + "encoding/json" + "fmt" + "io/ioutil" + "log" + "net/http" + "net/url" + "os" + "os/user" + "path/filepath" + "strings" + + "github.com/senorprogrammer/wtf/wtf" + "golang.org/x/oauth2" + "golang.org/x/oauth2/google" + sheets "google.golang.org/api/sheets/v4" +) + +/* -------------------- Exported Functions -------------------- */ + +func Fetch() ([]*sheets.ValueRange, error) { + ctx := context.Background() + + secretPath, _ := wtf.ExpandHomeDir(Config.UString("wtf.mods.gspreadsheets.secretFile")) + + b, err := ioutil.ReadFile(secretPath) + if err != nil { + log.Fatalf("Unable to read secretPath. %v", err) + return nil, err + } + + config, err := google.ConfigFromJSON(b, "https://www.googleapis.com/auth/spreadsheets.readonly") + + if err != nil { + log.Fatalf("Unable to get config from JSON. %v", err) + return nil, err + } + client := getClient(ctx, config) + + srv, err := sheets.New(client) + if err != nil { + log.Fatalf("Unable to get create server. %v", err) + return nil, err + } + + cells := wtf.ToStrs(Config.UList("wtf.mods.gspreadsheets.cells.addresses")) + documentId := Config.UString("wtf.mods.gspreadsheets.sheetId") + addresses := strings.Join(cells[:], ";") + + responses := make([]*sheets.ValueRange, len(cells)) + + for i := 0; i < len(cells); i++ { + resp, err := srv.Spreadsheets.Values.Get(documentId, cells[i]).Do() + if err != nil { + log.Fatalf("Error fetching cells %s", addresses) + return nil, err + } + responses[i] = resp + } + + return responses, err +} + +/* -------------------- Unexported Functions -------------------- */ + +// getClient uses a Context and Config to retrieve a Token +// then generate a Client. It returns the generated Client. +func getClient(ctx context.Context, config *oauth2.Config) *http.Client { + cacheFile, err := tokenCacheFile() + if err != nil { + log.Fatalf("Unable to get path to cached credential file. %v", err) + } + tok, err := tokenFromFile(cacheFile) + if err != nil { + tok = getTokenFromWeb(config) + saveToken(cacheFile, tok) + } + return config.Client(ctx, tok) +} + +// getTokenFromWeb uses Config to request a Token. +// It returns the retrieved Token. +func getTokenFromWeb(config *oauth2.Config) *oauth2.Token { + authURL := config.AuthCodeURL("state-token", oauth2.AccessTypeOffline) + fmt.Printf("Go to the following link in your browser then type the "+ + "authorization code: \n%v\n", authURL) + + var code string + if _, err := fmt.Scan(&code); err != nil { + log.Fatalf("Unable to read authorization code %v", err) + } + + tok, err := config.Exchange(oauth2.NoContext, code) + if err != nil { + log.Fatalf("Unable to retrieve token from web %v", err) + } + return tok +} + +// tokenCacheFile generates credential file path/filename. +// It returns the generated credential path/filename. +func tokenCacheFile() (string, error) { + usr, err := user.Current() + if err != nil { + return "", err + } + tokenCacheDir := filepath.Join(usr.HomeDir, ".credentials") + os.MkdirAll(tokenCacheDir, 0700) + return filepath.Join(tokenCacheDir, + url.QueryEscape("spreadsheets-go-quickstart.json")), err +} + +// tokenFromFile retrieves a Token from a given file path. +// It returns the retrieved Token and any read error encountered. +func tokenFromFile(file string) (*oauth2.Token, error) { + f, err := os.Open(file) + if err != nil { + return nil, err + } + t := &oauth2.Token{} + err = json.NewDecoder(f).Decode(t) + defer f.Close() + return t, err +} + +// saveToken uses a file path to create a file and store the +// token in it. +func saveToken(file string, token *oauth2.Token) { + fmt.Printf("Saving credential file to: %s\n", file) + f, err := os.OpenFile(file, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600) + if err != nil { + log.Fatalf("Unable to cache oauth token: %v", err) + } + defer f.Close() + + json.NewEncoder(f).Encode(token) +} diff --git a/gspreadsheets/widget.go b/gspreadsheets/widget.go new file mode 100644 index 00000000..680869cf --- /dev/null +++ b/gspreadsheets/widget.go @@ -0,0 +1,52 @@ +package gspreadsheets + +import ( + "fmt" + + "github.com/olebedev/config" + "github.com/senorprogrammer/wtf/wtf" + sheets "google.golang.org/api/sheets/v4" +) + +// Config is a pointer to the global config object +var Config *config.Config + +type Widget struct { + wtf.TextWidget +} + +func NewWidget() *Widget { + widget := Widget{ + TextWidget: wtf.NewTextWidget(" Google Spreadsheets ", "gspreadsheets", false), + } + + return &widget +} + +/* -------------------- Exported Functions -------------------- */ + +func (widget *Widget) Refresh() { + cells, _ := Fetch() + + widget.UpdateRefreshedAt() + + widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(cells))) +} + +/* -------------------- Unexported Functions -------------------- */ + +func (widget *Widget) contentFrom(valueRanges []*sheets.ValueRange) string { + if valueRanges == nil { + return "error 1" + } + + valuesColor := Config.UString("wtf.mods.gspreadsheets.colors.values", "green") + res := "" + + cells := wtf.ToStrs(Config.UList("wtf.mods.gspreadsheets.cells.names")) + for i := 0; i < len(valueRanges); i++ { + res = res + fmt.Sprintf("%s\t[%s]%s\n", cells[i], valuesColor, valueRanges[i].Values[0][0]) + } + + return res +} diff --git a/help/help.go b/help/help.go index cf79c930..bac22d0a 100644 --- a/help/help.go +++ b/help/help.go @@ -8,7 +8,7 @@ import ( "github.com/senorprogrammer/wtf/github" "github.com/senorprogrammer/wtf/textfile" "github.com/senorprogrammer/wtf/todo" - "github.com/senorprogrammer/wtf/weather" + "github.com/senorprogrammer/wtf/weatherservices/weather" ) func DisplayModuleInfo(moduleName string) { diff --git a/ipaddresses/ipapi/widget.go b/ipaddresses/ipapi/widget.go new file mode 100644 index 00000000..d65f2456 --- /dev/null +++ b/ipaddresses/ipapi/widget.go @@ -0,0 +1,131 @@ +package ipapi + +import ( + "encoding/json" + "fmt" + "net/http" + "strconv" + "text/template" + + "bytes" + + "github.com/olebedev/config" + "github.com/senorprogrammer/wtf/wtf" +) + +// Config is a pointer to the global config object +var Config *config.Config + +// Widget widget struct +type Widget struct { + wtf.TextWidget + result string + colors struct { + name, value string + } +} + +type ipinfo struct { + Query string `json:"query"` + ISP string `json:"isp"` + AS string `json:"as"` + City string `json:"city"` + Region string `json:"region"` + Country string `json:"country"` + CountryCode string `json:"countryCode"` + Latitude float64 `json:"lat"` + Longitude float64 `json:"lon"` + PostalCode string `json:"zip"` + Organization string `json:"org"` + Timezone string `json:"timezone"` +} + +// NewWidget constructor +func NewWidget() *Widget { + widget := Widget{ + TextWidget: wtf.NewTextWidget(" IPInfo ", "ipapi", false), + } + + widget.View.SetWrap(false) + + widget.config() + + return &widget +} + +// Refresh refresh the module +func (widget *Widget) Refresh() { + widget.UpdateRefreshedAt() + widget.ipinfo() + widget.View.SetText(widget.result) +} + +//this method reads the config and calls ipinfo for ip information +func (widget *Widget) ipinfo() { + client := &http.Client{} + req, err := http.NewRequest("GET", "http://ip-api.com/json", nil) + if err != nil { + widget.result = fmt.Sprintf("%s", err.Error()) + return + } + req.Header.Set("User-Agent", "curl") + response, err := client.Do(req) + if err != nil { + widget.result = fmt.Sprintf("%s", err.Error()) + return + } + defer response.Body.Close() + var info ipinfo + err = json.NewDecoder(response.Body).Decode(&info) + if err != nil { + widget.result = fmt.Sprintf("%s", err.Error()) + return + } + + widget.setResult(&info) +} + +// read module configs +func (widget *Widget) config() { + nameColor, valueColor := Config.UString("wtf.mods.ipinfo.colors.name", "red"), Config.UString("wtf.mods.ipinfo.colors.value", "white") + widget.colors.name = nameColor + widget.colors.value = valueColor +} + +func (widget *Widget) setResult(info *ipinfo) { + resultTemplate, _ := template.New("ipinfo_result").Parse( + formatableText("IP Address", "Ip") + + formatableText("ISP", "ISP") + + formatableText("AS", "AS") + + formatableText("City", "City") + + formatableText("Region", "Region") + + formatableText("Country", "Country") + + formatableText("Coordinates", "Coordinates") + + formatableText("Postal Code", "PostalCode") + + formatableText("Organization", "Organization") + + formatableText("Timezone", "Timezone"), + ) + + resultBuffer := new(bytes.Buffer) + + resultTemplate.Execute(resultBuffer, map[string]string{ + "nameColor": widget.colors.name, + "valueColor": widget.colors.value, + "Ip": info.Query, + "ISP": info.ISP, + "AS": info.AS, + "City": info.City, + "Region": info.Region, + "Country": info.Country, + "Coordinates": strconv.FormatFloat(info.Latitude, 'f', 6, 64) + "," + strconv.FormatFloat(info.Longitude, 'f', 6, 64), + "PostalCode": info.PostalCode, + "Organization": info.Organization, + "Timezone": info.Timezone, + }) + + widget.result = resultBuffer.String() +} + +func formatableText(key, value string) string { + return fmt.Sprintf(" [{{.nameColor}}]%s: [{{.valueColor}}]{{.%s}}\n", key, value) +} diff --git a/ipaddresses/ipinfo/widget.go b/ipaddresses/ipinfo/widget.go new file mode 100644 index 00000000..62db1732 --- /dev/null +++ b/ipaddresses/ipinfo/widget.go @@ -0,0 +1,122 @@ +package ipinfo + +import ( + "encoding/json" + "fmt" + "net/http" + "text/template" + + "bytes" + + "github.com/olebedev/config" + "github.com/senorprogrammer/wtf/wtf" +) + +// Config is a pointer to the global config object +var Config *config.Config + +type Widget struct { + wtf.TextWidget + result string + colors struct { + name, value string + } +} + +type ipinfo struct { + Ip string `json:"ip"` + Hostname string `json:"hostname"` + City string `json:"city"` + Region string `json:"region"` + Country string `json:"country"` + Coordinates string `json:"loc"` + PostalCode string `json:"postal"` + Organization string `json:"org"` +} + +func NewWidget() *Widget { + widget := Widget{ + TextWidget: wtf.NewTextWidget(" IPInfo ", "ipinfo", false), + } + + widget.View.SetWrap(false) + + widget.config() + + return &widget +} + +func (widget *Widget) Refresh() { + widget.UpdateRefreshedAt() + widget.ipinfo() + widget.View.Clear() + + widget.View.SetText(widget.result) +} + +//this method reads the config and calls ipinfo for ip information +func (widget *Widget) ipinfo() { + client := &http.Client{} + req, err := http.NewRequest("GET", "https://ipinfo.io/", nil) + if err != nil { + widget.result = fmt.Sprintf("%s", err.Error()) + return + } + req.Header.Set("User-Agent", "curl") + response, err := client.Do(req) + if err != nil { + widget.result = fmt.Sprintf("%s", err.Error()) + return + } + defer response.Body.Close() + + var info ipinfo + err = json.NewDecoder(response.Body).Decode(&info) + if err != nil { + widget.result = fmt.Sprintf("%s", err.Error()) + return + } + + widget.setResult(&info) +} + +// read module configs +func (widget *Widget) config() { + nameColor, valueColor := Config.UString("wtf.mods.ipinfo.colors.name", "red"), Config.UString("wtf.mods.ipinfo.colors.value", "white") + widget.colors.name = nameColor + widget.colors.value = valueColor +} + +func (widget *Widget) setResult(info *ipinfo) { + resultTemplate, _ := template.New("ipinfo_result").Parse( + formatableText("IP Address", "Ip") + + formatableText("Hostname", "Hostname") + + formatableText("City", "City") + + formatableText("Region", "Region") + + formatableText("Country", "Country") + + formatableText("Coordinates", "Coordinates") + + formatableText("Postal Code", "PostalCode") + + formatableText("Organization", "Organization"), + ) + + resultBuffer := new(bytes.Buffer) + + resultTemplate.Execute(resultBuffer, map[string]string{ + "nameColor": widget.colors.name, + "valueColor": widget.colors.value, + "Ip": info.Ip, + "Hostname": info.Hostname, + "City": info.City, + "Region": info.Region, + "Country": info.Country, + "Coordinates": info.Coordinates, + "PostalCode": info.PostalCode, + "Organization": info.Organization, + }) + + widget.result = resultBuffer.String() +} + +func formatableText(key, value string) string { + return fmt.Sprintf(" [{{.nameColor}}]%s: [{{.valueColor}}]{{.%s}}\n", key, value) +} diff --git a/jenkins/client.go b/jenkins/client.go new file mode 100644 index 00000000..e599b9f7 --- /dev/null +++ b/jenkins/client.go @@ -0,0 +1,64 @@ +package jenkins + +import ( + "bytes" + "encoding/json" + "io" + "io/ioutil" + "net/http" + "net/url" + "strings" +) + +func Create(jenkinsURL string, username string, apiKey string) (*View, error) { + const apiSuffix = "api/json?pretty=true" + parsedSuffix, err := url.Parse(apiSuffix) + if err != nil { + return &View{}, err + } + + parsedJenkinsURL, err := url.Parse(ensureLastSlash(jenkinsURL)) + if err != nil { + return &View{}, err + } + jenkinsAPIURL := parsedJenkinsURL.ResolveReference(parsedSuffix) + + req, err := http.NewRequest("GET", jenkinsAPIURL.String(), nil) + req.SetBasicAuth(username, apiKey) + + httpClient := &http.Client{} + resp, err := httpClient.Do(req) + + if err != nil { + return &View{}, err + } + + view := &View{} + parseJson(view, resp.Body) + + return view, nil +} + +func ensureLastSlash(URL string) string { + return strings.TrimRight(URL, "/") + "/" +} + +/* -------------------- Unexported Functions -------------------- */ + + +func parseJson(obj interface{}, text io.Reader) { + jsonStream, err := ioutil.ReadAll(text) + if err != nil { + panic(err) + } + + decoder := json.NewDecoder(bytes.NewReader(jsonStream)) + + for { + if err := decoder.Decode(obj); err == io.EOF { + break + } else if err != nil { + panic(err) + } + } +} diff --git a/jenkins/job.go b/jenkins/job.go new file mode 100644 index 00000000..e360e0f6 --- /dev/null +++ b/jenkins/job.go @@ -0,0 +1,8 @@ +package jenkins + +type Job struct { + Class string `json:"_class"` + Name string `json:"name"` + Url string `json:"url"` + Color string `json:"color"` +} diff --git a/jenkins/view.go b/jenkins/view.go new file mode 100644 index 00000000..9041b297 --- /dev/null +++ b/jenkins/view.go @@ -0,0 +1,10 @@ +package jenkins + +type View struct { + Class string `json:"_class"` + Description string `json:"description"` + Jobs []Job `json:"jobs"` + Name string `json:"name"` + Property []string `json:"property"` + url string `json:"url"` +} diff --git a/jenkins/widget.go b/jenkins/widget.go new file mode 100644 index 00000000..a922fbbf --- /dev/null +++ b/jenkins/widget.go @@ -0,0 +1,83 @@ +package jenkins + +import ( + "fmt" + "github.com/olebedev/config" + "github.com/senorprogrammer/wtf/wtf" + "os" +) + +// Config is a pointer to the global config object +var Config *config.Config + +type Widget struct { + wtf.TextWidget +} + +func NewWidget() *Widget { + widget := Widget{ + TextWidget: wtf.NewTextWidget("Jenkins", "jenkins", false), + } + + return &widget +} + +/* -------------------- Exported Functions -------------------- */ + +func (widget *Widget) Refresh() { + if widget.Disabled() { + return + } + + view, err := Create(Config.UString("wtf.mods.jenkins.url"), + Config.UString("wtf.mods.jenkins.user"), os.Getenv("WTF_JENKINS_API_KEY")) + + widget.UpdateRefreshedAt() + widget.View.Clear() + + if err != nil { + widget.View.SetWrap(true) + widget.View.SetTitle(fmt.Sprintf(" %s ", widget.Name)) + fmt.Fprintf(widget.View, "%v", err) + } else { + widget.View.SetWrap(false) + widget.View.SetTitle( + fmt.Sprintf( + " %s: [green] ", + widget.Name, + ), + ) + fmt.Fprintf(widget.View, "%s", widget.contentFrom(view)) + } +} + +/* -------------------- Unexported Functions -------------------- */ + +func (widget *Widget) contentFrom(view *View) string { + str := fmt.Sprintf(" [red]%s[white]\n", view.Name); + + for _, job := range view.Jobs { + str = str + fmt.Sprintf( + " [%s]%-6s[white]\n", + widget.jobColor(&job), + job.Name, + ) + } + + return str +} + +func (widget *Widget) jobColor(job *Job) string { + var color string + + switch job.Color { + case "blue": + color = "green" + case "red": + color = "red" + default: + color = "white" + } + + return color +} diff --git a/jira/client.go b/jira/client.go index 0e140694..226dd14c 100644 --- a/jira/client.go +++ b/jira/client.go @@ -7,11 +7,32 @@ import ( "io" "io/ioutil" "net/http" + "net/url" "os" + "strings" ) -func IssuesFor(username string) (*SearchResult, error) { - url := fmt.Sprintf("/rest/api/2/search?jql=assignee=%s", username) +func IssuesFor(username string, projects []string, jql string) (*SearchResult, error) { + query := []string{} + + var projQuery = getProjectQuery(projects) + if projQuery != "" { + query = append(query, projQuery) + } + + if username != "" { + query = append(query, buildJql("assignee", username)) + } + + if jql != "" { + query = append(query, jql) + } + + v := url.Values{} + + v.Set("jql", strings.Join(query, " AND ")) + + url := fmt.Sprintf("/rest/api/2/search?%s", v.Encode()) resp, err := jiraRequest(url) if err != nil { @@ -24,6 +45,10 @@ func IssuesFor(username string) (*SearchResult, error) { return searchResult, nil } +func buildJql(key string, value string) string { + return fmt.Sprintf("%s = \"%s\"", key, value) +} + /* -------------------- Unexported Functions -------------------- */ func jiraRequest(path string) (*http.Response, error) { @@ -64,3 +89,18 @@ func parseJson(obj interface{}, text io.Reader) { } } } + +func getProjectQuery(projects []string) string { + singleEmptyProject := len(projects) == 1 && len(projects[0]) == 0 + if len(projects) == 0 || singleEmptyProject { + return "" + } else if len(projects) == 1 { + return buildJql("project", projects[0]) + } + + quoted := make([]string, len(projects)) + for i := range projects { + quoted[i] = fmt.Sprintf("\"%s\"", projects[i]) + } + return fmt.Sprintf("project in (%s)", strings.Join(quoted, ", ")) +} diff --git a/jira/issues.go b/jira/issues.go index ecaceb92..a8ad546f 100644 --- a/jira/issues.go +++ b/jira/issues.go @@ -1,8 +1,5 @@ package jira -import ( -) - type Issue struct { Expand string `json:"expand"` ID string `json:"id"` diff --git a/jira/search_result.go b/jira/search_result.go index 66a3f1a8..7febef6d 100644 --- a/jira/search_result.go +++ b/jira/search_result.go @@ -1,7 +1,5 @@ package jira -import () - type SearchResult struct { StartAt int `json:"startAt"` MaxResults int `json:"maxResults"` diff --git a/jira/widget.go b/jira/widget.go index 4c69e2da..6ca9670e 100644 --- a/jira/widget.go +++ b/jira/widget.go @@ -16,7 +16,7 @@ type Widget struct { func NewWidget() *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget("JIRA", "jira", false), + TextWidget: wtf.NewTextWidget(" Jira ", "jira", false), } return &widget @@ -25,29 +25,24 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - - searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username")) + searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username"), getProjects(), Config.UString("wtf.mods.jira.jql", "")) widget.UpdateRefreshedAt() - widget.View.Clear() if err != nil { widget.View.SetWrap(true) - widget.View.SetTitle(fmt.Sprintf(" %s ", widget.Name)) + widget.View.SetTitle(fmt.Sprintf("%s", widget.Name)) fmt.Fprintf(widget.View, "%v", err) } else { widget.View.SetWrap(false) widget.View.SetTitle( fmt.Sprintf( - " %s: [green]%s[white] ", + "%s- [green]%s[white]", widget.Name, Config.UString("wtf.mods.jira.project"), ), ) - fmt.Fprintf(widget.View, "%s", widget.contentFrom(searchResult)) + widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(searchResult))) } } @@ -86,3 +81,21 @@ func (widget *Widget) issueTypeColor(issue *Issue) string { return color } + +func getProjects() []string { + // see if project is set to a single string + configPath := "wtf.mods.jira.project" + singleProject, err := Config.String(configPath) + if err == nil { + return []string{singleProject} + } + // else, assume list + projList := Config.UList(configPath) + var ret []string + for _, proj := range projList { + if str, ok := proj.(string); ok { + ret = append(ret, str) + } + } + return ret +} diff --git a/newrelic/widget.go b/newrelic/widget.go index c4076af9..ca16966f 100644 --- a/newrelic/widget.go +++ b/newrelic/widget.go @@ -26,10 +26,6 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - app, appErr := Application() deploys, depErr := Deployments() @@ -39,15 +35,15 @@ func (widget *Widget) Refresh() { } widget.UpdateRefreshedAt() - widget.View.SetTitle(fmt.Sprintf(" New Relic: [green]%s[white] ", appName)) + widget.View.SetTitle(fmt.Sprintf("%s- [green]%s[white]", widget.Name, appName)) widget.View.Clear() if depErr != nil { widget.View.SetWrap(true) - fmt.Fprintf(widget.View, "%s", depErr) + widget.View.SetText(fmt.Sprintf("%s", depErr)) } else { widget.View.SetWrap(false) - fmt.Fprintf(widget.View, "%s", widget.contentFrom(deploys)) + widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(deploys))) } } @@ -70,7 +66,7 @@ func (widget *Widget) contentFrom(deploys []nr.ApplicationDeployment) string { var revLen = 8 if revLen > len(deploy.Revision) { - revLen = len(deploy.Revision) + revLen = len(deploy.Revision) } str = str + fmt.Sprintf( diff --git a/opsgenie/widget.go b/opsgenie/widget.go index 3a75ce37..314b832a 100644 --- a/opsgenie/widget.go +++ b/opsgenie/widget.go @@ -17,7 +17,7 @@ type Widget struct { func NewWidget() *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" ⏰ OpsGenie ", "opsgenie", false), + TextWidget: wtf.NewTextWidget(" OpsGenie ", "opsgenie", false), } return &widget @@ -26,22 +26,17 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - data, err := Fetch() widget.UpdateRefreshedAt() - widget.View.SetTitle(" ⏰ On Call ") - widget.View.Clear() + widget.View.SetTitle(widget.Name) if err != nil { widget.View.SetWrap(true) - fmt.Fprintf(widget.View, "%s", err) + widget.View.SetText(fmt.Sprintf("%s", err)) } else { widget.View.SetWrap(false) - fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) + widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(data))) } } diff --git a/power/battery.go b/power/battery.go index c837b7f8..08b7fdfe 100644 --- a/power/battery.go +++ b/power/battery.go @@ -1,3 +1,5 @@ +// +build !linux + package power import ( diff --git a/power/battery_linux.go b/power/battery_linux.go new file mode 100644 index 00000000..693d95b6 --- /dev/null +++ b/power/battery_linux.go @@ -0,0 +1,112 @@ +// +build linux + +package power + +import ( + "fmt" + "os/exec" + "strconv" + "strings" + + "github.com/senorprogrammer/wtf/wtf" +) + +var batteryState string + +type Battery struct { + args []string + cmd string + result string + + Charge string + Remaining string +} + +func NewBattery() *Battery { + return &Battery{} +} + +/* -------------------- Exported Functions -------------------- */ + +func (battery *Battery) Refresh() { + data := battery.execute() + battery.result = battery.parse(data) +} + +func (battery *Battery) String() string { + return battery.result +} + +/* -------------------- Unexported Functions -------------------- */ + +func (battery *Battery) execute() string { + cmd := exec.Command("upower", "-e") + lines := strings.Split(wtf.ExecuteCommand(cmd), "\n") + var target string + for _, l := range lines { + if strings.Contains(l, "/battery") { + target = l + break + } + } + cmd = exec.Command("upower", "-i", target) + return wtf.ExecuteCommand(cmd) +} + +func (battery *Battery) parse(data string) string { + lines := strings.Split(data, "\n") + if len(lines) < 2 { + return "unknown" + } + table := make(map[string]string) + for _, line := range lines { + parts := strings.Split(line, ":") + if len(parts) < 2 { + continue + } + table[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1]) + } + if s := table["time to empty"]; s == "" { + table["time to empty"] = "∞" + } + str := "" + str = str + fmt.Sprintf(" %10s: %s\n", "Charge", battery.formatCharge(table["percentage"])) + str = str + fmt.Sprintf(" %10s: %s\n", "Remaining", table["time to empty"]) + str = str + fmt.Sprintf(" %10s: %s\n", "State", battery.formatState(table["state"])) + if s := table["time to full"]; s != "" { + str = str + fmt.Sprintf(" %10s: %s\n", "TimeToFull", table["time to full"]) + } + batteryState = table["state"] + return str +} + +func (battery *Battery) formatCharge(data string) string { + percent, _ := strconv.ParseFloat(strings.Replace(data, "%", "", -1), 32) + color := "" + + switch { + case percent >= 70: + color = "[green]" + case percent >= 35: + color = "[yellow]" + default: + color = "[red]" + } + + return color + data + "[white]" +} + +func (battery *Battery) formatState(data string) string { + color := "" + + switch data { + case "charging": + color = "[green]" + case "discharging": + color = "[yellow]" + default: + color = "[white]" + } + + return color + data + "[white]" +} diff --git a/power/source.go b/power/source.go index b5f0faff..e6eff36c 100644 --- a/power/source.go +++ b/power/source.go @@ -1,3 +1,5 @@ +// +build !linux + package power import ( diff --git a/power/source_linux.go b/power/source_linux.go new file mode 100644 index 00000000..a28368c8 --- /dev/null +++ b/power/source_linux.go @@ -0,0 +1,15 @@ +// +build linux + +package power + +// powerSource returns the name of the current power source, probably one of +// "AC Power" or "Battery Power" +func powerSource() string { + switch batteryState { + case "charging", "fully-charged": + return "AC Power" + case "discharging": + return "Battery Power" + } + return batteryState +} diff --git a/power/widget.go b/power/widget.go index f971bec8..d3d3a996 100644 --- a/power/widget.go +++ b/power/widget.go @@ -18,7 +18,7 @@ type Widget struct { func NewWidget() *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" ⚡️ Power ", "power", false), + TextWidget: wtf.NewTextWidget(" Power ", "power", false), Battery: NewBattery(), } @@ -28,18 +28,13 @@ func NewWidget() *Widget { } func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - widget.UpdateRefreshedAt() widget.Battery.Refresh() - widget.View.Clear() str := "" str = str + fmt.Sprintf(" %10s: %s\n", "Source", powerSource()) str = str + "\n" str = str + widget.Battery.String() - fmt.Fprintf(widget.View, "%s", str) + widget.View.SetText(fmt.Sprintf("%s", str)) } diff --git a/security/dns.go b/security/dns.go index 7360d801..2408c2c1 100644 --- a/security/dns.go +++ b/security/dns.go @@ -42,7 +42,8 @@ func dnsLinux() []string { } func dnsMacOS() []string { - cmd := exec.Command("networksetup", "-getdnsservers", "Wi-Fi") + cmdString := `scutil --dns | head -n 7 | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}'` + cmd := exec.Command("sh", "-c", cmdString) out := wtf.ExecuteCommand(cmd) lines := strings.Split(out, "\n") diff --git a/security/widget.go b/security/widget.go index 61bab3b2..f5769b8e 100644 --- a/security/widget.go +++ b/security/widget.go @@ -17,7 +17,7 @@ type Widget struct { func NewWidget() *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" 🤺 Security ", "security", false), + TextWidget: wtf.NewTextWidget(" Security ", "security", false), } return &widget @@ -26,17 +26,12 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - data := NewSecurityData() data.Fetch() widget.UpdateRefreshedAt() - widget.View.Clear() - fmt.Fprintf(widget.View, "%s", widget.contentFrom(data)) + widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(data))) } /* -------------------- Unexported Functions -------------------- */ diff --git a/status/widget.go b/status/widget.go index a4f2b4d0..3bd71599 100644 --- a/status/widget.go +++ b/status/widget.go @@ -18,7 +18,7 @@ type Widget struct { func NewWidget() *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" 🎉 Status ", "status", false), + TextWidget: wtf.NewTextWidget(" Status ", "status", false), CurrentIcon: 0, } @@ -28,17 +28,13 @@ func NewWidget() *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - widget.UpdateRefreshedAt() - widget.View.Clear() - fmt.Fprintf( - widget.View, - "\n%s", - widget.animation(), + widget.View.SetText( + fmt.Sprintf( + "\n%s", + widget.animation(), + ), ) } diff --git a/system/system_info.go b/system/system_info.go index 6773fe0e..1582ebe7 100644 --- a/system/system_info.go +++ b/system/system_info.go @@ -22,18 +22,18 @@ func NewSystemInfo() *SystemInfo { var cmd *exec.Cmd switch runtime.GOOS { case "linux": - cmd = exec.Command("uname -a", arg...) + arg = append(arg, "-a") + cmd = exec.Command("lsb_release", arg...) case "darwin": cmd = exec.Command("sw_vers", arg...) default: cmd = exec.Command("sw_vers", arg...) } - + raw := wtf.ExecuteCommand(cmd) for _, row := range strings.Split(raw, "\n") { parts := strings.Split(row, ":") - if len(parts) < 2 { continue } @@ -41,11 +41,27 @@ func NewSystemInfo() *SystemInfo { m[strings.TrimSpace(parts[0])] = strings.TrimSpace(parts[1]) } - sysInfo := SystemInfo{ - ProductName: m["ProductName"], - ProductVersion: m["ProductVersion"], - BuildVersion: m["BuildVersion"], - } + var sysInfo *SystemInfo + switch runtime.GOOS { + case "linux": + sysInfo = &SystemInfo{ + ProductName: m["Distributor ID"], + ProductVersion: m["Description"], + BuildVersion: m["Release"], + } + case "darwin": + sysInfo = &SystemInfo{ + ProductName: m["ProductName"], + ProductVersion: m["ProductVersion"], + BuildVersion: m["BuildVersion"], + } + default: + sysInfo = &SystemInfo{ + ProductName: m["ProductName"], + ProductVersion: m["ProductVersion"], + BuildVersion: m["BuildVersion"], + } - return &sysInfo + } + return sysInfo } diff --git a/system/widget.go b/system/widget.go index 5cfc8e60..c13ed5ea 100644 --- a/system/widget.go +++ b/system/widget.go @@ -21,7 +21,7 @@ type Widget struct { func NewWidget(date, version string) *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" Build ", "system", false), + TextWidget: wtf.NewTextWidget(" System ", "system", false), Date: date, Version: version, @@ -33,24 +33,20 @@ func NewWidget(date, version string) *Widget { } func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - widget.UpdateRefreshedAt() - widget.View.Clear() - fmt.Fprintf( - widget.View, - "%8s: %s\n%8s: %s\n\n%8s: %s\n%8s: %s", - "Built", - widget.prettyDate(), - "Vers", - widget.Version, - "OS", - widget.systemInfo.ProductVersion, - "Build", - widget.systemInfo.BuildVersion, + widget.View.SetText( + fmt.Sprintf( + "%8s: %s\n%8s: %s\n\n%8s: %s\n%8s: %s", + "Built", + widget.prettyDate(), + "Vers", + widget.Version, + "OS", + widget.systemInfo.ProductVersion, + "Build", + widget.systemInfo.BuildVersion, + ), ) } diff --git a/textfile/widget.go b/textfile/widget.go index e452c0d7..2bc3afe6 100644 --- a/textfile/widget.go +++ b/textfile/widget.go @@ -30,7 +30,7 @@ type Widget struct { func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" 📄 Text File ", "textfile", true), + TextWidget: wtf.NewTextWidget(" Text File ", "textfile", true), app: app, filePath: Config.UString("wtf.mods.textfile.filePath"), @@ -48,13 +48,8 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - widget.UpdateRefreshedAt() - widget.View.SetTitle(fmt.Sprintf(" 📄 %s ", widget.filePath)) - widget.View.Clear() + widget.View.SetTitle(fmt.Sprintf("%s %s", widget.Name, widget.filePath)) filePath, _ := wtf.ExpandHomeDir(widget.filePath) @@ -64,9 +59,9 @@ func (widget *Widget) Refresh() { } if err != nil { - fmt.Fprintf(widget.View, "%s", err) + widget.View.SetText(fmt.Sprintf("%s", err)) } else { - fmt.Fprintf(widget.View, "%s", string(fileData)) + widget.View.SetText(fmt.Sprintf("%s", string(fileData))) } } diff --git a/todo/display.go b/todo/display.go index 98f3eb72..d25d20cb 100644 --- a/todo/display.go +++ b/todo/display.go @@ -29,7 +29,7 @@ func (widget *Widget) display() { widget.SetList(&newList) widget.View.Clear() - fmt.Fprintf(widget.View, "%s", str) + widget.View.SetText(fmt.Sprintf("%s", str)) } func (widget *Widget) formattedItemLine(item *Item, selectedItem *Item, maxLen int) string { diff --git a/todo/item.go b/todo/item.go index aa77f41e..bc87b897 100644 --- a/todo/item.go +++ b/todo/item.go @@ -1,7 +1,5 @@ package todo -import () - type Item struct { Checked bool Text string diff --git a/todo/list.go b/todo/list.go index 9d93beb6..0e852f6c 100644 --- a/todo/list.go +++ b/todo/list.go @@ -1,7 +1,5 @@ package todo -import () - type List struct { Items []*Item @@ -33,6 +31,7 @@ func (list *List) CheckedItems() []*Item { func (list *List) Delete() { list.Items = append(list.Items[:list.selected], list.Items[list.selected+1:]...) + list.Prev() } func (list *List) Demote() { diff --git a/todo/widget.go b/todo/widget.go index df66bac4..e06c007c 100644 --- a/todo/widget.go +++ b/todo/widget.go @@ -7,6 +7,7 @@ import ( "github.com/gdamore/tcell" "github.com/olebedev/config" "github.com/rivo/tview" + "github.com/senorprogrammer/wtf/cfg" "github.com/senorprogrammer/wtf/wtf" "gopkg.in/yaml.v2" ) @@ -33,6 +34,10 @@ const HelpText = ` space: Check the selected item on or off ` +const offscreen = -1000 +const modalWidth = 80 +const modalHeight = 7 + type Widget struct { wtf.TextWidget @@ -44,7 +49,7 @@ type Widget struct { func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" 📝 Todo ", "todo", true), + TextWidget: wtf.NewTextWidget(" Todo ", "todo", true), app: app, filePath: Config.UString("wtf.mods.todo.filename"), @@ -61,10 +66,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget { /* -------------------- Exported Functions -------------------- */ func (widget *Widget) Refresh() { - if widget.Disabled() { - return - } - widget.UpdateRefreshedAt() widget.load() widget.display() @@ -99,7 +100,7 @@ func (widget *Widget) editItem() { } func (widget *Widget) init() { - _, err := wtf.CreateFile(widget.filePath) + _, err := cfg.CreateFile(widget.filePath) if err != nil { panic(err) } @@ -181,7 +182,7 @@ func (widget *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey { // Loads the todo list from Yaml file func (widget *Widget) load() { - confDir, _ := wtf.ConfigDir() + confDir, _ := cfg.ConfigDir() filePath := fmt.Sprintf("%s/%s", confDir, widget.filePath) fileData, _ := wtf.ReadFileBytes(filePath) @@ -207,7 +208,7 @@ func (widget *Widget) newItem() { // persist writes the todo list to Yaml file func (widget *Widget) persist() { - confDir, _ := wtf.ConfigDir() + confDir, _ := cfg.ConfigDir() filePath := fmt.Sprintf("%s/%s", confDir, widget.filePath) fileData, _ := yaml.Marshal(&widget.list) @@ -270,11 +271,18 @@ func (widget *Widget) modalForm(lbl, text string) *tview.Form { } func (widget *Widget) modalFrame(form *tview.Form) *tview.Frame { - _, _, w, h := widget.View.GetInnerRect() - frame := tview.NewFrame(form).SetBorders(0, 0, 0, 0, 0, 0) + frame.SetRect(offscreen, offscreen, modalWidth, modalHeight) frame.SetBorder(true) - frame.SetRect(w+20, h+2, 80, 7) + frame.SetBorders(1, 1, 0, 0, 1, 1) + + drawFunc := func(screen tcell.Screen, x, y, width, height int) (int, int, int, int) { + w, h := screen.Size() + frame.SetRect((w/2)-(width/2), (h/2)-(height/2), width, height) + return x, y, width, height + } + + frame.SetDrawFunc(drawFunc) return frame } diff --git a/vendor/cloud.google.com/go/AUTHORS b/vendor/cloud.google.com/go/AUTHORS new file mode 100644 index 00000000..c364af1d --- /dev/null +++ b/vendor/cloud.google.com/go/AUTHORS @@ -0,0 +1,15 @@ +# This is the official list of cloud authors for copyright purposes. +# This file is distinct from the CONTRIBUTORS files. +# See the latter for an explanation. + +# Names should be added to this file as: +# Name or Organization
-
Modules: Clocks
+Clocks
diff --git a/docs/posts/modules/cmdrunner/index.html b/docs/posts/modules/cmdrunner/index.html
index 8abc5c26..880401b3 100644
--- a/docs/posts/modules/cmdrunner/index.html
+++ b/docs/posts/modules/cmdrunner/index.html
@@ -10,8 +10,8 @@
-Modules: CmdRunner | WTF - A Terminal Dashboard
-
+CmdRunner | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
-
Modules: CmdRunner
+CmdRunner
diff --git a/docs/posts/modules/cryptocurrencies/bittrex/index.html b/docs/posts/modules/cryptocurrencies/bittrex/index.html
new file mode 100644
index 00000000..d4bcabef
--- /dev/null
+++ b/docs/posts/modules/cryptocurrencies/bittrex/index.html
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+Bittrex | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blockfolio | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CryptoLive | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Module: CryptoLive | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Modules: Google Calendar | WTF - A Terminal Dashboard
-
+Google Calendar | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/cryptocurrencies/blockfolio/index.html b/docs/posts/modules/cryptocurrencies/blockfolio/index.html
new file mode 100644
index 00000000..387ef88b
--- /dev/null
+++ b/docs/posts/modules/cryptocurrencies/blockfolio/index.html
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bittrex
+ +
+
+
+
+ Jun 04, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.5.
Get the last 24 hour summary of cryptocurrencies market using Bittrex.
+ +
Source Code
+wtf/cryptoexchanges/bittrex/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+bittrex:
+ enabled: true
+ position:
+ top: 1
+ left: 2
+ height: 3
+ width: 1
+ refreshInterval: 5
+ summary:
+ BTC:
+ displayName: Bitcoin
+ market:
+ - LTC
+ - ETH
+ colors:
+ base:
+ name: orange
+ displayName: red
+ market:
+ name: red
+ field: white
+ value: greenAttributes
+ +colors.base.name
+Values: Any X11
+color name.
colors.base.dispayName
+Values: Any X11
+color name.
colors.market.name
+Values: Any X11
+color name.
colors.market.field
+Values: Any X11
+color name.
colors.market.value
+Values: Any X11
+color name.
summary
enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/cryptocurrencies/cryptolive/index.html b/docs/posts/modules/cryptocurrencies/cryptolive/index.html
new file mode 100644
index 00000000..abbbeab4
--- /dev/null
+++ b/docs/posts/modules/cryptocurrencies/cryptolive/index.html
@@ -0,0 +1,209 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Blockfolio
+ +
+
+
+
+ Jun 13, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.8.
Display your Blockfolio crypto holdings.
+ +
Source
+wtf/blockfolio/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+blockfolio:
+ colors:
+ name: blue
+ grows: green
+ drop: red
+ device_token: "device token"
+ displayHoldings: true
+ enabled: true
+ position:
+ top: 3
+ left: 1
+ width: 1
+ height: 1
+ refreshInterval: 400Attributes
+ +colors.name
+Values: Any X11
+color name.
colors.grows
+Values: Any X11
+color name.
colors.drop
+Values: Any X11
+color name.
device_token
+Value: See this gist for
+details on how to get your Blockfolio API token.
displayHoldings
enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/cryptolive/index.html b/docs/posts/modules/cryptolive/index.html
new file mode 100644
index 00000000..63395a42
--- /dev/null
+++ b/docs/posts/modules/cryptolive/index.html
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CryptoLive
+ +
+
+
+
+ Jun 03, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.5.
Compare crypto currencies using CryptoCompare.
+ +
Source Code
+wtf/cryptoexchanges/cryptolive/Required ENV Vars
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+cryptolive:
+ colors:
+ from:
+ name: coral
+ displayName: grey
+ to:
+ name: white
+ price: green
+ currencies:
+ BTC:
+ displayName: Bitcoin
+ to:
+ - USD
+ - EUR
+ - ETH
+ ETH:
+ displayName: Ethereum
+ to:
+ - USD
+ - EUR
+ - ETH
+ enabled: true
+ position:
+ top: 5
+ left: 2
+ height: 1
+ width: 2
+ updateInterval: 15Attributes
+ +colors.from.name
+Values: Any X11
+color name.
colors.from.dispayName
+Values: Any X11
+color name.
colors.to.name
+Values: Any X11
+color name.
colors.to.price
+Values: Any X11
+color name.
currencies
enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/posts/modules/gcal/index.html b/docs/posts/modules/gcal/index.html
index 13a792f7..efcfb948 100644
--- a/docs/posts/modules/gcal/index.html
+++ b/docs/posts/modules/gcal/index.html
@@ -10,8 +10,8 @@
-
+
+
+ Module: CryptoLive
+ +
+
+
+ Jun 02, 2018
+
+
+ + +
+
+ + + +
Compare crypto currencies using cryptocompare.com
+ +Source Code
+
+
+ wtf/cryptolive/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+
+
+ cryptolive:
+ enabled: true
+ position:
+ top: 1
+ left: 2
+ height: 1
+ width: 1
+ refreshInterval: 15
+ updateInterval: 15
+ currencies:
+ BTC:
+ displayName: Bitcoin
+ to:
+ - USD
+ - EUR
+ - ETH
+ ETH:
+ displayName: Ethereum
+ to:
+ - USD
+ - EUR
+ - ETH
+ colors:
+ from:
+ name: coral
+ displayName: grey
+ to:
+ name: white
+ price: green
+
+Attributes
+ + + +
+ enabled
+
Determines whether or not this module is executed and if its data displayed onscreen.
+
Values:
+ true,
+ false.
+ position
+
Defines where in the grid this module’s widget will be displayed.
+
+
+ updateInterval
+
How often, in seconds, this module will update its data.
+
Values: A positive integer
+
Default Value: 10
+ colors
+
Sets color of texts.
+
Values: A valid color
+
+
+
+
-
Modules: Google Calendar
+Google Calendar
@@ -113,15 +123,14 @@
Modules: Git | WTF - A Terminal Dashboard
-
+Git | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
Not: Setting up access to Google Calendars for Go is a bit unobvious. Check out Google’s Go Quickstart +first and if you have problems, then take a look at this comment by WesleydeSouza which offers a slightly different approach.
+Source Code
wtf/gcal/Required ENV Variables
-Key: WTF_GOOGLE_CAL_CLIENT_ID
-Value: Your Google API client ID.
Key: WTF_GOOGLE_CAL_CLIENT_SECRET
-Value: Your Google API client secret.
None.
Keyboard Commands
diff --git a/docs/posts/modules/git/index.html b/docs/posts/modules/git/index.html index 7319d48d..93606c79 100644 --- a/docs/posts/modules/git/index.html +++ b/docs/posts/modules/git/index.html @@ -10,8 +10,8 @@ -
-
Modules: Git
+Git
diff --git a/docs/posts/modules/github/index.html b/docs/posts/modules/github/index.html
index 2a08ac16..c3c90345 100644
--- a/docs/posts/modules/github/index.html
+++ b/docs/posts/modules/github/index.html
@@ -10,8 +10,8 @@
-Modules: Github | WTF - A Terminal Dashboard
-
+GitHub | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
-
Modules: Github
+GitHub
@@ -109,10 +119,7 @@
-
Gitlab | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Google Spreadsheets | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Google Spreadsheets | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Displays information about git repositories hosted on Github: open -review requests, and open pull requests.
- -
Displays information about your git repositories hosted on Github:
Open Review Requests
@@ -122,6 +129,8 @@ review requests, and open pull requests.All open pull requests created by you.
+
Source Code
wtf/github/Required ENV Variables
diff --git a/docs/posts/modules/gitlab/index.html b/docs/posts/modules/gitlab/index.html new file mode 100644 index 00000000..5da8c1ef --- /dev/null +++ b/docs/posts/modules/gitlab/index.html @@ -0,0 +1,210 @@ + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/gspreadsheet/index.html b/docs/posts/modules/gspreadsheet/index.html
new file mode 100644
index 00000000..17e5e82c
--- /dev/null
+++ b/docs/posts/modules/gspreadsheet/index.html
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Gitlab
+ +
+
+
+
+ Jun 08, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.8.
Displays information about your projects hosted on Gitlab:
+ +Open Approval Requests
+ +All open merge requests that are requesting your approval.
+ +Open Merge Requests
+ +All open merge requests created by you.
+ +Source Code
+wtf/gitlab/Required ENV Variables
+ +Key: WTF_GITLAB_TOKEN
+Action: A Gitlab personal access token. Requires at least api access.
Keyboard Commands
+ +Key: /
+Action: Open/close the widget’s help window.
Key: h
+Action: Show the previous project.
Key: l
+Action: Show the next project.
Key: ←
+Action: Show the previous project.
Key: →
+Action: Show the next project.
Configuration
+gitlab:
+ enabled: true
+ position:
+ top: 2
+ left: 3
+ height: 2
+ width: 2
+ refreshInterval: 300
+ projects:
+ tasks: "gitlab-org/release"
+ gitlab-ce: "gitlab-org"
+ username: "senorprogrammer"Attributes
+ +enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
domain
+Optional. Your Gitlab corporate domain.
+Values: A valid URI.
projects
+A list of key/value pairs each describing a Gitlab project to fetch data
+for.
+Key: The name of the project.
+Value: The namespace of the project.
username
+Your Gitlab username. Used to figure out which requests require your approval
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/gspreadsheets/index.html b/docs/posts/modules/gspreadsheets/index.html
new file mode 100644
index 00000000..16f16696
--- /dev/null
+++ b/docs/posts/modules/gspreadsheets/index.html
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Google Spreadsheets
+ +
+
+
+
+ Jun 10, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.7.
Display information from cells in a Google Spreadsheet.
+wtf/gspreadsheets/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+gspreadsheets:
+ colors:
+ values: "green"
+ cells:
+ names:
+ - "Cell 1 name"
+ - "Cell 2 name"
+ addresses:
+ - "A1"
+ - "A2"
+ enabled: true
+ position:
+ top: 0
+ left: 0
+ width: 1
+ height: 1
+ refreshInterval: "300"
+ secretFile: "~/.wtf/gspreadsheets/client_secret.json"
+ sheetId: "id_of_google_spreadsheet"Attributes
+ +colors.values
+The color to display the cell values in.
+Values: Any X11 color name.
cells.names
cells.addresses
enabled
+Whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
secretFile
+Your Google client secret JSON file.
+Values: A string representing a file path to the JSON secret file.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/index.html b/docs/posts/modules/index.html
index 8af39b98..da012a25 100644
--- a/docs/posts/modules/index.html
+++ b/docs/posts/modules/index.html
@@ -64,15 +64,25 @@
+
+
+
+
+ Google Spreadsheets
+ +
+
+
+
+ Jun 10, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.7.
Display information
+wtf/gspreadsheets/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+gspreadsheets:
+ colors:
+ values: "green"
+ cells:
+ names:
+ - "Cell 1 name"
+ - "Cell 2 name"
+ addresses:
+ - "A1"
+ - "A2"
+ enabled: true
+ position:
+ top: 0
+ left: 0
+ width: 1
+ height: 1
+ refreshInterval: "300"
+ secretFile: "~/.wtf/gspreadsheets/client_secret.json"
+ sheetId: "id_of_google_spreadsheet"Attributes
+ +colors.values
+The color to display the cell values in.
+Values: Any X11 color name.
cells.names
cells.addresses
enabled
+Whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
secretFile
+Your Google client secret JSON file.
+Values: A string representing a file path to the JSON secret file.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/ipinfo/index.html b/docs/posts/modules/ipinfo/index.html
new file mode 100644
index 00000000..ccb0f4e5
--- /dev/null
+++ b/docs/posts/modules/ipinfo/index.html
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IP-API
+ +
+
+
+
+ Jun 10, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.7.
Displays your current IP address information, from IP-APIcom.
+ +Note: IP-API.com has a free-plan rate limit of 120 requests per +minute.
+ +Source Code
+wtf/ipapi/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+ipinfo:
+ colors:
+ name: red
+ value: white
+ enabled: true
+ position:
+ top: 1
+ left: 2
+ height: 1
+ width: 1
+ refreshInterval: 150Attributes
+ +colors.name
+The default colour for the row names.
+Values: Any X11 color name.
colors.value
+The default colour for the row values.
+Values: Any X11 color name.
enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/jenkins/index.html b/docs/posts/modules/jenkins/index.html
new file mode 100644
index 00000000..561b0108
--- /dev/null
+++ b/docs/posts/modules/jenkins/index.html
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ IPInfo
+ +
+
+
+
+ Jun 01, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Displays your current IP address information, from ipinfo.io.
+ +Note: IPInfo.io has a free-plan rate limit of 1000 requests per day.
+ +
Source Code
+wtf/ipinfo/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+ipinfo:
+ colors:
+ name: red
+ value: white
+ enabled: true
+ position:
+ top: 1
+ left: 2
+ height: 1
+ width: 1
+ refreshInterval: 150Attributes
+ +colors.name
+The default colour for the row names.
+Values: Any X11 color name.
colors.value
+The default colour for the row values.
+Values: Any X11 color name.
enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/jira/index.html b/docs/posts/modules/jira/index.html
index e5d77f88..f101522c 100644
--- a/docs/posts/modules/jira/index.html
+++ b/docs/posts/modules/jira/index.html
@@ -10,8 +10,8 @@
-
+
+
+
+
+ Modules: Jenkins
+ +
+
+
+
+ Jun 09, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Added in v0.0.8.
Displays jenkins status of given builds in a project or view
+ +
Source Code
+wtf/jenkins/Required ENV Variables
+ +Key: WTF_JENKINS_API_KEY
+Value: Your Jenkins API key.
Keyboard Commands
+ +None.
+ +Configuration
+jenkins:
+ enabled: true
+ position:
+ top: 2
+ left: 3
+ height: 2
+ width: 3
+ refreshInterval: 300
+ url: "https://jenkins.domain.com/jenkins/view_url"
+ user: "username"Attributes
+ +enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
user
+Your Jenkins username.
url
+The url to your Jenkins project or view.
+Values: A valid URI.
+
+
+
+
+
-
Modules: Jira
+Jira
@@ -125,6 +135,8 @@
+
Values:Modules: New Relic | WTF - A Terminal Dashboard
-
+New Relic | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
None.
Configuration
+ +Single Jira Project
jira:
colors:
rows:
@@ -133,12 +145,34 @@
domain: "https://umbrellacorp.atlassian.net"
email: "chriscummer@me.com"
enabled: true
+ jql: "issueType = Story"
position:
top: 4
left: 1
height: 1
width: 2
- project: "JIRA"
+ project: "ProjectA"
+ refreshInterval: 900
+ username: "chris.cummer"Multiple Jira Projects
+ +If you want to monitor multiple Jira projects, use the following
+configuration (note the difference in project):
jira:
+ colors:
+ rows:
+ even: "lightblue"
+ odd: "white"
+ domain: "https://umbrellacorp.atlassian.net"
+ email: "chriscummer@me.com"
+ enabled: true
+ jql: "issueType = Story"
+ position:
+ top: 4
+ left: 1
+ height: 1
+ width: 2
+ project: ["ProjectA", "ProjectB"]
refreshInterval: 900
username: "chris.cummer"Attributes
@@ -165,6 +199,11 @@ Values: A valid email address string. Determines whether or not this module is executed and if its data displayed onscreen.Values:
true, false.
+jql
+Optional
+Custom JQL to be appended to the search query.
+Values: See Search Jira like a boss with JQL for details.
position
Defines where in the grid this module’s widget will be displayed.
-
Modules: New Relic
+New Relic
diff --git a/docs/posts/modules/opsgenie/index.html b/docs/posts/modules/opsgenie/index.html
index 0ff2b35f..955d28ea 100644
--- a/docs/posts/modules/opsgenie/index.html
+++ b/docs/posts/modules/opsgenie/index.html
@@ -10,8 +10,8 @@
-Modules: OpsGenie | WTF - A Terminal Dashboard
-
+OpsGenie | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
-
Modules: OpsGenie
+OpsGenie
diff --git a/docs/posts/modules/power/index.html b/docs/posts/modules/power/index.html
index 48f7ad21..4cb003c3 100644
--- a/docs/posts/modules/power/index.html
+++ b/docs/posts/modules/power/index.html
@@ -10,8 +10,8 @@
-Modules: Power | WTF - A Terminal Dashboard
-
+Power | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
-
Modules: Power
+Power
diff --git a/docs/posts/modules/prettyweather/index.html b/docs/posts/modules/prettyweather/index.html
new file mode 100644
index 00000000..91b1abe3
--- /dev/null
+++ b/docs/posts/modules/prettyweather/index.html
@@ -0,0 +1,187 @@
+
+
+
+
+
+
+
+
+
+
+
+
+Pretty Weather | WTF - A Terminal Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Modules: Security | WTF - A Terminal Dashboard
-
+Security | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ Content
+ +-
+
-
+
+ © 2018 Chris Cummer.
+
+ Some Rights Reserved.
+
+
+
+
+
+
+
diff --git a/docs/posts/modules/security/index.html b/docs/posts/modules/security/index.html
index e4e37b6d..21b12d9b 100644
--- a/docs/posts/modules/security/index.html
+++ b/docs/posts/modules/security/index.html
@@ -10,8 +10,8 @@
-
+
+
+
+
+ Pretty Weather
+ +
+
+
+
+ Jun 02, 2018
+
+
+
+
+
+ + +
+
+
+
++ + +
Displays weather information as ASCII art from +Wttr.in.
+ +
Source Code
+wtf/prettyweather/Required ENV Variables
+ +None.
+ +Keyboard Commands
+ +None.
+ +Configuration
+ prettyweather:
+ enabled: true
+ city: "tehran"
+ position:
+ top: 3
+ left: 5
+ height: 1
+ width: 1
+ refreshInterval: 300
+ unit: "c"
+ view: 0Attributes
+ +city
+Optional. It will grab the current location from your IP address if
+omitted.
+Values: The name of any city supported by Wttr.in.
enabled
+Determines whether or not this module is executed and if its data displayed onscreen.
+Values: true, false.
position
+Defines where in the grid this module’s widget will be displayed.
refreshInterval
+How often, in seconds, this module will update its data.
+Values: A positive integer, 0..n.
unit
+Optional. It will use metric if you are out of US and imperial for US.
+The temperature scale in which to display temperature values.
+Values: F for Fahrenheit, C for Celcius.
view
+Optional Wttr.in view configuration.
+Values: See curl wttr.in/:help for more details.
+
+
+
+
+
-
Modules: Security
+Security
diff --git a/docs/posts/modules/textfile/index.html b/docs/posts/modules/textfile/index.html
index 56ad9029..d73fb57d 100644
--- a/docs/posts/modules/textfile/index.html
+++ b/docs/posts/modules/textfile/index.html
@@ -10,8 +10,8 @@
-Modules: Textfile | WTF - A Terminal Dashboard
-
+Textfile | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
-
Modules: Textfile
+Textfile
diff --git a/docs/posts/modules/todo/index.html b/docs/posts/modules/todo/index.html
index fd232a5f..20501206 100644
--- a/docs/posts/modules/todo/index.html
+++ b/docs/posts/modules/todo/index.html
@@ -10,8 +10,8 @@
-Modules: Todo | WTF - A Terminal Dashboard
-
+Todo | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
-
Modules: Todo
+Todo
diff --git a/docs/posts/modules/weather/index.html b/docs/posts/modules/weather/index.html
index 23baeee9..213ec3cf 100644
--- a/docs/posts/modules/weather/index.html
+++ b/docs/posts/modules/weather/index.html
@@ -10,8 +10,8 @@
-Modules: Weather | WTF - A Terminal Dashboard
-
+Weather | WTF - A Terminal Dashboard
+
@@ -64,15 +64,25 @@
-
Modules: Weather
+Weather
diff --git a/docs/posts/overview/index.html b/docs/posts/overview/index.html
index 2e7fb36c..bac121e8 100644
--- a/docs/posts/overview/index.html
+++ b/docs/posts/overview/index.html
@@ -64,15 +64,25 @@