diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..65e1ec0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "makefile.extensionOutputFolder": "./.vscode" +} \ No newline at end of file diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index b17aa5c..0000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "ImportPath": "github.com/yudai/gotty", - "GoVersion": "go1.9", - "GodepVersion": "v79", - "Deps": [ - { - "ImportPath": "github.com/NYTimes/gziphandler", - "Rev": "967539e5e271a2bc9b3dcb1285078a1b1df105ae" - }, - { - "ImportPath": "github.com/codegangsta/cli", - "Comment": "v1.19.1", - "Rev": "0bdeddeeb0f650497d603c4ad7b20cfe685682f6" - }, - { - "ImportPath": "github.com/elazarl/go-bindata-assetfs", - "Rev": "d5cac425555ca5cf00694df246e04f05e6a55150" - }, - { - "ImportPath": "github.com/fatih/structs", - "Rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f" - }, - { - "ImportPath": "github.com/gorilla/websocket", - "Rev": "b6ab76f1fe9803ee1d59e7e5b2a797c1fe897ce5" - }, - { - "ImportPath": "github.com/hashicorp/go-multierror", - "Rev": "56912fb08d85084aa318edcf2bba735b97cf35c5" - }, - { - "ImportPath": "github.com/kr/pty", - "Comment": "release.r56-28-g5cf931e", - "Rev": "5cf931ef8f76dccd0910001d74a58a7fca84a83d" - }, - { - "ImportPath": "github.com/pkg/errors", - "Comment": "v0.8.0-2-g248dadf", - "Rev": "248dadf4e9068a0b3e79f02ed0a610d935de5302" - }, - { - "ImportPath": "github.com/yudai/hcl", - "Rev": "5fa2393b3552119bf33a69adb1402a1160cba23d" - }, - { - "ImportPath": "github.com/yudai/hcl/hcl", - "Rev": "5fa2393b3552119bf33a69adb1402a1160cba23d" - }, - { - "ImportPath": "github.com/yudai/hcl/json", - "Rev": "5fa2393b3552119bf33a69adb1402a1160cba23d" - } - ] -} diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53..0000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/Makefile b/Makefile index 0326580..b7225f2 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,8 @@ GIT_COMMIT = `git rev-parse HEAD | cut -c1-7` VERSION = 2.0.0-alpha.3 BUILD_OPTIONS = -ldflags "-X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)" -gotty: main.go server/*.go webtty/*.go backend/*.go Makefile - godep go build ${BUILD_OPTIONS} +gotty: main.go server/*.go webtty/*.go backend/*.go Makefile go.sum + go build ${BUILD_OPTIONS} .PHONY: asset asset: bindata/static/js/gotty-bundle.js bindata/static/index.html bindata/static/favicon.png bindata/static/css/index.css bindata/static/css/xterm.css bindata/static/css/xterm_customize.css diff --git a/backend/localcommand/factory.go b/backend/localcommand/factory.go index 11810ed..820b6a9 100644 --- a/backend/localcommand/factory.go +++ b/backend/localcommand/factory.go @@ -4,7 +4,7 @@ import ( "syscall" "time" - "github.com/yudai/gotty/server" + "gotty/server" ) type Options struct { diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..25b72e7 --- /dev/null +++ b/go.mod @@ -0,0 +1,24 @@ +module gotty + +go 1.18 + +require ( + github.com/NYTimes/gziphandler v1.1.1 + github.com/elazarl/go-bindata-assetfs v1.0.1 + github.com/fatih/structs v1.1.0 + github.com/gorilla/websocket v1.5.0 + github.com/hashicorp/go-multierror v1.1.1 + github.com/kr/pty v1.1.8 + github.com/pkg/errors v0.9.1 + github.com/urfave/cli v1.22.9 + github.com/yudai/hcl v0.0.0-20151013225006-5fa2393b3552 +) + +require ( + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect + github.com/creack/pty v1.1.18 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..08fb5dc --- /dev/null +++ b/go.sum @@ -0,0 +1,52 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/NYTimes/gziphandler v0.0.0-20170804200234-967539e5e271/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= +github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/codegangsta/cli v1.19.1/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elazarl/go-bindata-assetfs v0.0.0-20150813044622-d5cac425555c/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw= +github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/fatih/structs v0.0.0-20150526064352-a9f7daa9c272/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/gorilla/websocket v0.0.0-20150811171432-b6ab76f1fe98/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v0.0.0-20150608033521-56912fb08d85 h1:cUIqw6AGGDeIa1KYdG1mLl/bX+WGDbvZJ+dhb2tprxo= +github.com/hashicorp/go-multierror v0.0.0-20150608033521-56912fb08d85/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/kr/pty v0.0.0-20150511174710-5cf931ef8f76/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/pkg/errors v0.8.1-0.20161029093637-248dadf4e906/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/urfave/cli v1.22.9 h1:cv3/KhXGBGjEXLC4bH0sLuJ9BewaAbpk5oyMOveu4pw= +github.com/urfave/cli v1.22.9/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/yudai/hcl v0.0.0-20151013225006-5fa2393b3552 h1:tjsK9T2IA3d2FFNxzDP7AJf+EXhyuPd7PB4Z2HrtAoc= +github.com/yudai/hcl v0.0.0-20151013225006-5fa2393b3552/go.mod h1:hg0ZaCmQL3rze1cH8Fh2g0a9q8vQs0uN8ESpePEwSEw= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index b6290be..755c1e2 100644 --- a/main.go +++ b/main.go @@ -9,12 +9,12 @@ import ( "strings" "syscall" - "github.com/codegangsta/cli" + "github.com/urfave/cli" - "github.com/yudai/gotty/backend/localcommand" - "github.com/yudai/gotty/pkg/homedir" - "github.com/yudai/gotty/server" - "github.com/yudai/gotty/utils" + "gotty/backend/localcommand" + "gotty/pkg/homedir" + "gotty/server" + "gotty/utils" ) func main() { diff --git a/server/handlers.go b/server/handlers.go index f1a2f9b..4efb071 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -13,7 +13,7 @@ import ( "github.com/gorilla/websocket" "github.com/pkg/errors" - "github.com/yudai/gotty/webtty" + "gotty/webtty" ) func (server *Server) generateHandleWS(ctx context.Context, cancel context.CancelFunc, counter *counter) http.HandlerFunc { diff --git a/server/server.go b/server/server.go index 6411e71..64dc71b 100644 --- a/server/server.go +++ b/server/server.go @@ -14,13 +14,13 @@ import ( "time" "github.com/NYTimes/gziphandler" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/gorilla/websocket" "github.com/pkg/errors" - "github.com/yudai/gotty/pkg/homedir" - "github.com/yudai/gotty/pkg/randomstring" - "github.com/yudai/gotty/webtty" + "gotty/pkg/homedir" + "gotty/pkg/randomstring" + "gotty/webtty" ) // Server provides a webtty HTTP endpoint. diff --git a/server/slave.go b/server/slave.go index 77d0973..eb60883 100644 --- a/server/slave.go +++ b/server/slave.go @@ -1,7 +1,7 @@ package server import ( - "github.com/yudai/gotty/webtty" + "gotty/webtty" ) // Slave is webtty.Slave with some additional methods. diff --git a/utils/flags.go b/utils/flags.go index b5c66b9..48e8821 100644 --- a/utils/flags.go +++ b/utils/flags.go @@ -7,11 +7,11 @@ import ( "reflect" "strings" - "github.com/codegangsta/cli" "github.com/fatih/structs" + "github.com/urfave/cli" "github.com/yudai/hcl" - "github.com/yudai/gotty/pkg/homedir" + "gotty/pkg/homedir" ) func GenerateFlags(options ...interface{}) (flags []cli.Flag, mappings map[string]string, err error) {