diff --git a/.travis.yml b/.travis.yml index 7ccc544a..e076863e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,7 @@ language: go -script: make test +os: + - linux + - osx +script: + - env GO111MODULE=on make build + - env GO111MODULE=on make test diff --git a/Makefile b/Makefile index 021d87b7..6c550747 100644 --- a/Makefile +++ b/Makefile @@ -41,5 +41,8 @@ runtime: mv runtime.go internal/config gofmt -w internal/config/runtime.go +test: + go test ./internal/... + clean: rm -f micro diff --git a/go.mod b/go.mod index 4749634a..a7165a9c 100644 --- a/go.mod +++ b/go.mod @@ -1,23 +1,35 @@ module github.com/zyedidia/micro require ( - github.com/blang/semver v3.5.1+incompatible // indirect + github.com/blang/semver v3.5.1+incompatible github.com/dustin/go-humanize v1.0.0 github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633 github.com/gdamore/encoding v1.0.0 // indirect github.com/go-errors/errors v1.0.1 - github.com/jteeuwen/go-bindata v3.0.7+incompatible + github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect + github.com/jtolds/gls v4.2.1+incompatible // indirect + github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 // indirect github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 // indirect github.com/mattn/go-isatty v0.0.4 github.com/mattn/go-runewidth v0.0.4 github.com/mitchellh/go-homedir v1.1.0 + github.com/npat-efault/poller v2.0.0+incompatible // indirect + github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d // indirect github.com/sergi/go-diff v1.0.0 + github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect + github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect + github.com/stretchr/testify v1.3.0 + github.com/yuin/gopher-lua v0.0.0-20190125051437-7b9317363aa9 github.com/zyedidia/clipboard v0.0.0-20180718195219-bd31d747117d github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3 github.com/zyedidia/poller v2.0.0+incompatible // indirect - github.com/zyedidia/pty v1.1.2-0.20180126010845-30364665a244 + github.com/zyedidia/pty v1.1.2-0.20180126010845-30364665a244 // indirect github.com/zyedidia/tcell v0.0.0-20190204041104-518c15c24302 github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415 golang.org/x/text v0.3.0 + gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect + gopkg.in/sourcemap.v1 v1.0.5 // indirect + gopkg.in/src-d/go-git.v4 v4.9.1 gopkg.in/yaml.v2 v2.2.2 + layeh.com/gopher-luar v1.0.4 ) diff --git a/go.sum b/go.sum index 7714e214..7063866b 100644 --- a/go.sum +++ b/go.sum @@ -1,43 +1,116 @@ +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo= +github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633 h1:xJMmr4GMYIbALX5edyoDIOQpc2bOQTeJiWMeCl9lX/8= github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633/go.mod h1:NJDK3/o7abx6PP54EOe0G0n0RLmhCo9xv61gUYpI0EY= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw= +github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/jteeuwen/go-bindata v3.0.7+incompatible h1:91Uy4d9SYVr1kyTJ15wJsog+esAZZl7JmEfTkwmhJts= -github.com/jteeuwen/go-bindata v3.0.7+incompatible/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs= +github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= +github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= +github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8= +github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY= github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/npat-efault/poller v2.0.0+incompatible h1:jtTdXWKgN5kDK41ts8hoY1rvTEi0K08MTB8/bRO9MqE= +github.com/npat-efault/poller v2.0.0+incompatible/go.mod h1:lni01B89P8PtVpwlAhdhK1niN5rPkDGGpGGgBJzpSgo= +github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d h1:1VUlQbCfkoSGv7qP7Y+ro3ap1P1pPZxgdGVqiTVy5C4= +github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY= +github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= +github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= +github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro= +github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8= +github.com/yuin/gopher-lua v0.0.0-20190125051437-7b9317363aa9 h1:Wy3fAQLBPP0JSWdq3kBnmbFgXDHcyhtPpd+8kENV7mU= +github.com/yuin/gopher-lua v0.0.0-20190125051437-7b9317363aa9/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac= github.com/zyedidia/clipboard v0.0.0-20180718195219-bd31d747117d h1:Lhqt2eo+rgM8aswvM7nTtAMVm8ARPWzkE9n6eZDOccY= github.com/zyedidia/clipboard v0.0.0-20180718195219-bd31d747117d/go.mod h1:WDk3p8GiZV9+xFWlSo8qreeoLhW6Ik692rqXk+cNeRY= github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3 h1:oMHjjTLfGXVuyOQBYj5/td9WC0mw4g1xDBPovIqmHew= github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod h1:YKbIYP//Eln8eDgAJGI3IDvR3s4Tv9Z9TGIOumiyQ5c= github.com/zyedidia/poller v2.0.0+incompatible h1:DMOvB0EXz2JTokqOKfxPWN/8xXFJbO+m4vNhMkOY7Lo= github.com/zyedidia/poller v2.0.0+incompatible/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE= -github.com/zyedidia/pty v1.1.1 h1:SGOF3egDZGCGbpB5DPlg+yabbAuVkUtXVeNTDFeEytM= -github.com/zyedidia/pty v1.1.1/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA= github.com/zyedidia/pty v1.1.2-0.20180126010845-30364665a244 h1:DZ7mZvUV5+oXeXV1E1t6ZIXRihHYyqYVIOSA+RGo88A= github.com/zyedidia/pty v1.1.2-0.20180126010845-30364665a244/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA= -github.com/zyedidia/tcell v0.0.0-20171006165952-a221f2faf4f9 h1:RpdSFmZxJJy2rMbQi2LcejNPEquLmB4sCVIq7F4Ha+g= -github.com/zyedidia/tcell v0.0.0-20171006165952-a221f2faf4f9/go.mod h1:yXgdp23+aW8OMENYVBvpKoeiBtjaVWJ9HhpPDu6LBfM= github.com/zyedidia/tcell v0.0.0-20190204041104-518c15c24302 h1:ruNSURcO81y+J+XnqrLLt+zxcdFtq8QNoZfWXSsybYQ= github.com/zyedidia/tcell v0.0.0-20190204041104-518c15c24302/go.mod h1:yXgdp23+aW8OMENYVBvpKoeiBtjaVWJ9HhpPDu6LBfM= github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415 h1:752dTQ5OatJ9M5ULK2+9lor+nzyZz+LYDo3WGngg3Rc= github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod h1:8leT8G0Cm8NoJHdrrKHyR9MirWoF4YW7pZh06B6H+1E= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9 h1:lkiLiLBHGoH3XnqSLUIaBsilGMUjI+Uy2Xu2JLUtTas= +golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY= +gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI= +gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= +gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo= +gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= +gopkg.in/src-d/go-git-fixtures.v3 v3.1.1 h1:XWW/s5W18RaJpmo1l0IYGqXKuJITWRFuA45iOf1dKJs= +gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.9.1 h1:0oKHJZY8tM7B71378cfTg2c5jmWyNlXvestTT6WfY+4= +gopkg.in/src-d/go-git.v4 v4.9.1/go.mod h1:Vtut8izDyrM8BUVQnzJ+YvmNcem2J89EmfZYCkLokZk= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +layeh.com/gopher-luar v1.0.4 h1:BFgt94J/CXh4HkDcE2b7A7pBaVeQKEVfHEBRKL/K/Tc= +layeh.com/gopher-luar v1.0.4/go.mod h1:N3rev/ttQd8yVluXaYsa0M/eknzRYWe+pxZ35ZFmaaI= diff --git a/internal/manager/manager_test.go b/internal/manager/manager_test.go index 9db9817c..ddd644cd 100644 --- a/internal/manager/manager_test.go +++ b/internal/manager/manager_test.go @@ -1,7 +1,6 @@ package manager import ( - "fmt" "testing" "github.com/zyedidia/micro/internal/config" @@ -60,13 +59,13 @@ func TestParse(t *testing.T) { // } // } -func TestList(t *testing.T) { - is, err := ListInstalledPlugins() - if err != nil { - t.Error(err) - } - - for _, i := range is { - fmt.Println(i.Name) - } -} +// func TestList(t *testing.T) { +// is, err := ListInstalledPlugins() +// if err != nil { +// t.Error(err) +// } +// +// for _, i := range is { +// fmt.Println(i.dir) +// } +// } diff --git a/internal/util/util_test.go b/internal/util/util_test.go index a1d59296..454b5c79 100644 --- a/internal/util/util_test.go +++ b/internal/util/util_test.go @@ -15,19 +15,19 @@ func TestStringWidth(t *testing.T) { func TestSliceVisualEnd(t *testing.T) { s := []byte("\thello") - slc, n := SliceVisualEnd(s, 2, 4) + slc, n, _ := SliceVisualEnd(s, 2, 4) assert.Equal(t, []byte("\thello"), slc) assert.Equal(t, 2, n) - slc, n = SliceVisualEnd(s, 1, 4) + slc, n, _ = SliceVisualEnd(s, 1, 4) assert.Equal(t, []byte("\thello"), slc) assert.Equal(t, 1, n) - slc, n = SliceVisualEnd(s, 4, 4) + slc, n, _ = SliceVisualEnd(s, 4, 4) assert.Equal(t, []byte("hello"), slc) assert.Equal(t, 0, n) - slc, n = SliceVisualEnd(s, 5, 4) + slc, n, _ = SliceVisualEnd(s, 5, 4) assert.Equal(t, []byte("ello"), slc) assert.Equal(t, 0, n) } diff --git a/pkg/shellwords/shellwords_test.go b/pkg/shellwords/shellwords_test.go deleted file mode 100644 index 594f9ef7..00000000 --- a/pkg/shellwords/shellwords_test.go +++ /dev/null @@ -1,229 +0,0 @@ -package shellwords - -import ( - "os" - "reflect" - "testing" -) - -var testcases = []struct { - line string - expected []string -}{ - {`var --bar=baz`, []string{`var`, `--bar=baz`}}, - {`var --bar="baz"`, []string{`var`, `--bar=baz`}}, - {`var "--bar=baz"`, []string{`var`, `--bar=baz`}}, - {`var "--bar='baz'"`, []string{`var`, `--bar='baz'`}}, - {"var --bar=`baz`", []string{`var`, "--bar=`baz`"}}, - {`var "--bar=\"baz'"`, []string{`var`, `--bar="baz'`}}, - {`var "--bar=\'baz\'"`, []string{`var`, `--bar='baz'`}}, - {`var --bar='\'`, []string{`var`, `--bar=\`}}, - {`var "--bar baz"`, []string{`var`, `--bar baz`}}, - {`var --"bar baz"`, []string{`var`, `--bar baz`}}, - {`var --"bar baz"`, []string{`var`, `--bar baz`}}, -} - -func TestSimple(t *testing.T) { - for _, testcase := range testcases { - args, err := Parse(testcase.line) - if err != nil { - t.Fatal(err) - } - if !reflect.DeepEqual(args, testcase.expected) { - t.Fatalf("Expected %#v, but %#v:", testcase.expected, args) - } - } -} - -func TestError(t *testing.T) { - _, err := Parse("foo '") - if err == nil { - t.Fatal("Should be an error") - } - _, err = Parse(`foo "`) - if err == nil { - t.Fatal("Should be an error") - } - - _, err = Parse("foo `") - if err == nil { - t.Fatal("Should be an error") - } -} - -func TestLastSpace(t *testing.T) { - args, err := Parse("foo bar\\ ") - if err != nil { - t.Fatal(err) - } - if len(args) != 2 { - t.Fatal("Should have two elements") - } - if args[0] != "foo" { - t.Fatal("1st element should be `foo`") - } - if args[1] != "bar " { - t.Fatal("1st element should be `bar `") - } -} - -func TestBacktick(t *testing.T) { - goversion, err := shellRun("go version") - if err != nil { - t.Fatal(err) - } - - parser := NewParser() - parser.ParseBacktick = true - args, err := parser.Parse("echo `go version`") - if err != nil { - t.Fatal(err) - } - expected := []string{"echo", goversion} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } - - args, err = parser.Parse(`echo $(echo foo)`) - if err != nil { - t.Fatal(err) - } - expected = []string{"echo", "foo"} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } - - parser.ParseBacktick = false - args, err = parser.Parse(`echo $(echo "foo")`) - expected = []string{"echo", `$(echo "foo")`} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } - args, err = parser.Parse("echo $(`echo1)") - if err != nil { - t.Fatal(err) - } - expected = []string{"echo", "$(`echo1)"} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } -} - -func TestBacktickError(t *testing.T) { - parser := NewParser() - parser.ParseBacktick = true - _, err := parser.Parse("echo `go Version`") - if err == nil { - t.Fatal("Should be an error") - } - expected := "exit status 2:go: unknown subcommand \"Version\"\nRun 'go help' for usage.\n" - if expected != err.Error() { - t.Fatalf("Expected %q, but %q", expected, err.Error()) - } - _, err = parser.Parse(`echo $(echo1)`) - if err == nil { - t.Fatal("Should be an error") - } - _, err = parser.Parse(`echo $(echo1`) - if err == nil { - t.Fatal("Should be an error") - } - _, err = parser.Parse(`echo $ (echo1`) - if err == nil { - t.Fatal("Should be an error") - } - _, err = parser.Parse(`echo (echo1`) - if err == nil { - t.Fatal("Should be an error") - } - _, err = parser.Parse(`echo )echo1`) - if err == nil { - t.Fatal("Should be an error") - } -} - -func TestEnv(t *testing.T) { - os.Setenv("FOO", "bar") - - parser := NewParser() - parser.ParseEnv = true - args, err := parser.Parse("echo $FOO") - if err != nil { - t.Fatal(err) - } - expected := []string{"echo", "bar"} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } -} - -func TestNoEnv(t *testing.T) { - parser := NewParser() - parser.ParseEnv = true - args, err := parser.Parse("echo $BAR") - if err != nil { - t.Fatal(err) - } - expected := []string{"echo", ""} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } -} - -func TestDupEnv(t *testing.T) { - os.Setenv("FOO", "bar") - os.Setenv("FOO_BAR", "baz") - - parser := NewParser() - parser.ParseEnv = true - args, err := parser.Parse("echo $$FOO$") - if err != nil { - t.Fatal(err) - } - expected := []string{"echo", "$bar$"} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } - - args, err = parser.Parse("echo $${FOO_BAR}$") - if err != nil { - t.Fatal(err) - } - expected = []string{"echo", "$baz$"} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } -} - -func TestHaveMore(t *testing.T) { - parser := NewParser() - parser.ParseEnv = true - - line := "echo foo; seq 1 10" - args, err := parser.Parse(line) - if err != nil { - t.Fatalf(err.Error()) - } - expected := []string{"echo", "foo"} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } - - if parser.Position == 0 { - t.Fatalf("Commands should be remaining") - } - - line = string([]rune(line)[parser.Position+1:]) - args, err = parser.Parse(line) - if err != nil { - t.Fatalf(err.Error()) - } - expected = []string{"seq", "1", "10"} - if !reflect.DeepEqual(args, expected) { - t.Fatalf("Expected %#v, but %#v:", expected, args) - } - - if parser.Position > 0 { - t.Fatalf("Commands should not be remaining") - } -} diff --git a/pkg/terminfo/terminfo_test.go b/pkg/terminfo/terminfo_test.go deleted file mode 100644 index 44664794..00000000 --- a/pkg/terminfo/terminfo_test.go +++ /dev/null @@ -1,194 +0,0 @@ -// Copyright 2016 The TCell Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use file except in compliance with the License. -// You may obtain a copy of the license at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package terminfo - -import ( - "bytes" - "os" - "testing" - - . "github.com/smartystreets/goconvey/convey" -) - -// This terminfo entry is a stripped down version from -// xterm-256color, but I've added some of my own entries. -var testTerminfo = &Terminfo{ - Name: "simulation_test", - Columns: 80, - Lines: 24, - Colors: 256, - Bell: "\a", - Blink: "\x1b2ms$<2>", - Reverse: "\x1b[7m", - SetFg: "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m", - SetBg: "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m", - AltChars: "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~", - Mouse: "\x1b[M", - MouseMode: "%?%p1%{1}%=%t%'h'%Pa%e%'l'%Pa%;\x1b[?1000%ga%c\x1b[?1003%ga%c\x1b[?1006%ga%c", - SetCursor: "\x1b[%i%p1%d;%p2%dH", - PadChar: "\x00", -} - -func TestTerminfo(t *testing.T) { - - ti := testTerminfo - - Convey("Terminfo parameter processing", t, func() { - // This tests %i, and basic parameter strings too - Convey("TGoto works", func() { - s := ti.TGoto(7, 9) - So(s, ShouldEqual, "\x1b[10;8H") - }) - - // This tests some conditionals - Convey("TParm extended formats work", func() { - s := ti.TParm("A[%p1%2.2X]B", 47) - So(s, ShouldEqual, "A[2F]B") - }) - - // This tests some conditionals - Convey("TParm colors work", func() { - s := ti.TParm(ti.SetFg, 7) - So(s, ShouldEqual, "\x1b[37m") - - s = ti.TParm(ti.SetFg, 15) - So(s, ShouldEqual, "\x1b[97m") - - s = ti.TParm(ti.SetFg, 200) - So(s, ShouldEqual, "\x1b[38;5;200m") - }) - - // This tests variables - Convey("TParm mouse mode works", func() { - s := ti.TParm(ti.MouseMode, 1) - So(s, ShouldEqual, "\x1b[?1000h\x1b[?1003h\x1b[?1006h") - s = ti.TParm(ti.MouseMode, 0) - So(s, ShouldEqual, "\x1b[?1000l\x1b[?1003l\x1b[?1006l") - }) - - }) - - Convey("Terminfo delay handling", t, func() { - - Convey("19200 baud", func() { - buf := bytes.NewBuffer(nil) - ti.TPuts(buf, ti.Blink, 19200) - s := string(buf.Bytes()) - So(s, ShouldEqual, "\x1b2ms\x00\x00\x00\x00") - }) - - Convey("50 baud", func() { - buf := bytes.NewBuffer(nil) - ti.TPuts(buf, ti.Blink, 50) - s := string(buf.Bytes()) - So(s, ShouldEqual, "\x1b2ms") - }) - }) -} - -func TestTerminfoDatabase(t *testing.T) { - - Convey("Database Lookups work", t, func() { - Convey("Basic lookup works", func() { - os.Setenv("TCELLDB", "testdata/test1") - ti, err := LookupTerminfo("test1") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Columns, ShouldEqual, 80) - - ti, err = LookupTerminfo("alias1") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Columns, ShouldEqual, 80) - - os.Setenv("TCELLDB", "testdata") - ti, err = LookupTerminfo("test2") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Columns, ShouldEqual, 80) - So(len(ti.Aliases), ShouldEqual, 1) - So(ti.Aliases[0], ShouldEqual, "alias2") - }) - - Convey("Incorrect primary name works", func() { - os.Setenv("TCELLDB", "testdata") - ti, err := LookupTerminfo("test3") - So(err, ShouldNotBeNil) - So(ti, ShouldBeNil) - }) - - Convey("Loops fail", func() { - os.Setenv("TCELLDB", "testdata") - ti, err := LookupTerminfo("loop1") - So(ti, ShouldBeNil) - So(err, ShouldNotBeNil) - }) - - Convey("Gzip database works", func() { - os.Setenv("TCELLDB", "testdata") - ti, err := LookupTerminfo("test-gzip") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Columns, ShouldEqual, 80) - }) - - Convey("Gzip alias lookup works", func() { - os.Setenv("TCELLDB", "testdata") - ti, err := LookupTerminfo("alias-gzip") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Columns, ShouldEqual, 80) - }) - - Convey("Broken alias works", func() { - os.Setenv("TCELLDB", "testdata") - ti, err := LookupTerminfo("alias-none") - So(err, ShouldNotBeNil) - So(ti, ShouldBeNil) - }) - - Convey("Combined database works", func() { - os.Setenv("TCELLDB", "testdata/combined") - ti, err := LookupTerminfo("combined2") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Lines, ShouldEqual, 102) - - ti, err = LookupTerminfo("alias-comb1") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Lines, ShouldEqual, 101) - - ti, err = LookupTerminfo("combined3") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Lines, ShouldEqual, 103) - - ti, err = LookupTerminfo("combined1") - So(err, ShouldBeNil) - So(ti, ShouldNotBeNil) - So(ti.Lines, ShouldEqual, 101) - }) - }) -} - -func BenchmarkSetFgBg(b *testing.B) { - ti := testTerminfo - - for i := 0; i < b.N; i++ { - ti.TParm(ti.SetFg, 100, 200) - ti.TParm(ti.SetBg, 100, 200) - } -}