Move private code into internal/trousseau

oleiade · Aug 22, 2019 · f45722e · f45722e
1 parent 486b685
commit f45722e
Show file tree

Hide file tree

Showing 26 changed files with 14 additions and 4 deletions.
diff --git a/cmd/trousseau/before.go b/cmd/trousseau/before.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/oleiade/trousseau"
+	"github.com/oleiade/trousseau/internal/trousseau"
 	"github.com/urfave/cli"
 )
 

diff --git a/cmd/trousseau/commands.go b/cmd/trousseau/commands.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/oleiade/trousseau"
+	"github.com/oleiade/trousseau/internal/trousseau"
 	"github.com/urfave/cli"
 )
 

diff --git a/cmd/trousseau/main.go b/cmd/trousseau/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/oleiade/trousseau"
+	"github.com/oleiade/trousseau/internal/trousseau"
 	"github.com/urfave/cli"
 )
 

diff --git a/go.mod b/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/google/go-querystring v0.0.0-20160401233042-9235644dd9e5
 	github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3
 	github.com/howeyc/gopass v0.0.0-20160803164817-b63a7d07e65d
+	github.com/kr/pretty v0.1.0 // indirect
 	github.com/oleiade/reflections v0.0.0-20131121131850-632977f98cd3
 	github.com/oleiade/serrure v0.0.0-20160812094227-28794589ac9b
 	github.com/oleiade/tempura v0.0.0-20140528162001-1e4f5790d506
@@ -19,4 +20,5 @@ require (
 	golang.org/x/crypto v0.0.0-20160812214243-6c932297e160
 	golang.org/x/net v0.0.0-20160811235142-07b51741c1d6
 	golang.org/x/oauth2 v0.0.0-20160810173516-4784bb855e56
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -9,6 +9,11 @@ github.com/google/go-querystring v0.0.0-20160401233042-9235644dd9e5/go.mod h1:od
 github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3/go.mod h1:0CNX5Cvi77WEH8llpfZ/ieuqyceb1cnO5//b5zzsnF8=
 github.com/howeyc/gopass v0.0.0-20160803164817-b63a7d07e65d h1:QSXZhkCwA1j3WbSVEnxB+9sPsuthBgvpi4BUTaYPc6E=
 github.com/howeyc/gopass v0.0.0-20160803164817-b63a7d07e65d/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
+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/oleiade/reflections v0.0.0-20131121131850-632977f98cd3 h1:shfb0dwW+oUvt8GjdLeitj0PpE4hw9mN6WXZ4OAf9DY=
 github.com/oleiade/reflections v0.0.0-20131121131850-632977f98cd3/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w=
 github.com/oleiade/serrure v0.0.0-20160812094227-28794589ac9b h1:3D0HyVLogm3spti98Jp9tRAEkgLq0dzLVVNcTD6/DxA=
@@ -29,3 +34,5 @@ golang.org/x/net v0.0.0-20160811235142-07b51741c1d6 h1:A/+8dHDavelB1CB3VF5cdxIxp
 golang.org/x/net v0.0.0-20160811235142-07b51741c1d6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/oauth2 v0.0.0-20160810173516-4784bb855e56 h1:HiiJye4gG8Fcv2Y07oKLC/LLoWZ2DWq9d/hBK0B+aSY=
 golang.org/x/oauth2 v0.0.0-20160810173516-4784bb855e56/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+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=
diff --git a/actions.go → internal/trousseau/actions.go b/actions.go → internal/trousseau/actions.go
diff --git a/cli_helpers.go → internal/trousseau/cli_helpers.go b/cli_helpers.go → internal/trousseau/cli_helpers.go
diff --git a/constants.go → internal/trousseau/constants.go b/constants.go → internal/trousseau/constants.go
diff --git a/context.go → internal/trousseau/context.go b/context.go → internal/trousseau/context.go
diff --git a/crypto.go → internal/trousseau/crypto.go b/crypto.go → internal/trousseau/crypto.go
diff --git a/download.go → internal/trousseau/download.go b/download.go → internal/trousseau/download.go
diff --git a/gpgagent.go → internal/trousseau/gpgagent.go b/gpgagent.go → internal/trousseau/gpgagent.go
diff --git a/gpgagent_test.go → internal/trousseau/gpgagent_test.go b/gpgagent_test.go → internal/trousseau/gpgagent_test.go
diff --git a/import.go → internal/trousseau/import.go b/import.go → internal/trousseau/import.go
diff --git a/kv.go → internal/trousseau/kv.go b/kv.go → internal/trousseau/kv.go
diff --git a/kv_test.go → internal/trousseau/kv_test.go b/kv_test.go → internal/trousseau/kv_test.go
diff --git a/logger.go → internal/trousseau/logger.go b/logger.go → internal/trousseau/logger.go
diff --git a/meta.go → internal/trousseau/meta.go b/meta.go → internal/trousseau/meta.go
diff --git a/store.go → internal/trousseau/store.go b/store.go → internal/trousseau/store.go
diff --git a/test_helpers.go → internal/trousseau/test_helpers.go b/test_helpers.go → internal/trousseau/test_helpers.go
diff --git a/trousseau.go → internal/trousseau/trousseau.go b/trousseau.go → internal/trousseau/trousseau.go
diff --git a/trousseau_test.go → internal/trousseau/trousseau_test.go b/trousseau_test.go → internal/trousseau/trousseau_test.go
diff --git a/upgrade.go → internal/trousseau/upgrade.go b/upgrade.go → internal/trousseau/upgrade.go
diff --git a/upgrade_test.go → internal/trousseau/upgrade_test.go b/upgrade_test.go → internal/trousseau/upgrade_test.go
@@ -2,8 +2,9 @@ package trousseau
 
 import (
 	"encoding/json"
-	"github.com/oleiade/serrure/openpgp"
 	"testing"
+
+	"github.com/oleiade/serrure/openpgp"
 )
 
 func TestIsVersionZeroDotThree(t *testing.T) {

diff --git a/upload.go → internal/trousseau/upload.go b/upload.go → internal/trousseau/upload.go
diff --git a/utils.go → internal/trousseau/utils.go b/utils.go → internal/trousseau/utils.go