seperate cli and cmd main package

cmd/bbolt/main_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	bolt "go.etcd.io/bbolt"
-	main "go.etcd.io/bbolt/cmd/bbolt"
+	"go.etcd.io/bbolt/cmd/cli"
 	"go.etcd.io/bbolt/internal/guts_cli"
 )
 
@@ -441,15 +441,15 @@ func (b *ConcurrentBuffer) String() string {
 
 // Main represents a test wrapper for main.Main that records output.
 type Main struct {
-	*main.Main
+	*cli.Main
 	Stdin  ConcurrentBuffer
 	Stdout ConcurrentBuffer
 	Stderr ConcurrentBuffer
 }
 
 // NewMain returns a new instance of Main.
 func NewMain() *Main {
-	m := &Main{Main: main.NewMain()}
+	m := &Main{Main: cli.NewMain()}
 	m.Main.Stdin = &m.Stdin
 	m.Main.Stdout = &m.Stdout
 	m.Main.Stderr = &m.Stderr

cmd/bbolt/utils_test.go

@@ -1,7 +1,6 @@
 package main_test
 
 import (
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -10,37 +9,10 @@ import (
 	"go.etcd.io/bbolt/internal/guts_cli"
 )
 
-func loadMetaPage(t *testing.T, dbPath string, pageID uint64) *common.Meta {
-	_, buf, err := guts_cli.ReadPage(dbPath, pageID)
-	require.NoError(t, err)
-	return common.LoadPageMeta(buf)
-}
-
 func readMetaPage(t *testing.T, path string) *common.Meta {
 	_, activeMetaPageId, err := guts_cli.GetRootPage(path)
 	require.NoError(t, err)
 	_, buf, err := guts_cli.ReadPage(path, uint64(activeMetaPageId))
 	require.NoError(t, err)
 	return common.LoadPageMeta(buf)
 }
-
-func readPage(t *testing.T, path string, pageId int, pageSize int) []byte {
-	dbFile, err := os.Open(path)
-	require.NoError(t, err)
-	defer dbFile.Close()
-
-	fi, err := dbFile.Stat()
-	require.NoError(t, err)
-	require.GreaterOrEqual(t, fi.Size(), int64((pageId+1)*pageSize))
-
-	buf := make([]byte, pageSize)
-	byteRead, err := dbFile.ReadAt(buf, int64(pageId*pageSize))
-	require.NoError(t, err)
-	require.Equal(t, pageSize, byteRead)
-
-	return buf
-}
-
-func pageDataWithoutPageId(buf []byte) []byte {
-	return buf[8:]
-}

cmd/bbolt/command_root.go → cmd/cli/command_root.go

@@ -1,4 +1,4 @@
-package main
+package cli
 
 import (
 	"github.com/spf13/cobra"

cmd/bbolt/command_surgery.go → cmd/cli/command_surgery.go

@@ -1,4 +1,4 @@
-package main
+package cli
 
 import (
 	"errors"

cmd/bbolt/command_surgery_freelist.go → cmd/cli/command_surgery_freelist.go

@@ -1,4 +1,4 @@
-package main
+package cli
 
 import (
 	"errors"

cmd/bbolt/command_surgery_freelist_test.go → cmd/cli/command_surgery_freelist_test.go

@@ -1,4 +1,4 @@
-package main_test
+package cli_test
 
 import (
 	"path/filepath"
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	bolt "go.etcd.io/bbolt"
-	main "go.etcd.io/bbolt/cmd/bbolt"
+	main "go.etcd.io/bbolt/cmd/cli"
 	"go.etcd.io/bbolt/internal/btesting"
 	"go.etcd.io/bbolt/internal/common"
 )

cmd/bbolt/command_surgery_test.go → cmd/cli/command_surgery_test.go

@@ -1,4 +1,4 @@
-package main_test
+package cli_test
 
 import (
 	"fmt"
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	bolt "go.etcd.io/bbolt"
-	main "go.etcd.io/bbolt/cmd/bbolt"
+	main "go.etcd.io/bbolt/cmd/cli"
 	"go.etcd.io/bbolt/internal/btesting"
 	"go.etcd.io/bbolt/internal/common"
 	"go.etcd.io/bbolt/internal/guts_cli"

cmd/bbolt/command_version.go → cmd/cli/command_version.go

@@ -1,4 +1,4 @@
-package main
+package cli
 
 import (
 	"fmt"