Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
rhnvrm committed Jul 20, 2018
2 parents e8f7266 + 9e06c2b commit c44a077
Show file tree
Hide file tree
Showing 180 changed files with 4,356 additions and 996 deletions.
28 changes: 28 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,34 @@
"name": "Jagdeep Singh",
"avatar_url": "https://avatars3.githubusercontent.com/u/3717137?v=4",
"profile": "https://jagdeep.me",
"contributions": []
},
{
"login": "darkSasori",
"name": "Lineu Felipe",
"avatar_url": "https://avatars0.githubusercontent.com/u/889171?v=4",
"profile": "https://github.com/darkSasori",
"contributions": []
},
{
"login": "kvj",
"name": "Konstantin",
"avatar_url": "https://avatars2.githubusercontent.com/u/159124?v=4",
"profile": "https://github.com/kvj",
"contributions": []
},
{
"login": "brendano86",
"name": "Brendan O'Leary",
"avatar_url": "https://avatars2.githubusercontent.com/u/6044920?v=4",
"profile": "http://www.brendanoleary.com",
"contributions": []
},
{
"login": "bertl4398",
"name": "bertl4398",
"avatar_url": "https://avatars2.githubusercontent.com/u/1226441?v=4",
"profile": "https://github.com/bertl4398",
"contributions": [
]
}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
.DS_Store
gcal/client_secret.json
gspreadsheets/client_secret.json
profile.pdf

#intellij idea
.idea/

Expand Down
30 changes: 21 additions & 9 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

[[constraint]]
name = "github.com/gdamore/tcell"
version = "1.0.0"
branch = "master"

[[constraint]]
name = "github.com/go-test/deep"
version = "1.0.1"
#[[constraint]]
#name = "github.com/go-test/deep"
#version = "1.0.1"

[[constraint]]
name = "github.com/google/go-github"
Expand All @@ -54,36 +54,40 @@
version = "1.4.0"

[[constraint]]
branch = "master"
name = "github.com/olebedev/config"
branch = "master"

[[constraint]]
name = "github.com/radovskyb/watcher"
version = "1.0.2"

[[constraint]]
branch = "master"
name = "github.com/rivo/tview"
branch = "master"

[[constraint]]
branch = "master"
name = "github.com/yfronto/newrelic"
branch = "master"

[[constraint]]
branch = "master"
name = "golang.org/x/oauth2"
branch = "master"

[[constraint]]
branch = "master"
name = "google.golang.org/api"
branch = "master"

[[constraint]]
name = "gopkg.in/yaml.v2"
version = "2.2.1"

[[constraint]]
branch = "master"
name = "github.com/adlio/trello"
branch = "master"

[[constraint]]
name = "github.com/darkSasori/todoist"
branch = "master"

[prune]
go-tests = true
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: contrib_check dependencies install run
.PHONY: contrib_check dependencies install run size

build:
go build -o bin/wtf
Expand All @@ -8,8 +8,11 @@ contrib_check:

install:
go clean
go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6) -X main.date=$(shell date +%FT%T%z)"
go install -ldflags="-s -w -X main.version=$(shell git describe --always --abbrev=6) -X main.date=$(shell date +%FT%T%z)"
which wtf

run: build
bin/wtf

