diff --git a/.travis.yml b/.travis.yml index 7b24e686..531b01ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,12 @@ go_import_path: github.com/zaquestion/lab sudo: false script: + - echo -e "Host *\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config + - echo -e "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkTcgXnHuqR0gbwegnr9Zxz4hTkjjV/SpgJNPJz7mo/HKNbx0rqjj1P0yGR053R9GSFFim2ut4NK9DPPUkQdyucw+DoLkYRHJmlJ4BNa9NTCD0sl+eSXO2969kZojCYSOgbmkCJx8mdgTwhzdgE/jhBrsY0hPE6pRTlU+H68/zeNdJUAIJf0LLXOm3hpTKLA19VICltl/j9VvBJpgRHdBylXEyL8HokYpjkQQk1ZXj3m7Nlo8yDdg4VcljOJWC+Xh8kxRMfK5x/VRVsYKCQXN5QlzKeqf7USRDUS/7mFoPUBW+d4kwKtGxRsWuIL2yeqzifZUTOgsh9+ZWAWxWffQZ your_email@example.com" > ~/.ssh/id_rsa.pub + - echo -e "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA5E3IF5x7qkdIG8HoJ6/Wcc+IU5I41f0qYCTTyc+5qPxyjW8d\nK6o49T9MhkdOd0fRkhRYptrreDSvQzz1JEHcrnMPg6C5GERyZpSeATWvTUwg9LJf\nnklztvevZGaIwmEjoG5pAicfJnYE8Ic3YBP44Qa7GNITxOqUU5VPh+vP83jXSVAC\nCX9Cy1zpt4aUyiwNfVSApbZf4/VbwSaYER3QcpVxMi/B6JGKY5EEJNWV495uzZaP\nMg3YOFXJYziVgvl4fJMUTHyucf1UVbGCgkFzeUJcynqn+1EkQ1Ev+5haD1AVvneJ\nMCrRsUbFriC9snqs4n2VEzoLIffmVgFsVn30GQIDAQABAoIBAQDPQm2sQbti0mN8\nD4Uawl8D40v30n8WhUa7EbPTOmlqKAQ2sfDhex9KRbTLEmEBmImA/Eee8o9iCTIy\n8Fv8Fm6pUHt9G6Pti/XvemwW3Q3QNpSUkHqN0FDkgecQVqVBEb6uHo3mDm4RFINX\neOmkp30BjIK9/blEw1D0sFALLOEUPaDdPMwiXtFgqfrFSgpDET3TvQIwZ2LxxTm0\ncNmP3sCSlZHJNkZI4hBEWaaXR+V5/+C1qblDCo5blAWTcX3UzqrwUUJgFi6VnBuh\n7S9Q6+CEIU+4JRyWQNmY8YgZFaAp6IOr/kyfPxTP1+UEVVgcLn3WDYwfG9og0tmz\nfzlruAgBAoGBAPfz73Pey86tNZEanhJhbX8gVjzy2hvyhT0paHg0q/H6c1VWOtUH\nOwZ3Ns2xAZqJhlDqCHnQYSCZDly042U/theP4N8zo1APb4Yg4qdmXF9QE1+2M03r\nkS6138gU/CSCLf8pCYa6pA/GmsaXxloeJGLvT4fzOZRsVav80/92XHRhAoGBAOu2\nmKh4Gr1EjgN9QNbk9cQTSFDtlBEqO/0pTepvL73UvNp/BAn4iYZFU4WnklFVBSWc\nL84Sc732xU12TAbTTUsa6E7W29pS8u7zVTxlIdQIIU5pzDyU1pNNk2kpxzte5p3Y\nPDtniPFsoYLWoH0LpsKL93t2pLAj+IOkE6f3XBq5AoGAIKaYo5N1FxQr952frx/x\nQUpK0N/R5Ng8v18SiLG26rhmM5iVSrQXC7TrHI7wfR8a9tC6qP/NqnM9NuwC/bQ0\nEEo7/GhaWxKNRwZRkmWiSFLNGk9t1hbtGU+N1lUdFtmloPIQdRNiw0kN3JTj474Q\nYI7O1EItFORnK6yxZfR6HEECgYEA1CT7MGUoa8APsMRCXyaiq15Pb8bjxK8mXquW\nHLEFXuzhLCW1FORDoj0y9s/iuKC0iS0ROX8R/J7k5NrbgikbH8WP36UxKkYNr1IC\nHOFImPTYRSKjVsL+fIUNb1DSp3S6SsYbL7v3XJJQqtlQiDq8U8x1aQFXJ9C4EoLR\nzhKrKsECgYBtU/TSF/TATZY5XtrN9O+HX1Fbz70Ci8XgvioheVI2fezOcXPRzDcC\nOYPaCMNKA5E8gHdg4s0TN7uDvKTJ+KhSg2V7gZ39A28dHrJaRX7Nz4k6t2uEBjX9\na1JidpAIbJ+3w7+hj6L299tVZvS+Y/6Dz/uuEQGXfJg/l/5CCvQPsA==\n-----END RSA PRIVATE KEY-----" > ~/.ssh/id_rsa + - chmod 600 ~/.ssh/id_rsa* + - eval `ssh-agent -s` + - ssh-add ~/.ssh/id_rsa - make test deploy: diff --git a/Makefile b/Makefile index 0a9cf74f..f7eb26aa 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,3 @@ internal-test: mv testdata/test.git testdata/.git go test ./... mv testdata/.git testdata/test.git - diff --git a/cmd/mrCheckout_test.go b/cmd/mrCheckout_test.go index d9bad1d0..bed4ca86 100644 --- a/cmd/mrCheckout_test.go +++ b/cmd/mrCheckout_test.go @@ -14,6 +14,7 @@ func Test_mrCheckoutCmdRun(t *testing.T) { cmd.Dir = repo b, err := cmd.CombinedOutput() if err != nil { + t.Log(string(b)) t.Fatal(err) } t.Log(string(b)) diff --git a/cmd/root.go b/cmd/root.go index da33c50f..5c432667 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -105,9 +105,3 @@ func Execute() { os.Exit(1) } } - -func init() { - // Unsure if this will mess up in other parts of the cli, so modified - // the function to return a string - // RootCmd.SetUsageFunc(labUsage) -} diff --git a/cmd/root_test.go b/cmd/root_test.go index 2eebbf97..c4c796e1 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -58,7 +58,8 @@ func copyTestRepo(t *testing.T) string { } func TestRootCloneNoArg(t *testing.T) { - cmd := exec.Command("./lab_bin", "clone") + cmd := exec.Command("../lab_bin", "clone") + cmd.Dir = "./testdata" b, _ := cmd.CombinedOutput() require.Contains(t, string(b), "You must specify a repository to clone.") } diff --git a/internal/gitlab/gitlab.go b/internal/gitlab/gitlab.go index 44e28e6f..10f677d4 100644 --- a/internal/gitlab/gitlab.go +++ b/internal/gitlab/gitlab.go @@ -34,7 +34,7 @@ var ( const defaultGitLabHost = "https://gitlab.com" -func init() { +func Init() { reader := bufio.NewReader(os.Stdin) var err error host, err = gitconfig.Entire("gitlab.host") diff --git a/main.go b/main.go index 5430e322..b55c7d3d 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,11 @@ package main -import "github.com/zaquestion/lab/cmd" +import ( + "github.com/zaquestion/lab/cmd" + "github.com/zaquestion/lab/internal/gitlab" +) func main() { + gitlab.Init() cmd.Execute() }