Refactor commands to subpackage.

aptly/version.go

@@ -0,0 +1,4 @@
+package aptly
+
+// Version of aptly
+const Version = "0.4~dev"

cmd/cmd.go

@@ -0,0 +1,62 @@
+// Package cmd implements console commands
+package cmd
+
+import (
+	"fmt"
+	"github.com/gonuts/commander"
+	"github.com/gonuts/flag"
+	"github.com/smira/aptly/debian"
+	"os"
+)
+
+// ListPackagesRefList shows list of packages in PackageRefList
+func ListPackagesRefList(reflist *debian.PackageRefList) (err error) {
+	fmt.Printf("Packages:\n")
+
+	packageCollection := debian.NewPackageCollection(context.database)
+
+	err = reflist.ForEach(func(key []byte) error {
+		p, err := packageCollection.ByKey(key)
+		if err != nil {
+			return err
+		}
+		fmt.Printf("  %s\n", p)
+		return nil
+	})
+	if err != nil {
+		return fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	return
+}
+
+// RootCommand creates root command in command tree
+func RootCommand() *commander.Command {
+	cmd := &commander.Command{
+		UsageLine: os.Args[0],
+		Short:     "Debian repository management tool",
+		Long: `
+}
+aptly is a tool to create partial and full mirrors of remote
+repositories, filter them, merge, upgrade individual packages,
+take snapshots and publish them back as Debian repositories.`,
+		Flag: *flag.NewFlagSet("aptly", flag.ExitOnError),
+		Subcommands: []*commander.Command{
+			makeCmdDb(),
+			makeCmdGraph(),
+			makeCmdMirror(),
+			makeCmdServe(),
+			makeCmdSnapshot(),
+			makeCmdPublish(),
+			makeCmdVersion(),
+		},
+	}
+
+	cmd.Flag.Bool("dep-follow-suggests", false, "when processing dependencies, follow Suggests")
+	cmd.Flag.Bool("dep-follow-source", false, "when processing dependencies, follow from binary to Source packages")
+	cmd.Flag.Bool("dep-follow-recommends", false, "when processing dependencies, follow Recommends")
+	cmd.Flag.Bool("dep-follow-all-variants", false, "when processing dependencies, follow a & b if depdency is 'a|b'")
+	cmd.Flag.String("architectures", "", "list of architectures to consider during (comma-separated), default to all available")
+	cmd.Flag.String("config", "", "location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf)")
+	return cmd
+}

cmd/context.go

@@ -0,0 +1,68 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/gonuts/commander"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/console"
+	"github.com/smira/aptly/database"
+	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/files"
+	"github.com/smira/aptly/http"
+	"github.com/smira/aptly/utils"
+	"path/filepath"
+	"strings"
+)
+
+// Common context shared by all commands
+var context struct {
+	progress          aptly.Progress
+	downloader        aptly.Downloader
+	database          database.Storage
+	packagePool       aptly.PackagePool
+	publishedStorage  aptly.PublishedStorage
+	dependencyOptions int
+	architecturesList []string
+}
+
+func InitContext(cmd *commander.Command) error {
+	var err error
+
+	context.dependencyOptions = 0
+	if utils.Config.DepFollowSuggests || cmd.Flag.Lookup("dep-follow-suggests").Value.Get().(bool) {
+		context.dependencyOptions |= debian.DepFollowSuggests
+	}
+	if utils.Config.DepFollowRecommends || cmd.Flag.Lookup("dep-follow-recommends").Value.Get().(bool) {
+		context.dependencyOptions |= debian.DepFollowRecommends
+	}
+	if utils.Config.DepFollowAllVariants || cmd.Flag.Lookup("dep-follow-all-variants").Value.Get().(bool) {
+		context.dependencyOptions |= debian.DepFollowAllVariants
+	}
+	if utils.Config.DepFollowSource || cmd.Flag.Lookup("dep-follow-source").Value.Get().(bool) {
+		context.dependencyOptions |= debian.DepFollowSource
+	}
+
+	context.architecturesList = utils.Config.Architectures
+	optionArchitectures := cmd.Flag.Lookup("architectures").Value.String()
+	if optionArchitectures != "" {
+		context.architecturesList = strings.Split(optionArchitectures, ",")
+	}
+
+	context.progress = console.NewProgress()
+	context.progress.Start()
+	defer context.progress.Shutdown()
+
+	context.downloader = http.NewDownloader(utils.Config.DownloadConcurrency, context.progress)
+	defer context.downloader.Shutdown()
+
+	context.database, err = database.OpenDB(filepath.Join(utils.Config.RootDir, "db"))
+	if err != nil {
+		return fmt.Errorf("can't open database: %s", err)
+	}
+	defer context.database.Close()
+
+	context.packagePool = files.NewPackagePool(utils.Config.RootDir)
+	context.publishedStorage = files.NewPublishedStorage(utils.Config.RootDir)
+
+	return nil
+}

cmd/db.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"github.com/gonuts/commander"

cmd/db_cleanup.go

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

cmd/graph.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"bytes"

cmd/mirror.go

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

cmd/publish.go

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

cmd/serve.go

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

cmd/snapshot.go

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

cmd/version.go

@@ -1,13 +1,14 @@
-package main
+package cmd
 
 import (
 	"fmt"
 	"github.com/gonuts/commander"
 	"github.com/gonuts/flag"
+	"github.com/smira/aptly/aptly"
 )
 
 func aptlyVersion(cmd *commander.Command, args []string) error {
-	fmt.Printf("aptly version: %s\n", Version)
+	fmt.Printf("aptly version: %s\n", aptly.Version)
 	return nil
 }
 

common.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/smira/aptly/debian"
-)
-
-//ListPackagesRefList shows list of packages in PackageRefList
-func ListPackagesRefList(reflist *debian.PackageRefList) (err error) {
-	fmt.Printf("Packages:\n")
-
-	packageCollection := debian.NewPackageCollection(context.database)
-
-	err = reflist.ForEach(func(key []byte) error {
-		p, err := packageCollection.ByKey(key)
-		if err != nil {
-			return err
-		}
-		fmt.Printf("  %s\n", p)
-		return nil
-	})
-	if err != nil {
-		return fmt.Errorf("unable to load packages: %s", err)
-	}
-
-	return
-}