size:
loc --exclude vendor/ _sample_configs/ _site/ docs/ Makefile *.md *.toml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Thanks goes to these wonderful people:
| [<img src="https://avatars2.githubusercontent.com/u/9014288?v=4" width="48px;"/><br /><sub><b>baustinanki</b></sub>](https://github.com/baustinanki)<br /> | [<img src="https://avatars0.githubusercontent.com/u/371475?v=4" width="48px;"/><br /><sub><b>lucus lee</b></sub>](https://github.com/lixin9311)<br /> | [<img src="https://avatars1.githubusercontent.com/u/7537841?v=4" width="48px;"/><br /><sub><b>Mike Lloyd</b></sub>](https://github.com/mxplusb)<br /> | [<img src="https://avatars3.githubusercontent.com/u/10998?v=4" width="48px;"/><br /><sub><b>Sergio Rubio</b></sub>](http://rubiojr.rbel.co)<br /> | [<img src="https://avatars3.githubusercontent.com/u/17374492?v=4" width="48px;"/><br /><sub><b>Farhad Farahi</b></sub>](https://github.com/FarhadF)<br /> | [<img src="https://avatars1.githubusercontent.com/u/634604?v=4" width="48px;"/><br /><sub><b>Lasantha Kularatne</b></sub>](http://lasantha.blogspot.com/)<br /> | [<img src="https://avatars1.githubusercontent.com/u/823331?v=4" width="48px;"/><br /><sub><b>Mark Old</b></sub>](https://github.com/dlom)<br /> |
| [<img src="https://avatars0.githubusercontent.com/u/5546718?v=4" width="48px;"/><br /><sub><b>flw</b></sub>](http://flw.tools/)<br /> | [<img src="https://avatars0.githubusercontent.com/u/6024927?v=4" width="48px;"/><br /><sub><b>David Barda</b></sub>](https://github.com/davebarda)<br /> | [<img src="https://avatars2.githubusercontent.com/u/4261980?v=4" width="48px;"/><br /><sub><b>Geoff Lee</b></sub>](https://github.com/matrinox)<br /> | [<img src="https://avatars3.githubusercontent.com/u/1022918?v=4" width="48px;"/><br /><sub><b>George Opritescu</b></sub>](http://international.github.io)<br /> | [<img src="https://avatars3.githubusercontent.com/u/497310?v=4" width="48px;"/><br /><sub><b>Grazfather</b></sub>](https://twitter.com/Grazfather)<br /> | [<img src="https://avatars2.githubusercontent.com/u/1691120?v=4" width="48px;"/><br /><sub><b>Michael Cordell</b></sub>](http://www.mikecordell.com/)<br /> | [<img src="https://avatars2.githubusercontent.com/u/1215497?v=4" width="48px;"/><br /><sub><b>Patrick José Pereira</b></sub>](http://patrick.ibexcps.com)<br /> |
| [<img src="https://avatars2.githubusercontent.com/u/1483092?v=4" width="48px;"/><br /><sub><b>sherod taylor</b></sub>](https://github.com/sherodtaylor)<br /> | [<img src="https://avatars2.githubusercontent.com/u/3062663?v=4" width="48px;"/><br /><sub><b>Andrew Scott</b></sub>](http://cogentia.io)<br /> | [<img src="https://avatars2.githubusercontent.com/u/3252403?v=4" width="48px;"/><br /><sub><b>Anand Sudhir Prayaga</b></sub>](https://github.com/anandsudhir)<br /> | [<img src="https://avatars1.githubusercontent.com/u/12018440?v=4" width="48px;"/><br /><sub><b>Lassi Piironen</b></sub>](https://github.com/lsipii)<br /> | [<img src="https://avatars0.githubusercontent.com/u/14799210?v=4" width="48px;"/><br /><sub><b>BlackWebWolf</b></sub>](https://github.com/BlackWebWolf)<br /> | [<img src="https://avatars0.githubusercontent.com/u/1894885?v=4" width="48px;"/><br /><sub><b>andrewzolotukhin</b></sub>](https://github.com/andrewzolotukhin)<br /> | [<img src="https://avatars1.githubusercontent.com/u/8568280?v=4" width="48px;"/><br /><sub><b>Leon Stigter</b></sub>](https://retgits.github.io)<br /> |
| [<img src="https://avatars3.githubusercontent.com/u/21756?v=4" width="48px;"/><br /><sub><b>Amr Tamimi</b></sub>](https://tamimi.se)<br /> | [<img src="https://avatars3.githubusercontent.com/u/3717137?v=4" width="48px;"/><br /><sub><b>Jagdeep Singh</b></sub>](https://jagdeep.me)<br /> |
| [<img src="https://avatars3.githubusercontent.com/u/21756?v=4" width="48px;"/><br /><sub><b>Amr Tamimi</b></sub>](https://tamimi.se)<br /> | [<img src="https://avatars3.githubusercontent.com/u/3717137?v=4" width="48px;"/><br /><sub><b>Jagdeep Singh</b></sub>](https://jagdeep.me)<br /> | [<img src="https://avatars0.githubusercontent.com/u/889171?v=4" width="48px;"/><br /><sub><b>Lineu Felipe</b></sub>](https://github.com/darkSasori)<br /> | [<img src="https://avatars2.githubusercontent.com/u/159124?v=4" width="48px;"/><br /><sub><b>Konstantin</b></sub>](https://github.com/kvj)<br /> | [<img src="https://avatars2.githubusercontent.com/u/6044920?v=4" width="48px;"/><br /><sub><b>Brendan O'Leary</b></sub>](http://www.brendanoleary.com)<br /> | [<img src="https://avatars2.githubusercontent.com/u/1226441?v=4" width="48px;"/><br /><sub><b>bertl4398</b></sub>](https://github.com/bertl4398)<br /> |
<!-- ALL-CONTRIBUTORS-LIST:END -->

This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
Expand Down
2 changes: 2 additions & 0 deletions _sample_configs/complex_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,12 @@ wtf:
width: 1
refreshInterval: 3600
weather:
apiKey: [YOUR API KEY]
# From http://openweathermap.org/help/city_list.txt
cityids:
- 3370352
- 1283240
WTF_OWM_API_KEY: [YOUR API KEY]
colors:
current: "lightblue"
enabled: true
Expand Down
4 changes: 3 additions & 1 deletion _site/content/posts/modules/gerrit.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ gerrit:
height: 2
width: 2
refreshInterval: 300
domain: https://gerrit-review.googlesource.com
projects:
- org/test-project"
- dotfiles
username: "myname"
verifyServerCertificate: false
```
### Attributes
Expand All @@ -75,7 +77,7 @@ How often, in seconds, this module will update its data. <br />
Values: A positive integer, `0..n`.

`domain` <br />
_Optional_. Your Gerrit corporate domain. <br />
Your Gerrit corporate domain. <br />
Values: A valid URI.

`projects` <br />
Expand Down
6 changes: 6 additions & 0 deletions _site/content/posts/modules/github.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ wtf/github/
```yaml
github:
enabled: true
enableStatus: true
position:
top: 2
left: 3
Expand All @@ -79,6 +80,11 @@ github:
Determines whether or not this module is executed and if its data displayed onscreen. <br />
Values: `true`, `false`.

`enableStatus` <br />
Display pull request mergeability status ('dirty', 'clean', 'unstable',
'blocked').<br />
Values: `true`, `false`.

`position` <br />
Defines where in the grid this module's widget will be displayed. <br />

Expand Down
12 changes: 6 additions & 6 deletions _site/content/posts/modules/gitlab.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Gitlab"
title: "GitLab"
date: 2018-06-08T13:14:11-07:00
draft: false
---
Expand All @@ -8,7 +8,7 @@ Added in `v0.0.8`.

<img src="/imgs/modules/gitlab.png" width="640" height="384" alt="gitlab screenshot" />

Displays information about your projects hosted on Gitlab:
Displays information about your projects hosted on GitLab:

#### Open Approval Requests

Expand All @@ -27,7 +27,7 @@ wtf/gitlab/
## Required ENV Variables

<span class="caption">Key:</span> `WTF_GITLAB_TOKEN` <br />
<span class="caption">Action:</span> A <a href="https://docs.gitlab.com/ce/user/profile/personal_access_tokens.html">Gitlab personal access token</a>. Requires at least `api` access.
<span class="caption">Action:</span> A <a href="https://docs.gitlab.com/ce/user/profile/personal_access_tokens.html">GitLab personal access token</a>. Requires at least `api` access.

## Keyboard Commands

Expand Down Expand Up @@ -77,14 +77,14 @@ How often, in seconds, this module will update its data. <br />
Values: A positive integer, `0..n`.

`domain` <br />
_Optional_. Your Gitlab corporate domain. <br />
_Optional_. Your GitLab corporate domain. <br />
Values: A valid URI.

`projects` <br />
A list of key/value pairs each describing a Gitlab project to fetch data
A list of key/value pairs each describing a GitLab project to fetch data
for. <br />
<span class="caption">Key:</span> The name of the project. <br />
<span class="caption">Value:</span> The namespace of the project.

`username` <br />
Your Gitlab username. Used to figure out which requests require your approval
Your GitLab username. Used to figure out which requests require your approval
5 changes: 5 additions & 0 deletions _site/content/posts/modules/jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jenkins:
refreshInterval: 300
url: "https://jenkins.domain.com/jenkins/view_url"
user: "username"
verifyServerCertificate: true
```
### Attributes
Expand All @@ -61,3 +62,7 @@ Your Jenkins username. <br />
The url to your Jenkins project or view. <br />
Values: A valid URI.

`verifyServerCertificate` <br />
_Optional_ <br />
Determines whether or not the server's certificate chain and host name are verified. <br />
Values: `true`, `false`.
15 changes: 14 additions & 1 deletion _site/content/posts/modules/jira.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,20 @@ wtf/jira/

## Keyboard Commands

None.
<span class="caption">Key:</span> `[return]` <br />
<span class="caption">Action:</span> Open the selected issue in the browser.

<span class="caption">Key:</span> `j` <br />
<span class="caption">Action:</span> Select the next item in the list.

<span class="caption">Key:</span> `k` <br />
<span class="caption">Action:</span> Select the previous item in the list.

<span class="caption">Key:</span> `` <br />
<span class="caption">Action:</span> Select the next item in the list.

<span class="caption">Key:</span> `` <br />
<span class="caption">Action:</span> Select the previous item in the list.

## Configuration

Expand Down
Loading

0 comments on commit c44a077

Please sign in to comment.