From 8958beb50768ba32febe6f6e8864bf8f46463b86 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Mon, 24 Jun 2024 15:32:19 +0200 Subject: [PATCH 1/2] Add advising category --- cmd/params/params_test.go | 1 + cmd/root.go | 2 +- pkg/heartbeat/category.go | 7 +++++++ pkg/heartbeat/category_test.go | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/params/params_test.go b/cmd/params/params_test.go index f9289180..5b928c4d 100644 --- a/cmd/params/params_test.go +++ b/cmd/params/params_test.go @@ -51,6 +51,7 @@ func TestLoadParams_AlternateProject_Unset(t *testing.T) { func TestLoadParams_Category(t *testing.T) { tests := map[string]heartbeat.Category{ + "advising": heartbeat.AdvisingCategory, "browsing": heartbeat.BrowsingCategory, "building": heartbeat.BuildingCategory, "coding": heartbeat.CodingCategory, diff --git a/cmd/root.go b/cmd/root.go index 1f5b5765..64c647c1 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -57,7 +57,7 @@ func setFlags(cmd *cobra.Command, v *viper.Viper) { "Category of this heartbeat activity. Can be \"coding\","+ " \"building\", \"indexing\", \"debugging\", \"learning\","+ " \"meeting\", \"planning\", \"researching\", \"communicating\","+ - " \"running tests\", \"writing tests\", \"manual testing\","+ + " \"advising\", \"running tests\", \"writing tests\", \"manual testing\","+ " \"writing docs\", \"code reviewing\", \"browsing\","+ " \"translating\", or \"designing\". Defaults to \"coding\".", ) diff --git a/pkg/heartbeat/category.go b/pkg/heartbeat/category.go index faa4b300..13d6abbf 100644 --- a/pkg/heartbeat/category.go +++ b/pkg/heartbeat/category.go @@ -11,6 +11,8 @@ type Category int const ( // CodingCategory means user is currently coding. This is the default value. CodingCategory Category = iota + // AdvisingCategory means user is currently adivising. + AdvisingCategory // BrowsingCategory means user is currently browsing. BrowsingCategory // BuildingCategory means user is currently building. @@ -46,6 +48,7 @@ const ( ) const ( + advisingCategoryString = "advising" browsingCategoryString = "browsing" buildingCategoryString = "building" codeReviewingCategoryString = "code reviewing" @@ -68,6 +71,8 @@ const ( // ParseCategory parses a category from a string. func ParseCategory(s string) (Category, error) { switch s { + case advisingCategoryString: + return AdvisingCategory, nil case browsingCategoryString: return BrowsingCategory, nil case buildingCategoryString: @@ -134,6 +139,8 @@ func (c Category) MarshalJSON() ([]byte, error) { // String implements fmt.Stringer interface. func (c Category) String() string { switch c { + case AdvisingCategory: + return advisingCategoryString case BrowsingCategory: return browsingCategoryString case BuildingCategory: diff --git a/pkg/heartbeat/category_test.go b/pkg/heartbeat/category_test.go index f5f93e7a..50fb03e4 100644 --- a/pkg/heartbeat/category_test.go +++ b/pkg/heartbeat/category_test.go @@ -12,6 +12,7 @@ import ( func categoryTests() map[string]heartbeat.Category { return map[string]heartbeat.Category{ + "advising": heartbeat.AdvisingCategory, "browsing": heartbeat.BrowsingCategory, "building": heartbeat.BuildingCategory, "code reviewing": heartbeat.CodeReviewingCategory, From 375e8e34a0d78079ba19cd9971e58c430eba378c Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Mon, 24 Jun 2024 15:53:12 +0200 Subject: [PATCH 2/2] Upgrade golang.org/x --- go.mod | 8 ++++---- go.sum | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index fad3d8de..3aa50884 100644 --- a/go.mod +++ b/go.mod @@ -22,9 +22,9 @@ require ( github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 go.etcd.io/bbolt v1.3.8 - golang.org/x/crypto v0.17.0 - golang.org/x/net v0.15.0 - golang.org/x/text v0.14.0 + golang.org/x/crypto v0.24.0 + golang.org/x/net v0.26.0 + golang.org/x/text v0.16.0 gopkg.in/ini.v1 v1.67.0 ) @@ -51,7 +51,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/yookoala/realpath v1.0.0 // indirect - golang.org/x/sys v0.16.0 // indirect + golang.org/x/sys v0.21.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 379cef0a..db24544b 100644 --- a/go.sum +++ b/go.sum @@ -298,6 +298,8 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -370,6 +372,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -433,11 +437,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -449,6 +456,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=