From 9b70236bbbc3545d7499c84be1b57a280708036a Mon Sep 17 00:00:00 2001 From: Sherod Taylor Date: Thu, 31 May 2018 18:46:52 +0100 Subject: [PATCH 01/19] add optional more advanced jql queries and working usernames --- jira/client.go | 28 ++++++++++++++++++++++++++-- jira/widget.go | 2 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/jira/client.go b/jira/client.go index 0e140694..b7903018 100644 --- a/jira/client.go +++ b/jira/client.go @@ -7,11 +7,31 @@ 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, project string, jql string) (*SearchResult, error) { + query := []string{} + + if project != "" { + query = append(query, buildJql("project", project)) + } + + 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 +44,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) { diff --git a/jira/widget.go b/jira/widget.go index 4c69e2da..ed3c11c3 100644 --- a/jira/widget.go +++ b/jira/widget.go @@ -29,7 +29,7 @@ func (widget *Widget) Refresh() { return } - searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username")) + searchResult, err := IssuesFor(Config.UString("wtf.mods.jira.username"), Config.UString("wtf.mods.jira.project", ""), Config.UString("wtf.mods.jira.jql", "")) widget.UpdateRefreshedAt() widget.View.Clear() From bc70c13ca45505d016d12b0ad0a8b3e450107c35 Mon Sep 17 00:00:00 2001 From: Lasantha Kularatne Date: Thu, 31 May 2018 13:35:47 -0500 Subject: [PATCH 02/19] NewRelic Module - Fixing out of bound error --- newrelic/widget.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/newrelic/widget.go b/newrelic/widget.go index 70466174..c4076af9 100644 --- a/newrelic/widget.go +++ b/newrelic/widget.go @@ -68,9 +68,14 @@ func (widget *Widget) contentFrom(deploys []nr.ApplicationDeployment) string { lineColor = "lightblue" } + var revLen = 8 + if revLen > len(deploy.Revision) { + revLen = len(deploy.Revision) + } + str = str + fmt.Sprintf( " [green]%s[%s] %s %-.16s[white]\n", - deploy.Revision[0:8], + deploy.Revision[0:revLen], lineColor, deploy.Timestamp.Format("Jan 02, 15:04 MST"), wtf.NameFromEmail(deploy.User), From 5d349523983f8e055635c7f9b755e845cf523a17 Mon Sep 17 00:00:00 2001 From: James Sapara Date: Thu, 31 May 2018 12:29:32 -0700 Subject: [PATCH 03/19] linux/ubuntu wraps for security --- Makefile | 2 +- security/dns.go | 43 ++++++++++++++++++++++++++++++----- security/firewall.go | 36 ++++++++++++++++++++++++++++-- security/security_data.go | 17 +++++--------- security/users.go | 40 +++++++++++++++++++++++++++++++-- security/wifi.go | 47 +++++++++++++++++++++++++++++++++++++-- 6 files changed, 161 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 60ef00cf..0828bf38 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ dependencies: go get -v ./... install: - which wtf | xargs rm + which wtf | xargs rm || true go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6)_$(BRANCH) -X main.date=$(shell date +%FT%T%z)" which wtf diff --git a/security/dns.go b/security/dns.go index c57a202b..93eadf43 100644 --- a/security/dns.go +++ b/security/dns.go @@ -2,13 +2,46 @@ package security import ( "os/exec" + "runtime" + "strings" "github.com/senorprogrammer/wtf/wtf" ) -const dnsCmd = "networksetup" - -func DnsServers() string { - cmd := exec.Command(dnsCmd, "-getdnsservers", "Wi-Fi") - return wtf.ExecuteCommand(cmd) +func dnsLinux() []string { + // This may be very Ubuntu specific + cmd := exec.Command("nmcli", "device", "show") + out := wtf.ExecuteCommand(cmd) + lines := strings.Split(out, "\n") + dns := []string{} + for _, l := range lines { + if strings.HasPrefix(l, "IP4.DNS") { + parts := strings.Split(l, ":") + dns = append(dns, strings.TrimSpace(parts[1])) + } + } + return dns +} + +func dnsMacOS() []string { + cmd := exec.Command("networksetup", "-getdnsservers", "Wi-Fi") + out := wtf.ExecuteCommand(cmd) + records := strings.Split(out, "\n") + + if len(records) > 0 { + return records + } else { + return []string{} + } +} + +func DnsServers() []string { + switch runtime.GOOS { + case "linux": + return dnsLinux() + case "macos": + return dnsMacOS() + default: + return []string{runtime.GOOS} + } } diff --git a/security/firewall.go b/security/firewall.go index 5d5cb95a..5a7f4c75 100644 --- a/security/firewall.go +++ b/security/firewall.go @@ -2,6 +2,7 @@ package security import ( "os/exec" + "runtime" "strings" "github.com/senorprogrammer/wtf/wtf" @@ -11,20 +12,51 @@ const osxFirewallCmd = "/usr/libexec/ApplicationFirewall/socketfilterfw" /* -------------------- Exported Functions -------------------- */ -func FirewallState() string { +func firewallStateLinux() string { + return "[red]NA[white]" +} + +func firewallStateMacOS() string { cmd := exec.Command(osxFirewallCmd, "--getglobalstate") str := wtf.ExecuteCommand(cmd) return status(str) } -func FirewallStealthState() string { +func FirewallState() string { + switch runtime.GOOS { + case "linux": + return firewallStateLinux() + case "macos": + return firewallStateMacOS() + default: + return "" + } +} + +func firewallStealthStateLinux() string { + return "[red]NA[white]" +} + +func firewallStealthStateMacOS() string { cmd := exec.Command(osxFirewallCmd, "--getstealthmode") str := wtf.ExecuteCommand(cmd) return status(str) } +func FirewallStealthState() string { + q + switch runtime.GOOS { + case "linux": + return firewallStealthStateLinux() + case "macos": + return firewallStealthStateMacOS() + default: + return "" + } +} + /* -------------------- Unexported Functions -------------------- */ func status(str string) string { diff --git a/security/security_data.go b/security/security_data.go index 1959b8f2..3a339340 100644 --- a/security/security_data.go +++ b/security/security_data.go @@ -1,11 +1,7 @@ package security -import ( - "strings" -) - type SecurityData struct { - Dns string + Dns []string FirewallEnabled string FirewallStealth string LoggedInUsers []string @@ -17,14 +13,11 @@ func NewSecurityData() *SecurityData { return &SecurityData{} } -func (data *SecurityData) DnsAt(idx int) string { - records := strings.Split(data.Dns, "\n") - - if len(records) > 0 && len(records) > idx { - return records[idx] - } else { - return "" +func (data SecurityData) DnsAt(idx int) string { + if len(data.Dns) > idx { + return data.Dns[idx] } + return "" } func (data *SecurityData) Fetch() { diff --git a/security/users.go b/security/users.go index 47e9f4c1..82479950 100644 --- a/security/users.go +++ b/security/users.go @@ -2,20 +2,56 @@ package security import ( "os/exec" + "runtime" "strings" "github.com/senorprogrammer/wtf/wtf" ) -// http://applehelpwriter.com/2017/05/21/how-to-reveal-hidden-users/ +func loggedInUsersLinux() []string { + cmd := exec.Command("who", "-us") + users := wtf.ExecuteCommand(cmd) -func LoggedInUsers() []string { + cleaned := []string{} + for _, u := range strings.Split(users, "\n") { + clean := true + col := strings.Split(u, " ") + if len(col) > 0 { + for _, cleanedU := range cleaned { + if strings.Compare(cleanedU, col[0]) == 0 { + clean = false + } + } + if clean { + cleaned = append(cleaned, col[0]) + } + } + + } + + return cleaned +} + +func loggedInUsersMacOs() []string { cmd := exec.Command("dscl", []string{".", "-list", "/Users"}...) users := wtf.ExecuteCommand(cmd) return cleanUsers(strings.Split(users, "\n")) } +// http://applehelpwriter.com/2017/05/21/how-to-reveal-hidden-users/ + +func LoggedInUsers() []string { + switch runtime.GOOS { + case "linux": + return loggedInUsersLinux() + case "macos": + return loggedInUsersMacOs() + default: + return []string{} + } +} + func cleanUsers(users []string) []string { rejects := []string{"_", "root", "nobody", "daemon", "Guest"} cleaned := []string{} diff --git a/security/wifi.go b/security/wifi.go index d84b808d..335a44f8 100644 --- a/security/wifi.go +++ b/security/wifi.go @@ -2,6 +2,7 @@ package security import ( "os/exec" + "runtime" "github.com/senorprogrammer/wtf/wtf" ) @@ -12,16 +13,58 @@ const osxWifiArg = "-I" /* -------------------- Exported Functions -------------------- */ -func WifiEncryption() string { +func wifiEncryptionLinux() string { + cmd := exec.Command("nmcli", "-t", "-f", "active,security", "dev", "wifi") + out := wtf.ExecuteCommand(cmd) + name := wtf.FindMatch(`yes:(.+)`, out) + if len(name) > 0 { + return name[0][1] + } + return "" +} + +func wifkEncryptionMacOS() string { name := wtf.FindMatch(`s*auth: (.+)s*`, wifiInfo()) return matchStr(name) } -func WifiName() string { +func WifiEncryption() string { + switch runtime.GOOS { + case "linux": + return wifiEncryptionLinux() + case "macos": + return wifkEncryptionMacOS() + default: + return "" + } +} + +func wifiNameMacOS() string { name := wtf.FindMatch(`s*SSID: (.+)s*`, wifiInfo()) return matchStr(name) } +func wifiNameLinux() string { + cmd := exec.Command("nmcli", "-t", "-f", "active,ssid", "dev", "wifi") + out := wtf.ExecuteCommand(cmd) + name := wtf.FindMatch(`yes:(.+)`, out) + if len(name) > 0 { + return name[0][1] + } + return "" +} + +func WifiName() string { + switch runtime.GOOS { + case "linux": + return wifiNameLinux() + case "macos": + return wifiNameMacOS() + default: + return "" + } +} + /* -------------------- Unexported Functions -------------------- */ func wifiInfo() string { From 60837104ca2e6a2962561f3c897ff6558af38310 Mon Sep 17 00:00:00 2001 From: James Sapara Date: Thu, 31 May 2018 12:30:52 -0700 Subject: [PATCH 04/19] removed q mistype --- security/firewall.go | 1 - 1 file changed, 1 deletion(-) diff --git a/security/firewall.go b/security/firewall.go index 5a7f4c75..33e0bfc8 100644 --- a/security/firewall.go +++ b/security/firewall.go @@ -46,7 +46,6 @@ func firewallStealthStateMacOS() string { } func FirewallStealthState() string { - q switch runtime.GOOS { case "linux": return firewallStealthStateLinux() From 1a53c50da6d781501f7e40eb0e168c26b8683c3b Mon Sep 17 00:00:00 2001 From: James Sapara Date: Thu, 31 May 2018 12:40:00 -0700 Subject: [PATCH 05/19] golang platform is darwin not macos --- security/dns.go | 2 +- security/firewall.go | 4 ++-- security/users.go | 2 +- security/wifi.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/security/dns.go b/security/dns.go index 93eadf43..343ddd94 100644 --- a/security/dns.go +++ b/security/dns.go @@ -39,7 +39,7 @@ func DnsServers() []string { switch runtime.GOOS { case "linux": return dnsLinux() - case "macos": + case "darwin": return dnsMacOS() default: return []string{runtime.GOOS} diff --git a/security/firewall.go b/security/firewall.go index 33e0bfc8..507103cc 100644 --- a/security/firewall.go +++ b/security/firewall.go @@ -27,7 +27,7 @@ func FirewallState() string { switch runtime.GOOS { case "linux": return firewallStateLinux() - case "macos": + case "darwin": return firewallStateMacOS() default: return "" @@ -49,7 +49,7 @@ func FirewallStealthState() string { switch runtime.GOOS { case "linux": return firewallStealthStateLinux() - case "macos": + case "darwin": return firewallStealthStateMacOS() default: return "" diff --git a/security/users.go b/security/users.go index 82479950..75b3cc2c 100644 --- a/security/users.go +++ b/security/users.go @@ -45,7 +45,7 @@ func LoggedInUsers() []string { switch runtime.GOOS { case "linux": return loggedInUsersLinux() - case "macos": + case "darwin": return loggedInUsersMacOs() default: return []string{} diff --git a/security/wifi.go b/security/wifi.go index 335a44f8..47c31fae 100644 --- a/security/wifi.go +++ b/security/wifi.go @@ -32,7 +32,7 @@ func WifiEncryption() string { switch runtime.GOOS { case "linux": return wifiEncryptionLinux() - case "macos": + case "darwin": return wifkEncryptionMacOS() default: return "" @@ -58,7 +58,7 @@ func WifiName() string { switch runtime.GOOS { case "linux": return wifiNameLinux() - case "macos": + case "darwin": return wifiNameMacOS() default: return "" From ac5cd6a48f435fee662d58e2d5e11e50ffbe08e3 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 31 May 2018 13:57:33 -0700 Subject: [PATCH 06/19] Update readme with Go version warning --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e5a84f0..5148713e 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ displaying infrequently-needed, but very important, daily data. ### Installation from Source -*Note:* Requires `go v1.7` or later (because it uses the `context` -package). +*Note:* This has only been tested to build against Go 1.9.2. It won't +work with Go versions < 1.7, and only _may_ work on other versions. ```bash go get github.com/senorprogrammer/wtf From 1a6a25799ac3f36306c6ae268f1b5363dd6ee919 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 31 May 2018 17:45:47 -0700 Subject: [PATCH 07/19] Clean up the Linux security code a bit --- security/dns.go | 36 +++++++++++++--------- security/firewall.go | 44 +++++++++++++-------------- security/users.go | 71 ++++++++++++++++++++++++-------------------- security/widget.go | 6 ++-- security/wifi.go | 65 +++++++++++++++++++++------------------- 5 files changed, 120 insertions(+), 102 deletions(-) diff --git a/security/dns.go b/security/dns.go index 343ddd94..7360d801 100644 --- a/security/dns.go +++ b/security/dns.go @@ -8,12 +8,30 @@ import ( "github.com/senorprogrammer/wtf/wtf" ) +/* -------------------- Exported Functions -------------------- */ + +func DnsServers() []string { + switch runtime.GOOS { + case "linux": + return dnsLinux() + case "darwin": + return dnsMacOS() + default: + return []string{runtime.GOOS} + } +} + +/* -------------------- Unexported Functions -------------------- */ + func dnsLinux() []string { // This may be very Ubuntu specific cmd := exec.Command("nmcli", "device", "show") out := wtf.ExecuteCommand(cmd) + lines := strings.Split(out, "\n") + dns := []string{} + for _, l := range lines { if strings.HasPrefix(l, "IP4.DNS") { parts := strings.Split(l, ":") @@ -26,22 +44,12 @@ func dnsLinux() []string { func dnsMacOS() []string { cmd := exec.Command("networksetup", "-getdnsservers", "Wi-Fi") out := wtf.ExecuteCommand(cmd) - records := strings.Split(out, "\n") - if len(records) > 0 { - return records + lines := strings.Split(out, "\n") + + if len(lines) > 0 { + return lines } else { return []string{} } } - -func DnsServers() []string { - switch runtime.GOOS { - case "linux": - return dnsLinux() - case "darwin": - return dnsMacOS() - default: - return []string{runtime.GOOS} - } -} diff --git a/security/firewall.go b/security/firewall.go index 507103cc..5867e983 100644 --- a/security/firewall.go +++ b/security/firewall.go @@ -12,17 +12,6 @@ const osxFirewallCmd = "/usr/libexec/ApplicationFirewall/socketfilterfw" /* -------------------- Exported Functions -------------------- */ -func firewallStateLinux() string { - return "[red]NA[white]" -} - -func firewallStateMacOS() string { - cmd := exec.Command(osxFirewallCmd, "--getglobalstate") - str := wtf.ExecuteCommand(cmd) - - return status(str) -} - func FirewallState() string { switch runtime.GOOS { case "linux": @@ -34,17 +23,6 @@ func FirewallState() string { } } -func firewallStealthStateLinux() string { - return "[red]NA[white]" -} - -func firewallStealthStateMacOS() string { - cmd := exec.Command(osxFirewallCmd, "--getstealthmode") - str := wtf.ExecuteCommand(cmd) - - return status(str) -} - func FirewallStealthState() string { switch runtime.GOOS { case "linux": @@ -58,6 +36,28 @@ func FirewallStealthState() string { /* -------------------- Unexported Functions -------------------- */ +func firewallStateLinux() string { + return "[red]NA[white]" +} + +func firewallStateMacOS() string { + cmd := exec.Command(osxFirewallCmd, "--getglobalstate") + str := wtf.ExecuteCommand(cmd) + + return status(str) +} + +func firewallStealthStateLinux() string { + return "[red]NA[white]" +} + +func firewallStealthStateMacOS() string { + cmd := exec.Command(osxFirewallCmd, "--getstealthmode") + str := wtf.ExecuteCommand(cmd) + + return status(str) +} + func status(str string) string { icon := "[red]off[white]" diff --git a/security/users.go b/security/users.go index 75b3cc2c..9bcab534 100644 --- a/security/users.go +++ b/security/users.go @@ -1,5 +1,7 @@ package security +// http://applehelpwriter.com/2017/05/21/how-to-reveal-hidden-users/ + import ( "os/exec" "runtime" @@ -8,38 +10,7 @@ import ( "github.com/senorprogrammer/wtf/wtf" ) -func loggedInUsersLinux() []string { - cmd := exec.Command("who", "-us") - users := wtf.ExecuteCommand(cmd) - - cleaned := []string{} - for _, u := range strings.Split(users, "\n") { - clean := true - col := strings.Split(u, " ") - if len(col) > 0 { - for _, cleanedU := range cleaned { - if strings.Compare(cleanedU, col[0]) == 0 { - clean = false - } - } - if clean { - cleaned = append(cleaned, col[0]) - } - } - - } - - return cleaned -} - -func loggedInUsersMacOs() []string { - cmd := exec.Command("dscl", []string{".", "-list", "/Users"}...) - users := wtf.ExecuteCommand(cmd) - - return cleanUsers(strings.Split(users, "\n")) -} - -// http://applehelpwriter.com/2017/05/21/how-to-reveal-hidden-users/ +/* -------------------- Exported Functions -------------------- */ func LoggedInUsers() []string { switch runtime.GOOS { @@ -52,6 +23,8 @@ func LoggedInUsers() []string { } } +/* -------------------- Unexported Functions -------------------- */ + func cleanUsers(users []string) []string { rejects := []string{"_", "root", "nobody", "daemon", "Guest"} cleaned := []string{} @@ -73,3 +46,37 @@ func cleanUsers(users []string) []string { return cleaned } + +func loggedInUsersLinux() []string { + cmd := exec.Command("who", "-us") + users := wtf.ExecuteCommand(cmd) + + cleaned := []string{} + + for _, user := range strings.Split(users, "\n") { + clean := true + col := strings.Split(user, " ") + + if len(col) > 0 { + for _, cleanedU := range cleaned { + if strings.Compare(cleanedU, col[0]) == 0 { + clean = false + } + } + + if clean { + cleaned = append(cleaned, col[0]) + } + } + + } + + return cleaned +} + +func loggedInUsersMacOs() []string { + cmd := exec.Command("dscl", []string{".", "-list", "/Users"}...) + users := wtf.ExecuteCommand(cmd) + + return cleanUsers(strings.Split(users, "\n")) +} diff --git a/security/widget.go b/security/widget.go index 37653640..7ad2d5bb 100644 --- a/security/widget.go +++ b/security/widget.go @@ -46,9 +46,9 @@ func (widget *Widget) contentFrom(data *SecurityData) string { str = str + fmt.Sprintf(" %8s: %s\n", "Network", data.WifiName) str = str + fmt.Sprintf(" %8s: %s\n", "Crypto", data.WifiEncryption) str = str + "\n" - str = str + " [red]Firewall[white] [red]DNS[white]\n" - str = str + fmt.Sprintf(" %8s: %4s %12s\n", "Enabled", data.FirewallEnabled, data.DnsAt(0)) - str = str + fmt.Sprintf(" %8s: %4s %12s\n", "Stealth", data.FirewallStealth, data.DnsAt(1)) + str = str + " [red]Firewall[white] [red]DNS[white]\n" + str = str + fmt.Sprintf(" %8s: %4s %-16s\n", "Enabled", data.FirewallEnabled, data.DnsAt(0)) + str = str + fmt.Sprintf(" %8s: %4s %-16s\n", "Stealth", data.FirewallStealth, data.DnsAt(1)) str = str + "\n" str = str + " [red]Users[white]\n" str = str + fmt.Sprintf(" %s", strings.Join(data.LoggedInUsers, ", ")) diff --git a/security/wifi.go b/security/wifi.go index 47c31fae..30b75767 100644 --- a/security/wifi.go +++ b/security/wifi.go @@ -13,47 +13,17 @@ const osxWifiArg = "-I" /* -------------------- Exported Functions -------------------- */ -func wifiEncryptionLinux() string { - cmd := exec.Command("nmcli", "-t", "-f", "active,security", "dev", "wifi") - out := wtf.ExecuteCommand(cmd) - name := wtf.FindMatch(`yes:(.+)`, out) - if len(name) > 0 { - return name[0][1] - } - return "" -} - -func wifkEncryptionMacOS() string { - name := wtf.FindMatch(`s*auth: (.+)s*`, wifiInfo()) - return matchStr(name) -} - func WifiEncryption() string { switch runtime.GOOS { case "linux": return wifiEncryptionLinux() case "darwin": - return wifkEncryptionMacOS() + return wifiEncryptionMacOS() default: return "" } } -func wifiNameMacOS() string { - name := wtf.FindMatch(`s*SSID: (.+)s*`, wifiInfo()) - return matchStr(name) -} - -func wifiNameLinux() string { - cmd := exec.Command("nmcli", "-t", "-f", "active,ssid", "dev", "wifi") - out := wtf.ExecuteCommand(cmd) - name := wtf.FindMatch(`yes:(.+)`, out) - if len(name) > 0 { - return name[0][1] - } - return "" -} - func WifiName() string { switch runtime.GOOS { case "linux": @@ -67,11 +37,44 @@ func WifiName() string { /* -------------------- Unexported Functions -------------------- */ +func wifiEncryptionLinux() string { + cmd := exec.Command("nmcli", "-t", "-f", "active,security", "dev", "wifi") + out := wtf.ExecuteCommand(cmd) + + name := wtf.FindMatch(`yes:(.+)`, out) + + if len(name) > 0 { + return name[0][1] + } + + return "" +} + +func wifiEncryptionMacOS() string { + name := wtf.FindMatch(`s*auth: (.+)s*`, wifiInfo()) + return matchStr(name) +} + func wifiInfo() string { cmd := exec.Command(osxWifiCmd, osxWifiArg) return wtf.ExecuteCommand(cmd) } +func wifiNameLinux() string { + cmd := exec.Command("nmcli", "-t", "-f", "active,ssid", "dev", "wifi") + out := wtf.ExecuteCommand(cmd) + name := wtf.FindMatch(`yes:(.+)`, out) + if len(name) > 0 { + return name[0][1] + } + return "" +} + +func wifiNameMacOS() string { + name := wtf.FindMatch(`s*SSID: (.+)s*`, wifiInfo()) + return matchStr(name) +} + func matchStr(data [][]string) string { if len(data) <= 1 { return "" From 70b56c314ba5958047a323a4b0c0fe4a337ea5fb Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 31 May 2018 18:01:11 -0700 Subject: [PATCH 08/19] Close #90. Firewall 'off' values are properly formatted --- security/firewall.go | 12 ++++++------ security/widget.go | 17 ++++++++++++++--- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/security/firewall.go b/security/firewall.go index 5867e983..6323b5e1 100644 --- a/security/firewall.go +++ b/security/firewall.go @@ -44,7 +44,7 @@ func firewallStateMacOS() string { cmd := exec.Command(osxFirewallCmd, "--getglobalstate") str := wtf.ExecuteCommand(cmd) - return status(str) + return statusLabel(str) } func firewallStealthStateLinux() string { @@ -55,15 +55,15 @@ func firewallStealthStateMacOS() string { cmd := exec.Command(osxFirewallCmd, "--getstealthmode") str := wtf.ExecuteCommand(cmd) - return status(str) + return statusLabel(str) } -func status(str string) string { - icon := "[red]off[white]" +func statusLabel(str string) string { + label := "off" if strings.Contains(str, "enabled") { - icon = "[green]on[white]" + label = "on" } - return icon + return label } diff --git a/security/widget.go b/security/widget.go index 7ad2d5bb..61bab3b2 100644 --- a/security/widget.go +++ b/security/widget.go @@ -46,12 +46,23 @@ func (widget *Widget) contentFrom(data *SecurityData) string { str = str + fmt.Sprintf(" %8s: %s\n", "Network", data.WifiName) str = str + fmt.Sprintf(" %8s: %s\n", "Crypto", data.WifiEncryption) str = str + "\n" - str = str + " [red]Firewall[white] [red]DNS[white]\n" - str = str + fmt.Sprintf(" %8s: %4s %-16s\n", "Enabled", data.FirewallEnabled, data.DnsAt(0)) - str = str + fmt.Sprintf(" %8s: %4s %-16s\n", "Stealth", data.FirewallStealth, data.DnsAt(1)) + str = str + " [red]Firewall[white] [red]DNS[white]\n" + str = str + fmt.Sprintf(" %8s: [%s]%-3s[white] %-16s\n", "Enabled", widget.labelColor(data.FirewallEnabled), data.FirewallEnabled, data.DnsAt(0)) + str = str + fmt.Sprintf(" %8s: [%s]%-3s[white] %-16s\n", "Stealth", widget.labelColor(data.FirewallStealth), data.FirewallStealth, data.DnsAt(1)) str = str + "\n" str = str + " [red]Users[white]\n" str = str + fmt.Sprintf(" %s", strings.Join(data.LoggedInUsers, ", ")) return str } + +func (widget *Widget) labelColor(label string) string { + switch label { + case "on": + return "green" + case "off": + return "red" + default: + return "white" + } +} From f86179b74ef7fd7f02d3542da326060252238d11 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Thu, 31 May 2018 21:49:10 -0700 Subject: [PATCH 09/19] Close #91. Site sidebar is now scrollable with main content. --- _site/themes/hyde-hyde/layouts/partials/sidebar.html | 2 +- _site/themes/hyde-hyde/static/css/custom.css | 11 +++++++---- _site/themes/hyde-hyde/static/css/hyde.css | 10 ++++++---- docs/404.html | 2 +- docs/categories/index.html | 2 +- docs/css/custom.css | 11 +++++++---- docs/css/hyde.css | 10 ++++++---- docs/index.html | 2 +- docs/posts/configuration/attributes/index.html | 2 +- docs/posts/configuration/index.html | 2 +- docs/posts/configuration/iterm2/index.html | 2 +- docs/posts/glossary/index.html | 2 +- docs/posts/index.html | 2 +- docs/posts/installation/index.html | 2 +- docs/posts/modules/bamboohr/index.html | 2 +- docs/posts/modules/clocks/index.html | 2 +- docs/posts/modules/cmdrunner/index.html | 2 +- docs/posts/modules/gcal/index.html | 2 +- docs/posts/modules/git/index.html | 2 +- docs/posts/modules/github/index.html | 2 +- docs/posts/modules/index.html | 2 +- docs/posts/modules/jira/index.html | 2 +- docs/posts/modules/newrelic/index.html | 2 +- docs/posts/modules/opsgenie/index.html | 2 +- docs/posts/modules/power/index.html | 2 +- docs/posts/modules/security/index.html | 2 +- docs/posts/modules/textfile/index.html | 2 +- docs/posts/modules/todo/index.html | 2 +- docs/posts/modules/weather/index.html | 2 +- docs/posts/overview/index.html | 2 +- docs/tags/index.html | 2 +- 31 files changed, 53 insertions(+), 43 deletions(-) diff --git a/_site/themes/hyde-hyde/layouts/partials/sidebar.html b/_site/themes/hyde-hyde/layouts/partials/sidebar.html index 7922fbc7..b3c4f515 100644 --- a/_site/themes/hyde-hyde/layouts/partials/sidebar.html +++ b/_site/themes/hyde-hyde/layouts/partials/sidebar.html @@ -1,5 +1,5 @@
-
+
{{ with .Site.Params.authorimage }} WFT Logo {{ end }} diff --git a/_site/themes/hyde-hyde/static/css/custom.css b/_site/themes/hyde-hyde/static/css/custom.css index 560e197a..40856419 100644 --- a/_site/themes/hyde-hyde/static/css/custom.css +++ b/_site/themes/hyde-hyde/static/css/custom.css @@ -1,5 +1,4 @@ -html, -body +html, body { font-family: 'Fira Sans', sans-serif; font-size: 18px; @@ -7,6 +6,10 @@ body line-height: 1.5; } +.clear { + clear: both; +} + .img-circle { border-radius: 50%; @@ -46,7 +49,7 @@ pre .hljs { white-space: pre; - + overflow-x: auto; /* no line wrapping */ } @@ -67,7 +70,7 @@ code { font-family: 'Roboto Mono', monospace; font-size: 90%; } -.copyright, +.copyright, .poweredby { font-size: 13px; diff --git a/_site/themes/hyde-hyde/static/css/hyde.css b/_site/themes/hyde-hyde/static/css/hyde.css index 46cc0aed..4941083b 100644 --- a/_site/themes/hyde-hyde/static/css/hyde.css +++ b/_site/themes/hyde-hyde/static/css/hyde.css @@ -34,13 +34,14 @@ html { font-family: 'Fira Sans', 'Helvetica Neue', 'Arial', sans-serif; font-weight:300; - } + @media (min-width: 48em) { html { font-size: 16px; } } + @media (min-width: 58em) { html { font-size: 20px; @@ -63,13 +64,14 @@ pre { padding: 2rem 1rem; color: rgba(255,255,255,.5); background-color: #300030; + height: 100%; + float: left; } @media (min-width: 48em) { .sidebar { - position: fixed; + position: relative; top: 0; left: 0; - bottom: 0; width: 18rem; text-align: left; } @@ -167,7 +169,7 @@ a.sidebar-nav-item:focus { display:inline; vertical-align: bottom; } - + .badges { float: right; } diff --git a/docs/404.html b/docs/404.html index 39825d70..b5dddde5 100644 --- a/docs/404.html +++ b/docs/404.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/categories/index.html b/docs/categories/index.html index b4982dc3..0718fcfd 100644 --- a/docs/categories/index.html +++ b/docs/categories/index.html @@ -42,7 +42,7 @@
-
+
WFT Logo diff --git a/docs/css/custom.css b/docs/css/custom.css index 560e197a..40856419 100644 --- a/docs/css/custom.css +++ b/docs/css/custom.css @@ -1,5 +1,4 @@ -html, -body +html, body { font-family: 'Fira Sans', sans-serif; font-size: 18px; @@ -7,6 +6,10 @@ body line-height: 1.5; } +.clear { + clear: both; +} + .img-circle { border-radius: 50%; @@ -46,7 +49,7 @@ pre .hljs { white-space: pre; - + overflow-x: auto; /* no line wrapping */ } @@ -67,7 +70,7 @@ code { font-family: 'Roboto Mono', monospace; font-size: 90%; } -.copyright, +.copyright, .poweredby { font-size: 13px; diff --git a/docs/css/hyde.css b/docs/css/hyde.css index 46cc0aed..4941083b 100644 --- a/docs/css/hyde.css +++ b/docs/css/hyde.css @@ -34,13 +34,14 @@ html { font-family: 'Fira Sans', 'Helvetica Neue', 'Arial', sans-serif; font-weight:300; - } + @media (min-width: 48em) { html { font-size: 16px; } } + @media (min-width: 58em) { html { font-size: 20px; @@ -63,13 +64,14 @@ pre { padding: 2rem 1rem; color: rgba(255,255,255,.5); background-color: #300030; + height: 100%; + float: left; } @media (min-width: 48em) { .sidebar { - position: fixed; + position: relative; top: 0; left: 0; - bottom: 0; width: 18rem; text-align: left; } @@ -167,7 +169,7 @@ a.sidebar-nav-item:focus { display:inline; vertical-align: bottom; } - + .badges { float: right; } diff --git a/docs/index.html b/docs/index.html index 020af1c4..f7e9f6ea 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,7 +41,7 @@
-
+
WFT Logo diff --git a/docs/posts/configuration/attributes/index.html b/docs/posts/configuration/attributes/index.html index e06cedcc..5bdd1beb 100644 --- a/docs/posts/configuration/attributes/index.html +++ b/docs/posts/configuration/attributes/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/configuration/index.html b/docs/posts/configuration/index.html index bf7bac0d..a477814a 100644 --- a/docs/posts/configuration/index.html +++ b/docs/posts/configuration/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/configuration/iterm2/index.html b/docs/posts/configuration/iterm2/index.html index 04226e63..3653da28 100644 --- a/docs/posts/configuration/iterm2/index.html +++ b/docs/posts/configuration/iterm2/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/glossary/index.html b/docs/posts/glossary/index.html index a87af5d6..cbbcf557 100644 --- a/docs/posts/glossary/index.html +++ b/docs/posts/glossary/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/index.html b/docs/posts/index.html index 8cc3b70c..c2bf43af 100644 --- a/docs/posts/index.html +++ b/docs/posts/index.html @@ -42,7 +42,7 @@
-
+
WFT Logo diff --git a/docs/posts/installation/index.html b/docs/posts/installation/index.html index 7dddd502..c4c95ddb 100644 --- a/docs/posts/installation/index.html +++ b/docs/posts/installation/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/bamboohr/index.html b/docs/posts/modules/bamboohr/index.html index c4705242..9cf803f1 100644 --- a/docs/posts/modules/bamboohr/index.html +++ b/docs/posts/modules/bamboohr/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/clocks/index.html b/docs/posts/modules/clocks/index.html index 0b196902..3e2c8930 100644 --- a/docs/posts/modules/clocks/index.html +++ b/docs/posts/modules/clocks/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/cmdrunner/index.html b/docs/posts/modules/cmdrunner/index.html index f0e6d262..8abc5c26 100644 --- a/docs/posts/modules/cmdrunner/index.html +++ b/docs/posts/modules/cmdrunner/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/gcal/index.html b/docs/posts/modules/gcal/index.html index fc1b6a5c..13a792f7 100644 --- a/docs/posts/modules/gcal/index.html +++ b/docs/posts/modules/gcal/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/git/index.html b/docs/posts/modules/git/index.html index b491eef5..7319d48d 100644 --- a/docs/posts/modules/git/index.html +++ b/docs/posts/modules/git/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/github/index.html b/docs/posts/modules/github/index.html index 46092f6d..2a08ac16 100644 --- a/docs/posts/modules/github/index.html +++ b/docs/posts/modules/github/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/index.html b/docs/posts/modules/index.html index 3b152408..8af39b98 100644 --- a/docs/posts/modules/index.html +++ b/docs/posts/modules/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/jira/index.html b/docs/posts/modules/jira/index.html index 1a9532d6..e5d77f88 100644 --- a/docs/posts/modules/jira/index.html +++ b/docs/posts/modules/jira/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/newrelic/index.html b/docs/posts/modules/newrelic/index.html index ce6c261f..82023ff1 100644 --- a/docs/posts/modules/newrelic/index.html +++ b/docs/posts/modules/newrelic/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/opsgenie/index.html b/docs/posts/modules/opsgenie/index.html index c7198ea7..0ff2b35f 100644 --- a/docs/posts/modules/opsgenie/index.html +++ b/docs/posts/modules/opsgenie/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/power/index.html b/docs/posts/modules/power/index.html index 80855585..48f7ad21 100644 --- a/docs/posts/modules/power/index.html +++ b/docs/posts/modules/power/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/security/index.html b/docs/posts/modules/security/index.html index 91f70a8c..e4e37b6d 100644 --- a/docs/posts/modules/security/index.html +++ b/docs/posts/modules/security/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/textfile/index.html b/docs/posts/modules/textfile/index.html index e6c9ab81..56ad9029 100644 --- a/docs/posts/modules/textfile/index.html +++ b/docs/posts/modules/textfile/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/todo/index.html b/docs/posts/modules/todo/index.html index ca8bafe8..fd232a5f 100644 --- a/docs/posts/modules/todo/index.html +++ b/docs/posts/modules/todo/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/modules/weather/index.html b/docs/posts/modules/weather/index.html index b1718251..23baeee9 100644 --- a/docs/posts/modules/weather/index.html +++ b/docs/posts/modules/weather/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/posts/overview/index.html b/docs/posts/overview/index.html index 08636f40..2e7fb36c 100644 --- a/docs/posts/overview/index.html +++ b/docs/posts/overview/index.html @@ -40,7 +40,7 @@
-
+
WFT Logo diff --git a/docs/tags/index.html b/docs/tags/index.html index d3ba0e27..dab3d643 100644 --- a/docs/tags/index.html +++ b/docs/tags/index.html @@ -42,7 +42,7 @@
-
+
WFT Logo From a7880dd395d9a195a9168539f1028dd8195a9204 Mon Sep 17 00:00:00 2001 From: flw Date: Fri, 1 Jun 2018 16:37:07 +0800 Subject: [PATCH 10/19] Feat: add an error message when WTF was failed This is just a minor change to avoid a small number of inexperienced users not be intimidated by a minor mistake, such as the incorrect setting of the TERM environment variable. I hope this will be improved a bit of user experience for let WTF more popular. --- wtf.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wtf.go b/wtf.go index 1cac8af9..00ae6f10 100644 --- a/wtf.go +++ b/wtf.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "log" "os" "time" @@ -232,6 +233,7 @@ func main() { go watchForConfigChanges(app, cmdFlags.Config, grid, pages) if err := app.SetRoot(pages, true).Run(); err != nil { + fmt.Printf("An error occurred: %v\n", err) os.Exit(1) } } From 28cabb29defddd47e50df982921a97dd9c7eca81 Mon Sep 17 00:00:00 2001 From: deltax Date: Fri, 1 Jun 2018 12:33:11 +0200 Subject: [PATCH 11/19] Quick fix for #105 - add lsb_release because sw_vers doesn't work on linux - add system check --- system/system_info.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/system/system_info.go b/system/system_info.go index d255bde4..7526570a 100644 --- a/system/system_info.go +++ b/system/system_info.go @@ -18,7 +18,15 @@ func NewSystemInfo() *SystemInfo { arg := []string{} - cmd := exec.Command("sw_vers", arg...) + switch runtime.GOOS { + case "linux": + cmd := exec.Command("lsb_release -a", arg...) + case "darwin": + cmd := exec.Command("sw_vers", arg...) + default: + return "" + } + raw := wtf.ExecuteCommand(cmd) for _, row := range strings.Split(raw, "\n") { From ed855d9227614e00a17501b2c0f724be04b2aaea Mon Sep 17 00:00:00 2001 From: deltax Date: Fri, 1 Jun 2018 17:57:41 +0200 Subject: [PATCH 12/19] Update system_info.go --- system/system_info.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/system_info.go b/system/system_info.go index 7526570a..21ee60f1 100644 --- a/system/system_info.go +++ b/system/system_info.go @@ -20,11 +20,11 @@ func NewSystemInfo() *SystemInfo { switch runtime.GOOS { case "linux": - cmd := exec.Command("lsb_release -a", arg...) + cmd := exec.Command("uname -a", arg...) case "darwin": cmd := exec.Command("sw_vers", arg...) default: - return "" + cmd := exec.Command("sw_vers", arg...) } raw := wtf.ExecuteCommand(cmd) From 81ffdc783c717d0657fa8d487553f9227fca6276 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 1 Jun 2018 09:13:21 -0700 Subject: [PATCH 13/19] Add a missing require and a missing var declaration to system_info.go --- system/system_info.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/system/system_info.go b/system/system_info.go index 21ee60f1..6773fe0e 100644 --- a/system/system_info.go +++ b/system/system_info.go @@ -2,6 +2,7 @@ package system import ( "os/exec" + "runtime" "strings" "github.com/senorprogrammer/wtf/wtf" @@ -18,13 +19,14 @@ func NewSystemInfo() *SystemInfo { arg := []string{} + var cmd *exec.Cmd switch runtime.GOOS { case "linux": - cmd := exec.Command("uname -a", arg...) + cmd = exec.Command("uname -a", arg...) case "darwin": - cmd := exec.Command("sw_vers", arg...) + cmd = exec.Command("sw_vers", arg...) default: - cmd := exec.Command("sw_vers", arg...) + cmd = exec.Command("sw_vers", arg...) } raw := wtf.ExecuteCommand(cmd) From 6d59974fed6a39c98a58de25a63c5468b52ce424 Mon Sep 17 00:00:00 2001 From: James Sapara Date: Fri, 1 Jun 2018 10:37:25 -0700 Subject: [PATCH 14/19] strip space and ignore empty users from who --- security/users.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/users.go b/security/users.go index 9bcab534..b8fe5164 100644 --- a/security/users.go +++ b/security/users.go @@ -59,7 +59,8 @@ func loggedInUsersLinux() []string { if len(col) > 0 { for _, cleanedU := range cleaned { - if strings.Compare(cleanedU, col[0]) == 0 { + u := strings.TrimSpace(col[0]) + if len(u) == 0 || strings.Compare(cleanedU, col[0]) == 0 { clean = false } } From 492438c5f562d28dea3dea80d66827c6b2082989 Mon Sep 17 00:00:00 2001 From: Bryan Austin Date: Fri, 1 Jun 2018 12:01:34 -0700 Subject: [PATCH 15/19] Fix clocks module chronological sorting issue #98 `clock.LocalTime()` sets the location of a `time.Time` object, but doesn't change the point in time. Since `clock.LocalTime()` calls `time.Now()` to create the "local time", what ends up happening is that the first `LocalTime()` is always "before" the second one (because of the order of function calls), leading to unstable sorting. This change does two things to fix chronological sorting. The first is to add a `clock.ToLocal(time.Time)` function that acts like `clock.LocalTime()` for a given time point, so that a single stable time point can be used throughout sorting. The second is to do chronological sorting by comparing the string versions of the local time, which look like (for London vs. SF): 2018-06-01 19:48:26.591550198 +0100 BST vs. 2018-06-01 11:48:26.5915538 -0700 PDT There may be a better way, this feels hacky-ish but works for me on OSX. One remaining downside is that for locations in the same time zone (i.e. Avignon and Barcelona in the default settings), order is determined ~randomly on startup. You could maybe append the location to the string used for comparison to make alphabetical sorting a fallback for equivalent times, but at least they don't jump around anymore. --- clocks/clock.go | 6 +++++- clocks/clock_collection.go | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/clocks/clock.go b/clocks/clock.go index 2ce17e5f..fc4965fc 100644 --- a/clocks/clock.go +++ b/clocks/clock.go @@ -25,7 +25,11 @@ func (clock *Clock) Date() string { } func (clock *Clock) LocalTime() time.Time { - return time.Now().In(clock.Location) + return clock.ToLocal(time.Now()) +} + +func (clock *Clock) ToLocal(t time.Time) time.Time { + return t.In(clock.Location) } func (clock *Clock) Time() string { diff --git a/clocks/clock_collection.go b/clocks/clock_collection.go index d81b18ff..a1c226ea 100644 --- a/clocks/clock_collection.go +++ b/clocks/clock_collection.go @@ -2,6 +2,7 @@ package clocks import ( "sort" + "time" ) type ClockCollection struct { @@ -28,10 +29,11 @@ func (clocks *ClockCollection) SortedAlphabetically() { } func (clocks *ClockCollection) SortedChronologically() { + now := time.Now() sort.Slice(clocks.Clocks, func(i, j int) bool { clock := clocks.Clocks[i] other := clocks.Clocks[j] - return clock.LocalTime().Before(other.LocalTime()) + return clock.ToLocal(now).String() < other.ToLocal(now).String() }) } From f2c099a6013ee98835162c2501ed42286c3dddba Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 1 Jun 2018 13:41:27 -0700 Subject: [PATCH 16/19] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..0eef35b1 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at chriscummer+wtf@me.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ From 96bbe03fbf6c1d7e1d56786c4120334a1c752562 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 1 Jun 2018 14:15:22 -0700 Subject: [PATCH 17/19] Set terminal type in the config file. Adds a "term" option that takes a terminal type (ie: vt100, xterm, xterm-256color, etc.) Example: ```yaml wtf: term: "vt100" ``` --- _site/content/posts/configuration/attributes.md | 9 +++++++++ docs/index.xml | 2 +- docs/posts/configuration/attributes/index.html | 11 ++++++++++- docs/posts/index.xml | 2 +- wtf.go | 2 ++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/_site/content/posts/configuration/attributes.md b/_site/content/posts/configuration/attributes.md index d709a8fb..93e7c3bb 100644 --- a/_site/content/posts/configuration/attributes.md +++ b/_site/content/posts/configuration/attributes.md @@ -25,6 +25,7 @@ wtf: rows: [10, 10, 10, 10, 10, 3, 4] # The app redraws itself once a second refreshInterval: 1 + term: "xterm-256color" ``` ### Attributes @@ -69,3 +70,11 @@ How often, in seconds, the UI refreshes itself.
**Note:** This implementation is probably wrong and buggy and likely to change.
Values: A positive integer, `0..n`. + +`term`
+This value is _optional_. Sets a custom value for the terminal type this app runs in. Leave this entry out of the config if you simply want to use your terminal's +default setting.
+**Note:** If an invalid value is provided for this setting, the app will + crash with a `"terminal entry not found"` error.
+Values: Any valid terminal type (ie: vt100, xterm, xterm-256color, ansi, +etc.). diff --git a/docs/index.xml b/docs/index.xml index 22a96bce..f5186f07 100644 --- a/docs/index.xml +++ b/docs/index.xml @@ -82,7 +82,7 @@ cmd The terminal command to be run, withouth the arguments. Ie: ping, whoami, cu https://wtfutil.com/posts/configuration/attributes/ The following top-level attributes are configurable in config.yml. See this example config file for more details. -wtf:colors:background:&#34;red&#34;border:Focusable:&#34;darkslateblue&#34;focused:&#34;orange&#34;normal:&#34;gray&#34;grid:# How _wide_ the columns are, in terminal characters. In this case we have# six columns, each of which are 35 characters widecolumns:[35,35,35,35,35,35]# How _high_ the rows are, in terminal lines. In this case we have five rows# that support ten line of text, one of three lines, and one of fourrows:[10,10,10,10,10,3,4]# The app redraws itself once a secondrefreshInterval:1 Attributes colors. +wtf:colors:background:&#34;red&#34;border:Focusable:&#34;darkslateblue&#34;focused:&#34;orange&#34;normal:&#34;gray&#34;grid:# How _wide_ the columns are, in terminal characters. In this case we have# six columns, each of which are 35 characters widecolumns:[35,35,35,35,35,35]# How _high_ the rows are, in terminal lines. In this case we have five rows# that support ten line of text, one of three lines, and one of fourrows:[10,10,10,10,10,3,4]# The app redraws itself once a secondrefreshInterval:1term:&#34;xterm-256color&#34; Attributes colors. diff --git a/docs/posts/configuration/attributes/index.html b/docs/posts/configuration/attributes/index.html index 5bdd1beb..f8ae04f0 100644 --- a/docs/posts/configuration/attributes/index.html +++ b/docs/posts/configuration/attributes/index.html @@ -127,7 +127,8 @@ See this # that support ten line of text, one of three lines, and one of four rows: [10, 10, 10, 10, 10, 3, 4] # The app redraws itself once a second - refreshInterval: 1
+ refreshInterval: 1 + term: "xterm-256color"

Attributes

colors.background
@@ -171,6 +172,14 @@ How often, in seconds, the UI refreshes itself.
change.
Values: A positive integer, 0..n.

+

term
+This value is optional. Sets a custom value for the terminal type this app runs in. Leave this entry out of the config if you simply want to use your terminal’s +default setting.
+Note: If an invalid value is provided for this setting, the app will + crash with a "terminal entry not found" error.
+Values: Any valid terminal type (ie: vt100, xterm, xterm-256color, ansi, +etc.).

+
diff --git a/docs/posts/index.xml b/docs/posts/index.xml index b867dd86..c41e936e 100644 --- a/docs/posts/index.xml +++ b/docs/posts/index.xml @@ -82,7 +82,7 @@ cmd The terminal command to be run, withouth the arguments. Ie: ping, whoami, cu https://wtfutil.com/posts/configuration/attributes/ The following top-level attributes are configurable in config.yml. See this example config file for more details. -wtf:colors:background:&#34;red&#34;border:Focusable:&#34;darkslateblue&#34;focused:&#34;orange&#34;normal:&#34;gray&#34;grid:# How _wide_ the columns are, in terminal characters. In this case we have# six columns, each of which are 35 characters widecolumns:[35,35,35,35,35,35]# How _high_ the rows are, in terminal lines. In this case we have five rows# that support ten line of text, one of three lines, and one of fourrows:[10,10,10,10,10,3,4]# The app redraws itself once a secondrefreshInterval:1 Attributes colors. +wtf:colors:background:&#34;red&#34;border:Focusable:&#34;darkslateblue&#34;focused:&#34;orange&#34;normal:&#34;gray&#34;grid:# How _wide_ the columns are, in terminal characters. In this case we have# six columns, each of which are 35 characters widecolumns:[35,35,35,35,35,35]# How _high_ the rows are, in terminal lines. In this case we have five rows# that support ten line of text, one of three lines, and one of fourrows:[10,10,10,10,10,3,4]# The app redraws itself once a secondrefreshInterval:1term:&#34;xterm-256color&#34; Attributes colors. diff --git a/wtf.go b/wtf.go index 00ae6f10..b5a8ea4f 100644 --- a/wtf.go +++ b/wtf.go @@ -201,6 +201,7 @@ func loadConfig(configFlag string) { } func main() { + cmdFlags := wtf.NewCommandFlags() cmdFlags.Parse(version) @@ -216,6 +217,7 @@ func main() { wtf.WriteConfigFile() loadConfig(cmdFlags.Config) + os.Setenv("TERM", Config.UString("wtf.term", os.Getenv("TERM"))) app := tview.NewApplication() pages := tview.NewPages() From f025606f9d7d7c3356dbb69e27bd557e97308293 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 1 Jun 2018 18:17:50 -0700 Subject: [PATCH 18/19] Add image --- docs/img/dude_wtf.png | Bin 0 -> 13867 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/img/dude_wtf.png diff --git a/docs/img/dude_wtf.png b/docs/img/dude_wtf.png new file mode 100644 index 0000000000000000000000000000000000000000..7ede2f724e81ee9cf53f992819405c310a0e6f91 GIT binary patch literal 13867 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 Date: Fri, 1 Jun 2018 18:32:53 -0700 Subject: [PATCH 19/19] Add Jira JQL configuration documentation --- _site/content/posts/modules/jira.md | 6 ++++++ docs/index.xml | 2 +- docs/posts/index.xml | 2 +- docs/posts/modules/jira/index.html | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/_site/content/posts/modules/jira.md b/_site/content/posts/modules/jira.md index 008db39a..0f40d4b3 100644 --- a/_site/content/posts/modules/jira.md +++ b/_site/content/posts/modules/jira.md @@ -34,6 +34,7 @@ jira: domain: "https://umbrellacorp.atlassian.net" email: "chriscummer@me.com" enabled: true + jql: "issueType = Story" position: top: 4 left: 1 @@ -68,6 +69,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.
diff --git a/docs/index.xml b/docs/index.xml index f5186f07..26d7190e 100644 --- a/docs/index.xml +++ b/docs/index.xml @@ -108,7 +108,7 @@ Key: j Action: Select the next item in the list. Displays all Jira issues assigned to you for the specified project. Source Code wtf/jira/ Required ENV Variables Key: WTF_JIRA_API_KEY Value: Your Jira API key. Keyboard Commands None. -Configuration jira:colors:rows:even:&#34;lightblue&#34;odd:&#34;white&#34;domain:&#34;https://umbrellacorp.atlassian.net&#34;email:&#34;chriscummer@me.com&#34;enabled:trueposition:top:4left:1height:1width:2project:&#34;JIRA&#34;refreshInterval:900username:&#34;chris.cummer&#34; Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. +Configuration jira:colors:rows:even:&#34;lightblue&#34;odd:&#34;white&#34;domain:&#34;https://umbrellacorp.atlassian.net&#34;email:&#34;chriscummer@me.com&#34;enabled:truejql:&#34;issueType = Story&#34;position:top:4left:1height:1width:2project:&#34;JIRA&#34;refreshInterval:900username:&#34;chris.cummer&#34; Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. colors.rows.odd Define the foreground color for odd-numbered rows. Values: Any X11 color name. domain Your Jira corporate domain. Values: A valid URI. email The email address associated with your Jira account. diff --git a/docs/posts/index.xml b/docs/posts/index.xml index c41e936e..3550f945 100644 --- a/docs/posts/index.xml +++ b/docs/posts/index.xml @@ -108,7 +108,7 @@ Key: j Action: Select the next item in the list. Displays all Jira issues assigned to you for the specified project. Source Code wtf/jira/ Required ENV Variables Key: WTF_JIRA_API_KEY Value: Your Jira API key. Keyboard Commands None. -Configuration jira:colors:rows:even:&#34;lightblue&#34;odd:&#34;white&#34;domain:&#34;https://umbrellacorp.atlassian.net&#34;email:&#34;chriscummer@me.com&#34;enabled:trueposition:top:4left:1height:1width:2project:&#34;JIRA&#34;refreshInterval:900username:&#34;chris.cummer&#34; Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. +Configuration jira:colors:rows:even:&#34;lightblue&#34;odd:&#34;white&#34;domain:&#34;https://umbrellacorp.atlassian.net&#34;email:&#34;chriscummer@me.com&#34;enabled:truejql:&#34;issueType = Story&#34;position:top:4left:1height:1width:2project:&#34;JIRA&#34;refreshInterval:900username:&#34;chris.cummer&#34; Attributes colors.rows.even Define the foreground color for even-numbered rows. Values: Any X11 color name. colors.rows.odd Define the foreground color for odd-numbered rows. Values: Any X11 color name. domain Your Jira corporate domain. Values: A valid URI. email The email address associated with your Jira account. diff --git a/docs/posts/modules/jira/index.html b/docs/posts/modules/jira/index.html index e5d77f88..98cea108 100644 --- a/docs/posts/modules/jira/index.html +++ b/docs/posts/modules/jira/index.html @@ -133,6 +133,7 @@ domain: "https://umbrellacorp.atlassian.net" email: "chriscummer@me.com" enabled: true + jql: "issueType = Story" position: top: 4 left: 1 @@ -165,6 +166,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.