Fix style warnings.

Conflicts:
	deb/publish_test.go

.gitignore

@@ -26,3 +26,9 @@ coverage.html
 coverage*.out
 
 *.pyc
+
+_vendor/
+
+gen
+man/aptly.1.html
+man/aptly.1.ronn

.travis.yml

@@ -2,7 +2,8 @@ language: go
 
 go:
   - 1.1
-  - 1.2
+  - 1.2.1
+  - tip
 
 env:
   global:
@@ -12,4 +13,8 @@ install:
   - make prepare
 
 
-script: make travis
+script: make travis
+
+matrix:
+    allow_failures:
+        - go: tip

Gomfile

@@ -0,0 +1,22 @@
+gom 'code.google.com/p/go-uuid/uuid', :commit => '5fac954758f5'
+gom 'code.google.com/p/go.crypto/ssh/terminal', :commit => '7aa593ce8cea'
+gom 'code.google.com/p/gographviz', :commit => '454bc64fdfa2'
+gom 'code.google.com/p/snappy-go/snappy', :commit => '12e4b4183793'
+gom 'github.com/cheggaaa/pb', :commit => '74be7a1388046f374ac36e93d46f5d56e856f827'
+gom 'github.com/smira/commander', :commit => 'f408b00e68d5d6e21b9f18bd310978dafc604e47'
+gom 'github.com/smira/flag', :commit => '0d0aac2addb39050f45e92c5a6252926096dc841'
+gom 'github.com/mkrautz/goar', :commit => '36eb5f3452b1283a211fa35bc00c646fd0db5c4b'
+gom 'github.com/syndtr/goleveldb/leveldb', :commit => 'ff3719c6816e2cd194f05058452d660608e178ac'
+gom 'github.com/ugorji/go/codec', :commit => '71c2886f5a673a35f909803f38ece5810165097b'
+gom 'github.com/wsxiaoys/terminal/color', :commit => '5668e431776a7957528361f90ce828266c69ed08'
+
+group :test do
+    gom 'launchpad.net/gocheck'
+end
+
+group :development do
+   gom 'github.com/golang/lint/golint'
+   gom 'github.com/mattn/goveralls'
+   gom 'github.com/axw/gocov/gocov'
+   gom 'code.google.com/p/go.tools/cmd/cover'
+end

Makefile

@@ -1,63 +1,87 @@
 GOVERSION=$(shell go version | awk '{print $$3;}')
+PACKAGES=database deb files http utils
+ALL_PACKAGES=aptly cmd console database deb files http utils
+BINPATH=$(abspath ./_vendor/bin)
+GOM_ENVIRONMENT=-test
+PYTHON?=python
 
-ifeq ($(TRAVIS), true)
-GOVERALLS?=$(HOME)/gopath/bin/goveralls
-SRCPATH?=$(HOME)/gopath/src
-BINPATH=$(HOME)/gopath/bin
-else
-GOVERALLS?=goveralls
-SRCPATH?=$(GOPATH)/src
-BINPATH?=$(GOPATH)/bin
-endif
-
-ifeq ($(GOVERSION), go1.2)
+ifeq ($(GOVERSION), devel)
 TRAVIS_TARGET=coveralls
-PREPARE_LIST=cover-prepare
+GOM_ENVIRONMENT+=-development
 else
 TRAVIS_TARGET=test
-PREPARE_LIST=
+endif
+
+ifeq ($(TRAVIS), true)
+GOM=$(HOME)/gopath/bin/gom
+else
+GOM=gom
 endif
 
 all: test check system-test
 
-prepare: $(PREPARE_LIST)
-	go get -d -v ./...
-	go get launchpad.net/gocheck
-
-cover-prepare:
-	go get github.com/golang/lint/golint
-	go get github.com/mattn/goveralls
-	go get github.com/axw/gocov/gocov
-	go get code.google.com/p/go.tools/cmd/cover
+prepare:
+	go get -u github.com/mattn/gom
+	$(GOM) $(GOM_ENVIRONMENT) install
 
 coverage.out:
-	go test -coverprofile=coverage.debian.out -covermode=count ./debian
-	go test -coverprofile=coverage.utils.out -covermode=count ./utils
-	go test -coverprofile=coverage.database.out -covermode=count ./database
+	rm -f coverage.*.out
+	for i in $(PACKAGES); do $(GOM) test -coverprofile=coverage.$$i.out -covermode=count ./$$i; done
 	echo "mode: count" > coverage.out
 	grep -v -h "mode: count" coverage.*.out >> coverage.out
+	rm -f coverage.*.out
 
 coverage: coverage.out
-	go tool cover -html=coverage.out
+	$(GOM) exec go tool cover -html=coverage.out
 	rm -f coverage.out
 
 check:
-	go tool vet -all=true .
-	golint .
+	$(GOM) exec go tool vet -all=true -shadow=true $(ALL_PACKAGES:%=./%)
+	$(GOM) exec golint $(ALL_PACKAGES:%=./%)
 
-system-test:
-ifeq ($(GOVERSION), go1.2)
+install:
+	$(GOM) build -o $(BINPATH)/aptly
+
+system-test: install
+ifeq ($(GOVERSION),$(filter $(GOVERSION),go1.2 go1.2.1 devel))
 	if [ ! -e ~/aptly-fixture-db ]; then git clone https://github.com/aptly-dev/aptly-fixture-db.git ~/aptly-fixture-db/; fi
 endif
-	go install
-	PATH=$(BINPATH):$(PATH) python system/run.py --long
+	if [ ! -e ~/aptly-fixture-pool ]; then git clone https://github.com/aptly-dev/aptly-fixture-pool.git ~/aptly-fixture-pool/; fi
+	PATH=$(BINPATH)/:$(PATH) $(PYTHON) system/run.py --long
 
 travis: $(TRAVIS_TARGET) system-test
 
 test:
-	go test -v ./... -gocheck.v=true
+	$(GOM) test -v ./... -gocheck.v=true
 
 coveralls: coverage.out
-	@$(GOVERALLS) -service travis-ci.org -coverprofile=coverage.out $(COVERALLS_TOKEN)
+	$(GOM) exec $(BINPATH)/goveralls -service travis-ci.org -coverprofile=coverage.out -repotoken=$(COVERALLS_TOKEN)
 
-.PHONY: coverage.out
+mem.png: mem.dat mem.gp
+	gnuplot mem.gp
+	open mem.png
+
+package:
+	rm -rf root/
+	mkdir -p root/usr/bin/ root/usr/share/man/man1/ root/etc/bash_completion.d
+	cp $(BINPATH)/aptly root/usr/bin
+	cp man/aptly.1 root/usr/share/man/man1
+	(cd root/etc/bash_completion.d && wget https://raw.github.com/aptly-dev/aptly-bash-completion/master/aptly)
+	gzip root/usr/share/man/man1/aptly.1
+	fpm -s dir -t deb -n aptly -v $(VERSION) --url=http://www.aptly.info/ --license=MIT --vendor="Andrey Smirnov <me@smira.ru>" \
+	   -f -m "Andrey Smirnov <me@smira.ru>" --description="Debian repository management tool" -C root/ .
+	mv aptly_$(VERSION)_*.deb ~
+
+src-package:
+	rm -rf aptly-$(VERSION)
+	mkdir -p aptly-$(VERSION)/src/github.com/smira/aptly/
+	cd aptly-$(VERSION)/src/github.com/smira/ && git clone https://github.com/smira/aptly && cd aptly && git checkout v$(VERSION)
+	cd aptly-$(VERSION)/src/github.com/smira/aptly && gom -production install
+	cd aptly-$(VERSION)/src/github.com/smira/aptly && find . -name .git -print | xargs rm -rf
+	cd aptly-$(VERSION)/src/github.com/smira/aptly && find . -name .bzr -print | xargs rm -rf
+	cd aptly-$(VERSION)/src/github.com/smira/aptly && find . -name .hg -print | xargs rm -rf
+	rm -rf aptly-$(VERSION)/src/github.com/smira/aptly/_vendor/{pkg,bin}
+	tar cyf aptly-$(VERSION)-src.tar.bz2 aptly-$(VERSION)
+	rm -rf aptly-$(VERSION)
+
+.PHONY: coverage.out

README.rst

@@ -19,25 +19,50 @@ Aptly features: ("+" means planned features)
 * take snapshots of mirrors at any point in time, fixing state of repository at some moment of time
 * publish snapshot as Debian repository, ready to be consumed by apt
 * controlled update of one or more packages in snapshot from upstream mirror, tracking dependencies
-* merge two or more snapshots into one (+)
+* merge two or more snapshots into one
 * filter repository by search query, pulling dependencies when required (+)
 * publish self-made packages as Debian repositories (+)
+* mirror repositories "as-is" (without resigning with user's key) (+)
+* support for yum repositories (+)
 
 Current limitations:
 
-* source packages, debian-installer and translations not supported yet
-* signature is not verified while downloading
-* cleaning up stale files is not implemented
-
-Currently aptly is under heavy development, so please use it with care.
+* debian-installer and translations not supported yet
 
 Download
 --------
 
+To install aptly on Debian/Ubuntu, add new repository to /etc/apt/sources.list::
+
+    deb http://repo.aptly.info/ squeeze main
+
+And import key that is used to sign the release::
+
+    $ gpg --keyserver keys.gnupg.net --recv-keys 2A194991
+    $ gpg -a --export 2A194991 | sudo apt-key add -
+
+After that you can install aptly as any other software package::
+
+    $ apt-get update
+    $ apt-get install aptly
+
+Don't worry about squeeze part in repo name: aptly package should work on Debian squeeze+,
+Ubuntu 10.0+. Package contains aptly binary, man page and bash completion.
+
 Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_.
 
 If you have Go environment set up, you can build aptly from source by running (go 1.1+ required)::
 
-    go get github.com/smira/aptly
+    go get -u github.com/mattn/gom
+    mkdir -p $GOPATH/src/github.com/smira/aptly
+    git clone https://github.com/smira/aptly $GOPATH/src/github.com/smira/aptly
+    cd $GOPATH/src/github.com/smira/aptly
+    gom -production install
+    gom build -o $GOPATH/bin/aptly
+
+Aptly is using `gom <https://github.com/mattn/gom>`_ to fix external dependencies, so regular ``go get github.com/smira/aptly``
+should work as well, but might fail or produce different result (if external libraries got updated).
 
 If you don't have Go installed (or older version), you can easily install Go using `gvm <https://github.com/moovweb/gvm/>`_.
+
+

aptly/interfaces.go

@@ -0,0 +1,88 @@
+// Package aptly provides common infrastructure that doesn't depend directly on
+// Debian or CentOS
+package aptly
+
+import (
+	"github.com/smira/aptly/utils"
+	"io"
+	"os"
+)
+
+// PackagePool is asbtraction of package pool storage.
+//
+// PackagePool stores all the package files, deduplicating them.
+type PackagePool interface {
+	// Path returns full path to package file in pool given any name and hash of file contents
+	Path(filename string, hashMD5 string) (string, error)
+	// RelativePath returns path relative to pool's root for package files given MD5 and original filename
+	RelativePath(filename string, hashMD5 string) (string, error)
+	// FilepathList returns file paths of all the files in the pool
+	FilepathList(progress Progress) ([]string, error)
+	// Remove deletes file in package pool returns its size
+	Remove(path string) (size int64, err error)
+	// Import copies file into package pool
+	Import(path string, hashMD5 string) error
+}
+
+// PublishedStorage is abstraction of filesystem storing all published repositories
+type PublishedStorage interface {
+	// PublicPath returns root of public part
+	PublicPath() string
+	// MkDir creates directory recursively under public path
+	MkDir(path string) error
+	// CreateFile creates file for writing under public path
+	CreateFile(path string) (*os.File, error)
+	// RemoveDirs removes directory structure under public path
+	RemoveDirs(path string, progress Progress) error
+	// Remove removes single file under public path
+	Remove(path string) error
+	// LinkFromPool links package file from pool to dist's pool location
+	LinkFromPool(publishedDirectory string, sourcePool PackagePool, sourcePath string) error
+	// Filelist returns list of files under prefix
+	Filelist(prefix string) ([]string, error)
+	// ChecksumsForFile proxies requests to utils.ChecksumsForFile, joining public path
+	ChecksumsForFile(path string) (utils.ChecksumInfo, error)
+	// RenameFile renames (moves) file
+	RenameFile(oldName, newName string) error
+}
+
+// Progress is a progress displaying entity, it allows progress bars & simple prints
+type Progress interface {
+	// Writer interface to support progress bar ticking
+	io.Writer
+	// Start makes progress start its work
+	Start()
+	// Shutdown shuts down progress display
+	Shutdown()
+	// Flush returns when all queued messages are sent
+	Flush()
+	// InitBar starts progressbar for count bytes or count items
+	InitBar(count int64, isBytes bool)
+	// ShutdownBar stops progress bar and hides it
+	ShutdownBar()
+	// AddBar increments progress for progress bar
+	AddBar(count int)
+	// SetBar sets current position for progress bar
+	SetBar(count int)
+	// Printf does printf but in safe manner: not overwriting progress bar
+	Printf(msg string, a ...interface{})
+	// ColoredPrintf does printf in colored way + newline
+	ColoredPrintf(msg string, a ...interface{})
+}
+
+// Downloader is parallel HTTP fetcher
+type Downloader interface {
+	// Download starts new download task
+	Download(url string, destination string, result chan<- error)
+	// DownloadWithChecksum starts new download task with checksum verification
+	DownloadWithChecksum(url string, destination string, result chan<- error, expected utils.ChecksumInfo, ignoreMismatch bool)
+	// Pause pauses task processing
+	Pause()
+	// Resume resumes task processing
+	Resume()
+	// Shutdown stops downloader after current tasks are finished,
+	// but doesn't process rest of queue
+	Shutdown()
+	// GetProgress returns Progress object
+	GetProgress() Progress
+}

aptly/version.go

@@ -0,0 +1,7 @@
+package aptly
+
+// Version of aptly
+const Version = "0.6"
+
+// Enable debugging features?
+const EnableDebug = false

cmd/cmd.go

@@ -0,0 +1,81 @@
+// Package cmd implements console commands
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"os"
+	"time"
+)
+
+// ListPackagesRefList shows list of packages in PackageRefList
+func ListPackagesRefList(reflist *deb.PackageRefList) (err error) {
+	fmt.Printf("Packages:\n")
+
+	if reflist == nil {
+		return
+	}
+
+	err = reflist.ForEach(func(key []byte) error {
+		p, err2 := context.CollectionFactory().PackageCollection().ByKey(key)
+		if err2 != nil {
+			return err2
+		}
+		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, manage local repositories, filter them, merge,
+upgrade individual packages, take snapshots and publish them
+back as Debian repositories.
+
+aptly's goal is to establish repeatability and controlled changes
+in a package-centric environment. aptly allows to fix a set of packages
+in a repository, so that package installation and upgrade becomes
+deterministic. At the same time aptly allows to perform controlled,
+fine-grained changes in repository contents to transition your
+package environment to new version.`,
+		Flag: *flag.NewFlagSet("aptly", flag.ExitOnError),
+		Subcommands: []*commander.Command{
+			makeCmdDb(),
+			makeCmdGraph(),
+			makeCmdMirror(),
+			makeCmdRepo(),
+			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)")
+
+	if aptly.EnableDebug {
+		cmd.Flag.String("cpuprofile", "", "write cpu profile to file")
+		cmd.Flag.String("memprofile", "", "write memory profile to this file")
+		cmd.Flag.String("memstats", "", "write memory stats periodically to this file")
+		cmd.Flag.Duration("meminterval", 100*time.Millisecond, "memory stats dump interval")
+	}
+	return cmd
+}

cmd/context.go

@@ -0,0 +1,286 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/console"
+	"github.com/smira/aptly/database"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/aptly/files"
+	"github.com/smira/aptly/http"
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"os"
+	"path/filepath"
+	"runtime"
+	"runtime/pprof"
+	"strings"
+	"time"
+)
+
+// AptlyContext is a common context shared by all commands
+type AptlyContext struct {
+	flags        *flag.FlagSet
+	configLoaded bool
+
+	progress          aptly.Progress
+	downloader        aptly.Downloader
+	database          database.Storage
+	packagePool       aptly.PackagePool
+	publishedStorage  aptly.PublishedStorage
+	collectionFactory *deb.CollectionFactory
+	dependencyOptions int
+	architecturesList []string
+	// Debug features
+	fileCPUProfile *os.File
+	fileMemProfile *os.File
+	fileMemStats   *os.File
+}
+
+var context *AptlyContext
+
+// FatalError is type for panicking to abort execution with non-zero
+// exit code and print meaningful explanation
+type FatalError struct {
+	ReturnCode int
+	Message    string
+}
+
+// Fatal panics and aborts execution with exit code 1
+func Fatal(err error) {
+	returnCode := 1
+	if err == commander.ErrFlagError || err == commander.ErrCommandError {
+		returnCode = 2
+	}
+	panic(&FatalError{ReturnCode: returnCode, Message: err.Error()})
+}
+
+// Config loads and returns current configuration
+func (context *AptlyContext) Config() *utils.ConfigStructure {
+	if !context.configLoaded {
+		var err error
+
+		configLocation := context.flags.Lookup("config").Value.String()
+		if configLocation != "" {
+			err = utils.LoadConfig(configLocation, &utils.Config)
+
+			if err != nil {
+				Fatal(err)
+			}
+		} else {
+			configLocations := []string{
+				filepath.Join(os.Getenv("HOME"), ".aptly.conf"),
+				"/etc/aptly.conf",
+			}
+
+			for _, configLocation := range configLocations {
+				err = utils.LoadConfig(configLocation, &utils.Config)
+				if err == nil {
+					break
+				}
+				if !os.IsNotExist(err) {
+					Fatal(fmt.Errorf("error loading config file %s: %s", configLocation, err))
+				}
+			}
+
+			if err != nil {
+				fmt.Printf("Config file not found, creating default config at %s\n\n", configLocations[0])
+				utils.SaveConfig(configLocations[0], &utils.Config)
+			}
+		}
+
+		context.configLoaded = true
+
+	}
+	return &utils.Config
+}
+
+// DependencyOptions calculates options related to dependecy handling
+func (context *AptlyContext) DependencyOptions() int {
+	if context.dependencyOptions == -1 {
+		context.dependencyOptions = 0
+		if context.Config().DepFollowSuggests || context.flags.Lookup("dep-follow-suggests").Value.Get().(bool) {
+			context.dependencyOptions |= deb.DepFollowSuggests
+		}
+		if context.Config().DepFollowRecommends || context.flags.Lookup("dep-follow-recommends").Value.Get().(bool) {
+			context.dependencyOptions |= deb.DepFollowRecommends
+		}
+		if context.Config().DepFollowAllVariants || context.flags.Lookup("dep-follow-all-variants").Value.Get().(bool) {
+			context.dependencyOptions |= deb.DepFollowAllVariants
+		}
+		if context.Config().DepFollowSource || context.flags.Lookup("dep-follow-source").Value.Get().(bool) {
+			context.dependencyOptions |= deb.DepFollowSource
+		}
+	}
+
+	return context.dependencyOptions
+}
+
+// ArchitecturesList returns list of architectures fixed via command line or config
+func (context *AptlyContext) ArchitecturesList() []string {
+	if context.architecturesList == nil {
+		context.architecturesList = context.Config().Architectures
+		optionArchitectures := context.flags.Lookup("architectures").Value.String()
+		if optionArchitectures != "" {
+			context.architecturesList = strings.Split(optionArchitectures, ",")
+		}
+	}
+
+	return context.architecturesList
+}
+
+// Progress creates or returns Progress object
+func (context *AptlyContext) Progress() aptly.Progress {
+	if context.progress == nil {
+		context.progress = console.NewProgress()
+		context.progress.Start()
+	}
+
+	return context.progress
+}
+
+// Downloader returns instance of current downloader
+func (context *AptlyContext) Downloader() aptly.Downloader {
+	if context.downloader == nil {
+		context.downloader = http.NewDownloader(context.Config().DownloadConcurrency, context.Progress())
+	}
+
+	return context.downloader
+}
+
+// DBPath builds path to database
+func (context *AptlyContext) DBPath() string {
+	return filepath.Join(context.Config().RootDir, "db")
+}
+
+// Database opens and returns current instance of database
+func (context *AptlyContext) Database() (database.Storage, error) {
+	if context.database == nil {
+		var err error
+
+		context.database, err = database.OpenDB(context.DBPath())
+		if err != nil {
+			return nil, fmt.Errorf("can't open database: %s", err)
+		}
+	}
+
+	return context.database, nil
+}
+
+// CollectionFactory builds factory producing all kinds of collections
+func (context *AptlyContext) CollectionFactory() *deb.CollectionFactory {
+	if context.collectionFactory == nil {
+		db, err := context.Database()
+		if err != nil {
+			Fatal(err)
+		}
+		context.collectionFactory = deb.NewCollectionFactory(db)
+	}
+
+	return context.collectionFactory
+}
+
+// PackagePool returns instance of PackagePool
+func (context *AptlyContext) PackagePool() aptly.PackagePool {
+	if context.packagePool == nil {
+		context.packagePool = files.NewPackagePool(context.Config().RootDir)
+	}
+
+	return context.packagePool
+}
+
+// PublishedStorage returns instance of PublishedStorage
+func (context *AptlyContext) PublishedStorage() aptly.PublishedStorage {
+	if context.publishedStorage == nil {
+		context.publishedStorage = files.NewPublishedStorage(context.Config().RootDir)
+	}
+
+	return context.publishedStorage
+}
+
+// ShutdownContext shuts context down
+func ShutdownContext() {
+	if aptly.EnableDebug {
+		if context.fileMemProfile != nil {
+			pprof.WriteHeapProfile(context.fileMemProfile)
+			context.fileMemProfile.Close()
+			context.fileMemProfile = nil
+		}
+		if context.fileCPUProfile != nil {
+			pprof.StopCPUProfile()
+			context.fileCPUProfile.Close()
+			context.fileCPUProfile = nil
+		}
+		if context.fileMemProfile != nil {
+			context.fileMemProfile.Close()
+			context.fileMemProfile = nil
+		}
+	}
+	if context.database != nil {
+		context.database.Close()
+	}
+	if context.downloader != nil {
+		context.downloader.Shutdown()
+	}
+	if context.progress != nil {
+		context.progress.Shutdown()
+	}
+}
+
+// InitContext initializes context with default settings
+func InitContext(flags *flag.FlagSet) error {
+	var err error
+
+	context = &AptlyContext{flags: flags, dependencyOptions: -1}
+
+	if aptly.EnableDebug {
+		cpuprofile := flags.Lookup("cpuprofile").Value.String()
+		if cpuprofile != "" {
+			context.fileCPUProfile, err = os.Create(cpuprofile)
+			if err != nil {
+				return err
+			}
+			pprof.StartCPUProfile(context.fileCPUProfile)
+		}
+
+		memprofile := flags.Lookup("memprofile").Value.String()
+		if memprofile != "" {
+			context.fileMemProfile, err = os.Create(memprofile)
+			if err != nil {
+				return err
+			}
+		}
+
+		memstats := flags.Lookup("memstats").Value.String()
+		if memstats != "" {
+			interval := flags.Lookup("meminterval").Value.Get().(time.Duration)
+
+			context.fileMemStats, err = os.Create(memstats)
+			if err != nil {
+				return err
+			}
+
+			context.fileMemStats.WriteString("# Time\tHeapSys\tHeapAlloc\tHeapIdle\tHeapReleased\n")
+
+			go func() {
+				var stats runtime.MemStats
+
+				start := time.Now().UnixNano()
+
+				for {
+					runtime.ReadMemStats(&stats)
+					if context.fileMemStats != nil {
+						context.fileMemStats.WriteString(fmt.Sprintf("%d\t%d\t%d\t%d\t%d\n",
+							(time.Now().UnixNano()-start)/1000000, stats.HeapSys, stats.HeapAlloc, stats.HeapIdle, stats.HeapReleased))
+						time.Sleep(interval)
+					} else {
+						break
+					}
+				}
+			}()
+		}
+	}
+
+	return nil
+}

cmd/db.go

@@ -0,0 +1,16 @@
+package cmd
+
+import (
+	"github.com/smira/commander"
+)
+
+func makeCmdDb() *commander.Command {
+	return &commander.Command{
+		UsageLine: "db",
+		Short:     "manage aptly's internal database and package pool",
+		Subcommands: []*commander.Command{
+			makeCmdDbCleanup(),
+			makeCmdDbRecover(),
+		},
+	}
+}

cmd/db_cleanup.go

@@ -0,0 +1,167 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"sort"
+)
+
+// aptly db cleanup
+func aptlyDbCleanup(cmd *commander.Command, args []string) error {
+	var err error
+
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	// collect information about references packages...
+	existingPackageRefs := deb.NewPackageRefList()
+
+	context.Progress().Printf("Loading mirrors, local repos and snapshots...\n")
+	err = context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
+		err := context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
+		if err != nil {
+			return err
+		}
+		if repo.RefList() != nil {
+			existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
+		err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+		if err != nil {
+			return err
+		}
+		if repo.RefList() != nil {
+			existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
+		err := context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
+		if err != nil {
+			return err
+		}
+		existingPackageRefs = existingPackageRefs.Merge(snapshot.RefList(), false)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	// ... and compare it to the list of all packages
+	context.Progress().Printf("Loading list of all packages...\n")
+	allPackageRefs := context.CollectionFactory().PackageCollection().AllPackageRefs()
+
+	toDelete := allPackageRefs.Substract(existingPackageRefs)
+
+	// delete packages that are no longer referenced
+	context.Progress().Printf("Deleting unreferenced packages (%d)...\n", toDelete.Len())
+
+	// database can't err as collection factory already constructed
+	db, _ := context.Database()
+	db.StartBatch()
+	err = toDelete.ForEach(func(ref []byte) error {
+		return context.CollectionFactory().PackageCollection().DeleteByKey(ref)
+	})
+	if err != nil {
+		return err
+	}
+
+	err = db.FinishBatch()
+	if err != nil {
+		return fmt.Errorf("unable to write to DB: %s", err)
+	}
+
+	// now, build a list of files that should be present in Repository (package pool)
+	context.Progress().Printf("Building list of files referenced by packages...\n")
+	referencedFiles := make([]string, 0, existingPackageRefs.Len())
+	context.Progress().InitBar(int64(existingPackageRefs.Len()), false)
+
+	err = existingPackageRefs.ForEach(func(key []byte) error {
+		pkg, err2 := context.CollectionFactory().PackageCollection().ByKey(key)
+		if err2 != nil {
+			return err2
+		}
+		paths, err2 := pkg.FilepathList(context.PackagePool())
+		if err2 != nil {
+			return err2
+		}
+		referencedFiles = append(referencedFiles, paths...)
+		context.Progress().AddBar(1)
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	sort.Strings(referencedFiles)
+	context.Progress().ShutdownBar()
+
+	// build a list of files in the package pool
+	context.Progress().Printf("Building list of files in package pool...\n")
+	existingFiles, err := context.PackagePool().FilepathList(context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to collect file paths: %s", err)
+	}
+
+	// find files which are in the pool but not referenced by packages
+	filesToDelete := utils.StrSlicesSubstract(existingFiles, referencedFiles)
+
+	// delete files that are no longer referenced
+	context.Progress().Printf("Deleting unreferenced files (%d)...\n", len(filesToDelete))
+
+	if len(filesToDelete) > 0 {
+		context.Progress().InitBar(int64(len(filesToDelete)), false)
+
+		var size, totalSize int64
+		for _, file := range filesToDelete {
+			size, err = context.PackagePool().Remove(file)
+			if err != nil {
+				return err
+			}
+
+			context.Progress().AddBar(1)
+			totalSize += size
+		}
+		context.Progress().ShutdownBar()
+
+		context.Progress().Printf("Disk space freed: %s...\n", utils.HumanBytes(totalSize))
+	}
+
+	context.Progress().Printf("Compacting database...\n")
+	err = db.CompactDB()
+
+	return err
+}
+
+func makeCmdDbCleanup() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyDbCleanup,
+		UsageLine: "cleanup",
+		Short:     "cleanup DB and package pool",
+		Long: `
+Database cleanup removes information about unreferenced packages and removes
+files in the package pool that aren't used by packages anymore
+
+Example:
+
+  $ aptly db cleanup
+`,
+	}
+
+	return cmd
+}

cmd/db_recover.go

@@ -0,0 +1,39 @@
+package cmd
+
+import (
+	"github.com/smira/aptly/database"
+	"github.com/smira/commander"
+)
+
+// aptly db recover
+func aptlyDbRecover(cmd *commander.Command, args []string) error {
+	var err error
+
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	context.Progress().Printf("Recovering database...\n")
+	err = database.RecoverDB(context.DBPath())
+
+	return err
+}
+
+func makeCmdDbRecover() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyDbRecover,
+		UsageLine: "recover",
+		Short:     "recover DB after crash",
+		Long: `
+Database recover does its' best to recover the database after a crash.
+It is recommended to backup the DB before running recover.
+
+Example:
+
+  $ aptly db recover
+`,
+	}
+
+	return cmd
+}

cmd/graph.go

@@ -0,0 +1,205 @@
+package cmd
+
+import (
+	"bytes"
+	"code.google.com/p/gographviz"
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func aptlyGraph(cmd *commander.Command, args []string) error {
+	var err error
+
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	graph := gographviz.NewEscape()
+	graph.SetDir(true)
+	graph.SetName("aptly")
+
+	existingNodes := map[string]bool{}
+
+	fmt.Printf("Loading mirrors...\n")
+
+	err = context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
+		err := context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
+		if err != nil {
+			return err
+		}
+
+		graph.AddNode("aptly", repo.UUID, map[string]string{
+			"shape":     "Mrecord",
+			"style":     "filled",
+			"fillcolor": "darkgoldenrod1",
+			"label": fmt.Sprintf("{Mirror %s|url: %s|dist: %s|comp: %s|arch: %s|pkgs: %d}",
+				repo.Name, repo.ArchiveRoot, repo.Distribution, strings.Join(repo.Components, ", "),
+				strings.Join(repo.Architectures, ", "), repo.NumPackages()),
+		})
+		existingNodes[repo.UUID] = true
+		return nil
+	})
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Loading local repos...\n")
+
+	err = context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
+		err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+		if err != nil {
+			return err
+		}
+
+		graph.AddNode("aptly", repo.UUID, map[string]string{
+			"shape":     "Mrecord",
+			"style":     "filled",
+			"fillcolor": "mediumseagreen",
+			"label": fmt.Sprintf("{Repo %s|comment: %s|pkgs: %d}",
+				repo.Name, repo.Comment, repo.NumPackages()),
+		})
+		existingNodes[repo.UUID] = true
+		return nil
+	})
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Loading snapshots...\n")
+
+	context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
+		existingNodes[snapshot.UUID] = true
+		return nil
+	})
+
+	err = context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
+		err := context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
+		if err != nil {
+			return err
+		}
+
+		description := snapshot.Description
+		if snapshot.SourceKind == "repo" {
+			description = "Snapshot from repo"
+		}
+
+		graph.AddNode("aptly", snapshot.UUID, map[string]string{
+			"shape":     "Mrecord",
+			"style":     "filled",
+			"fillcolor": "cadetblue1",
+			"label":     fmt.Sprintf("{Snapshot %s|%s|pkgs: %d}", snapshot.Name, description, snapshot.NumPackages()),
+		})
+
+		if snapshot.SourceKind == "repo" || snapshot.SourceKind == "local" || snapshot.SourceKind == "snapshot" {
+			for _, uuid := range snapshot.SourceIDs {
+				_, exists := existingNodes[uuid]
+				if exists {
+					graph.AddEdge(uuid, snapshot.UUID, true, nil)
+				}
+			}
+		}
+		return nil
+	})
+
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Loading published repos...\n")
+
+	context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *deb.PublishedRepo) error {
+		graph.AddNode("aptly", repo.UUID, map[string]string{
+			"shape":     "Mrecord",
+			"style":     "filled",
+			"fillcolor": "darkolivegreen1",
+			"label": fmt.Sprintf("{Published %s/%s|comp: %s|arch: %s}", repo.Prefix, repo.Distribution,
+				strings.Join(repo.Components(), " "), strings.Join(repo.Architectures, ", ")),
+		})
+
+		for _, uuid := range repo.Sources {
+			_, exists := existingNodes[uuid]
+			if exists {
+				graph.AddEdge(uuid, repo.UUID, true, nil)
+			}
+		}
+
+		return nil
+	})
+
+	fmt.Printf("Generating graph...\n")
+
+	buf := bytes.NewBufferString(graph.String())
+
+	tempfile, err := ioutil.TempFile("", "aptly-graph")
+	if err != nil {
+		return err
+	}
+	tempfile.Close()
+	os.Remove(tempfile.Name())
+
+	tempfilename := tempfile.Name() + ".png"
+
+	command := exec.Command("dot", "-Tpng", "-o"+tempfilename)
+	command.Stderr = os.Stderr
+
+	stdin, err := command.StdinPipe()
+	if err != nil {
+		return err
+	}
+
+	err = command.Start()
+	if err != nil {
+		return fmt.Errorf("unable to execute dot: %s (is graphviz package installed?)", err)
+	}
+
+	_, err = io.Copy(stdin, buf)
+	if err != nil {
+		return err
+	}
+
+	err = stdin.Close()
+	if err != nil {
+		return err
+	}
+
+	err = command.Wait()
+	if err != nil {
+		return err
+	}
+
+	err = exec.Command("open", tempfilename).Run()
+	if err != nil {
+		fmt.Printf("Rendered to PNG file: %s\n", tempfilename)
+		err = nil
+	}
+
+	return err
+}
+
+func makeCmdGraph() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyGraph,
+		UsageLine: "graph",
+		Short:     "render graph of relationships",
+		Long: `
+Command graph displays relationship between mirrors, local repositories,
+snapshots and published repositories using graphviz package to render
+graph as an image.
+
+Example:
+
+  $ aptly graph
+`,
+	}
+
+	return cmd
+}

cmd/mirror.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"strings"
+)
+
+func getVerifier(flags *flag.FlagSet) (utils.Verifier, error) {
+	if context.Config().GpgDisableVerify || flags.Lookup("ignore-signatures").Value.Get().(bool) {
+		return nil, nil
+	}
+
+	keyRings := flags.Lookup("keyring").Value.Get().([]string)
+
+	verifier := &utils.GpgVerifier{}
+	for _, keyRing := range keyRings {
+		verifier.AddKeyring(keyRing)
+	}
+
+	err := verifier.InitKeyring()
+	if err != nil {
+		return nil, err
+	}
+
+	return verifier, nil
+}
+
+type keyRingsFlag struct {
+	keyRings []string
+}
+
+func (k *keyRingsFlag) Set(value string) error {
+	k.keyRings = append(k.keyRings, value)
+	return nil
+}
+
+func (k *keyRingsFlag) Get() interface{} {
+	return k.keyRings
+}
+
+func (k *keyRingsFlag) String() string {
+	return strings.Join(k.keyRings, ",")
+}
+
+func makeCmdMirror() *commander.Command {
+	return &commander.Command{
+		UsageLine: "mirror",
+		Short:     "manage mirrors of remote repositories",
+		Subcommands: []*commander.Command{
+			makeCmdMirrorCreate(),
+			makeCmdMirrorList(),
+			makeCmdMirrorShow(),
+			makeCmdMirrorDrop(),
+			makeCmdMirrorUpdate(),
+		},
+	}
+}

cmd/mirror_create.go

@@ -0,0 +1,85 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"strings"
+)
+
+func aptlyMirrorCreate(cmd *commander.Command, args []string) error {
+	var err error
+	if !(len(args) == 2 && strings.HasPrefix(args[1], "ppa:") || len(args) >= 3) {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	downloadSources := context.Config().DownloadSourcePackages || context.flags.Lookup("with-sources").Value.Get().(bool)
+
+	var (
+		mirrorName, archiveURL, distribution string
+		components                           []string
+	)
+
+	mirrorName = args[0]
+	if len(args) == 2 {
+		archiveURL, distribution, components, err = deb.ParsePPA(args[1], context.Config())
+		if err != nil {
+			return err
+		}
+	} else {
+		archiveURL, distribution, components = args[1], args[2], args[3:]
+	}
+
+	repo, err := deb.NewRemoteRepo(mirrorName, archiveURL, distribution, components, context.ArchitecturesList(), downloadSources)
+	if err != nil {
+		return fmt.Errorf("unable to create mirror: %s", err)
+	}
+
+	verifier, err := getVerifier(context.flags)
+	if err != nil {
+		return fmt.Errorf("unable to initialize GPG verifier: %s", err)
+	}
+
+	err = repo.Fetch(context.Downloader(), verifier)
+	if err != nil {
+		return fmt.Errorf("unable to fetch mirror: %s", err)
+	}
+
+	err = context.CollectionFactory().RemoteRepoCollection().Add(repo)
+	if err != nil {
+		return fmt.Errorf("unable to add mirror: %s", err)
+	}
+
+	fmt.Printf("\nMirror %s successfully added.\nYou can run 'aptly mirror update %s' to download repository contents.\n", repo, repo.Name)
+	return err
+}
+
+func makeCmdMirrorCreate() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyMirrorCreate,
+		UsageLine: "create <name> <archive url> <distribution> [<component1> ...]",
+		Short:     "create new mirror",
+		Long: `
+Creates mirror <name> of remote repository, aptly supports both regular and flat Debian repositories exported
+via HTTP. aptly would try download Release file from remote repository and verify its' signature. Command
+line format resembles apt utlitily sources.list(5).
+
+PPA urls could specified in short format:
+
+  $ aptly mirror create <name> ppa:<user>/<project>
+
+Example:
+
+  $ aptly mirror create wheezy-main http://mirror.yandex.ru/debian/ wheezy main
+`,
+		Flag: *flag.NewFlagSet("aptly-mirror-create", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("ignore-signatures", false, "disable verification of Release file signatures")
+	cmd.Flag.Bool("with-sources", false, "download source packages in addition to binary packages")
+	cmd.Flag.Var(&keyRingsFlag{}, "keyring", "gpg keyring to use when verifying Release file (could be specified multiple times)")
+
+	return cmd
+}

cmd/mirror_drop.go

@@ -0,0 +1,67 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyMirrorDrop(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	repo, err := context.CollectionFactory().RemoteRepoCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to drop: %s", err)
+	}
+
+	force := context.flags.Lookup("force").Value.Get().(bool)
+	if !force {
+		snapshots := context.CollectionFactory().SnapshotCollection().ByRemoteRepoSource(repo)
+
+		if len(snapshots) > 0 {
+			fmt.Printf("Mirror `%s` was used to create following snapshots:\n", repo.Name)
+			for _, snapshot := range snapshots {
+				fmt.Printf(" * %s\n", snapshot)
+			}
+
+			return fmt.Errorf("won't delete mirror with snapshots, use -force to override")
+		}
+	}
+
+	err = context.CollectionFactory().RemoteRepoCollection().Drop(repo)
+	if err != nil {
+		return fmt.Errorf("unable to drop: %s", err)
+	}
+
+	fmt.Printf("Mirror `%s` has been removed.\n", repo.Name)
+
+	return err
+}
+
+func makeCmdMirrorDrop() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyMirrorDrop,
+		UsageLine: "drop <name>",
+		Short:     "delete mirror",
+		Long: `
+Drop deletes information about remote repository mirror <name>. Package data is not deleted
+(since it could still be used by other mirrors or snapshots).  If mirror is used as source
+to create a snapshot, aptly would refuse to delete such mirror, use flag -force to override.
+
+Example:
+
+  $ aptly mirror drop wheezy-main
+`,
+		Flag: *flag.NewFlagSet("aptly-mirror-drop", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("force", false, "force mirror deletion even if used by snapshots")
+
+	return cmd
+}

cmd/mirror_list.go

@@ -0,0 +1,69 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"sort"
+)
+
+func aptlyMirrorList(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
+
+	repos := make([]string, context.CollectionFactory().RemoteRepoCollection().Len())
+	i := 0
+	context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
+		if raw {
+			repos[i] = repo.Name
+		} else {
+			repos[i] = repo.String()
+		}
+		i++
+		return nil
+	})
+
+	sort.Strings(repos)
+
+	if raw {
+		for _, repo := range repos {
+			fmt.Printf("%s\n", repo)
+		}
+	} else {
+		if len(repos) > 0 {
+			fmt.Printf("List of mirrors:\n")
+			for _, repo := range repos {
+				fmt.Printf(" * %s\n", repo)
+			}
+
+			fmt.Printf("\nTo get more information about mirror, run `aptly mirror show <name>`.\n")
+		} else {
+			fmt.Printf("No mirrors found, create one with `aptly mirror create ...`.\n")
+		}
+	}
+	return err
+}
+
+func makeCmdMirrorList() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyMirrorList,
+		UsageLine: "list",
+		Short:     "list mirrors",
+		Long: `
+List shows full list of remote repository mirrors.
+
+Example:
+
+  $ aptly mirror list
+`,
+	}
+
+	cmd.Flag.Bool("raw", false, "display list in machine-readable format")
+
+	return cmd
+}

cmd/mirror_show.go

@@ -0,0 +1,82 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"strings"
+)
+
+func aptlyMirrorShow(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	repo, err := context.CollectionFactory().RemoteRepoCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to show: %s", err)
+	}
+
+	err = context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
+	if err != nil {
+		return fmt.Errorf("unable to show: %s", err)
+	}
+
+	fmt.Printf("Name: %s\n", repo.Name)
+	fmt.Printf("Archive Root URL: %s\n", repo.ArchiveRoot)
+	fmt.Printf("Distribution: %s\n", repo.Distribution)
+	fmt.Printf("Components: %s\n", strings.Join(repo.Components, ", "))
+	fmt.Printf("Architectures: %s\n", strings.Join(repo.Architectures, ", "))
+	downloadSources := "no"
+	if repo.DownloadSources {
+		downloadSources = "yes"
+	}
+	fmt.Printf("Download Sources: %s\n", downloadSources)
+	if repo.LastDownloadDate.IsZero() {
+		fmt.Printf("Last update: never\n")
+	} else {
+		fmt.Printf("Last update: %s\n", repo.LastDownloadDate.Format("2006-01-02 15:04:05 MST"))
+		fmt.Printf("Number of packages: %d\n", repo.NumPackages())
+	}
+
+	fmt.Printf("\nInformation from release file:\n")
+	for _, k := range utils.StrMapSortedKeys(repo.Meta) {
+		fmt.Printf("%s: %s\n", k, repo.Meta[k])
+	}
+
+	withPackages := context.flags.Lookup("with-packages").Value.Get().(bool)
+	if withPackages {
+		if repo.LastDownloadDate.IsZero() {
+			fmt.Printf("Unable to show package list, mirror hasn't been downloaded yet.\n")
+		} else {
+			ListPackagesRefList(repo.RefList())
+		}
+	}
+
+	return err
+}
+
+func makeCmdMirrorShow() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyMirrorShow,
+		UsageLine: "show <name>",
+		Short:     "show details about mirror",
+		Long: `
+Shows detailed information about the mirror.
+
+Example:
+
+  $ aptly mirror show wheezy-main
+`,
+		Flag: *flag.NewFlagSet("aptly-mirror-show", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("with-packages", false, "show detailed list of packages and versions stored in the mirror")
+
+	return cmd
+}

cmd/mirror_update.go

@@ -0,0 +1,76 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyMirrorUpdate(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	repo, err := context.CollectionFactory().RemoteRepoCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	err = context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	ignoreMismatch := context.flags.Lookup("ignore-checksums").Value.Get().(bool)
+
+	verifier, err := getVerifier(context.flags)
+	if err != nil {
+		return fmt.Errorf("unable to initialize GPG verifier: %s", err)
+	}
+
+	err = repo.Fetch(context.Downloader(), verifier)
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	err = repo.Download(context.Progress(), context.Downloader(), context.CollectionFactory(), context.PackagePool(), ignoreMismatch)
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	err = context.CollectionFactory().RemoteRepoCollection().Update(repo)
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	context.Progress().Printf("\nMirror `%s` has been successfully updated.\n", repo.Name)
+	return err
+}
+
+func makeCmdMirrorUpdate() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyMirrorUpdate,
+		UsageLine: "update <name>",
+		Short:     "update mirror",
+		Long: `
+Updates remote mirror (downloads package files and meta information). When mirror is created,
+this command should be run for the first time to fetch mirror contents. This command can be
+run multiple times to get updated repository contents. If interrupted, command can be safely restarted.
+
+Example:
+
+  $ aptly mirror update wheezy-main
+`,
+		Flag: *flag.NewFlagSet("aptly-mirror-update", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("ignore-checksums", false, "ignore checksum mismatches while downloading package files and metadata")
+	cmd.Flag.Bool("ignore-signatures", false, "disable verification of Release file signatures")
+	cmd.Flag.Var(&keyRingsFlag{}, "keyring", "gpg keyring to use when verifying Release file (could be specified multiple times)")
+
+	return cmd
+}

cmd/publish.go

@@ -0,0 +1,40 @@
+package cmd
+
+import (
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func getSigner(flags *flag.FlagSet) (utils.Signer, error) {
+	if flags.Lookup("skip-signing").Value.Get().(bool) || context.Config().GpgDisableSign {
+		return nil, nil
+	}
+
+	signer := &utils.GpgSigner{}
+	signer.SetKey(flags.Lookup("gpg-key").Value.String())
+	signer.SetKeyRing(flags.Lookup("keyring").Value.String(), flags.Lookup("secret-keyring").Value.String())
+
+	err := signer.Init()
+	if err != nil {
+		return nil, err
+	}
+
+	return signer, nil
+
+}
+
+func makeCmdPublish() *commander.Command {
+	return &commander.Command{
+		UsageLine: "publish",
+		Short:     "manage published repositories",
+		Subcommands: []*commander.Command{
+			makeCmdPublishDrop(),
+			makeCmdPublishList(),
+			makeCmdPublishRepo(),
+			makeCmdPublishSnapshot(),
+			makeCmdPublishSwitch(),
+			makeCmdPublishUpdate(),
+		},
+	}
+}

cmd/publish_drop.go

@@ -0,0 +1,49 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+)
+
+func aptlyPublishDrop(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 1 || len(args) > 2 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	distribution := args[0]
+	prefix := "."
+
+	if len(args) == 2 {
+		prefix = args[1]
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().Remove(context.PublishedStorage(), prefix, distribution,
+		context.CollectionFactory(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to remove: %s", err)
+	}
+
+	context.Progress().Printf("\nPublished repository has been removed successfully.\n")
+
+	return err
+}
+
+func makeCmdPublishDrop() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyPublishDrop,
+		UsageLine: "drop <distribution> [<prefix>]",
+		Short:     "remove published repository",
+		Long: `
+Command removes whatever has been published under specified <prefix> and
+<distribution> name.
+
+Example:
+
+    $ aptly publish drop wheezy
+`,
+	}
+
+	return cmd
+}

cmd/publish_list.go

@@ -0,0 +1,78 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"sort"
+)
+
+func aptlyPublishList(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
+
+	published := make([]string, 0, context.CollectionFactory().PublishedRepoCollection().Len())
+
+	err = context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *deb.PublishedRepo) error {
+		err := context.CollectionFactory().PublishedRepoCollection().LoadComplete(repo, context.CollectionFactory())
+		if err != nil {
+			return err
+		}
+
+		if raw {
+			published = append(published, fmt.Sprintf("%s %s", repo.Prefix, repo.Distribution))
+		} else {
+			published = append(published, repo.String())
+		}
+		return nil
+	})
+
+	if err != nil {
+		return fmt.Errorf("unable to load list of repos: %s", err)
+	}
+
+	sort.Strings(published)
+
+	if raw {
+		for _, info := range published {
+			fmt.Printf("%s\n", info)
+		}
+	} else {
+		if len(published) == 0 {
+			fmt.Printf("No snapshots/local repos have been published. Publish a snapshot by running `aptly publish snapshot ...`.\n")
+			return err
+		}
+
+		fmt.Printf("Published repositories:\n")
+
+		for _, description := range published {
+			fmt.Printf("  * %s\n", description)
+		}
+	}
+
+	return err
+}
+
+func makeCmdPublishList() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyPublishList,
+		UsageLine: "list",
+		Short:     "list of published repositories",
+		Long: `
+Display list of currently published snapshots.
+
+Example:
+
+    $ aptly publish list
+`,
+	}
+
+	cmd.Flag.Bool("raw", false, "display list in machine-readable format")
+
+	return cmd
+}

cmd/publish_repo.go

@@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func makeCmdPublishRepo() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyPublishSnapshotOrRepo,
+		UsageLine: "repo <name> [<prefix>]",
+		Short:     "publish local repository",
+		Long: `
+Command publishes current state of local repository ready to be consumed
+by apt tools. Published repostiories appear under rootDir/public directory.
+Valid GPG key is required for publishing.
+
+Multiple component repository could be published by specifying several
+components split by commas via -component flag and multiple local
+repositories as the arguments:
+
+    aptly publish repo -component=main,contrib repo-main repo-contrib
+
+It is not recommended to publish local repositories directly unless the
+repository is for testing purposes and changes happen frequently. For
+production usage please take snapshot of repository and publish it
+using publish snapshot command.
+
+Example:
+
+    $ aptly publish repo testing
+`,
+		Flag: *flag.NewFlagSet("aptly-publish-repo", flag.ExitOnError),
+	}
+	cmd.Flag.String("distribution", "", "distribution name to publish")
+	cmd.Flag.String("component", "", "component name to publish (for multi-component publishing, separate components with commas)")
+	cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
+	cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
+	cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
+	cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
+	cmd.Flag.String("origin", "", "origin name to publish")
+	cmd.Flag.String("label", "", "label to publish")
+
+	return cmd
+}

cmd/publish_snapshot.go

@@ -0,0 +1,194 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"strings"
+)
+
+func aptlyPublishSnapshotOrRepo(cmd *commander.Command, args []string) error {
+	var err error
+
+	components := strings.Split(context.flags.Lookup("component").Value.String(), ",")
+
+	if len(args) < len(components) || len(args) > len(components)+1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	var prefix string
+	if len(args) == len(components)+1 {
+		prefix = args[len(components)]
+		args = args[0 : len(args)-1]
+	} else {
+		prefix = ""
+	}
+
+	var (
+		sources = []interface{}{}
+		message string
+	)
+
+	if cmd.Name() == "snapshot" {
+		var (
+			snapshot     *deb.Snapshot
+			emptyWarning = false
+			parts        = []string{}
+		)
+
+		for _, name := range args {
+			snapshot, err = context.CollectionFactory().SnapshotCollection().ByName(name)
+			if err != nil {
+				return fmt.Errorf("unable to publish: %s", err)
+			}
+
+			err = context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
+			if err != nil {
+				return fmt.Errorf("unable to publish: %s", err)
+			}
+
+			sources = append(sources, snapshot)
+			parts = append(parts, snapshot.Name)
+
+			if snapshot.NumPackages() == 0 {
+				emptyWarning = true
+			}
+		}
+
+		if len(parts) == 1 {
+			message = fmt.Sprintf("Snapshot %s has", parts[0])
+		} else {
+			message = fmt.Sprintf("Snapshots %s have", strings.Join(parts, ", "))
+
+		}
+
+		if emptyWarning {
+			context.Progress().Printf("Warning: publishing from empty source, architectures list should be complete, it can't be changed after publishing (use -architectures flag)\n")
+		}
+	} else if cmd.Name() == "repo" {
+		var (
+			localRepo    *deb.LocalRepo
+			emptyWarning = false
+			parts        = []string{}
+		)
+
+		for _, name := range args {
+			localRepo, err = context.CollectionFactory().LocalRepoCollection().ByName(name)
+			if err != nil {
+				return fmt.Errorf("unable to publish: %s", err)
+			}
+
+			err = context.CollectionFactory().LocalRepoCollection().LoadComplete(localRepo)
+			if err != nil {
+				return fmt.Errorf("unable to publish: %s", err)
+			}
+
+			sources = append(sources, localRepo)
+			parts = append(parts, localRepo.Name)
+
+			if localRepo.NumPackages() == 0 {
+				emptyWarning = true
+			}
+		}
+
+		if len(parts) == 1 {
+			message = fmt.Sprintf("Local repo %s has", parts[0])
+		} else {
+			message = fmt.Sprintf("Local repos %s have", strings.Join(parts, ", "))
+
+		}
+
+		if emptyWarning {
+			context.Progress().Printf("Warning: publishing from empty source, architectures list should be complete, it can't be changed after publishing (use -architectures flag)\n")
+		}
+	} else {
+		panic("unknown command")
+	}
+
+	distribution := context.flags.Lookup("distribution").Value.String()
+
+	published, err := deb.NewPublishedRepo(prefix, distribution, context.ArchitecturesList(), components, sources, context.CollectionFactory())
+	if err != nil {
+		return fmt.Errorf("unable to publish: %s", err)
+	}
+	published.Origin = cmd.Flag.Lookup("origin").Value.String()
+	published.Label = cmd.Flag.Lookup("label").Value.String()
+
+	duplicate := context.CollectionFactory().PublishedRepoCollection().CheckDuplicate(published)
+	if duplicate != nil {
+		context.CollectionFactory().PublishedRepoCollection().LoadComplete(duplicate, context.CollectionFactory())
+		return fmt.Errorf("prefix/distribution already used by another published repo: %s", duplicate)
+	}
+
+	signer, err := getSigner(context.flags)
+	if err != nil {
+		return fmt.Errorf("unable to initialize GPG signer: %s", err)
+	}
+
+	err = published.Publish(context.PackagePool(), context.PublishedStorage(), context.CollectionFactory(), signer, context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to publish: %s", err)
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().Add(published)
+	if err != nil {
+		return fmt.Errorf("unable to save to DB: %s", err)
+	}
+
+	var repoComponents string
+	prefix, repoComponents, distribution = published.Prefix, strings.Join(published.Components(), " "), published.Distribution
+	if prefix == "." {
+		prefix = ""
+	} else if !strings.HasSuffix(prefix, "/") {
+		prefix += "/"
+	}
+
+	context.Progress().Printf("\n%s been successfully published.\nPlease setup your webserver to serve directory '%s' with autoindexing.\n",
+		message, context.PublishedStorage().PublicPath())
+	context.Progress().Printf("Now you can add following line to apt sources:\n")
+	context.Progress().Printf("  deb http://your-server/%s %s %s\n", prefix, distribution, repoComponents)
+	if utils.StrSliceHasItem(published.Architectures, "source") {
+		context.Progress().Printf("  deb-src http://your-server/%s %s %s\n", prefix, distribution, repoComponents)
+	}
+	context.Progress().Printf("Don't forget to add your GPG key to apt with apt-key.\n")
+	context.Progress().Printf("\nYou can also use `aptly serve` to publish your repositories over HTTP quickly.\n")
+
+	return err
+}
+
+func makeCmdPublishSnapshot() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyPublishSnapshotOrRepo,
+		UsageLine: "snapshot <name> [<prefix>]",
+		Short:     "publish snapshot",
+		Long: `
+Command publishes snapshot as Debian repository ready to be consumed
+by apt tools. Published repostiories appear under rootDir/public directory.
+Valid GPG key is required for publishing.
+
+Multiple component repository could be published by specifying several
+components split by commas via -component flag and multiple snapshots
+as the arguments:
+
+    aptly publish snapshot -component=main,contrib snap-main snap-contrib
+
+Example:
+
+    $ aptly publish snapshot wheezy-main
+`,
+		Flag: *flag.NewFlagSet("aptly-publish-snapshot", flag.ExitOnError),
+	}
+	cmd.Flag.String("distribution", "", "distribution name to publish")
+	cmd.Flag.String("component", "", "component name to publish (for multi-component publishing, separate components with commas)")
+	cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
+	cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
+	cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
+	cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
+	cmd.Flag.String("origin", "", "origin name to publish")
+	cmd.Flag.String("label", "", "label to publish")
+
+	return cmd
+}

cmd/publish_switch.go

@@ -0,0 +1,130 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"strings"
+)
+
+func aptlyPublishSwitch(cmd *commander.Command, args []string) error {
+	var err error
+
+	components := strings.Split(context.flags.Lookup("component").Value.String(), ",")
+
+	if len(args) < len(components)+1 || len(args) > len(components)+2 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	distribution := args[0]
+	prefix := "."
+
+	var (
+		names    []string
+		snapshot *deb.Snapshot
+	)
+
+	if len(args) == len(components)+2 {
+		prefix = args[1]
+		names = args[2:]
+	} else {
+		names = args[1:]
+	}
+
+	var published *deb.PublishedRepo
+
+	published, err = context.CollectionFactory().PublishedRepoCollection().ByPrefixDistribution(prefix, distribution)
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	if published.SourceKind != "snapshot" {
+		return fmt.Errorf("unable to update: not a snapshot publish")
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().LoadComplete(published, context.CollectionFactory())
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	publishedComponents := published.Components()
+	if len(components) == 1 && len(publishedComponents) == 1 && components[0] == "" {
+		components = publishedComponents
+	}
+
+	if len(names) != len(components) {
+		return fmt.Errorf("mismatch in number of components (%d) and snapshots (%d)", len(components), len(names))
+	}
+
+	for i, component := range components {
+		snapshot, err = context.CollectionFactory().SnapshotCollection().ByName(names[i])
+		if err != nil {
+			return fmt.Errorf("unable to switch: %s", err)
+		}
+
+		err = context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
+		if err != nil {
+			return fmt.Errorf("unable to switch: %s", err)
+		}
+
+		published.UpdateSnapshot(component, snapshot)
+	}
+
+	signer, err := getSigner(context.flags)
+	if err != nil {
+		return fmt.Errorf("unable to initialize GPG signer: %s", err)
+	}
+
+	err = published.Publish(context.PackagePool(), context.PublishedStorage(), context.CollectionFactory(), signer, context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to publish: %s", err)
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().Update(published)
+	if err != nil {
+		return fmt.Errorf("unable to save to DB: %s", err)
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().CleanupPrefixComponentFiles(published.Prefix, components,
+		context.PublishedStorage(), context.CollectionFactory(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	context.Progress().Printf("\nPublish for snapshot %s has been successfully switched to new snapshot.\n", published.String())
+
+	return err
+}
+
+func makeCmdPublishSwitch() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyPublishSwitch,
+		UsageLine: "switch <distribution> [<prefix>] <new-snapshot>",
+		Short:     "update published repository by switching to new snapshot",
+		Long: `
+Command switches in-place published repository with new snapshot contents. All
+publishing parameters are preserved (architecture list, distribution,
+component).
+
+For multiple component repositories, flag -component should be given with
+list of components to update. Corresponding snapshots should be given in the
+same order, e.g.:
+
+	aptly publish update -component=main,contrib wheezy wh-main wh-contrib
+
+Example:
+
+    $ aptly publish update wheezy ppa wheezy-7.5
+`,
+		Flag: *flag.NewFlagSet("aptly-publish-switch", flag.ExitOnError),
+	}
+	cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
+	cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
+	cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
+	cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
+	cmd.Flag.String("component", "", "component names to update (for multi-component publishing, separate components with commas)")
+
+	return cmd
+}

cmd/publish_update.go

@@ -0,0 +1,97 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyPublishUpdate(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 1 || len(args) > 2 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	distribution := args[0]
+	prefix := "."
+
+	if len(args) == 2 {
+		prefix = args[1]
+	}
+
+	var published *deb.PublishedRepo
+
+	published, err = context.CollectionFactory().PublishedRepoCollection().ByPrefixDistribution(prefix, distribution)
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	if published.SourceKind != "local" {
+		return fmt.Errorf("unable to update: not a local repository publish")
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().LoadComplete(published, context.CollectionFactory())
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	components := published.Components()
+	for _, component := range components {
+		published.UpdateLocalRepo(component)
+	}
+
+	signer, err := getSigner(context.flags)
+	if err != nil {
+		return fmt.Errorf("unable to initialize GPG signer: %s", err)
+	}
+
+	err = published.Publish(context.PackagePool(), context.PublishedStorage(), context.CollectionFactory(), signer, context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to publish: %s", err)
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().Update(published)
+	if err != nil {
+		return fmt.Errorf("unable to save to DB: %s", err)
+	}
+
+	err = context.CollectionFactory().PublishedRepoCollection().CleanupPrefixComponentFiles(published.Prefix, components,
+		context.PublishedStorage(), context.CollectionFactory(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to update: %s", err)
+	}
+
+	context.Progress().Printf("\nPublish for local repo %s has been successfully updated.\n", published.String())
+
+	return err
+}
+
+func makeCmdPublishUpdate() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyPublishUpdate,
+		UsageLine: "update <distribution> [<prefix>]",
+		Short:     "update published local repository",
+		Long: `
+Command re-publishes (updates) published local repository. <distribution>
+and <prefix> should be occupied with local repository published
+using command aptly publish repo. Update happens in-place with
+minimum possible downtime for published repository.
+
+For multiple component published repositories, all local repositories
+are updated.
+
+Example:
+
+    $ aptly publish update wheezy ppa
+`,
+		Flag: *flag.NewFlagSet("aptly-publish-update", flag.ExitOnError),
+	}
+	cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
+	cmd.Flag.Var(&keyRingsFlag{}, "keyring", "GPG keyring to use (instead of default)")
+	cmd.Flag.String("secret-keyring", "", "GPG secret keyring to use (instead of default)")
+	cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
+
+	return cmd
+}

cmd/repo.go

@@ -0,0 +1,24 @@
+package cmd
+
+import (
+	"github.com/smira/commander"
+)
+
+func makeCmdRepo() *commander.Command {
+	return &commander.Command{
+		UsageLine: "repo",
+		Short:     "manage local package repositories",
+		Subcommands: []*commander.Command{
+			makeCmdRepoAdd(),
+			makeCmdRepoCopy(),
+			makeCmdRepoCreate(),
+			makeCmdRepoDrop(),
+			makeCmdRepoEdit(),
+			makeCmdRepoImport(),
+			makeCmdRepoList(),
+			makeCmdRepoMove(),
+			makeCmdRepoRemove(),
+			makeCmdRepoShow(),
+		},
+	}
+}

cmd/repo_add.go

@@ -0,0 +1,221 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+)
+
+func aptlyRepoAdd(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 2 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	verifier := &utils.GpgVerifier{}
+
+	repo, err := context.CollectionFactory().LocalRepoCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to add: %s", err)
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+	if err != nil {
+		return fmt.Errorf("unable to add: %s", err)
+	}
+
+	context.Progress().Printf("Loading packages...\n")
+
+	list, err := deb.NewPackageListFromRefList(repo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	packageFiles := []string{}
+	failedFiles := []string{}
+
+	for _, location := range args[1:] {
+		info, err2 := os.Stat(location)
+		if err2 != nil {
+			context.Progress().ColoredPrintf("@y[!]@| @!Unable to process %s: %s@|", location, err2)
+			failedFiles = append(failedFiles, location)
+			continue
+		}
+		if info.IsDir() {
+			err2 = filepath.Walk(location, func(path string, info os.FileInfo, err3 error) error {
+				if err3 != nil {
+					return err3
+				}
+				if info.IsDir() {
+					return nil
+				}
+
+				if strings.HasSuffix(info.Name(), ".deb") || strings.HasSuffix(info.Name(), ".dsc") {
+					packageFiles = append(packageFiles, path)
+				}
+
+				return nil
+			})
+		} else {
+			if strings.HasSuffix(info.Name(), ".deb") || strings.HasSuffix(info.Name(), ".dsc") {
+				packageFiles = append(packageFiles, location)
+			} else {
+				context.Progress().ColoredPrintf("@y[!]@| @!Unknwon file extenstion: %s@|", location)
+				failedFiles = append(failedFiles, location)
+				continue
+			}
+		}
+	}
+
+	processedFiles := []string{}
+	sort.Strings(packageFiles)
+
+	for _, file := range packageFiles {
+		var (
+			stanza deb.Stanza
+			p      *deb.Package
+		)
+
+		candidateProcessedFiles := []string{}
+		isSourcePackage := strings.HasSuffix(file, ".dsc")
+
+		if isSourcePackage {
+			stanza, err = deb.GetControlFileFromDsc(file, verifier)
+
+			if err == nil {
+				stanza["Package"] = stanza["Source"]
+				delete(stanza, "Source")
+
+				p, err = deb.NewSourcePackageFromControlFile(stanza)
+			}
+		} else {
+			stanza, err = deb.GetControlFileFromDeb(file)
+			p = deb.NewPackageFromControlFile(stanza)
+		}
+		if err != nil {
+			context.Progress().ColoredPrintf("@y[!]@| @!Unable to read file %s: %s@|", file, err)
+			failedFiles = append(failedFiles, file)
+			continue
+		}
+
+		var checksums utils.ChecksumInfo
+		checksums, err = utils.ChecksumsForFile(file)
+		if err != nil {
+			return err
+		}
+
+		if isSourcePackage {
+			p.UpdateFiles(append(p.Files(), deb.PackageFile{Filename: filepath.Base(file), Checksums: checksums}))
+		} else {
+			p.UpdateFiles([]deb.PackageFile{deb.PackageFile{Filename: filepath.Base(file), Checksums: checksums}})
+		}
+
+		err = context.PackagePool().Import(file, checksums.MD5)
+		if err != nil {
+			context.Progress().ColoredPrintf("@y[!]@| @!Unable to import file %s into pool: %s@|", file, err)
+			failedFiles = append(failedFiles, file)
+			continue
+		}
+
+		candidateProcessedFiles = append(candidateProcessedFiles, file)
+
+		// go over all files, except for the last one (.dsc/.deb itself)
+		for _, f := range p.Files() {
+			if filepath.Base(f.Filename) == filepath.Base(file) {
+				continue
+			}
+			sourceFile := filepath.Join(filepath.Dir(file), filepath.Base(f.Filename))
+			err = context.PackagePool().Import(sourceFile, f.Checksums.MD5)
+			if err != nil {
+				context.Progress().ColoredPrintf("@y[!]@| @!Unable to import file %s into pool: %s@|", sourceFile, err)
+				failedFiles = append(failedFiles, file)
+				break
+			}
+
+			candidateProcessedFiles = append(candidateProcessedFiles, sourceFile)
+		}
+		if err != nil {
+			// some files haven't been imported
+			continue
+		}
+
+		err = context.CollectionFactory().PackageCollection().Update(p)
+		if err != nil {
+			context.Progress().ColoredPrintf("@y[!]@| @!Unable to save package %s: %s@|", p, err)
+			failedFiles = append(failedFiles, file)
+			continue
+		}
+
+		err = list.Add(p)
+		if err != nil {
+			context.Progress().ColoredPrintf("@y[!]@| @!Unable to add package to repo %s: %s@|", p, err)
+			failedFiles = append(failedFiles, file)
+			continue
+		}
+
+		context.Progress().ColoredPrintf("@g[+]@| %s added@|", p)
+		processedFiles = append(processedFiles, candidateProcessedFiles...)
+	}
+
+	repo.UpdateRefList(deb.NewPackageRefListFromPackageList(list))
+
+	err = context.CollectionFactory().LocalRepoCollection().Update(repo)
+	if err != nil {
+		return fmt.Errorf("unable to save: %s", err)
+	}
+
+	if context.flags.Lookup("remove-files").Value.Get().(bool) {
+		processedFiles = utils.StrSliceDeduplicate(processedFiles)
+
+		for _, file := range processedFiles {
+			err := os.Remove(file)
+			if err != nil {
+				return fmt.Errorf("unable to remove file: %s", err)
+			}
+		}
+	}
+
+	if len(failedFiles) > 0 {
+		context.Progress().ColoredPrintf("@y[!]@| @!Some files were skipped due to errors:@|")
+		for _, file := range failedFiles {
+			context.Progress().ColoredPrintf("  %s", file)
+		}
+
+		return fmt.Errorf("some files failed to be added")
+	}
+
+	return err
+}
+
+func makeCmdRepoAdd() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoAdd,
+		UsageLine: "add <name> <package file.deb>|<directory> ...",
+		Short:     "add packages to local repository",
+		Long: `
+Command adds packages to local repository from .deb (binary packages) and .dsc (source packages) files.
+When importing from directory aptly would do recursive scan looking for all files matching *.deb or *.dsc
+patterns. Every file discovered would be analyzed to extract metadata, package would then be created and added
+to the database. Files would be imported to internal package pool. For source packages, all required files are
+added automatically as well. Extra files for source package should be in the same directory as *.dsc file.
+
+Example:
+
+  $ aptly repo add testing myapp-0.1.2.deb incoming/
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-add", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("remove-files", false, "remove files that have been imported successfully into repository")
+
+	return cmd
+}

cmd/repo_copy.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func makeCmdRepoCopy() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoMoveCopyImport,
+		UsageLine: "copy <src-name> <dst-name> <package-spec> ...",
+		Short:     "copy packages between local repositories",
+		Long: `
+Command copy copies packages matching <package-spec> from local repo
+<src-name> to local repo <dst-name>.
+
+Example:
+
+  $ aptly repo copy testing stable 'myapp (=0.1.12)'
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-copy", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("dry-run", false, "don't copy, just show what would be copied")
+	cmd.Flag.Bool("with-deps", false, "follow dependencies when processing package-spec")
+
+	return cmd
+}

cmd/repo_create.go

@@ -0,0 +1,52 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyRepoCreate(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	repo := deb.NewLocalRepo(args[0], context.flags.Lookup("comment").Value.String())
+	repo.DefaultDistribution = context.flags.Lookup("distribution").Value.String()
+	repo.DefaultComponent = context.flags.Lookup("component").Value.String()
+
+	err = context.CollectionFactory().LocalRepoCollection().Add(repo)
+	if err != nil {
+		return fmt.Errorf("unable to add local repo: %s", err)
+	}
+
+	fmt.Printf("\nLocal repo %s successfully added.\nYou can run 'aptly repo add %s ...' to add packages to repository.\n", repo, repo.Name)
+	return err
+}
+
+func makeCmdRepoCreate() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoCreate,
+		UsageLine: "create <name>",
+		Short:     "create local repository",
+		Long: `
+Create local package repository. Repository would be empty when
+created, packages could be added from files, copied or moved from
+another local repository or imported from the mirror.
+
+Example:
+
+  $ aptly repo create testing
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-create", flag.ExitOnError),
+	}
+
+	cmd.Flag.String("comment", "", "any text that would be used to described local repository")
+	cmd.Flag.String("distribution", "", "default distribution when publishing")
+	cmd.Flag.String("component", "main", "default component when publishing")
+
+	return cmd
+}

cmd/repo_drop.go

@@ -0,0 +1,80 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyRepoDrop(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	repo, err := context.CollectionFactory().LocalRepoCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to drop: %s", err)
+	}
+
+	published := context.CollectionFactory().PublishedRepoCollection().ByLocalRepo(repo)
+	if len(published) > 0 {
+		fmt.Printf("Local repo `%s` is published currently:\n", repo.Name)
+		for _, repo := range published {
+			err = context.CollectionFactory().PublishedRepoCollection().LoadComplete(repo, context.CollectionFactory())
+			if err != nil {
+				return fmt.Errorf("unable to load published: %s", err)
+			}
+			fmt.Printf(" * %s\n", repo)
+		}
+
+		return fmt.Errorf("unable to drop: local repo is published")
+	}
+
+	force := context.flags.Lookup("force").Value.Get().(bool)
+	if !force {
+		snapshots := context.CollectionFactory().SnapshotCollection().ByLocalRepoSource(repo)
+
+		if len(snapshots) > 0 {
+			fmt.Printf("Local repo `%s` was used to create following snapshots:\n", repo.Name)
+			for _, snapshot := range snapshots {
+				fmt.Printf(" * %s\n", snapshot)
+			}
+
+			return fmt.Errorf("won't delete local repo with snapshots, use -force to override")
+		}
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().Drop(repo)
+	if err != nil {
+		return fmt.Errorf("unable to drop: %s", err)
+	}
+
+	fmt.Printf("Local repo `%s` has been removed.\n", repo.Name)
+
+	return err
+}
+
+func makeCmdRepoDrop() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoDrop,
+		UsageLine: "drop <name>",
+		Short:     "delete local repository",
+		Long: `
+Drop information about deletions from local repo. Package data is not deleted
+(since it could be still used by other mirrors or snapshots).
+
+Example:
+
+  $ aptly repo drop local-repo
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-drop", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("force", false, "force local repo deletion even if used by snapshots")
+
+	return cmd
+}

cmd/repo_edit.go

@@ -0,0 +1,68 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyRepoEdit(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	repo, err := context.CollectionFactory().LocalRepoCollection().ByName(args[0])
+	if err != nil {
+		return fmt.Errorf("unable to edit: %s", err)
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+	if err != nil {
+		return fmt.Errorf("unable to edit: %s", err)
+	}
+
+	if context.flags.Lookup("comment").Value.String() != "" {
+		repo.Comment = context.flags.Lookup("comment").Value.String()
+	}
+
+	if context.flags.Lookup("distribution").Value.String() != "" {
+		repo.DefaultDistribution = context.flags.Lookup("distribution").Value.String()
+	}
+
+	if context.flags.Lookup("component").Value.String() != "" {
+		repo.DefaultComponent = context.flags.Lookup("component").Value.String()
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().Update(repo)
+	if err != nil {
+		return fmt.Errorf("unable to edit: %s", err)
+	}
+
+	fmt.Printf("Local repo %s successfully updated.\n", repo)
+	return err
+}
+
+func makeCmdRepoEdit() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoEdit,
+		UsageLine: "edit <name>",
+		Short:     "edit properties of local repository",
+		Long: `
+Command edit allows to change metadata of local repository:
+comment, default distribution and component.
+
+Example:
+
+  $ aptly repo edit -distribution=wheezy testing
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-edit", flag.ExitOnError),
+	}
+
+	cmd.Flag.String("comment", "", "any text that would be used to described local repository")
+	cmd.Flag.String("distribution", "", "default distribution when publishing")
+	cmd.Flag.String("component", "", "default component when publishing")
+
+	return cmd
+}

cmd/repo_import.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func makeCmdRepoImport() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoMoveCopyImport,
+		UsageLine: "import <src-mirror> <dst-repo> <package-spec> ...",
+		Short:     "import packages from mirror to local repository",
+		Long: `
+Command import looks up packages matching <package-spec> in mirror <src-mirror>
+and copies them to local repo <dst-repo>.
+
+Example:
+
+  $ aptly repo import wheezy-main testing nginx
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-import", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("dry-run", false, "don't import, just show what would be imported")
+	cmd.Flag.Bool("with-deps", false, "follow dependencies when processing package-spec")
+
+	return cmd
+}

cmd/repo_list.go

@@ -0,0 +1,75 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"sort"
+)
+
+func aptlyRepoList(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
+
+	repos := make([]string, context.CollectionFactory().LocalRepoCollection().Len())
+	i := 0
+	context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
+		if raw {
+			repos[i] = repo.Name
+		} else {
+			err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+			if err != nil {
+				return err
+			}
+
+			repos[i] = fmt.Sprintf(" * %s (packages: %d)", repo.String(), repo.NumPackages())
+		}
+		i++
+		return nil
+	})
+
+	sort.Strings(repos)
+
+	if raw {
+		for _, repo := range repos {
+			fmt.Printf("%s\n", repo)
+		}
+	} else {
+		if len(repos) > 0 {
+			fmt.Printf("List of local repos:\n")
+			for _, repo := range repos {
+				fmt.Println(repo)
+			}
+
+			fmt.Printf("\nTo get more information about local repository, run `aptly repo show <name>`.\n")
+		} else {
+			fmt.Printf("No local repositories found, create one with `aptly repo create ...`.\n")
+		}
+	}
+
+	return err
+}
+
+func makeCmdRepoList() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoList,
+		UsageLine: "list",
+		Short:     "list local repositories",
+		Long: `
+List command shows full list of local package repositories.
+
+Example:
+
+  $ aptly repo list
+`,
+	}
+
+	cmd.Flag.Bool("raw", false, "display list in machine-readable format")
+
+	return cmd
+}

cmd/repo_move.go

@@ -0,0 +1,182 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"sort"
+)
+
+func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 3 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	command := cmd.Name()
+
+	dstRepo, err := context.CollectionFactory().LocalRepoCollection().ByName(args[1])
+	if err != nil {
+		return fmt.Errorf("unable to %s: %s", command, err)
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().LoadComplete(dstRepo)
+	if err != nil {
+		return fmt.Errorf("unable to %s: %s", command, err)
+	}
+
+	var (
+		srcRefList *deb.PackageRefList
+		srcRepo    *deb.LocalRepo
+	)
+
+	if command == "copy" || command == "move" {
+		srcRepo, err = context.CollectionFactory().LocalRepoCollection().ByName(args[0])
+		if err != nil {
+			return fmt.Errorf("unable to %s: %s", command, err)
+		}
+
+		if srcRepo.UUID == dstRepo.UUID {
+			return fmt.Errorf("unable to %s: source and destination are the same", command)
+		}
+
+		err = context.CollectionFactory().LocalRepoCollection().LoadComplete(srcRepo)
+		if err != nil {
+			return fmt.Errorf("unable to %s: %s", command, err)
+		}
+
+		srcRefList = srcRepo.RefList()
+	} else if command == "import" {
+		var srcRemoteRepo *deb.RemoteRepo
+
+		srcRemoteRepo, err = context.CollectionFactory().RemoteRepoCollection().ByName(args[0])
+		if err != nil {
+			return fmt.Errorf("unable to %s: %s", command, err)
+		}
+
+		err = context.CollectionFactory().RemoteRepoCollection().LoadComplete(srcRemoteRepo)
+		if err != nil {
+			return fmt.Errorf("unable to %s: %s", command, err)
+		}
+
+		if srcRemoteRepo.RefList() == nil {
+			return fmt.Errorf("unable to %s: mirror not updated", command)
+		}
+
+		srcRefList = srcRemoteRepo.RefList()
+	} else {
+		panic("unexpected command")
+	}
+
+	context.Progress().Printf("Loading packages...\n")
+
+	dstList, err := deb.NewPackageListFromRefList(dstRepo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	srcList, err := deb.NewPackageListFromRefList(srcRefList, context.CollectionFactory().PackageCollection(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	srcList.PrepareIndex()
+
+	var architecturesList []string
+
+	withDeps := context.flags.Lookup("with-deps").Value.Get().(bool)
+
+	if withDeps {
+		dstList.PrepareIndex()
+
+		// Calculate architectures
+		if len(context.ArchitecturesList()) > 0 {
+			architecturesList = context.ArchitecturesList()
+		} else {
+			architecturesList = dstList.Architectures(false)
+		}
+
+		sort.Strings(architecturesList)
+
+		if len(architecturesList) == 0 {
+			return fmt.Errorf("unable to determine list of architectures, please specify explicitly")
+		}
+	}
+
+	toProcess, err := srcList.Filter(args[2:], withDeps, dstList, context.DependencyOptions(), architecturesList)
+	if err != nil {
+		return fmt.Errorf("unable to %s: %s", command, err)
+	}
+
+	var verb string
+
+	if command == "move" {
+		verb = "moved"
+	} else if command == "copy" {
+		verb = "copied"
+	} else if command == "import" {
+		verb = "imported"
+	}
+
+	err = toProcess.ForEach(func(p *deb.Package) error {
+		err = dstList.Add(p)
+		if err != nil {
+			return err
+		}
+
+		if command == "move" {
+			srcList.Remove(p)
+		}
+		context.Progress().ColoredPrintf("@g[o]@| %s %s", p, verb)
+		return nil
+	})
+	if err != nil {
+		return fmt.Errorf("unable to %s: %s", command, err)
+	}
+
+	if context.flags.Lookup("dry-run").Value.Get().(bool) {
+		context.Progress().Printf("\nChanges not saved, as dry run has been requested.\n")
+	} else {
+		dstRepo.UpdateRefList(deb.NewPackageRefListFromPackageList(dstList))
+
+		err = context.CollectionFactory().LocalRepoCollection().Update(dstRepo)
+		if err != nil {
+			return fmt.Errorf("unable to save: %s", err)
+		}
+
+		if command == "move" {
+			srcRepo.UpdateRefList(deb.NewPackageRefListFromPackageList(srcList))
+
+			err = context.CollectionFactory().LocalRepoCollection().Update(srcRepo)
+			if err != nil {
+				return fmt.Errorf("unable to save: %s", err)
+			}
+		}
+	}
+
+	return err
+}
+
+func makeCmdRepoMove() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoMoveCopyImport,
+		UsageLine: "move <src-name> <dst-name> <package-spec> ...",
+		Short:     "move packages between local repositories",
+		Long: `
+Command move moves packages matching <package-spec> from local repo
+<src-name> to local repo <dst-name>.
+
+Example:
+
+  $ aptly repo move testing stable 'myapp (=0.1.12)'
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-move", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("dry-run", false, "don't move, just show what would be moved")
+	cmd.Flag.Bool("with-deps", false, "follow dependencies when processing package-spec")
+
+	return cmd
+}

cmd/repo_remove.go

@@ -0,0 +1,83 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyRepoRemove(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 2 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	repo, err := context.CollectionFactory().LocalRepoCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to remove: %s", err)
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+	if err != nil {
+		return fmt.Errorf("unable to remove: %s", err)
+	}
+
+	context.Progress().Printf("Loading packages...\n")
+
+	list, err := deb.NewPackageListFromRefList(repo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	list.PrepareIndex()
+	toRemove, err := list.Filter(args[1:], false, nil, 0, nil)
+	if err != nil {
+		return fmt.Errorf("unable to remove: %s", err)
+	}
+
+	toRemove.ForEach(func(p *deb.Package) error {
+		list.Remove(p)
+		context.Progress().ColoredPrintf("@r[-]@| %s removed", p)
+		return nil
+	})
+
+	if context.flags.Lookup("dry-run").Value.Get().(bool) {
+		context.Progress().Printf("\nChanges not saved, as dry run has been requested.\n")
+	} else {
+		repo.UpdateRefList(deb.NewPackageRefListFromPackageList(list))
+
+		err = context.CollectionFactory().LocalRepoCollection().Update(repo)
+		if err != nil {
+			return fmt.Errorf("unable to save: %s", err)
+		}
+	}
+
+	return err
+}
+
+func makeCmdRepoRemove() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoRemove,
+		UsageLine: "remove <name> <package-spec> ...",
+		Short:     "remove packages from local repository",
+		Long: `
+Commands removes packages matching <package-spec> from local repository
+<name>. If removed packages are not referenced by other repos or
+snapshots, they can be removed completely (including files) by running
+'aptly db cleanup'.
+
+Example:
+
+  $ aptly repo remove testing 'myapp (=0.1.12)'
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-add", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("dry-run", false, "don't remove, just show what would be removed")
+
+	return cmd
+}

cmd/repo_show.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlyRepoShow(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	repo, err := context.CollectionFactory().LocalRepoCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to show: %s", err)
+	}
+
+	err = context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+	if err != nil {
+		return fmt.Errorf("unable to show: %s", err)
+	}
+
+	fmt.Printf("Name: %s\n", repo.Name)
+	fmt.Printf("Comment: %s\n", repo.Comment)
+	fmt.Printf("Default Distribution: %s\n", repo.DefaultDistribution)
+	fmt.Printf("Default Component: %s\n", repo.DefaultComponent)
+	fmt.Printf("Number of packages: %d\n", repo.NumPackages())
+
+	withPackages := context.flags.Lookup("with-packages").Value.Get().(bool)
+	if withPackages {
+		ListPackagesRefList(repo.RefList())
+	}
+
+	return err
+}
+
+func makeCmdRepoShow() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyRepoShow,
+		UsageLine: "show <name>",
+		Short:     "show details about local repository",
+		Long: `
+Show command shows full information about local package repository.
+
+ex:
+  $ aptly repo show testing
+`,
+		Flag: *flag.NewFlagSet("aptly-repo-show", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("with-packages", false, "show list of packages")
+
+	return cmd
+}

cmd/serve.go

@@ -1,28 +1,32 @@
-package main
+package cmd
 
 import (
 	"fmt"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/aptly/utils"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
 	"net"
 	"net/http"
 	"os"
 	"sort"
+	"strings"
 )
 
 func aptlyServe(cmd *commander.Command, args []string) error {
 	var err error
 
-	publishedCollection := debian.NewPublishedRepoCollection(context.database)
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
 
-	if publishedCollection.Len() == 0 {
+	if context.CollectionFactory().PublishedRepoCollection().Len() == 0 {
 		fmt.Printf("No published repositories, unable to serve.\n")
 		return nil
 	}
 
-	listen := cmd.Flag.Lookup("listen").Value.String()
+	listen := context.flags.Lookup("listen").Value.String()
 
 	listenHost, listenPort, err := net.SplitHostPort(listen)
 
@@ -39,11 +43,11 @@ func aptlyServe(cmd *commander.Command, args []string) error {
 
 	fmt.Printf("Serving published repositories, recommended apt sources list:\n\n")
 
-	sources := make(sort.StringSlice, 0, publishedCollection.Len())
-	published := make(map[string]*debian.PublishedRepo, publishedCollection.Len())
+	sources := make(sort.StringSlice, 0, context.CollectionFactory().PublishedRepoCollection().Len())
+	published := make(map[string]*deb.PublishedRepo, context.CollectionFactory().PublishedRepoCollection().Len())
 
-	err = publishedCollection.ForEach(func(repo *debian.PublishedRepo) error {
-		err := publishedCollection.LoadComplete(repo, snapshotCollection)
+	err = context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *deb.PublishedRepo) error {
+		err := context.CollectionFactory().PublishedRepoCollection().LoadComplete(repo, context.CollectionFactory())
 		if err != nil {
 			return err
 		}
@@ -71,14 +75,20 @@ func aptlyServe(cmd *commander.Command, args []string) error {
 		}
 
 		fmt.Printf("# %s\ndeb http://%s:%s/%s %s %s\n",
-			repo, listenHost, listenPort, prefix, repo.Distribution, repo.Component)
+			repo, listenHost, listenPort, prefix, repo.Distribution, strings.Join(repo.Components(), " "))
+
+		if utils.StrSliceHasItem(repo.Architectures, "source") {
+			fmt.Printf("deb-src http://%s:%s/%s %s %s\n",
+				listenHost, listenPort, prefix, repo.Distribution, strings.Join(repo.Components(), " "))
+		}
 	}
 
-	context.database.Close()
+	publicPath := context.PublishedStorage().PublicPath()
+	ShutdownContext()
 
 	fmt.Printf("\nStarting web server at: %s (press Ctrl+C to quit)...\n", listen)
 
-	err = http.ListenAndServe(listen, http.FileServer(http.Dir(context.packageRepository.PublicPath())))
+	err = http.ListenAndServe(listen, http.FileServer(http.Dir(publicPath)))
 	if err != nil {
 		return fmt.Errorf("unable to serve: %s", err)
 	}
@@ -89,12 +99,13 @@ func makeCmdServe() *commander.Command {
 	cmd := &commander.Command{
 		Run:       aptlyServe,
 		UsageLine: "serve",
-		Short:     "start embedded HTTP server to serve published repositories",
+		Short:     "HTTP serve published repositories",
 		Long: `
 Command serve starts embedded HTTP server (not suitable for real production usage) to serve
 contents of public/ subdirectory of aptly's root that contains published repositories.
 
-ex:
+Example:
+
   $ aptly serve -listen=:8080
 `,
 		Flag: *flag.NewFlagSet("aptly-serve", flag.ExitOnError),

cmd/snapshot.go

@@ -0,0 +1,22 @@
+package cmd
+
+import (
+	"github.com/smira/commander"
+)
+
+func makeCmdSnapshot() *commander.Command {
+	return &commander.Command{
+		UsageLine: "snapshot",
+		Short:     "manage snapshots of repositories",
+		Subcommands: []*commander.Command{
+			makeCmdSnapshotCreate(),
+			makeCmdSnapshotList(),
+			makeCmdSnapshotShow(),
+			makeCmdSnapshotVerify(),
+			makeCmdSnapshotPull(),
+			makeCmdSnapshotDiff(),
+			makeCmdSnapshotMerge(),
+			makeCmdSnapshotDrop(),
+		},
+	}
+}

cmd/snapshot_create.go

@@ -0,0 +1,103 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+)
+
+func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
+	var (
+		err      error
+		snapshot *deb.Snapshot
+	)
+
+	if len(args) == 4 && args[1] == "from" && args[2] == "mirror" {
+		// aptly snapshot create snap from mirror mirror
+		var repo *deb.RemoteRepo
+
+		repoName, snapshotName := args[3], args[0]
+
+		repo, err = context.CollectionFactory().RemoteRepoCollection().ByName(repoName)
+		if err != nil {
+			return fmt.Errorf("unable to create snapshot: %s", err)
+		}
+
+		err = context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
+		if err != nil {
+			return fmt.Errorf("unable to create snapshot: %s", err)
+		}
+
+		snapshot, err = deb.NewSnapshotFromRepository(snapshotName, repo)
+		if err != nil {
+			return fmt.Errorf("unable to create snapshot: %s", err)
+		}
+	} else if len(args) == 4 && args[1] == "from" && args[2] == "repo" {
+		// aptly snapshot create snap from repo repo
+		var repo *deb.LocalRepo
+
+		localRepoName, snapshotName := args[3], args[0]
+
+		repo, err = context.CollectionFactory().LocalRepoCollection().ByName(localRepoName)
+		if err != nil {
+			return fmt.Errorf("unable to create snapshot: %s", err)
+		}
+
+		err = context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
+		if err != nil {
+			return fmt.Errorf("unable to create snapshot: %s", err)
+		}
+
+		snapshot, err = deb.NewSnapshotFromLocalRepo(snapshotName, repo)
+		if err != nil {
+			return fmt.Errorf("unable to create snapshot: %s", err)
+		}
+	} else if len(args) == 2 && args[1] == "empty" {
+		// aptly snapshot create snap empty
+		snapshotName := args[0]
+
+		packageList := deb.NewPackageList()
+
+		snapshot = deb.NewSnapshotFromPackageList(snapshotName, nil, packageList, "Created as empty")
+	} else {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().Add(snapshot)
+	if err != nil {
+		return fmt.Errorf("unable to add snapshot: %s", err)
+	}
+
+	fmt.Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", snapshot.Name, snapshot.Name)
+
+	return err
+}
+
+func makeCmdSnapshotCreate() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotCreate,
+		UsageLine: "create <name> from mirror <mirror-name> | from repo <repo-name> | empty",
+		Short:     "creates snapshot of mirror (local repository) contents",
+		Long: `
+Command create <name> from mirror makes persistent immutable snapshot of remote
+repository mirror. Snapshot could be published or further modified using
+merge, pull and other aptly features.
+
+Command create <name> from repo makes persistent immutable snapshot of local
+repository. Snapshot could be processed as mirror snapshots, and mixed with
+snapshots of remote mirrors.
+
+Command create <name> empty creates empty snapshot that could be used as a
+basis for snapshot pull operations, for example. As snapshots are immutable,
+creating one empty snapshot should be enough.
+
+Example:
+
+  $ aptly snapshot create wheezy-main-today from mirror wheezy-main
+`,
+	}
+
+	return cmd
+
+}

cmd/snapshot_diff.go

@@ -0,0 +1,111 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlySnapshotDiff(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 2 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	onlyMatching := context.flags.Lookup("only-matching").Value.Get().(bool)
+
+	// Load <name-a> snapshot
+	snapshotA, err := context.CollectionFactory().SnapshotCollection().ByName(args[0])
+	if err != nil {
+		return fmt.Errorf("unable to load snapshot A: %s", err)
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().LoadComplete(snapshotA)
+	if err != nil {
+		return fmt.Errorf("unable to load snapshot A: %s", err)
+	}
+
+	// Load <name-b> snapshot
+	snapshotB, err := context.CollectionFactory().SnapshotCollection().ByName(args[1])
+	if err != nil {
+		return fmt.Errorf("unable to load snapshot B: %s", err)
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().LoadComplete(snapshotB)
+	if err != nil {
+		return fmt.Errorf("unable to load snapshot B: %s", err)
+	}
+
+	// Calculate diff
+	diff, err := snapshotA.RefList().Diff(snapshotB.RefList(), context.CollectionFactory().PackageCollection())
+	if err != nil {
+		return fmt.Errorf("unable to calculate diff: %s", err)
+	}
+
+	if len(diff) == 0 {
+		context.Progress().Printf("Snapshots are identical.\n")
+	} else {
+		context.Progress().Printf("  Arch   | Package                                  | Version in A                             | Version in B\n")
+		for _, pdiff := range diff {
+			if onlyMatching && (pdiff.Left == nil || pdiff.Right == nil) {
+				continue
+			}
+
+			var verA, verB, pkg, arch, code string
+
+			if pdiff.Left == nil {
+				verA = "-"
+				verB = pdiff.Right.Version
+				pkg = pdiff.Right.Name
+				arch = pdiff.Right.Architecture
+			} else {
+				pkg = pdiff.Left.Name
+				arch = pdiff.Left.Architecture
+				verA = pdiff.Left.Version
+				if pdiff.Right == nil {
+					verB = "-"
+				} else {
+					verB = pdiff.Right.Version
+				}
+			}
+
+			if pdiff.Left == nil {
+				code = "@g+@|"
+			} else {
+				if pdiff.Right == nil {
+					code = "@r-@|"
+				} else {
+					code = "@y!@|"
+				}
+			}
+
+			context.Progress().ColoredPrintf(code+" %-6s | %-40s | %-40s | %-40s", arch, pkg, verA, verB)
+		}
+	}
+
+	return err
+}
+
+func makeCmdSnapshotDiff() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotDiff,
+		UsageLine: "diff <name-a> <name-b>",
+		Short:     "difference between two snapshots",
+		Long: `
+Displays difference in packages between two snapshots. Snapshot is a list
+of packages, so difference between snapshots is a difference between package
+lists. Package could be either completely missing in one snapshot, or package
+is present in both snapshots with different versions.
+
+Example:
+
+    $ aptly snapshot diff -only-matching wheezy-main wheezy-backports
+`,
+		Flag: *flag.NewFlagSet("aptly-snapshot-diff", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("only-matching", false, "display diff only for matching packages (don't display missing packages)")
+
+	return cmd
+}

cmd/snapshot_drop.go

@@ -0,0 +1,80 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlySnapshotDrop(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	snapshot, err := context.CollectionFactory().SnapshotCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to drop: %s", err)
+	}
+
+	published := context.CollectionFactory().PublishedRepoCollection().BySnapshot(snapshot)
+
+	if len(published) > 0 {
+		fmt.Printf("Snapshot `%s` is published currently:\n", snapshot.Name)
+		for _, repo := range published {
+			err = context.CollectionFactory().PublishedRepoCollection().LoadComplete(repo, context.CollectionFactory())
+			if err != nil {
+				return fmt.Errorf("unable to load published: %s", err)
+			}
+			fmt.Printf(" * %s\n", repo)
+		}
+
+		return fmt.Errorf("unable to drop: snapshot is published")
+	}
+
+	force := context.flags.Lookup("force").Value.Get().(bool)
+	if !force {
+		snapshots := context.CollectionFactory().SnapshotCollection().BySnapshotSource(snapshot)
+		if len(snapshots) > 0 {
+			fmt.Printf("Snapshot `%s` was used as a source in following snapshots:\n", snapshot.Name)
+			for _, snap := range snapshots {
+				fmt.Printf(" * %s\n", snap)
+			}
+
+			return fmt.Errorf("won't delete snapshot that was used as source for other snapshots, use -force to override")
+		}
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().Drop(snapshot)
+	if err != nil {
+		return fmt.Errorf("unable to drop: %s", err)
+	}
+
+	fmt.Printf("Snapshot `%s` has been dropped.\n", snapshot.Name)
+
+	return err
+}
+
+func makeCmdSnapshotDrop() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotDrop,
+		UsageLine: "drop <name>",
+		Short:     "delete snapshot",
+		Long: `
+Drop removes information about a snapshot. If snapshot is published,
+it can't be dropped.
+
+Example:
+
+    $ aptly snapshot drop wheezy-main
+`,
+		Flag: *flag.NewFlagSet("aptly-snapshot-drop", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("force", false, "remove snapshot even if it was used as source for other snapshots")
+
+	return cmd
+}

cmd/snapshot_list.go

@@ -0,0 +1,72 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"sort"
+)
+
+func aptlySnapshotList(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	raw := cmd.Flag.Lookup("raw").Value.Get().(bool)
+
+	snapshots := make([]string, context.CollectionFactory().SnapshotCollection().Len())
+
+	i := 0
+	context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
+		if raw {
+			snapshots[i] = snapshot.Name
+		} else {
+			snapshots[i] = snapshot.String()
+		}
+		i++
+		return nil
+	})
+
+	sort.Strings(snapshots)
+
+	if raw {
+		for _, snapshot := range snapshots {
+			fmt.Printf("%s\n", snapshot)
+		}
+	} else {
+		if len(snapshots) > 0 {
+			fmt.Printf("List of snapshots:\n")
+
+			for _, snapshot := range snapshots {
+				fmt.Printf(" * %s\n", snapshot)
+			}
+
+			fmt.Printf("\nTo get more information about snapshot, run `aptly snapshot show <name>`.\n")
+		} else {
+			fmt.Printf("\nNo snapshots found, create one with `aptly snapshot create...`.\n")
+		}
+	}
+	return err
+
+}
+
+func makeCmdSnapshotList() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotList,
+		UsageLine: "list",
+		Short:     "list snapshots",
+		Long: `
+Command list shows full list of snapshots created.
+
+Example:
+
+  $ aptly snapshot list
+`,
+	}
+
+	cmd.Flag.Bool("raw", false, "display list in machine-readable format")
+
+	return cmd
+}

cmd/snapshot_merge.go

@@ -0,0 +1,90 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"strings"
+)
+
+func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 2 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	sources := make([]*deb.Snapshot, len(args)-1)
+
+	for i := 0; i < len(args)-1; i++ {
+		sources[i], err = context.CollectionFactory().SnapshotCollection().ByName(args[i+1])
+		if err != nil {
+			return fmt.Errorf("unable to load snapshot: %s", err)
+		}
+
+		err = context.CollectionFactory().SnapshotCollection().LoadComplete(sources[i])
+		if err != nil {
+			return fmt.Errorf("unable to load snapshot: %s", err)
+		}
+	}
+
+	latest := context.flags.Lookup("latest").Value.Get().(bool)
+    noRemove := context.flags.Lookup("no-remove").Value.Get().(bool)
+
+    if noRemove && latest {
+        return fmt.Errorf("-no-remove and -latest can't be specified together")
+    }
+
+	overrideMatching := !latest && !noRemove
+
+	result := sources[0].RefList()
+	for i := 1; i < len(sources); i++ {
+		result = result.Merge(sources[i].RefList(), overrideMatching)
+	}
+
+	if latest {
+		deb.FilterLatestRefs(result)
+	}
+
+	sourceDescription := make([]string, len(sources))
+	for i, s := range sources {
+		sourceDescription[i] = fmt.Sprintf("'%s'", s.Name)
+	}
+
+	// Create <destination> snapshot
+	destination := deb.NewSnapshotFromRefList(args[0], sources, result,
+		fmt.Sprintf("Merged from sources: %s", strings.Join(sourceDescription, ", ")))
+
+	err = context.CollectionFactory().SnapshotCollection().Add(destination)
+	if err != nil {
+		return fmt.Errorf("unable to create snapshot: %s", err)
+	}
+
+	fmt.Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
+
+	return err
+}
+
+func makeCmdSnapshotMerge() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotMerge,
+		UsageLine: "merge <destination> <source> [<source>...]",
+		Short:     "merges snapshots",
+		Long: `
+Merge command merges several <source> snapshots into one <destination> snapshot.
+Merge happens from left to right. By default, packages with the same
+name-architecture pair are replaced during merge (package from latest snapshot
+on the list wins).  If run with only one source snapshot, merge copies <source> into
+<destination>.
+
+Example:
+
+    $ aptly snapshot merge wheezy-w-backports wheezy-main wheezy-backports
+`,
+	}
+
+	cmd.Flag.Bool("latest", false, "use only the latest version of each package")
+    cmd.Flag.Bool("no-remove", false, "don't remove duplicate arch/name packages")
+
+	return cmd
+}

cmd/snapshot_pull.go

@@ -0,0 +1,191 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+	"sort"
+	"strings"
+)
+
+func aptlySnapshotPull(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 4 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	noDeps := context.flags.Lookup("no-deps").Value.Get().(bool)
+	noRemove := context.flags.Lookup("no-remove").Value.Get().(bool)
+
+	// Load <name> snapshot
+	snapshot, err := context.CollectionFactory().SnapshotCollection().ByName(args[0])
+	if err != nil {
+		return fmt.Errorf("unable to pull: %s", err)
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
+	if err != nil {
+		return fmt.Errorf("unable to pull: %s", err)
+	}
+
+	// Load <source> snapshot
+	source, err := context.CollectionFactory().SnapshotCollection().ByName(args[1])
+	if err != nil {
+		return fmt.Errorf("unable to pull: %s", err)
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().LoadComplete(source)
+	if err != nil {
+		return fmt.Errorf("unable to pull: %s", err)
+	}
+
+	context.Progress().Printf("Dependencies would be pulled into snapshot:\n    %s\nfrom snapshot:\n    %s\nand result would be saved as new snapshot %s.\n",
+		snapshot, source, args[2])
+
+	// Convert snapshot to package list
+	context.Progress().Printf("Loading packages (%d)...\n", snapshot.RefList().Len()+source.RefList().Len())
+	packageList, err := deb.NewPackageListFromRefList(snapshot.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	sourcePackageList, err := deb.NewPackageListFromRefList(source.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	context.Progress().Printf("Building indexes...\n")
+	packageList.PrepareIndex()
+	sourcePackageList.PrepareIndex()
+
+	// Calculate architectures
+	var architecturesList []string
+
+	if len(context.ArchitecturesList()) > 0 {
+		architecturesList = context.ArchitecturesList()
+	} else {
+		architecturesList = packageList.Architectures(false)
+	}
+
+	sort.Strings(architecturesList)
+
+	if len(architecturesList) == 0 {
+		return fmt.Errorf("unable to determine list of architectures, please specify explicitly")
+	}
+
+	// Initial dependencies out of arguments
+	initialDependencies := make([]deb.Dependency, len(args)-3)
+	for i, arg := range args[3:] {
+		initialDependencies[i], err = deb.ParseDependency(arg)
+		if err != nil {
+			return fmt.Errorf("unable to parse argument: %s", err)
+		}
+	}
+
+	// Perform pull
+	for _, arch := range architecturesList {
+		dependencies := make([]deb.Dependency, len(initialDependencies), 2*len(initialDependencies))
+		for i := range dependencies {
+			dependencies[i] = initialDependencies[i]
+			dependencies[i].Architecture = arch
+		}
+
+		// Go over list of initial dependencies + list of dependencies found
+		for i := 0; i < len(dependencies); i++ {
+			dep := dependencies[i]
+
+			// Search for package that can satisfy dependencies
+			pkg := sourcePackageList.Search(dep)
+			if pkg == nil {
+				context.Progress().ColoredPrintf("@y[!]@| @!Dependency %s can't be satisfied with source %s@|", &dep, source)
+				continue
+			}
+
+			if !noRemove {
+				// Remove all packages with the same name and architecture
+				for p := packageList.Search(deb.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name}); p != nil; {
+					packageList.Remove(p)
+					context.Progress().ColoredPrintf("@r[-]@| %s removed", p)
+					p = packageList.Search(deb.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name})
+				}
+			}
+
+			// Add new discovered package
+			packageList.Add(pkg)
+			context.Progress().ColoredPrintf("@g[+]@| %s added", pkg)
+
+			if noDeps {
+				continue
+			}
+
+			// Find missing dependencies for single added package
+			pL := deb.NewPackageList()
+			pL.Add(pkg)
+
+			var missing []deb.Dependency
+			missing, err = pL.VerifyDependencies(context.DependencyOptions(), []string{arch}, packageList, nil)
+			if err != nil {
+				context.Progress().ColoredPrintf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
+			}
+
+			// Append missing dependencies to the list of dependencies to satisfy
+			for _, misDep := range missing {
+				found := false
+				for _, d := range dependencies {
+					if d == misDep {
+						found = true
+						break
+					}
+				}
+
+				if !found {
+					dependencies = append(dependencies, misDep)
+				}
+			}
+		}
+	}
+
+	if context.flags.Lookup("dry-run").Value.Get().(bool) {
+		context.Progress().Printf("\nNot creating snapshot, as dry run was requested.\n")
+	} else {
+		// Create <destination> snapshot
+		destination := deb.NewSnapshotFromPackageList(args[2], []*deb.Snapshot{snapshot, source}, packageList,
+			fmt.Sprintf("Pulled into '%s' with '%s' as source, pull request was: '%s'", snapshot.Name, source.Name, strings.Join(args[3:], " ")))
+
+		err = context.CollectionFactory().SnapshotCollection().Add(destination)
+		if err != nil {
+			return fmt.Errorf("unable to create snapshot: %s", err)
+		}
+
+		context.Progress().Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
+	}
+	return err
+}
+
+func makeCmdSnapshotPull() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotPull,
+		UsageLine: "pull <name> <source> <destination> <package-name> ...",
+		Short:     "pull packages from another snapshot",
+		Long: `
+Command pull pulls new packages along with its' dependencies to snapshot <name>
+from snapshot <source>. Pull can upgrade package version in <name> with
+versions from <source> following dependencies. New snapshot <destination>
+is created as a result of this process. Packages could be specified simply
+as 'package-name' or as dependency 'package-name (>= version)'.
+
+Example:
+
+    $ aptly snapshot pull wheezy-main wheezy-backports wheezy-new-xorg xorg-server-server
+`,
+		Flag: *flag.NewFlagSet("aptly-snapshot-pull", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("dry-run", false, "don't create destination snapshot, just show what would be pulled")
+	cmd.Flag.Bool("no-deps", false, "don't process dependencies, just pull listed packages")
+	cmd.Flag.Bool("no-remove", false, "don't remove other package versions when pulling package")
+
+	return cmd
+}

cmd/snapshot_show.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/commander"
+	"github.com/smira/flag"
+)
+
+func aptlySnapshotShow(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) != 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	name := args[0]
+
+	snapshot, err := context.CollectionFactory().SnapshotCollection().ByName(name)
+	if err != nil {
+		return fmt.Errorf("unable to show: %s", err)
+	}
+
+	err = context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
+	if err != nil {
+		return fmt.Errorf("unable to show: %s", err)
+	}
+
+	fmt.Printf("Name: %s\n", snapshot.Name)
+	fmt.Printf("Created At: %s\n", snapshot.CreatedAt.Format("2006-01-02 15:04:05 MST"))
+	fmt.Printf("Description: %s\n", snapshot.Description)
+	fmt.Printf("Number of packages: %d\n", snapshot.NumPackages())
+
+	withPackages := context.flags.Lookup("with-packages").Value.Get().(bool)
+	if withPackages {
+		ListPackagesRefList(snapshot.RefList())
+	}
+
+	return err
+}
+
+func makeCmdSnapshotShow() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotShow,
+		UsageLine: "show <name>",
+		Short:     "shows details about snapshot",
+		Long: `
+Command show displays full information about a snapshot.
+
+Example:
+
+    $ aptly snapshot show wheezy-main
+`,
+		Flag: *flag.NewFlagSet("aptly-snapshot-show", flag.ExitOnError),
+	}
+
+	cmd.Flag.Bool("with-packages", false, "show list of packages")
+
+	return cmd
+}

cmd/snapshot_verify.go

@@ -0,0 +1,115 @@
+package cmd
+
+import (
+	"fmt"
+	"github.com/smira/aptly/deb"
+	"github.com/smira/commander"
+	"sort"
+)
+
+func aptlySnapshotVerify(cmd *commander.Command, args []string) error {
+	var err error
+	if len(args) < 1 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	snapshots := make([]*deb.Snapshot, len(args))
+	for i := range snapshots {
+		snapshots[i], err = context.CollectionFactory().SnapshotCollection().ByName(args[i])
+		if err != nil {
+			return fmt.Errorf("unable to verify: %s", err)
+		}
+
+		err = context.CollectionFactory().SnapshotCollection().LoadComplete(snapshots[i])
+		if err != nil {
+			return fmt.Errorf("unable to verify: %s", err)
+		}
+	}
+
+	context.Progress().Printf("Loading packages...\n")
+
+	packageList, err := deb.NewPackageListFromRefList(snapshots[0].RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	if err != nil {
+		fmt.Errorf("unable to load packages: %s", err)
+	}
+
+	sourcePackageList := deb.NewPackageList()
+	err = sourcePackageList.Append(packageList)
+	if err != nil {
+		fmt.Errorf("unable to merge sources: %s", err)
+	}
+
+	var pL *deb.PackageList
+	for i := 1; i < len(snapshots); i++ {
+		pL, err = deb.NewPackageListFromRefList(snapshots[i].RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+		if err != nil {
+			fmt.Errorf("unable to load packages: %s", err)
+		}
+
+		err = sourcePackageList.Append(pL)
+		if err != nil {
+			fmt.Errorf("unable to merge sources: %s", err)
+		}
+	}
+
+	sourcePackageList.PrepareIndex()
+
+	var architecturesList []string
+
+	if len(context.ArchitecturesList()) > 0 {
+		architecturesList = context.ArchitecturesList()
+	} else {
+		architecturesList = packageList.Architectures(true)
+	}
+
+	if len(architecturesList) == 0 {
+		return fmt.Errorf("unable to determine list of architectures, please specify explicitly")
+	}
+
+	context.Progress().Printf("Verifying...\n")
+
+	missing, err := packageList.VerifyDependencies(context.DependencyOptions(), architecturesList, sourcePackageList, context.Progress())
+	if err != nil {
+		return fmt.Errorf("unable to verify dependencies: %s", err)
+	}
+
+	if len(missing) == 0 {
+		context.Progress().Printf("All dependencies are satisfied.\n")
+	} else {
+		context.Progress().Printf("Missing dependencies (%d):\n", len(missing))
+		deps := make([]string, len(missing))
+		i := 0
+		for _, dep := range missing {
+			deps[i] = dep.String()
+			i++
+		}
+
+		sort.Strings(deps)
+
+		for _, dep := range deps {
+			context.Progress().Printf("  %s\n", dep)
+		}
+	}
+
+	return err
+}
+
+func makeCmdSnapshotVerify() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlySnapshotVerify,
+		UsageLine: "verify <name> [<source> ...]",
+		Short:     "verify dependencies in snapshot",
+		Long: `
+Verify does dependency resolution in snapshot <name>, possibly using additional
+snapshots <source> as dependency sources. All unsatisfied dependencies are
+printed.
+
+Example:
+
+    $ aptly snapshot verify wheezy-main wheezy-contrib wheezy-non-free
+`,
+	}
+
+	return cmd
+}

cmd/version.go

@@ -1,13 +1,18 @@
-package main
+package cmd
 
 import (
 	"fmt"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/commander"
 )
 
 func aptlyVersion(cmd *commander.Command, args []string) error {
-	fmt.Printf("aptly version: %s\n", Version)
+	if len(args) != 0 {
+		cmd.Usage()
+		return commander.ErrCommandError
+	}
+
+	fmt.Printf("aptly version: %s\n", aptly.Version)
 	return nil
 }
 
@@ -22,6 +27,5 @@ Shows aptly version.
 ex:
   $ aptly version
 `,
-		Flag: *flag.NewFlagSet("aptly-version", flag.ExitOnError),
 	}
 }

cmd_graph.go

@@ -1,174 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"code.google.com/p/gographviz"
-	"fmt"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
-	"github.com/smira/aptly/debian"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"strings"
-)
-
-func graphvizEscape(s string) string {
-	return fmt.Sprintf("\"%s\"", strings.Replace(s, "\"", "\\\"", 0))
-}
-
-func aptlyGraph(cmd *commander.Command, args []string) error {
-	var err error
-
-	graph := gographviz.NewGraph()
-	graph.SetDir(true)
-	graph.SetName("aptly")
-
-	fmt.Printf("Loading mirrors...\n")
-
-	repoCollection := debian.NewRemoteRepoCollection(context.database)
-
-	err = repoCollection.ForEach(func(repo *debian.RemoteRepo) error {
-		err := repoCollection.LoadComplete(repo)
-		if err != nil {
-			return err
-		}
-
-		graph.AddNode("aptly", graphvizEscape(repo.UUID), map[string]string{
-			"shape":     "Mrecord",
-			"style":     "filled",
-			"fillcolor": "darkgoldenrod1",
-			"label": graphvizEscape(fmt.Sprintf("{Mirror %s|url: %s|dist: %s|comp: %s|arch: %s|pkgs: %d}",
-				repo.Name, repo.ArchiveRoot, repo.Distribution, strings.Join(repo.Components, ", "),
-				strings.Join(repo.Architectures, ", "), repo.NumPackages())),
-		})
-		return nil
-	})
-
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Loading snapshots...\n")
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-
-	err = snapshotCollection.ForEach(func(snapshot *debian.Snapshot) error {
-		err := snapshotCollection.LoadComplete(snapshot)
-		if err != nil {
-			return err
-		}
-
-		description := snapshot.Description
-		if snapshot.SourceKind == "repo" {
-			description = "Snapshot from repo"
-		}
-
-		graph.AddNode("aptly", graphvizEscape(snapshot.UUID), map[string]string{
-			"shape":     "Mrecord",
-			"style":     "filled",
-			"fillcolor": "cadetblue1",
-			"label":     graphvizEscape(fmt.Sprintf("{Snapshot %s|%s|pkgs: %d}", snapshot.Name, description, snapshot.NumPackages())),
-		})
-
-		if snapshot.SourceKind == "repo" {
-			for _, uuid := range snapshot.SourceIDs {
-				graph.AddEdge(graphvizEscape(uuid), "", graphvizEscape(snapshot.UUID), "", true, nil)
-			}
-		} else if snapshot.SourceKind == "snapshot" {
-			for _, uuid := range snapshot.SourceIDs {
-				graph.AddEdge(graphvizEscape(uuid), "", graphvizEscape(snapshot.UUID), "", true, nil)
-			}
-		}
-		return nil
-	})
-
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("Loading published repos...\n")
-
-	publishedCollection := debian.NewPublishedRepoCollection(context.database)
-
-	publishedCollection.ForEach(func(repo *debian.PublishedRepo) error {
-		graph.AddNode("aptly", graphvizEscape(repo.UUID), map[string]string{
-			"shape":     "Mrecord",
-			"style":     "filled",
-			"fillcolor": "darkolivegreen1",
-			"label":     graphvizEscape(fmt.Sprintf("{Published %s/%s|comp: %s|arch: %s}", repo.Prefix, repo.Distribution, repo.Component, strings.Join(repo.Architectures, ", "))),
-		})
-
-		graph.AddEdge(graphvizEscape(repo.SnapshotUUID), "", graphvizEscape(repo.UUID), "", true, nil)
-
-		return nil
-	})
-
-	fmt.Printf("Generating graph...\n")
-
-	buf := bytes.NewBufferString(graph.String())
-
-	tempfile, err := ioutil.TempFile("", "aptly-graph")
-	if err != nil {
-		return err
-	}
-	tempfile.Close()
-	os.Remove(tempfile.Name())
-
-	tempfilename := tempfile.Name() + ".png"
-
-	command := exec.Command("dot", "-Tpng", "-o"+tempfilename)
-	command.Stderr = os.Stderr
-
-	stdin, err := command.StdinPipe()
-	if err != nil {
-		return err
-	}
-
-	err = command.Start()
-	if err != nil {
-		return fmt.Errorf("unable to execute dot: %s (is graphviz package installed?)", err)
-	}
-
-	_, err = io.Copy(stdin, buf)
-	if err != nil {
-		return err
-	}
-
-	err = stdin.Close()
-	if err != nil {
-		return err
-	}
-
-	err = command.Wait()
-	if err != nil {
-		return err
-	}
-
-	err = exec.Command("open", tempfilename).Run()
-	if err != nil {
-		fmt.Printf("Rendered to PNG file: %s\n", tempfilename)
-		err = nil
-	}
-
-	return err
-}
-
-func makeCmdGraph() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyGraph,
-		UsageLine: "graph",
-		Short:     "display graph of dependencies between aptly objects (requires graphviz)",
-		Long: `
-Command graph displays relationship between mirrors, snapshots and published repositories using
-graphviz package to render graph as image.
-
-ex:
-  $ aptly graph
-`,
-		Flag: *flag.NewFlagSet("aptly-graph", flag.ExitOnError),
-	}
-
-	return cmd
-}

cmd_mirror.go

@@ -1,362 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
-	"github.com/smira/aptly/debian"
-	"github.com/smira/aptly/utils"
-	"sort"
-	"strings"
-)
-
-func getVerifier(cmd *commander.Command) (utils.Verifier, error) {
-	if utils.Config.GpgDisableVerify || cmd.Flag.Lookup("ignore-signatures").Value.Get().(bool) {
-		return nil, nil
-	}
-
-	verifier := &utils.GpgVerifier{}
-	for _, keyRing := range keyRings.keyRings {
-		verifier.AddKeyring(keyRing)
-	}
-
-	err := verifier.InitKeyring()
-	if err != nil {
-		return nil, err
-	}
-
-	return verifier, nil
-}
-
-type keyRingsFlag struct {
-	keyRings []string
-}
-
-func (k *keyRingsFlag) Set(value string) error {
-	k.keyRings = append(k.keyRings, value)
-	return nil
-}
-
-func (k *keyRingsFlag) Get() interface{} {
-	return k.keyRings
-}
-
-func (k *keyRingsFlag) String() string {
-	return strings.Join(k.keyRings, ",")
-}
-
-var keyRings = keyRingsFlag{}
-
-func aptlyMirrorList(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 0 {
-		cmd.Usage()
-		return err
-	}
-
-	repoCollection := debian.NewRemoteRepoCollection(context.database)
-
-	if repoCollection.Len() > 0 {
-		fmt.Printf("List of mirrors:\n")
-		repos := make(sort.StringSlice, repoCollection.Len())
-		i := 0
-		repoCollection.ForEach(func(repo *debian.RemoteRepo) error {
-			repos[i] = repo.String()
-			i++
-			return nil
-		})
-
-		sort.Strings(repos)
-		for _, repo := range repos {
-			fmt.Printf(" * %s\n", repo)
-		}
-
-		fmt.Printf("\nTo get more information about mirror, run `aptly mirror show <name>`.\n")
-	} else {
-		fmt.Printf("No mirrors found, create one with `aptly mirror create ...`.\n")
-	}
-	return err
-}
-
-func aptlyMirrorCreate(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) < 3 {
-		cmd.Usage()
-		return err
-	}
-
-	repo, err := debian.NewRemoteRepo(args[0], args[1], args[2], args[3:], context.architecturesList)
-	if err != nil {
-		return fmt.Errorf("unable to create mirror: %s", err)
-	}
-
-	verifier, err := getVerifier(cmd)
-	if err != nil {
-		return fmt.Errorf("unable to initialize GPG verifier: %s", err)
-	}
-
-	err = repo.Fetch(context.downloader, verifier)
-	if err != nil {
-		return fmt.Errorf("unable to fetch mirror: %s", err)
-	}
-
-	repoCollection := debian.NewRemoteRepoCollection(context.database)
-
-	err = repoCollection.Add(repo)
-	if err != nil {
-		return fmt.Errorf("unable to add mirror: %s", err)
-	}
-
-	fmt.Printf("\nMirror %s successfully added.\nYou can run 'aptly mirror update %s' to download repository contents.\n", repo, repo.Name)
-	return err
-}
-
-func aptlyMirrorShow(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 1 {
-		cmd.Usage()
-		return err
-	}
-
-	name := args[0]
-
-	repoCollection := debian.NewRemoteRepoCollection(context.database)
-	repo, err := repoCollection.ByName(name)
-	if err != nil {
-		return fmt.Errorf("unable to show: %s", err)
-	}
-
-	err = repoCollection.LoadComplete(repo)
-	if err != nil {
-		return fmt.Errorf("unable to show: %s", err)
-	}
-
-	fmt.Printf("Name: %s\n", repo.Name)
-	fmt.Printf("Archive Root URL: %s\n", repo.ArchiveRoot)
-	fmt.Printf("Distribution: %s\n", repo.Distribution)
-	fmt.Printf("Components: %s\n", strings.Join(repo.Components, ", "))
-	fmt.Printf("Architectures: %s\n", strings.Join(repo.Architectures, ", "))
-	if repo.LastDownloadDate.IsZero() {
-		fmt.Printf("Last update: never\n")
-	} else {
-		fmt.Printf("Last update: %s\n", repo.LastDownloadDate.Format("2006-01-02 15:04:05 MST"))
-		fmt.Printf("Number of packages: %d\n", repo.NumPackages())
-	}
-
-	fmt.Printf("\nInformation from release file:\n")
-	for _, k := range utils.StrMapSortedKeys(repo.Meta) {
-		fmt.Printf("%s: %s\n", k, repo.Meta[k])
-	}
-
-	withPackages := cmd.Flag.Lookup("with-packages").Value.Get().(bool)
-	if withPackages {
-		if repo.LastDownloadDate.IsZero() {
-			fmt.Printf("Unable to show package list, mirror hasn't been downloaded yet.\n")
-		} else {
-			ListPackagesRefList(repo.RefList())
-		}
-	}
-
-	return err
-}
-
-func aptlyMirrorUpdate(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 1 {
-		cmd.Usage()
-		return err
-	}
-
-	name := args[0]
-
-	repoCollection := debian.NewRemoteRepoCollection(context.database)
-	repo, err := repoCollection.ByName(name)
-	if err != nil {
-		return fmt.Errorf("unable to update: %s", err)
-	}
-
-	err = repoCollection.LoadComplete(repo)
-	if err != nil {
-		return fmt.Errorf("unable to update: %s", err)
-	}
-
-	ignoreMismatch := cmd.Flag.Lookup("ignore-checksums").Value.Get().(bool)
-
-	verifier, err := getVerifier(cmd)
-	if err != nil {
-		return fmt.Errorf("unable to initialize GPG verifier: %s", err)
-	}
-
-	err = repo.Fetch(context.downloader, verifier)
-	if err != nil {
-		return fmt.Errorf("unable to update: %s", err)
-	}
-
-	packageCollection := debian.NewPackageCollection(context.database)
-
-	err = repo.Download(context.downloader, packageCollection, context.packageRepository, ignoreMismatch)
-	if err != nil {
-		return fmt.Errorf("unable to update: %s", err)
-	}
-
-	err = repoCollection.Update(repo)
-	if err != nil {
-		return fmt.Errorf("unable to update: %s", err)
-	}
-
-	fmt.Printf("\nMirror `%s` has been successfully updated.\n", repo.Name)
-	return err
-}
-
-func aptlyMirrorDrop(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 1 {
-		cmd.Usage()
-		return err
-	}
-
-	name := args[0]
-
-	repoCollection := debian.NewRemoteRepoCollection(context.database)
-	repo, err := repoCollection.ByName(name)
-	if err != nil {
-		return fmt.Errorf("unable to drop: %s", err)
-	}
-
-	force := cmd.Flag.Lookup("force").Value.Get().(bool)
-	if !force {
-		snapshotCollection := debian.NewSnapshotCollection(context.database)
-		snapshots := snapshotCollection.ByRemoteRepoSource(repo)
-
-		if len(snapshots) > 0 {
-			fmt.Printf("Mirror `%s` was used to create following snapshots:\n", repo.Name)
-			for _, snapshot := range snapshots {
-				fmt.Printf(" * %s\n", snapshot)
-			}
-
-			return fmt.Errorf("won't delete mirror with snapshots, use -force to override")
-		}
-	}
-
-	err = repoCollection.Drop(repo)
-	if err != nil {
-		return fmt.Errorf("unable to drop: %s", err)
-	}
-
-	fmt.Printf("Mirror `%s` has been removed.\n", repo.Name)
-
-	return err
-}
-
-func makeCmdMirrorCreate() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyMirrorCreate,
-		UsageLine: "create <name> <archive url> <distribution> [<component1> ...]",
-		Short:     "create new mirror of Debian repository",
-		Long: `
-Create records information about new mirror and fetches Release file (it doesn't download packages).
-
-ex:
-  $ aptly mirror create wheezy-main http://mirror.yandex.ru/debian/ wheezy main
-`,
-		Flag: *flag.NewFlagSet("aptly-mirror-create", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("ignore-signatures", false, "disable verification of Release file signatures")
-	cmd.Flag.Var(&keyRings, "keyring", "gpg keyring to use when verifying Release file (could be specified multiple times)")
-
-	return cmd
-}
-
-func makeCmdMirrorList() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyMirrorList,
-		UsageLine: "list",
-		Short:     "list mirrors of remote repositories",
-		Long: `
-List shows full list of remote repositories.
-
-ex:
-  $ aptly mirror list
-`,
-		Flag: *flag.NewFlagSet("aptly-mirror-list", flag.ExitOnError),
-	}
-	cmd.Flag.Bool("v", false, "enable verbose output")
-
-	return cmd
-}
-
-func makeCmdMirrorShow() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyMirrorShow,
-		UsageLine: "show <name>",
-		Short:     "show details about remote repository mirror",
-		Long: `
-Show shows full information about mirror.
-
-ex:
-  $ aptly mirror show wheezy-main
-`,
-		Flag: *flag.NewFlagSet("aptly-mirror-show", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("with-packages", false, "show list of packages")
-
-	return cmd
-}
-
-func makeCmdMirrorUpdate() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyMirrorUpdate,
-		UsageLine: "update <name>",
-		Short:     "update packages from remote mirror",
-		Long: `
-Update downloads list of packages and package files.
-
-ex:
-  $ aptly mirror update wheezy-main
-`,
-		Flag: *flag.NewFlagSet("aptly-mirror-update", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("ignore-checksums", false, "ignore checksum mismatches while downloading package files and metadata")
-	cmd.Flag.Bool("ignore-signatures", false, "disable verification of Release file signatures")
-	cmd.Flag.Var(&keyRings, "keyring", "gpg keyring to use when verifying Release file (could be specified multiple times)")
-
-	return cmd
-}
-
-func makeCmdMirrorDrop() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyMirrorDrop,
-		UsageLine: "drop <name>",
-		Short:     "delete remote repository mirror",
-		Long: `
-Drop deletes information about remote repository mirror. Package data is not deleted
-(it could be still used by other mirrors or snapshots).
-
-ex:
-  $ aptly mirror drop wheezy-main
-`,
-		Flag: *flag.NewFlagSet("aptly-mirror-drop", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("force", false, "force mirror deletion even if used by snapshots")
-
-	return cmd
-}
-
-func makeCmdMirror() *commander.Command {
-	return &commander.Command{
-		UsageLine: "mirror",
-		Short:     "manage mirrors of remote repositories",
-		Subcommands: []*commander.Command{
-			makeCmdMirrorCreate(),
-			makeCmdMirrorList(),
-			makeCmdMirrorShow(),
-			makeCmdMirrorDrop(),
-			makeCmdMirrorUpdate(),
-		},
-		Flag: *flag.NewFlagSet("aptly-mirror", flag.ExitOnError),
-	}
-}

cmd_publish.go

@@ -1,266 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
-	"github.com/smira/aptly/debian"
-	"github.com/smira/aptly/utils"
-	"sort"
-	"strings"
-)
-
-func getSigner(cmd *commander.Command) (utils.Signer, error) {
-	if cmd.Flag.Lookup("skip-signing").Value.Get().(bool) || utils.Config.GpgDisableSign {
-		return nil, nil
-	}
-
-	signer := &utils.GpgSigner{}
-
-	key := cmd.Flag.Lookup("gpg-key").Value.String()
-	if key != "" {
-		signer.SetKey(key)
-	}
-
-	err := signer.Init()
-	if err != nil {
-		return nil, err
-	}
-
-	return signer, nil
-
-}
-
-func aptlyPublishSnapshot(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) < 1 || len(args) > 2 {
-		cmd.Usage()
-		return err
-	}
-
-	name := args[0]
-
-	var prefix string
-	if len(args) == 2 {
-		prefix = args[1]
-	} else {
-		prefix = ""
-	}
-
-	publishedCollecton := debian.NewPublishedRepoCollection(context.database)
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-	snapshot, err := snapshotCollection.ByName(name)
-	if err != nil {
-		return fmt.Errorf("unable to publish: %s", err)
-	}
-
-	err = snapshotCollection.LoadComplete(snapshot)
-	if err != nil {
-		return fmt.Errorf("unable to publish: %s", err)
-	}
-
-	var sourceRepo *debian.RemoteRepo
-
-	if snapshot.SourceKind == "repo" && len(snapshot.SourceIDs) == 1 {
-		repoCollection := debian.NewRemoteRepoCollection(context.database)
-
-		sourceRepo, _ = repoCollection.ByUUID(snapshot.SourceIDs[0])
-	}
-
-	component := cmd.Flag.Lookup("component").Value.String()
-	if component == "" {
-		if sourceRepo != nil && len(sourceRepo.Components) == 1 {
-			component = sourceRepo.Components[0]
-		} else {
-			component = "main"
-		}
-	}
-
-	distribution := cmd.Flag.Lookup("distribution").Value.String()
-	if distribution == "" {
-		if sourceRepo != nil {
-			distribution = sourceRepo.Distribution
-		}
-
-		if distribution == "" {
-			return fmt.Errorf("unable to guess distribution name, please specify explicitly")
-		}
-	}
-
-	published, err := debian.NewPublishedRepo(prefix, distribution, component, context.architecturesList, snapshot)
-	if err != nil {
-		return fmt.Errorf("unable to publish: %s", err)
-	}
-
-	duplicate := publishedCollecton.CheckDuplicate(published)
-	if duplicate != nil {
-		publishedCollecton.LoadComplete(duplicate, snapshotCollection)
-		return fmt.Errorf("prefix/distribution already used by another published repo: %s", duplicate)
-	}
-
-	signer, err := getSigner(cmd)
-	if err != nil {
-		return fmt.Errorf("unable to initialize GPG signer: %s", err)
-	}
-
-	packageCollection := debian.NewPackageCollection(context.database)
-	err = published.Publish(context.packageRepository, packageCollection, signer)
-	if err != nil {
-		return fmt.Errorf("unable to publish: %s", err)
-	}
-
-	err = publishedCollecton.Add(published)
-	if err != nil {
-		return fmt.Errorf("unable to save to DB: %s", err)
-	}
-
-	if prefix != "" && !strings.HasSuffix(prefix, "/") {
-		prefix += "/"
-	}
-
-	fmt.Printf("\nSnapshot %s has been successfully published.\nPlease setup your webserver to serve directory '%s' with autoindexing.\n",
-		snapshot.Name, context.packageRepository.PublicPath())
-	fmt.Printf("Now you can add following line to apt sources:\n")
-	fmt.Printf("  deb http://your-server/%s %s %s\n", prefix, distribution, component)
-	fmt.Printf("Don't forget to add your GPG key to apt with apt-key.\n")
-	fmt.Printf("\nYou can also use `aptly serve` to publish your repositories over HTTP quickly.\n")
-
-	return err
-}
-
-func aptlyPublishList(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 0 {
-		cmd.Usage()
-		return err
-	}
-
-	publishedCollecton := debian.NewPublishedRepoCollection(context.database)
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-
-	if publishedCollecton.Len() == 0 {
-		fmt.Printf("No snapshots have been published. Publish a snapshot by running `aptly publish snapshot ...`.\n")
-		return err
-	}
-
-	published := make(sort.StringSlice, 0, publishedCollecton.Len())
-
-	err = publishedCollecton.ForEach(func(repo *debian.PublishedRepo) error {
-		err := publishedCollecton.LoadComplete(repo, snapshotCollection)
-		if err != nil {
-			return err
-		}
-
-		published = append(published, repo.String())
-		return nil
-	})
-
-	if err != nil {
-		return fmt.Errorf("unable to load list of repos: %s", err)
-	}
-
-	sort.Strings(published)
-
-	fmt.Printf("Published repositories:\n")
-
-	for _, description := range published {
-		fmt.Printf("  * %s\n", description)
-	}
-
-	return err
-}
-
-func aptlyPublishDrop(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) < 1 || len(args) > 2 {
-		cmd.Usage()
-		return err
-	}
-
-	distribution := args[0]
-	prefix := "."
-
-	if len(args) == 2 {
-		prefix = args[1]
-	}
-
-	publishedCollecton := debian.NewPublishedRepoCollection(context.database)
-
-	err = publishedCollecton.Remove(context.packageRepository, prefix, distribution)
-	if err != nil {
-		return fmt.Errorf("unable to remove: %s", err)
-	}
-
-	fmt.Printf("\nPublished repositroy has been removed successfully.\n")
-
-	return err
-}
-
-func makeCmdPublishSnapshot() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyPublishSnapshot,
-		UsageLine: "snapshot <name> [<prefix>]",
-		Short:     "makes Debian repository out of snapshot",
-		Long: `
-Command publish oublishes snapshot as Debian repository ready to be used by apt tools.
-
-ex.
-	$ aptly publish snapshot wheezy-main
-`,
-		Flag: *flag.NewFlagSet("aptly-publish-snapshot", flag.ExitOnError),
-	}
-	cmd.Flag.String("distribution", "", "distribution name to publish")
-	cmd.Flag.String("component", "", "component name to publish")
-	cmd.Flag.String("gpg-key", "", "GPG key ID to use when signing the release")
-	cmd.Flag.Bool("skip-signing", false, "don't sign Release files with GPG")
-
-	return cmd
-}
-
-func makeCmdPublishDrop() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyPublishDrop,
-		UsageLine: "drop <distribution> [<prefix>]",
-		Short:     "removes files of published repository",
-		Long: `
-Command removes whatever has been published under specified prefix and distribution name.
-
-ex.
-	$ aptly publish drop wheezy
-`,
-		Flag: *flag.NewFlagSet("aptly-publish-drop", flag.ExitOnError),
-	}
-
-	return cmd
-}
-
-func makeCmdPublishList() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlyPublishList,
-		UsageLine: "list",
-		Short:     "displays list of published repositories",
-		Long: `
-Display command displays list of currently published snapshots with information about published root.
-
-ex.
-	$ aptly publish list
-`,
-		Flag: *flag.NewFlagSet("aptly-publish-list", flag.ExitOnError),
-	}
-
-	return cmd
-}
-
-func makeCmdPublish() *commander.Command {
-	return &commander.Command{
-		UsageLine: "publish",
-		Short:     "manage published repositories",
-		Subcommands: []*commander.Command{
-			makeCmdPublishSnapshot(),
-			makeCmdPublishList(),
-			makeCmdPublishDrop(),
-		},
-		Flag: *flag.NewFlagSet("aptly-publish", flag.ExitOnError),
-	}
-}

cmd_snapshot.go

@@ -1,730 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
-	"github.com/smira/aptly/debian"
-	"github.com/wsxiaoys/terminal/color"
-	"sort"
-	"strings"
-)
-
-func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
-	var (
-		err      error
-		snapshot *debian.Snapshot
-	)
-
-	if len(args) == 4 && args[1] == "from" && args[2] == "mirror" {
-		// aptly snapshot create snap from mirror mirror
-		repoName, snapshotName := args[3], args[0]
-
-		repoCollection := debian.NewRemoteRepoCollection(context.database)
-		repo, err := repoCollection.ByName(repoName)
-		if err != nil {
-			return fmt.Errorf("unable to create snapshot: %s", err)
-		}
-
-		err = repoCollection.LoadComplete(repo)
-		if err != nil {
-			return fmt.Errorf("unable to create snapshot: %s", err)
-		}
-
-		snapshot, err = debian.NewSnapshotFromRepository(snapshotName, repo)
-		if err != nil {
-			return fmt.Errorf("unable to create snapshot: %s", err)
-		}
-	} else if len(args) == 2 && args[1] == "empty" {
-		// aptly snapshot create snap empty
-		snapshotName := args[0]
-
-		packageList := debian.NewPackageList()
-
-		snapshot = debian.NewSnapshotFromPackageList(snapshotName, nil, packageList, "Created as empty")
-	} else {
-		cmd.Usage()
-		return err
-	}
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-
-	err = snapshotCollection.Add(snapshot)
-	if err != nil {
-		return fmt.Errorf("unable to add snapshot: %s", err)
-	}
-
-	fmt.Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", snapshot.Name, snapshot.Name)
-
-	return err
-}
-
-func aptlySnapshotList(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 0 {
-		cmd.Usage()
-		return err
-	}
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-
-	if snapshotCollection.Len() > 0 {
-		fmt.Printf("List of snapshots:\n")
-
-		snapshots := make(sort.StringSlice, snapshotCollection.Len())
-
-		i := 0
-		snapshotCollection.ForEach(func(snapshot *debian.Snapshot) error {
-			snapshots[i] = snapshot.String()
-			i++
-			return nil
-		})
-
-		sort.Strings(snapshots)
-		for _, snapshot := range snapshots {
-			fmt.Printf(" * %s\n", snapshot)
-		}
-
-		fmt.Printf("\nTo get more information about snapshot, run `aptly snapshot show <name>`.\n")
-	} else {
-		fmt.Printf("\nNo snapshots found, create one with `aptly snapshot create...`.\n")
-	}
-	return err
-
-}
-
-func aptlySnapshotShow(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 1 {
-		cmd.Usage()
-		return err
-	}
-
-	name := args[0]
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-	snapshot, err := snapshotCollection.ByName(name)
-	if err != nil {
-		return fmt.Errorf("unable to show: %s", err)
-	}
-
-	err = snapshotCollection.LoadComplete(snapshot)
-	if err != nil {
-		return fmt.Errorf("unable to show: %s", err)
-	}
-
-	fmt.Printf("Name: %s\n", snapshot.Name)
-	fmt.Printf("Created At: %s\n", snapshot.CreatedAt.Format("2006-01-02 15:04:05 MST"))
-	fmt.Printf("Description: %s\n", snapshot.Description)
-	fmt.Printf("Number of packages: %d\n", snapshot.NumPackages())
-
-	withPackages := cmd.Flag.Lookup("with-packages").Value.Get().(bool)
-	if withPackages {
-		ListPackagesRefList(snapshot.RefList())
-	}
-
-	return err
-}
-
-func aptlySnapshotVerify(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) < 1 {
-		cmd.Usage()
-		return err
-	}
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-	packageCollection := debian.NewPackageCollection(context.database)
-
-	snapshots := make([]*debian.Snapshot, len(args))
-	for i := range snapshots {
-		snapshots[i], err = snapshotCollection.ByName(args[i])
-		if err != nil {
-			return fmt.Errorf("unable to verify: %s", err)
-		}
-
-		err = snapshotCollection.LoadComplete(snapshots[i])
-		if err != nil {
-			return fmt.Errorf("unable to verify: %s", err)
-		}
-	}
-
-	packageList, err := debian.NewPackageListFromRefList(snapshots[0].RefList(), packageCollection)
-	if err != nil {
-		fmt.Errorf("unable to load packages: %s", err)
-	}
-
-	sourcePackageList := debian.NewPackageList()
-	err = sourcePackageList.Append(packageList)
-	if err != nil {
-		fmt.Errorf("unable to merge sources: %s", err)
-	}
-
-	for i := 1; i < len(snapshots); i++ {
-		pL, err := debian.NewPackageListFromRefList(snapshots[i].RefList(), packageCollection)
-		if err != nil {
-			fmt.Errorf("unable to load packages: %s", err)
-		}
-
-		err = sourcePackageList.Append(pL)
-		if err != nil {
-			fmt.Errorf("unable to merge sources: %s", err)
-		}
-	}
-
-	sourcePackageList.PrepareIndex()
-
-	var architecturesList []string
-
-	if len(context.architecturesList) > 0 {
-		architecturesList = context.architecturesList
-	} else {
-		architecturesList = packageList.Architectures()
-	}
-
-	if len(architecturesList) == 0 {
-		return fmt.Errorf("unable to determine list of architectures, please specify explicitly")
-	}
-
-	missing, err := packageList.VerifyDependencies(context.dependencyOptions, architecturesList, sourcePackageList)
-	if err != nil {
-		return fmt.Errorf("unable to verify dependencies: %s", err)
-	}
-
-	if len(missing) == 0 {
-		fmt.Printf("All dependencies are satisfied.\n")
-	} else {
-		fmt.Printf("Missing dependencies (%d):\n", len(missing))
-		deps := make(sort.StringSlice, len(missing))
-		i := 0
-		for _, dep := range missing {
-			deps[i] = dep.String()
-			i++
-		}
-
-		sort.Strings(deps)
-
-		for _, dep := range deps {
-			fmt.Printf("  %s\n", dep)
-		}
-	}
-
-	return err
-}
-
-func aptlySnapshotPull(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) < 4 {
-		cmd.Usage()
-		return err
-	}
-
-	noDeps := cmd.Flag.Lookup("no-deps").Value.Get().(bool)
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-	packageCollection := debian.NewPackageCollection(context.database)
-
-	// Load <name> snapshot
-	snapshot, err := snapshotCollection.ByName(args[0])
-	if err != nil {
-		return fmt.Errorf("unable to pull: %s", err)
-	}
-
-	err = snapshotCollection.LoadComplete(snapshot)
-	if err != nil {
-		return fmt.Errorf("unable to pull: %s", err)
-	}
-
-	// Load <source> snapshot
-	source, err := snapshotCollection.ByName(args[1])
-	if err != nil {
-		return fmt.Errorf("unable to pull: %s", err)
-	}
-
-	err = snapshotCollection.LoadComplete(source)
-	if err != nil {
-		return fmt.Errorf("unable to pull: %s", err)
-	}
-
-	fmt.Printf("Dependencies would be pulled into snapshot:\n    %s\nfrom snapshot:\n    %s\nand result would be saved as new snapshot %s.\n",
-		snapshot, source, args[2])
-
-	// Convert snapshot to package list
-	fmt.Printf("Loading packages (%d)...\n", snapshot.RefList().Len()+source.RefList().Len())
-	packageList, err := debian.NewPackageListFromRefList(snapshot.RefList(), packageCollection)
-	if err != nil {
-		return fmt.Errorf("unable to load packages: %s", err)
-	}
-
-	sourcePackageList, err := debian.NewPackageListFromRefList(source.RefList(), packageCollection)
-	if err != nil {
-		return fmt.Errorf("unable to load packages: %s", err)
-	}
-
-	fmt.Printf("Building indexes...\n")
-	packageList.PrepareIndex()
-	sourcePackageList.PrepareIndex()
-
-	// Calculate architectures
-	var architecturesList []string
-
-	if len(context.architecturesList) > 0 {
-		architecturesList = context.architecturesList
-	} else {
-		architecturesList = packageList.Architectures()
-	}
-
-	if len(architecturesList) == 0 {
-		return fmt.Errorf("unable to determine list of architectures, please specify explicitly")
-	}
-
-	// Initial dependencies out of arguments
-	initialDependencies := make([]debian.Dependency, len(args)-3)
-	for i, arg := range args[3:] {
-		initialDependencies[i], err = debian.ParseDependency(arg)
-		if err != nil {
-			return fmt.Errorf("unable to parse argument: %s", err)
-		}
-	}
-
-	// Perform pull
-	for _, arch := range architecturesList {
-		dependencies := make([]debian.Dependency, len(initialDependencies), 128)
-		for i := range dependencies {
-			dependencies[i] = initialDependencies[i]
-			dependencies[i].Architecture = arch
-		}
-
-		// Go over list of initial dependencies + list of dependencies found
-		for i := 0; i < len(dependencies); i++ {
-			dep := dependencies[i]
-
-			// Search for package that can satisfy dependencies
-			pkg := sourcePackageList.Search(dep)
-			if pkg == nil {
-				color.Printf("@y[!]@| @!Dependency %s can't be satisfied with source %s@|", &dep, source)
-				fmt.Printf("\n")
-				continue
-			}
-
-			// Remove all packages with the same name and architecture
-			for p := packageList.Search(debian.Dependency{Architecture: arch, Pkg: pkg.Name}); p != nil; {
-				packageList.Remove(p)
-				color.Printf("@r[-]@| %s removed", p)
-				fmt.Printf("\n")
-				p = packageList.Search(debian.Dependency{Architecture: arch, Pkg: pkg.Name})
-			}
-
-			// Add new discovered package
-			packageList.Add(pkg)
-			color.Printf("@g[+]@| %s added", pkg)
-			fmt.Printf("\n")
-
-			if noDeps {
-				continue
-			}
-
-			// Find missing dependencies for single added package
-			pL := debian.NewPackageList()
-			pL.Add(pkg)
-
-			missing, err := pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList)
-			if err != nil {
-				color.Printf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
-				fmt.Printf("\n")
-			}
-
-			// Append missing dependencies to the list of dependencies to satisfy
-			for _, misDep := range missing {
-				found := false
-				for _, d := range dependencies {
-					if d == misDep {
-						found = true
-						break
-					}
-				}
-
-				if !found {
-					dependencies = append(dependencies, misDep)
-				}
-			}
-		}
-	}
-
-	if cmd.Flag.Lookup("dry-run").Value.Get().(bool) {
-		fmt.Printf("\nNot creating snapshot, as dry run was requested.\n")
-	} else {
-		// Create <destination> snapshot
-		destination := debian.NewSnapshotFromPackageList(args[2], []*debian.Snapshot{snapshot, source}, packageList,
-			fmt.Sprintf("Pulled into '%s' with '%s' as source, pull request was: '%s'", snapshot.Name, source.Name, strings.Join(args[3:], " ")))
-
-		err = snapshotCollection.Add(destination)
-		if err != nil {
-			return fmt.Errorf("unable to create snapshot: %s", err)
-		}
-
-		fmt.Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
-	}
-	return err
-}
-
-func aptlySnapshotDiff(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 2 {
-		cmd.Usage()
-		return err
-	}
-
-	onlyMatching := cmd.Flag.Lookup("only-matching").Value.Get().(bool)
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-	packageCollection := debian.NewPackageCollection(context.database)
-
-	// Load <name-a> snapshot
-	snapshotA, err := snapshotCollection.ByName(args[0])
-	if err != nil {
-		return fmt.Errorf("unable to load snapshot A: %s", err)
-	}
-
-	err = snapshotCollection.LoadComplete(snapshotA)
-	if err != nil {
-		return fmt.Errorf("unable to load snapshot A: %s", err)
-	}
-
-	// Load <name-b> snapshot
-	snapshotB, err := snapshotCollection.ByName(args[1])
-	if err != nil {
-		return fmt.Errorf("unable to load snapshot B: %s", err)
-	}
-
-	err = snapshotCollection.LoadComplete(snapshotB)
-	if err != nil {
-		return fmt.Errorf("unable to load snapshot B: %s", err)
-	}
-
-	// Calculate diff
-	diff, err := snapshotA.RefList().Diff(snapshotB.RefList(), packageCollection)
-	if err != nil {
-		return fmt.Errorf("unable to calculate diff: %s", err)
-	}
-
-	if len(diff) == 0 {
-		fmt.Printf("Snapshots are identical.\n")
-	} else {
-		fmt.Printf("  Arch   | Package                                  | Version in A                             | Version in B\n")
-		for _, pdiff := range diff {
-			if onlyMatching && (pdiff.Left == nil || pdiff.Right == nil) {
-				continue
-			}
-
-			var verA, verB, pkg, arch, code string
-
-			if pdiff.Left == nil {
-				verA = "-"
-				verB = pdiff.Right.Version
-				pkg = pdiff.Right.Name
-				arch = pdiff.Right.Architecture
-			} else {
-				pkg = pdiff.Left.Name
-				arch = pdiff.Left.Architecture
-				verA = pdiff.Left.Version
-				if pdiff.Right == nil {
-					verB = "-"
-				} else {
-					verB = pdiff.Right.Version
-				}
-			}
-
-			if pdiff.Left == nil {
-				code = "@g+@|"
-			} else {
-				if pdiff.Right == nil {
-					code = "@r-@|"
-				} else {
-					code = "@y!@|"
-				}
-			}
-
-			color.Printf(code+" %-6s | %-40s | %-40s | %-40s\n", arch, pkg, verA, verB)
-		}
-	}
-
-	return err
-}
-
-func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) < 2 {
-		cmd.Usage()
-		return err
-	}
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-
-	sources := make([]*debian.Snapshot, len(args)-1)
-
-	for i := 0; i < len(args)-1; i++ {
-		sources[i], err = snapshotCollection.ByName(args[i+1])
-		if err != nil {
-			return fmt.Errorf("unable to load snapshot: %s", err)
-		}
-
-		err = snapshotCollection.LoadComplete(sources[i])
-		if err != nil {
-			return fmt.Errorf("unable to load snapshot: %s", err)
-		}
-	}
-
-	result := sources[0].RefList()
-
-	for i := 1; i < len(sources); i++ {
-		result = result.Merge(sources[i].RefList())
-	}
-
-	sourceDescription := make([]string, len(sources))
-	for i, s := range sources {
-		sourceDescription[i] = fmt.Sprintf("'%s'", s.Name)
-	}
-
-	// Create <destination> snapshot
-	destination := debian.NewSnapshotFromRefList(args[0], sources, result,
-		fmt.Sprintf("Merged from sources: %s", strings.Join(sourceDescription, ", ")))
-
-	err = snapshotCollection.Add(destination)
-	if err != nil {
-		return fmt.Errorf("unable to create snapshot: %s", err)
-	}
-
-	fmt.Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
-
-	return err
-}
-
-func aptlySnapshotDrop(cmd *commander.Command, args []string) error {
-	var err error
-	if len(args) != 1 {
-		cmd.Usage()
-		return err
-	}
-
-	name := args[0]
-
-	snapshotCollection := debian.NewSnapshotCollection(context.database)
-	snapshot, err := snapshotCollection.ByName(name)
-	if err != nil {
-		return fmt.Errorf("unable to drop: %s", err)
-	}
-
-	publishedRepoCollection := debian.NewPublishedRepoCollection(context.database)
-	published := publishedRepoCollection.BySnapshot(snapshot)
-
-	if len(published) > 0 {
-		fmt.Printf("Snapshot `%s` is published currently:\n", snapshot.Name)
-		for _, repo := range published {
-			err = publishedRepoCollection.LoadComplete(repo, snapshotCollection)
-			if err != nil {
-				return fmt.Errorf("unable to load published: %s", err)
-			}
-			fmt.Printf(" * %s\n", repo)
-		}
-
-		return fmt.Errorf("unable to drop: snapshot is published")
-	}
-
-	force := cmd.Flag.Lookup("force").Value.Get().(bool)
-	if !force {
-		snapshots := snapshotCollection.BySnapshotSource(snapshot)
-		if len(snapshots) > 0 {
-			fmt.Printf("Snapshot `%s` was used as a source in following snapshots:\n", snapshot.Name)
-			for _, snap := range snapshots {
-				fmt.Printf(" * %s\n", snap)
-			}
-
-			return fmt.Errorf("won't delete snapshot that was used as source for other snapshots, use -force to override")
-		}
-	}
-
-	err = snapshotCollection.Drop(snapshot)
-	if err != nil {
-		return fmt.Errorf("unable to drop: %s", err)
-	}
-
-	fmt.Printf("Snapshot `%s` has been dropped.\n", snapshot.Name)
-
-	return err
-}
-
-func makeCmdSnapshotCreate() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotCreate,
-		UsageLine: "create <name> from mirror <mirror-name> | create <name> empty",
-		Short:     "creates immutable snapshot of mirror contents",
-		Long: `
-Command create .. from mirror makes persistent immutable snapshot of remote repository mirror. Snapshot could be
-published or further modified using merge, pull and other aptly features.
-
-Command create .. empty creates empty snapshot that could be used as a basis for snapshot pull operations, for example.
-As snapshots are immutable, creating one empty snapshot should be enough.
-
-ex.
-  $ aptly snapshot create wheezy-main-today from mirror wheezy-main
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-create", flag.ExitOnError),
-	}
-
-	return cmd
-
-}
-
-func makeCmdSnapshotList() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotList,
-		UsageLine: "list",
-		Short:     "lists snapshots",
-		Long: `
-Command list shows full list of snapshots created.
-
-ex:
-  $ aptly snapshot list
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-list", flag.ExitOnError),
-	}
-
-	return cmd
-}
-
-func makeCmdSnapshotShow() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotShow,
-		UsageLine: "show <name>",
-		Short:     "shows details about snapshot",
-		Long: `
-Command show displays full information about snapshot.
-
-ex.
-	$ aptly snapshot show wheezy-main
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-show", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("with-packages", false, "show list of packages")
-
-	return cmd
-}
-
-func makeCmdSnapshotVerify() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotVerify,
-		UsageLine: "verify <name> [<source> ...]",
-		Short:     "verifies that dependencies are satisfied in snapshot",
-		Long: `
-Verify does depenency resolution in snapshot, possibly using additional snapshots as dependency sources.
-All unsatisfied dependencies are returned.
-
-ex.
-	$ aptly snapshot verify wheezy-main wheezy-contrib wheezy-non-free
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-verify", flag.ExitOnError),
-	}
-
-	return cmd
-}
-
-func makeCmdSnapshotPull() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotPull,
-		UsageLine: "pull <name> <source> <destination> <package-name> ...",
-		Short:     "performs partial upgrades (pulls new packages) from another snapshot",
-		Long: `
-Command pull pulls new packages along with its dependencies in <name> snapshot
-from <source> snapshot. Also can upgrade package version from one snapshot into
-another, once again along with dependencies. New snapshot <destination> is created as result of this
-process. Packages could be specified simply as 'package-name' or as dependency 'package-name (>= version)'.
-
-ex.
-	$ aptly snapshot pull wheezy-main wheezy-backports wheezy-new-xorg xorg-server-server
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-pull", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("dry-run", false, "don't create destination snapshot, just show what would be pulled")
-	cmd.Flag.Bool("no-deps", false, "don't process dependencies, just pull listed packages")
-
-	return cmd
-}
-
-func makeCmdSnapshotDiff() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotDiff,
-		UsageLine: "diff <name-a> <name-b>",
-		Short:     "calculates difference in packages between two snapshots",
-		Long: `
-Command diff shows list of missing and new packages, difference in package versions between two snapshots.
-
-ex.
-	$ aptly snapshot diff -only-matching wheezy-main wheezy-backports
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-diff", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("only-matching", false, "display diff only for matching packages (don't display missing packages)")
-
-	return cmd
-}
-
-func makeCmdSnapshotMerge() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotMerge,
-		UsageLine: "merge <destination> <source> [<source>...]",
-		Short:     "merges snapshots into one, replacing matching packages",
-		Long: `
-Merge merges several snapshots into one. Merge happens from left to right. Packages with the same
-name-architecture pair are replaced during merge (package from latest snapshot on the list wins).
-If run with only one source snapshot, merge copies source into destination.
-
-ex.
-	$ aptly snapshot merge wheezy-w-backports wheezy-main wheezy-backports
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-merge", flag.ExitOnError),
-	}
-
-	return cmd
-}
-
-func makeCmdSnapshotDrop() *commander.Command {
-	cmd := &commander.Command{
-		Run:       aptlySnapshotDrop,
-		UsageLine: "drop <name>",
-		Short:     "delete snapshot",
-		Long: `
-Drop removes information about snapshot. If snapshot is published,
-it can't be dropped.
-
-ex.
-	$ aptly snapshot drop wheezy-main
-`,
-		Flag: *flag.NewFlagSet("aptly-snapshot-drop", flag.ExitOnError),
-	}
-
-	cmd.Flag.Bool("force", false, "remove snapshot even if it was used as source for other snapshots")
-
-	return cmd
-}
-
-func makeCmdSnapshot() *commander.Command {
-	return &commander.Command{
-		UsageLine: "snapshot",
-		Short:     "manage snapshots of repositories",
-		Subcommands: []*commander.Command{
-			makeCmdSnapshotCreate(),
-			makeCmdSnapshotList(),
-			makeCmdSnapshotShow(),
-			makeCmdSnapshotVerify(),
-			makeCmdSnapshotPull(),
-			makeCmdSnapshotDiff(),
-			makeCmdSnapshotMerge(),
-			makeCmdSnapshotDrop(),
-		},
-		Flag: *flag.NewFlagSet("aptly-snapshot", flag.ExitOnError),
-	}
-}

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
-}

console/progress.go

@@ -1,19 +1,25 @@
-package utils
+package console
 
 import (
 	"fmt"
 	"github.com/cheggaaa/pb"
+	"github.com/smira/aptly/aptly"
+	"github.com/wsxiaoys/terminal/color"
+	"strings"
 )
 
 const (
 	codePrint = iota
 	codeProgress
 	codeHideProgress
+	codeStop
+	codeFlush
 )
 
 type printTask struct {
 	code    int
 	message string
+	reply   chan bool
 }
 
 // Progress is a progress displaying subroutine, it allows to show download and other operations progress
@@ -26,10 +32,14 @@ type Progress struct {
 	barShown bool
 }
 
+// Check interface
+var (
+	_ aptly.Progress = (*Progress)(nil)
+)
+
 // NewProgress creates new progress instance
 func NewProgress() *Progress {
 	return &Progress{
-		stop:    make(chan bool),
 		stopped: make(chan bool),
 		queue:   make(chan printTask, 100),
 	}
@@ -43,11 +53,18 @@ func (p *Progress) Start() {
 // Shutdown shuts down progress display
 func (p *Progress) Shutdown() {
 	p.ShutdownBar()
-	p.stop <- true
+	p.queue <- printTask{code: codeStop}
 	<-p.stopped
 }
 
-// InitBar creates progressbar for count bytes
+// Flush waits for all queued messages to be displayed
+func (p *Progress) Flush() {
+	ch := make(chan bool)
+	p.queue <- printTask{code: codeFlush, reply: ch}
+	<-ch
+}
+
+// InitBar starts progressbar for count bytes or count items
 func (p *Progress) InitBar(count int64, isBytes bool) {
 	if p.bar != nil {
 		panic("bar already initialized")
@@ -64,7 +81,6 @@ func (p *Progress) InitBar(count int64, isBytes bool) {
 			p.bar.SetUnits(pb.U_BYTES)
 			p.bar.ShowSpeed = true
 		}
-		p.barShown = false
 		p.bar.Start()
 	}
 }
@@ -94,32 +110,69 @@ func (p *Progress) AddBar(count int) {
 	}
 }
 
+// SetBar sets current position for progress bar
+func (p *Progress) SetBar(count int) {
+	if p.bar != nil {
+		p.bar.Set(count)
+	}
+}
+
 // Printf does printf but in safe manner: not overwriting progress bar
 func (p *Progress) Printf(msg string, a ...interface{}) {
 	p.queue <- printTask{code: codePrint, message: fmt.Sprintf(msg, a...)}
 }
 
+// ColoredPrintf does printf in colored way + newline
+func (p *Progress) ColoredPrintf(msg string, a ...interface{}) {
+	if RunningOnTerminal() {
+		p.queue <- printTask{code: codePrint, message: color.Sprintf(msg, a...) + "\n"}
+	} else {
+		// stip color marks
+		var prev rune
+		msg = strings.Map(func(r rune) rune {
+			if prev == '@' {
+				prev = 0
+				if r == '@' {
+					return r
+				}
+				return -1
+			}
+			prev = r
+			if r == '@' {
+				return -1
+
+			}
+
+			return r
+		}, msg)
+
+		p.Printf(msg+"\n", a...)
+	}
+}
+
 func (p *Progress) worker() {
 	for {
-		select {
-		case task := <-p.queue:
-			switch task.code {
-			case codePrint:
-				if p.barShown {
-					fmt.Print("\r\033[2K")
-					p.barShown = false
-				}
-				fmt.Print(task.message)
-			case codeProgress:
+		task := <-p.queue
+		switch task.code {
+		case codePrint:
+			if p.barShown {
+				fmt.Print("\r\033[2K")
+				p.barShown = false
+			}
+			fmt.Print(task.message)
+		case codeProgress:
+			if p.bar != nil {
 				fmt.Print("\r" + task.message)
 				p.barShown = true
-			case codeHideProgress:
-				if p.barShown {
-					fmt.Print("\r\033[2K")
-					p.barShown = false
-				}
 			}
-		case <-p.stop:
+		case codeHideProgress:
+			if p.barShown {
+				fmt.Print("\r\033[2K")
+				p.barShown = false
+			}
+		case codeFlush:
+			task.reply <- true
+		case codeStop:
 			p.stopped <- true
 			return
 		}

console/terminal.go

@@ -1,12 +1,13 @@
 // +build !freebsd
 
-package utils
+package console
 
 import (
 	"code.google.com/p/go.crypto/ssh/terminal"
 	"syscall"
 )
 
+// RunningOnTerminal checks whether stdout is terminal
 func RunningOnTerminal() bool {
 	return terminal.IsTerminal(syscall.Stdout)
 }

console/terminal_bsd.go

@@ -0,0 +1,10 @@
+// +build freebsd
+
+package console
+
+// RunningOnTerminal checks whether stdout is terminal
+//
+// Stub for FreeBSD, until in go1.3 terminal.IsTerminal would start working for FreeBSD
+func RunningOnTerminal() bool {
+	return false
+}

database/leveldb.go

@@ -7,6 +7,8 @@ import (
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/filter"
 	"github.com/syndtr/goleveldb/leveldb/opt"
+	"github.com/syndtr/goleveldb/leveldb/storage"
+	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
 // Errors for Storage
@@ -19,12 +21,17 @@ type Storage interface {
 	Get(key []byte) ([]byte, error)
 	Put(key []byte, value []byte) error
 	Delete(key []byte) error
+	KeysByPrefix(prefix []byte) [][]byte
 	FetchByPrefix(prefix []byte) [][]byte
 	Close() error
+	StartBatch()
+	FinishBatch() error
+	CompactDB() error
 }
 
 type levelDB struct {
-	db *leveldb.DB
+	db    *leveldb.DB
+	batch *leveldb.Batch
 }
 
 // Check interface
@@ -45,6 +52,25 @@ func OpenDB(path string) (Storage, error) {
 	return &levelDB{db: db}, nil
 }
 
+// RecoverDB recovers LevelDB database from corruption
+func RecoverDB(path string) error {
+	stor, err := storage.OpenFile(path)
+	if err != nil {
+		return err
+	}
+
+	db, err := leveldb.Recover(stor, nil)
+	if err != nil {
+		return err
+	}
+
+	db.Close()
+	stor.Close()
+
+	return nil
+}
+
+// Get key value from database
 func (l *levelDB) Get(key []byte) ([]byte, error) {
 	value, err := l.db.Get(key, nil)
 	if err != nil {
@@ -57,33 +83,94 @@ func (l *levelDB) Get(key []byte) ([]byte, error) {
 	return value, nil
 }
 
+// Put saves key to database, if key has the same value in DB already, it is not saved
 func (l *levelDB) Put(key []byte, value []byte) error {
+	if l.batch != nil {
+		l.batch.Put(key, value)
+		return nil
+	}
+	old, err := l.db.Get(key, nil)
+	if err != nil {
+		if err != leveldb.ErrNotFound {
+			return err
+		}
+	} else {
+		if bytes.Compare(old, value) == 0 {
+			return nil
+		}
+	}
 	return l.db.Put(key, value, nil)
 }
 
+// Delete removes key from DB
 func (l *levelDB) Delete(key []byte) error {
+	if l.batch != nil {
+		l.batch.Delete(key)
+		return nil
+	}
 	return l.db.Delete(key, nil)
 }
 
-func (l *levelDB) FetchByPrefix(prefix []byte) [][]byte {
+// KeysByPrefix returns all keys that start with prefix
+func (l *levelDB) KeysByPrefix(prefix []byte) [][]byte {
 	result := make([][]byte, 0, 20)
 
-	iterator := l.db.NewIterator(nil)
-	if iterator.Seek(prefix) {
-		for bytes.HasPrefix(iterator.Key(), prefix) {
-			val := iterator.Value()
-			valc := make([]byte, len(val))
-			copy(valc, val)
-			result = append(result, valc)
-			if !iterator.Next() {
-				break
-			}
-		}
+	iterator := l.db.NewIterator(nil, nil)
+	defer iterator.Release()
+
+	for ok := iterator.Seek(prefix); ok && bytes.HasPrefix(iterator.Key(), prefix); ok = iterator.Next() {
+		key := iterator.Key()
+		keyc := make([]byte, len(key))
+		copy(keyc, key)
+		result = append(result, keyc)
 	}
 
 	return result
 }
 
+// FetchByPrefix returns all values with keys that start with prefix
+func (l *levelDB) FetchByPrefix(prefix []byte) [][]byte {
+	result := make([][]byte, 0, 20)
+
+	iterator := l.db.NewIterator(nil, nil)
+	defer iterator.Release()
+
+	for ok := iterator.Seek(prefix); ok && bytes.HasPrefix(iterator.Key(), prefix); ok = iterator.Next() {
+		val := iterator.Value()
+		valc := make([]byte, len(val))
+		copy(valc, val)
+		result = append(result, valc)
+	}
+
+	return result
+}
+
+// Close finishes DB work
 func (l *levelDB) Close() error {
 	return l.db.Close()
 }
+
+// StartBatch starts batch processing of keys
+//
+// All subsequent Get, Put and Delete would work on batch
+func (l *levelDB) StartBatch() {
+	if l.batch != nil {
+		panic("batch already started")
+	}
+	l.batch = new(leveldb.Batch)
+}
+
+// FinishBatch finalizes the batch, saving operations
+func (l *levelDB) FinishBatch() error {
+	if l.batch == nil {
+		panic("no batch")
+	}
+	err := l.db.Write(l.batch, nil)
+	l.batch = nil
+	return err
+}
+
+// CompactDB compacts database by merging layers
+func (l *levelDB) CompactDB() error {
+	return l.db.CompactRange(util.Range{})
+}

database/leveldb_test.go

@@ -11,7 +11,8 @@ func Test(t *testing.T) {
 }
 
 type LevelDBSuite struct {
-	db Storage
+	path string
+	db   Storage
 }
 
 var _ = Suite(&LevelDBSuite{})
@@ -19,7 +20,8 @@ var _ = Suite(&LevelDBSuite{})
 func (s *LevelDBSuite) SetUpTest(c *C) {
 	var err error
 
-	s.db, err = OpenDB(c.MkDir())
+	s.path = c.MkDir()
+	s.db, err = OpenDB(s.path)
 	c.Assert(err, IsNil)
 }
 
@@ -28,6 +30,29 @@ func (s *LevelDBSuite) TearDownTest(c *C) {
 	c.Assert(err, IsNil)
 }
 
+func (s *LevelDBSuite) TestRecoverDB(c *C) {
+	var (
+		key   = []byte("key")
+		value = []byte("value")
+	)
+
+	err := s.db.Put(key, value)
+	c.Check(err, IsNil)
+
+	err = s.db.Close()
+	c.Check(err, IsNil)
+
+	err = RecoverDB(s.path)
+	c.Check(err, IsNil)
+
+	s.db, err = OpenDB(s.path)
+	c.Check(err, IsNil)
+
+	result, err := s.db.Get(key)
+	c.Assert(err, IsNil)
+	c.Assert(result, DeepEquals, value)
+}
+
 func (s *LevelDBSuite) TestGetPut(c *C) {
 	var (
 		key   = []byte("key")
@@ -64,19 +89,69 @@ func (s *LevelDBSuite) TestDelete(c *C) {
 	c.Assert(err, IsNil)
 }
 
-func (s *LevelDBSuite) TestFetchByPrefix(c *C) {
+func (s *LevelDBSuite) TestByPrefix(c *C) {
 	c.Check(s.db.FetchByPrefix([]byte{0x80}), DeepEquals, [][]byte{})
 
 	s.db.Put([]byte{0x80, 0x01}, []byte{0x01})
 	s.db.Put([]byte{0x80, 0x03}, []byte{0x03})
 	s.db.Put([]byte{0x80, 0x02}, []byte{0x02})
 	c.Check(s.db.FetchByPrefix([]byte{0x80}), DeepEquals, [][]byte{{0x01}, {0x02}, {0x03}})
+	c.Check(s.db.KeysByPrefix([]byte{0x80}), DeepEquals, [][]byte{{0x80, 0x01}, {0x80, 0x02}, {0x80, 0x03}})
 
 	s.db.Put([]byte{0x90, 0x01}, []byte{0x04})
 	c.Check(s.db.FetchByPrefix([]byte{0x80}), DeepEquals, [][]byte{{0x01}, {0x02}, {0x03}})
+	c.Check(s.db.KeysByPrefix([]byte{0x80}), DeepEquals, [][]byte{{0x80, 0x01}, {0x80, 0x02}, {0x80, 0x03}})
 
 	s.db.Put([]byte{0x00, 0x01}, []byte{0x05})
 	c.Check(s.db.FetchByPrefix([]byte{0x80}), DeepEquals, [][]byte{{0x01}, {0x02}, {0x03}})
+	c.Check(s.db.KeysByPrefix([]byte{0x80}), DeepEquals, [][]byte{{0x80, 0x01}, {0x80, 0x02}, {0x80, 0x03}})
 
 	c.Check(s.db.FetchByPrefix([]byte{0xa0}), DeepEquals, [][]byte{})
+	c.Check(s.db.KeysByPrefix([]byte{0xa0}), DeepEquals, [][]byte{})
+}
+
+func (s *LevelDBSuite) TestBatch(c *C) {
+	var (
+		key    = []byte("key")
+		key2   = []byte("key2")
+		value  = []byte("value")
+		value2 = []byte("value2")
+	)
+
+	err := s.db.Put(key, value)
+	c.Assert(err, IsNil)
+
+	s.db.StartBatch()
+	s.db.Put(key2, value2)
+	s.db.Delete(key)
+
+	v, err := s.db.Get(key)
+	c.Check(err, IsNil)
+	c.Check(v, DeepEquals, value)
+
+	_, err = s.db.Get(key2)
+	c.Check(err, ErrorMatches, "key not found")
+
+	err = s.db.FinishBatch()
+	c.Check(err, IsNil)
+
+	v2, err := s.db.Get(key2)
+	c.Check(err, IsNil)
+	c.Check(v2, DeepEquals, value2)
+
+	_, err = s.db.Get(key)
+	c.Check(err, ErrorMatches, "key not found")
+
+	c.Check(func() { s.db.FinishBatch() }, Panics, "no batch")
+
+	s.db.StartBatch()
+	c.Check(func() { s.db.StartBatch() }, Panics, "batch already started")
+}
+
+func (s *LevelDBSuite) TestCompactDB(c *C) {
+	s.db.Put([]byte{0x80, 0x01}, []byte{0x01})
+	s.db.Put([]byte{0x80, 0x03}, []byte{0x03})
+	s.db.Put([]byte{0x80, 0x02}, []byte{0x02})
+
+	c.Check(s.db.CompactDB(), IsNil)
 }

deb/collections.go

@@ -0,0 +1,65 @@
+package deb
+
+import (
+	"github.com/smira/aptly/database"
+)
+
+// CollectionFactory is a single place to generate all desired collections
+type CollectionFactory struct {
+	db             database.Storage
+	packages       *PackageCollection
+	remoteRepos    *RemoteRepoCollection
+	snapshots      *SnapshotCollection
+	localRepos     *LocalRepoCollection
+	publishedRepos *PublishedRepoCollection
+}
+
+// NewCollectionFactory creates new factory
+func NewCollectionFactory(db database.Storage) *CollectionFactory {
+	return &CollectionFactory{db: db}
+}
+
+// PackageCollection returns (or creates) new PackageCollection
+func (factory *CollectionFactory) PackageCollection() *PackageCollection {
+	if factory.packages == nil {
+		factory.packages = NewPackageCollection(factory.db)
+	}
+
+	return factory.packages
+}
+
+// RemoteRepoCollection returns (or creates) new RemoteRepoCollection
+func (factory *CollectionFactory) RemoteRepoCollection() *RemoteRepoCollection {
+	if factory.remoteRepos == nil {
+		factory.remoteRepos = NewRemoteRepoCollection(factory.db)
+	}
+
+	return factory.remoteRepos
+}
+
+// SnapshotCollection returns (or creates) new SnapshotCollection
+func (factory *CollectionFactory) SnapshotCollection() *SnapshotCollection {
+	if factory.snapshots == nil {
+		factory.snapshots = NewSnapshotCollection(factory.db)
+	}
+
+	return factory.snapshots
+}
+
+// LocalRepoCollection returns (or creates) new LocalRepoCollection
+func (factory *CollectionFactory) LocalRepoCollection() *LocalRepoCollection {
+	if factory.localRepos == nil {
+		factory.localRepos = NewLocalRepoCollection(factory.db)
+	}
+
+	return factory.localRepos
+}
+
+// PublishedRepoCollection returns (or creates) new PublishedRepoCollection
+func (factory *CollectionFactory) PublishedRepoCollection() *PublishedRepoCollection {
+	if factory.publishedRepos == nil {
+		factory.publishedRepos = NewPublishedRepoCollection(factory.db)
+	}
+
+	return factory.publishedRepos
+}

deb/deb.go

@@ -0,0 +1,99 @@
+package deb
+
+import (
+	"archive/tar"
+	"bufio"
+	"compress/gzip"
+	"fmt"
+	"github.com/mkrautz/goar"
+	"github.com/smira/aptly/utils"
+	"io"
+	"os"
+	"strings"
+)
+
+// GetControlFileFromDeb reads control file from deb package
+func GetControlFileFromDeb(packageFile string) (Stanza, error) {
+	file, err := os.Open(packageFile)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	library := ar.NewReader(file)
+	for {
+		header, err := library.Next()
+		if err == io.EOF {
+			return nil, fmt.Errorf("unable to find control.tar.gz part")
+		}
+		if err != nil {
+			return nil, fmt.Errorf("unable to read .deb archive: %s", err)
+		}
+
+		if header.Name == "control.tar.gz" {
+			ungzip, err := gzip.NewReader(library)
+			if err != nil {
+				return nil, fmt.Errorf("unable to ungzip: %s", err)
+			}
+			defer ungzip.Close()
+
+			untar := tar.NewReader(ungzip)
+			for {
+				tarHeader, err := untar.Next()
+				if err == io.EOF {
+					return nil, fmt.Errorf("unable to find control file")
+				}
+				if err != nil {
+					return nil, fmt.Errorf("unable to read .tar archive: %s", err)
+				}
+
+				if tarHeader.Name == "./control" {
+					reader := NewControlFileReader(untar)
+					stanza, err := reader.ReadStanza()
+					if err != nil {
+						return nil, err
+					}
+
+					return stanza, nil
+				}
+			}
+		}
+	}
+}
+
+// GetControlFileFromDsc reads control file from dsc package
+func GetControlFileFromDsc(dscFile string, verifier utils.Verifier) (Stanza, error) {
+	file, err := os.Open(dscFile)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	line, err := bufio.NewReader(file).ReadString('\n')
+	if err != nil {
+		return nil, err
+	}
+
+	file.Seek(0, 0)
+
+	var text *os.File
+
+	if strings.Index(line, "BEGIN PGP SIGN") != -1 {
+		text, err = verifier.ExtractClearsigned(file)
+		if err != nil {
+			return nil, err
+		}
+		defer text.Close()
+	} else {
+		text = file
+	}
+
+	reader := NewControlFileReader(text)
+	stanza, err := reader.ReadStanza()
+	if err != nil {
+		return nil, err
+	}
+
+	return stanza, nil
+
+}

deb/deb_test.go

@@ -0,0 +1,56 @@
+package deb
+
+import (
+	"github.com/smira/aptly/utils"
+	. "launchpad.net/gocheck"
+	"path/filepath"
+	"runtime"
+)
+
+type DebSuite struct {
+	debFile, dscFile, dscFileNoSign string
+}
+
+var _ = Suite(&DebSuite{})
+
+func (s *DebSuite) SetUpSuite(c *C) {
+	_, _File, _, _ := runtime.Caller(0)
+	s.debFile = filepath.Join(filepath.Dir(_File), "../system/files/libboost-program-options-dev_1.49.0.1_i386.deb")
+	s.dscFile = filepath.Join(filepath.Dir(_File), "../system/files/pyspi_0.6.1-1.3.dsc")
+	s.dscFileNoSign = filepath.Join(filepath.Dir(_File), "../system/files/pyspi-0.6.1-1.3.stripped.dsc")
+}
+
+func (s *DebSuite) TestGetControlFileFromDeb(c *C) {
+	_, err := GetControlFileFromDeb("/no/such/file")
+	c.Check(err, ErrorMatches, ".*no such file or directory")
+
+	_, _File, _, _ := runtime.Caller(0)
+	_, err = GetControlFileFromDeb(_File)
+	c.Check(err, ErrorMatches, "unable to read .deb archive: ar: missing global header")
+
+	st, err := GetControlFileFromDeb(s.debFile)
+	c.Check(err, IsNil)
+	c.Check(st["Version"], Equals, "1.49.0.1")
+	c.Check(st["Package"], Equals, "libboost-program-options-dev")
+}
+
+func (s *DebSuite) TestGetControlFileFromDsc(c *C) {
+	verifier := &utils.GpgVerifier{}
+
+	_, err := GetControlFileFromDsc("/no/such/file", verifier)
+	c.Check(err, ErrorMatches, ".*no such file or directory")
+
+	_, _File, _, _ := runtime.Caller(0)
+	_, err = GetControlFileFromDsc(_File, verifier)
+	c.Check(err, ErrorMatches, "malformed stanza syntax")
+
+	st, err := GetControlFileFromDsc(s.dscFile, verifier)
+	c.Check(err, IsNil)
+	c.Check(st["Version"], Equals, "0.6.1-1.3")
+	c.Check(st["Source"], Equals, "pyspi")
+
+	st, err = GetControlFileFromDsc(s.dscFileNoSign, verifier)
+	c.Check(err, IsNil)
+	c.Check(st["Version"], Equals, "0.6.1-1.4")
+	c.Check(st["Source"], Equals, "pyspi")
+}

deb/debian.go

@@ -0,0 +1,2 @@
+// Package deb implements Debian-specific repository handling
+package deb

deb/debian_test.go

@@ -0,0 +1,11 @@
+package deb
+
+import (
+	. "launchpad.net/gocheck"
+	"testing"
+)
+
+// Launch gocheck tests
+func Test(t *testing.T) {
+	TestingT(t)
+}

deb/format.go

@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bufio"
@@ -11,7 +11,7 @@ import (
 type Stanza map[string]string
 
 // Canonical order of fields in stanza
-var canocialOrder = []string{"Origin", "Label", "Suite", "Package", "Version", "Installed-Size", "Priority", "Section", "Maintainer",
+var canocialOrder = []string{"Package", "Origin", "Label", "Suite", "Version", "Installed-Size", "Priority", "Section", "Maintainer",
 	"Architecture", "Codename", "Date", "Architectures", "Components", "Description", "MD5sum", "MD5Sum", "SHA1", "SHA256"}
 
 // Copy returns copy of Stanza

deb/format_test.go

@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bufio"

deb/list.go

@@ -1,11 +1,11 @@
-package debian
+package deb
 
 import (
-	"bytes"
 	"fmt"
+	"github.com/smira/aptly/aptly"
 	"github.com/smira/aptly/utils"
-	"github.com/ugorji/go/codec"
 	"sort"
+	"strings"
 )
 
 // Dependency options
@@ -18,6 +18,8 @@ const (
 	DepFollowRecommends
 	// DepFollowAllVariants follows all variants if depends on "a | b"
 	DepFollowAllVariants
+	// DepFollowBuild pulls build dependencies
+	DepFollowBuild
 )
 
 // PackageList is list of unique (by key) packages
@@ -48,17 +50,33 @@ func NewPackageList() *PackageList {
 }
 
 // NewPackageListFromRefList loads packages list from PackageRefList
-func NewPackageListFromRefList(reflist *PackageRefList, collection *PackageCollection) (*PackageList, error) {
+func NewPackageListFromRefList(reflist *PackageRefList, collection *PackageCollection, progress aptly.Progress) (*PackageList, error) {
+	// empty reflist
+	if reflist == nil {
+		return NewPackageList(), nil
+	}
+
 	result := &PackageList{packages: make(map[string]*Package, reflist.Len())}
 
+	if progress != nil {
+		progress.InitBar(int64(reflist.Len()), false)
+	}
+
 	err := reflist.ForEach(func(key []byte) error {
-		p, err := collection.ByKey(key)
-		if err != nil {
-			return fmt.Errorf("unable to load package with key %s: %s", key, err)
+		p, err2 := collection.ByKey(key)
+		if err2 != nil {
+			return fmt.Errorf("unable to load package with key %s: %s", key, err2)
+		}
+		if progress != nil {
+			progress.AddBar(1)
 		}
 		return result.Add(p)
 	})
 
+	if progress != nil {
+		progress.ShutdownBar()
+	}
+
 	if err != nil {
 		return nil, err
 	}
@@ -68,11 +86,11 @@ func NewPackageListFromRefList(reflist *PackageRefList, collection *PackageColle
 
 // Add appends package to package list, additionally checking for uniqueness
 func (l *PackageList) Add(p *Package) error {
-	key := string(p.Key())
+	key := string(p.ShortKey(""))
 	existing, ok := l.packages[key]
 	if ok {
 		if !existing.Equals(p) {
-			return fmt.Errorf("conflict in package %s: %#v != %#v", p, existing, p)
+			return fmt.Errorf("conflict in package %s", p)
 		}
 		return nil
 	}
@@ -119,7 +137,7 @@ func (l *PackageList) Append(pl *PackageList) error {
 		existing, ok := l.packages[k]
 		if ok {
 			if !existing.Equals(p) {
-				return fmt.Errorf("conflict in package %s: %#v != %#v", p, existing, p)
+				return fmt.Errorf("conflict in package %s", p)
 			}
 		} else {
 			l.packages[k] = p
@@ -131,7 +149,7 @@ func (l *PackageList) Append(pl *PackageList) error {
 
 // Remove removes package from the list, and updates index when required
 func (l *PackageList) Remove(p *Package) {
-	delete(l.packages, string(p.Key()))
+	delete(l.packages, string(p.ShortKey("")))
 	if l.indexed {
 		for _, provides := range p.Provides {
 			for i, pkg := range l.providesIndex[provides] {
@@ -158,11 +176,13 @@ func (l *PackageList) Remove(p *Package) {
 	}
 }
 
-// Architectures returns list of architectures present in packages
-func (l *PackageList) Architectures() (result []string) {
+// Architectures returns list of architectures present in packages and flag if source packages are present.
+//
+// If includeSource is true, meta-architecture "source" would be present in the list
+func (l *PackageList) Architectures(includeSource bool) (result []string) {
 	result = make([]string, 0, 10)
 	for _, pkg := range l.packages {
-		if pkg.Architecture != "all" && !utils.StrSliceHasItem(result, pkg.Architecture) {
+		if pkg.Architecture != "all" && (pkg.Architecture != "source" || includeSource) && !utils.StrSliceHasItem(result, pkg.Architecture) {
 			result = append(result, pkg.Architecture)
 		}
 	}
@@ -199,13 +219,21 @@ func depSliceDeduplicate(s []Dependency) []Dependency {
 // VerifyDependencies looks for missing dependencies in package list.
 //
 // Analysis would be peformed for each architecture, in specified sources
-func (l *PackageList) VerifyDependencies(options int, architectures []string, sources *PackageList) ([]Dependency, error) {
+func (l *PackageList) VerifyDependencies(options int, architectures []string, sources *PackageList, progress aptly.Progress) ([]Dependency, error) {
 	missing := make([]Dependency, 0, 128)
 
+	if progress != nil {
+		progress.InitBar(int64(l.Len())*int64(len(architectures)), false)
+	}
+
 	for _, arch := range architectures {
 		cache := make(map[string]bool, 2048)
 
 		for _, p := range l.packages {
+			if progress != nil {
+				progress.AddBar(1)
+			}
+
 			if !p.MatchesArchitecture(arch) {
 				continue
 			}
@@ -222,7 +250,9 @@ func (l *PackageList) VerifyDependencies(options int, architectures []string, so
 				missingCount := 0
 
 				for _, dep := range variants {
-					dep.Architecture = arch
+					if dep.Architecture == "" {
+						dep.Architecture = arch
+					}
 
 					hash := dep.Hash()
 					r, ok := cache[hash]
@@ -258,6 +288,10 @@ func (l *PackageList) VerifyDependencies(options int, architectures []string, so
 		}
 	}
 
+	if progress != nil {
+		progress.ShutdownBar()
+	}
+
 	return missing, nil
 }
 
@@ -309,269 +343,95 @@ func (l *PackageList) Search(dep Dependency) *Package {
 
 	for i < len(l.packagesIndex) && l.packagesIndex[i].Name == dep.Pkg {
 		p := l.packagesIndex[i]
-		if p.MatchesArchitecture(dep.Architecture) {
-			if dep.Relation == VersionDontCare {
-				return p
-			}
-
-			r := CompareVersions(p.Version, dep.Version)
-			switch dep.Relation {
-			case VersionEqual:
-				if r == 0 {
-					return p
-				}
-			case VersionLess:
-				if r < 0 {
-					return p
-				}
-			case VersionGreater:
-				if r > 0 {
-					return p
-				}
-			case VersionLessOrEqual:
-				if r <= 0 {
-					return p
-				}
-			case VersionGreaterOrEqual:
-				if r >= 0 {
-					return p
-				}
-			}
+		if p.MatchesDependency(dep) {
+			return p
 		}
+
 		i++
 	}
 	return nil
 }
 
-// PackageRefList is a list of keys of packages, this is basis for snapshot
-// and similar stuff
-//
-// Refs are sorted in lexicographical order
-type PackageRefList struct {
-	// List of package keys
-	Refs [][]byte
-}
-
-// Verify interface
-var (
-	_ sort.Interface = &PackageRefList{}
-)
-
-// NewPackageRefListFromPackageList creates PackageRefList from PackageList
-func NewPackageRefListFromPackageList(list *PackageList) *PackageRefList {
-	reflist := &PackageRefList{}
-	reflist.Refs = make([][]byte, list.Len())
-
-	i := 0
-	for _, p := range list.packages {
-		reflist.Refs[i] = p.Key()
-		i++
+// Filter filters package index by specified queries (ORed together), possibly pulling dependencies
+func (l *PackageList) Filter(queries []string, withDependencies bool, source *PackageList, dependencyOptions int, architecturesList []string) (*PackageList, error) {
+	if !l.indexed {
+		panic("list not indexed, can't filter")
 	}
 
-	sort.Sort(reflist)
+	result := NewPackageList()
 
-	return reflist
-}
+	for _, query := range queries {
+		isDepQuery := strings.IndexAny(query, " (){}=<>") != -1
 
-// Len returns number of refs
-func (l *PackageRefList) Len() int {
-	return len(l.Refs)
-}
+		if !isDepQuery {
+			// try to interpret query as package string representation
 
-// Swap swaps two refs
-func (l *PackageRefList) Swap(i, j int) {
-	l.Refs[i], l.Refs[j] = l.Refs[j], l.Refs[i]
-}
+			// convert Package.String() to Package.Key()
+			i := strings.Index(query, "_")
+			if i != -1 {
+				pkg, query := query[:i], query[i+1:]
+				j := strings.LastIndex(query, "_")
+				if j != -1 {
+					version, arch := query[:j], query[j+1:]
+					p := l.packages["P"+arch+" "+pkg+" "+version]
+					if p != nil {
+						result.Add(p)
+						continue
+					}
+				}
+			}
+		}
 
-// Compare compares two refs in lexographical order
-func (l *PackageRefList) Less(i, j int) bool {
-	return bytes.Compare(l.Refs[i], l.Refs[j]) < 0
-}
-
-// Encode does msgpack encoding of PackageRefList
-func (l *PackageRefList) Encode() []byte {
-	var buf bytes.Buffer
-
-	encoder := codec.NewEncoder(&buf, &codec.MsgpackHandle{})
-	encoder.Encode(l)
-
-	return buf.Bytes()
-}
-
-// Decode decodes msgpack representation into PackageRefLit
-func (l *PackageRefList) Decode(input []byte) error {
-	decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
-	return decoder.Decode(l)
-}
-
-// ForEach calls handler for each package ref in list
-func (l *PackageRefList) ForEach(handler func([]byte) error) error {
-	var err error
-	for _, p := range l.Refs {
-		err = handler(p)
+		// try as dependency
+		dep, err := ParseDependency(query)
 		if err != nil {
-			return err
-		}
-	}
-	return err
-}
-
-// PackageDiff is a difference between two packages in a list.
-//
-// If left & right are present, difference is in package version
-// If left is nil, package is present only in right
-// If right is nil, package is present only in left
-type PackageDiff struct {
-	Left, Right *Package
-}
-
-// PackageDiffs is a list of PackageDiff records
-type PackageDiffs []PackageDiff
-
-// Diff calculates difference between two reflists
-func (l *PackageRefList) Diff(r *PackageRefList, packageCollection *PackageCollection) (result PackageDiffs, err error) {
-	result = make(PackageDiffs, 0, 128)
-
-	// pointer to left and right reflists
-	il, ir := 0, 0
-	// length of reflists
-	ll, lr := l.Len(), r.Len()
-	// cached loaded packages on the left & right
-	pl, pr := (*Package)(nil), (*Package)(nil)
-
-	// until we reached end of both lists
-	for il < ll || ir < lr {
-		// if we've exhausted left list, pull the rest from the right
-		if il == ll {
-			pr, err = packageCollection.ByKey(r.Refs[ir])
-			if err != nil {
+			if isDepQuery {
 				return nil, err
 			}
-			result = append(result, PackageDiff{Left: nil, Right: pr})
-			ir++
-			continue
-		}
-		// if we've exhausted right list, pull the rest from the left
-		if ir == lr {
-			pl, err = packageCollection.ByKey(l.Refs[il])
-			if err != nil {
-				return nil, err
-			}
-			result = append(result, PackageDiff{Left: pl, Right: nil})
-			il++
+			// parsing failed, but probably that wasn't a dep query
 			continue
 		}
 
-		// refs on both sides are present, load them
-		rl, rr := l.Refs[il], r.Refs[ir]
-		// compare refs
-		rel := bytes.Compare(rl, rr)
+		i := sort.Search(len(l.packagesIndex), func(j int) bool { return l.packagesIndex[j].Name >= dep.Pkg })
 
-		if rel == 0 {
-			// refs are identical, so are packages, advance pointer
-			il++
-			ir++
-			pl, pr = nil, nil
-		} else {
-			// load pl & pr if they haven't been loaded before
-			if pl == nil {
-				pl, err = packageCollection.ByKey(rl)
-				if err != nil {
-					return nil, err
-				}
+		for i < len(l.packagesIndex) && l.packagesIndex[i].Name == dep.Pkg {
+			p := l.packagesIndex[i]
+			if p.MatchesDependency(dep) {
+				result.Add(p)
 			}
-
-			if pr == nil {
-				pr, err = packageCollection.ByKey(rr)
-				if err != nil {
-					return nil, err
-				}
-			}
-
-			// is pl & pr the same package, but different version?
-			if pl.Name == pr.Name && pl.Architecture == pr.Architecture {
-				result = append(result, PackageDiff{Left: pl, Right: pr})
-				il++
-				ir++
-				pl, pr = nil, nil
-			} else {
-				// otherwise pl or pr is missing on one of the sides
-				if rel < 0 {
-					result = append(result, PackageDiff{Left: pl, Right: nil})
-					il++
-					pl = nil
-				} else {
-					result = append(result, PackageDiff{Left: nil, Right: pr})
-					ir++
-					pr = nil
-				}
-			}
-
+			i++
 		}
 	}
 
-	return
-}
+	if withDependencies {
+		added := result.Len()
 
-// Merge merges reflist r into current reflist. Merge replaces matching packages (by architecture/name)
-// with reference from r.
-func (l *PackageRefList) Merge(r *PackageRefList) (result *PackageRefList) {
-	// pointer to left and right reflists
-	il, ir := 0, 0
-	// length of reflists
-	ll, lr := l.Len(), r.Len()
+		dependencySource := NewPackageList()
+		dependencySource.Append(source)
+		dependencySource.Append(result)
+		dependencySource.PrepareIndex()
 
-	result = &PackageRefList{}
-	result.Refs = make([][]byte, 0, ll+lr)
+		// while some new dependencies were discovered
+		for added > 0 {
+			added = 0
 
-	// until we reached end of both lists
-	for il < ll || ir < lr {
-		// if we've exhausted left list, pull the rest from the right
-		if il == ll {
-			result.Refs = append(result.Refs, r.Refs[ir:]...)
-			break
-		}
-		// if we've exhausted right list, pull the rest from the left
-		if ir == lr {
-			result.Refs = append(result.Refs, l.Refs[il:]...)
-			break
-		}
-
-		// refs on both sides are present, load them
-		rl, rr := l.Refs[il], r.Refs[ir]
-		// compare refs
-		rel := bytes.Compare(rl, rr)
-
-		if rel == 0 {
-			// refs are identical, so are packages, advance pointer
-			result.Refs = append(result.Refs, l.Refs[il])
-			il++
-			ir++
-		} else {
-			partsL := bytes.Split(rl, []byte(" "))
-			archL, nameL := partsL[0][1:], partsL[1]
-
-			partsR := bytes.Split(rr, []byte(" "))
-			archR, nameR := partsR[0][1:], partsR[1]
-
-			if bytes.Compare(archL, archR) == 0 && bytes.Compare(nameL, nameR) == 0 {
-				// override with package from the right
-				result.Refs = append(result.Refs, r.Refs[ir])
-				il++
-				ir++
-			} else {
-				// otherwise append smallest of two
-				if rel < 0 {
-					result.Refs = append(result.Refs, l.Refs[il])
-					il++
-				} else {
-					result.Refs = append(result.Refs, r.Refs[ir])
-					ir++
-				}
+			// find missing dependencies
+			missing, err := result.VerifyDependencies(dependencyOptions, architecturesList, dependencySource, nil)
+			if err != nil {
+				return nil, err
 			}
 
+			// try to satisfy dependencies
+			for _, dep := range missing {
+				p := l.Search(dep)
+				if p != nil {
+					result.Add(p)
+					dependencySource.Add(p)
+					added++
+				}
+			}
 		}
 	}
 
-	return
+	return result, nil
 }

deb/list_test.go

@@ -1,10 +1,10 @@
-package debian
+package deb
 
 import (
 	"errors"
-	"github.com/smira/aptly/database"
 	. "launchpad.net/gocheck"
 	"sort"
+	"strings"
 )
 
 type PackageListSuite struct {
@@ -13,8 +13,9 @@ type PackageListSuite struct {
 	p1, p2, p3, p4, p5, p6 *Package
 
 	// Mocked packages in list
-	packages []*Package
-	il       *PackageList
+	packages       []*Package
+	sourcePackages []*Package
+	il             *PackageList
 }
 
 var _ = Suite(&PackageListSuite{})
@@ -28,7 +29,7 @@ func (s *PackageListSuite) SetUpTest(c *C) {
 	stanza["Package"] = "mars-invaders"
 	s.p3 = NewPackageFromControlFile(stanza)
 	stanza = packageStanza.Copy()
-	stanza["Size"] = "42"
+	stanza["Source"] = "unknown-planet"
 	s.p4 = NewPackageFromControlFile(stanza)
 	stanza = packageStanza.Copy()
 	stanza["Package"] = "lonely-strangers"
@@ -39,24 +40,33 @@ func (s *PackageListSuite) SetUpTest(c *C) {
 
 	s.il = NewPackageList()
 	s.packages = []*Package{
-		&Package{Name: "lib", Version: "1.0", Architecture: "i386", PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"mail-agent"}},
-		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386", Provides: []string{"package-installer"}},
-		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all", PreDepends: []string{"dpkg (>= 1.6)"}},
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386", PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}},
-		&Package{Name: "mailer", Version: "3.5.8", Architecture: "i386", Provides: []string{"mail-agent"}},
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "amd64", PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}},
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "arm", PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9) | libx (>= 1.5)", "data (>= 1.0) | mail-agent"}},
-		&Package{Name: "app", Version: "1.0", Architecture: "s390", PreDepends: []string{"dpkg >= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}},
-		&Package{Name: "aa", Version: "2.0-1", Architecture: "i386", PreDepends: []string{"dpkg (>= 1.6)"}},
-		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "amd64", Provides: []string{"package-installer"}},
-		&Package{Name: "libx", Version: "1.5", Architecture: "arm", PreDepends: []string{"dpkg (>= 1.6)"}},
-		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "arm", Provides: []string{"package-installer"}},
+		&Package{Name: "lib", Version: "1.0", Architecture: "i386", Source: "lib (0.9)", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"mail-agent"}}},
+		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
+		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all", Source: "app", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
+		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		&Package{Name: "mailer", Version: "3.5.8", Architecture: "i386", Source: "postfix (1.3)", Provides: []string{"mail-agent"}, deps: &PackageDependencies{}},
+		&Package{Name: "app", Version: "1.1~bp1", Architecture: "amd64", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		&Package{Name: "app", Version: "1.1~bp1", Architecture: "arm", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}, Depends: []string{"lib (>> 0.9) | libx (>= 1.5)", "data (>= 1.0) | mail-agent"}}},
+		&Package{Name: "app", Version: "1.0", Architecture: "s390", deps: &PackageDependencies{PreDepends: []string{"dpkg >= 1.6)"}, Depends: []string{"lib (>> 0.9)", "data (>= 1.0)"}}},
+		&Package{Name: "aa", Version: "2.0-1", Architecture: "i386", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
+		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "amd64", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
+		&Package{Name: "libx", Version: "1.5", Architecture: "arm", deps: &PackageDependencies{PreDepends: []string{"dpkg (>= 1.6)"}}},
+		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "arm", Provides: []string{"package-installer"}, deps: &PackageDependencies{}},
+		&Package{Name: "dpkg", Version: "1.6.1-3", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		&Package{Name: "dpkg", Version: "1.7", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
 	}
 	for _, p := range s.packages {
 		s.il.Add(p)
 	}
 	s.il.PrepareIndex()
 
+	s.sourcePackages = []*Package{
+		&Package{Name: "postfix", Version: "1.3", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		&Package{Name: "app", Version: "1.1~bp1", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		&Package{Name: "aa", Version: "2.0-1", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+		&Package{Name: "lib", Version: "0.9", Architecture: "source", SourceArchitecture: "any", IsSource: true, deps: &PackageDependencies{}},
+	}
+
 }
 
 func (s *PackageListSuite) TestAddLen(c *C) {
@@ -110,14 +120,14 @@ func (s *PackageListSuite) TestRemoveWhenIndexed(c *C) {
 	for i, p := range s.il.packagesIndex {
 		names[i] = p.Name
 	}
-	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "dpkg", "dpkg", "libx", "mailer"})
+	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "dpkg", "dpkg", "dpkg", "dpkg", "libx", "mailer"})
 
 	s.il.Remove(s.packages[4])
 	names = make([]string, s.il.Len())
 	for i, p := range s.il.packagesIndex {
 		names[i] = p.Name
 	}
-	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "dpkg", "dpkg", "libx"})
+	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "dpkg", "dpkg", "dpkg", "dpkg", "libx"})
 	c.Check(s.il.providesIndex["mail-agent"], DeepEquals, []*Package{})
 
 	s.il.Remove(s.packages[9])
@@ -125,7 +135,7 @@ func (s *PackageListSuite) TestRemoveWhenIndexed(c *C) {
 	for i, p := range s.il.packagesIndex {
 		names[i] = p.Name
 	}
-	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "dpkg", "libx"})
+	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "dpkg", "dpkg", "dpkg", "libx"})
 	c.Check(s.il.providesIndex["package-installer"], HasLen, 2)
 
 	s.il.Remove(s.packages[1])
@@ -133,7 +143,7 @@ func (s *PackageListSuite) TestRemoveWhenIndexed(c *C) {
 	for i, p := range s.il.packagesIndex {
 		names[i] = p.Name
 	}
-	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "libx"})
+	c.Check(names, DeepEquals, []string{"aa", "app", "app", "app", "app", "data", "dpkg", "dpkg", "dpkg", "libx"})
 	c.Check(s.il.providesIndex["package-installer"], DeepEquals, []*Package{s.packages[11]})
 }
 
@@ -173,7 +183,7 @@ func (s *PackageListSuite) TestAppend(c *C) {
 
 	err := s.list.Append(s.il)
 	c.Check(err, IsNil)
-	c.Check(s.list.Len(), Equals, 14)
+	c.Check(s.list.Len(), Equals, 16)
 
 	list := NewPackageList()
 	list.Add(s.p4)
@@ -210,240 +220,84 @@ func (s *PackageListSuite) TestSearch(c *C) {
 	c.Check(s.il.Search(Dependency{Architecture: "i386", Pkg: "app", Relation: VersionGreaterOrEqual, Version: "1.2"}), IsNil)
 }
 
-func (s *PackageListSuite) TestVerifyDependencies(c *C) {
-	missing, err := s.il.VerifyDependencies(0, []string{"i386"}, s.il)
+func (s *PackageListSuite) TestFilter(c *C) {
+	c.Check(func() { s.list.Filter([]string{"abcd_0.3_i386"}, false, nil, 0, nil) }, Panics, "list not indexed, can't filter")
 
+	_, err := s.il.Filter([]string{"app >3)"}, false, nil, 0, nil)
+	c.Check(err, ErrorMatches, "unable to parse dependency.*")
+
+	plString := func(l *PackageList) string {
+		list := make([]string, 0, l.Len())
+		for _, p := range l.packages {
+			list = append(list, p.String())
+		}
+
+		sort.Strings(list)
+
+		return strings.Join(list, " ")
+	}
+
+	result, err := s.il.Filter([]string{"app_1.1~bp1_i386"}, false, nil, 0, nil)
+	c.Check(err, IsNil)
+	c.Check(plString(result), Equals, "app_1.1~bp1_i386")
+
+	result, err = s.il.Filter([]string{"app_1.1~bp1_i386", "dpkg_1.7_source", "dpkg_1.8_amd64"}, false, nil, 0, nil)
+	c.Check(err, IsNil)
+	c.Check(plString(result), Equals, "app_1.1~bp1_i386 dpkg_1.7_source")
+
+	result, err = s.il.Filter([]string{"app", "dpkg (>>1.6.1-3)", "app (>=1.0)", "xyz", "aa (>>3.0)"}, false, nil, 0, nil)
+	c.Check(err, IsNil)
+	c.Check(plString(result), Equals, "app_1.0_s390 app_1.1~bp1_amd64 app_1.1~bp1_arm app_1.1~bp1_i386 dpkg_1.7_i386 dpkg_1.7_source")
+
+	result, err = s.il.Filter([]string{"app {i386}"}, true, NewPackageList(), 0, []string{"i386"})
+	c.Check(err, IsNil)
+	c.Check(plString(result), Equals, "app_1.1~bp1_i386 data_1.1~bp1_all dpkg_1.7_i386 lib_1.0_i386 mailer_3.5.8_i386")
+
+	result, err = s.il.Filter([]string{"app (>=0.9)", "lib", "data"}, true, NewPackageList(), 0, []string{"i386", "amd64"})
+	c.Check(err, IsNil)
+	c.Check(plString(result), Equals, "app_1.0_s390 app_1.1~bp1_amd64 app_1.1~bp1_arm app_1.1~bp1_i386 data_1.1~bp1_all dpkg_1.6.1-3_amd64 dpkg_1.7_i386 lib_1.0_i386 mailer_3.5.8_i386")
+}
+
+func (s *PackageListSuite) TestVerifyDependencies(c *C) {
+	missing, err := s.il.VerifyDependencies(0, []string{"i386"}, s.il, nil)
 	c.Check(err, IsNil)
 	c.Check(missing, DeepEquals, []Dependency{})
 
-	missing, err = s.il.VerifyDependencies(0, []string{"i386", "amd64"}, s.il)
-
+	missing, err = s.il.VerifyDependencies(0, []string{"i386", "amd64"}, s.il, nil)
 	c.Check(err, IsNil)
 	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "amd64"}})
 
-	missing, err = s.il.VerifyDependencies(0, []string{"arm"}, s.il)
-
+	missing, err = s.il.VerifyDependencies(0, []string{"arm"}, s.il, nil)
 	c.Check(err, IsNil)
 	c.Check(missing, DeepEquals, []Dependency{})
 
-	missing, err = s.il.VerifyDependencies(DepFollowAllVariants, []string{"arm"}, s.il)
-
+	missing, err = s.il.VerifyDependencies(DepFollowAllVariants, []string{"arm"}, s.il, nil)
 	c.Check(err, IsNil)
 	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "arm"},
 		Dependency{Pkg: "mail-agent", Relation: VersionDontCare, Version: "", Architecture: "arm"}})
 
-	_, err = s.il.VerifyDependencies(0, []string{"i386", "amd64", "s390"}, s.il)
+	for _, p := range s.sourcePackages {
+		s.il.Add(p)
+	}
 
-	c.Check(err, ErrorMatches, "unable to process package app-1.0_s390:.*")
+	missing, err = s.il.VerifyDependencies(DepFollowSource, []string{"i386", "amd64"}, s.il, nil)
+	c.Check(err, IsNil)
+	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "lib", Relation: VersionGreater, Version: "0.9", Architecture: "amd64"}})
+
+	missing, err = s.il.VerifyDependencies(DepFollowSource, []string{"arm"}, s.il, nil)
+	c.Check(err, IsNil)
+	c.Check(missing, DeepEquals, []Dependency{Dependency{Pkg: "libx", Relation: VersionEqual, Version: "1.5", Architecture: "source"}})
+
+	_, err = s.il.VerifyDependencies(0, []string{"i386", "amd64", "s390"}, s.il, nil)
+	c.Check(err, ErrorMatches, "unable to process package app_1.0_s390:.*")
 }
 
 func (s *PackageListSuite) TestArchitectures(c *C) {
-	archs := s.il.Architectures()
+	archs := s.il.Architectures(true)
+	sort.Strings(archs)
+	c.Check(archs, DeepEquals, []string{"amd64", "arm", "i386", "s390", "source"})
+
+	archs = s.il.Architectures(false)
 	sort.Strings(archs)
 	c.Check(archs, DeepEquals, []string{"amd64", "arm", "i386", "s390"})
 }
-
-func (s *PackageListSuite) TestNewPackageListFromRefList(c *C) {
-	db, _ := database.OpenDB(c.MkDir())
-	coll := NewPackageCollection(db)
-	coll.Update(s.p1)
-	coll.Update(s.p3)
-
-	s.list.Add(s.p1)
-	s.list.Add(s.p3)
-	s.list.Add(s.p5)
-	s.list.Add(s.p6)
-
-	reflist := NewPackageRefListFromPackageList(s.list)
-
-	_, err := NewPackageListFromRefList(reflist, coll)
-	c.Assert(err, ErrorMatches, "unable to load package with key.*")
-
-	coll.Update(s.p5)
-	coll.Update(s.p6)
-
-	list, err := NewPackageListFromRefList(reflist, coll)
-	c.Assert(err, IsNil)
-	c.Check(list.Len(), Equals, 4)
-	c.Check(list.Add(s.p4), ErrorMatches, "conflict in package.*")
-}
-
-func (s *PackageListSuite) TestNewPackageRefList(c *C) {
-	s.list.Add(s.p1)
-	s.list.Add(s.p3)
-	s.list.Add(s.p5)
-	s.list.Add(s.p6)
-
-	reflist := NewPackageRefListFromPackageList(s.list)
-	c.Assert(reflist.Len(), Equals, 4)
-	c.Check(reflist.Refs[0], DeepEquals, []byte(s.p1.Key()))
-	c.Check(reflist.Refs[1], DeepEquals, []byte(s.p6.Key()))
-	c.Check(reflist.Refs[2], DeepEquals, []byte(s.p5.Key()))
-	c.Check(reflist.Refs[3], DeepEquals, []byte(s.p3.Key()))
-}
-
-func (s *PackageListSuite) TestPackageRefListEncodeDecode(c *C) {
-	s.list.Add(s.p1)
-	s.list.Add(s.p3)
-	s.list.Add(s.p5)
-	s.list.Add(s.p6)
-
-	reflist := NewPackageRefListFromPackageList(s.list)
-
-	reflist2 := &PackageRefList{}
-	err := reflist2.Decode(reflist.Encode())
-	c.Assert(err, IsNil)
-	c.Check(reflist2.Len(), Equals, reflist.Len())
-	c.Check(reflist2.Refs, DeepEquals, reflist.Refs)
-}
-
-func (s *PackageListSuite) TestPackageRefListForeach(c *C) {
-	s.list.Add(s.p1)
-	s.list.Add(s.p3)
-	s.list.Add(s.p5)
-	s.list.Add(s.p6)
-
-	reflist := NewPackageRefListFromPackageList(s.list)
-
-	Len := 0
-	err := reflist.ForEach(func([]byte) error {
-		Len++
-		return nil
-	})
-
-	c.Check(Len, Equals, 4)
-	c.Check(err, IsNil)
-
-	e := errors.New("b")
-
-	err = reflist.ForEach(func([]byte) error {
-		return e
-	})
-
-	c.Check(err, Equals, e)
-}
-
-func (s *PackageListSuite) TestDiff(c *C) {
-	db, _ := database.OpenDB(c.MkDir())
-	coll := NewPackageCollection(db)
-
-	packages := []*Package{
-		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},      //0
-		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386"},     //1
-		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all"},  //2
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386"},  //3
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "i386"},  //4
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "amd64"}, //5
-		&Package{Name: "xyz", Version: "3.0", Architecture: "sparc"},     //6
-	}
-
-	for _, p := range packages {
-		coll.Update(p)
-	}
-
-	listA := NewPackageList()
-	listA.Add(packages[0])
-	listA.Add(packages[1])
-	listA.Add(packages[2])
-	listA.Add(packages[3])
-	listA.Add(packages[6])
-
-	listB := NewPackageList()
-	listB.Add(packages[0])
-	listB.Add(packages[2])
-	listB.Add(packages[4])
-	listB.Add(packages[5])
-
-	reflistA := NewPackageRefListFromPackageList(listA)
-	reflistB := NewPackageRefListFromPackageList(listB)
-
-	diffAA, err := reflistA.Diff(reflistA, coll)
-	c.Check(err, IsNil)
-	c.Check(diffAA, HasLen, 0)
-
-	diffAB, err := reflistA.Diff(reflistB, coll)
-	c.Check(err, IsNil)
-	c.Check(diffAB, HasLen, 4)
-
-	c.Check(diffAB[0].Left, IsNil)
-	c.Check(diffAB[0].Right.String(), Equals, "app-1.1~bp2_amd64")
-
-	c.Check(diffAB[1].Left.String(), Equals, "app-1.1~bp1_i386")
-	c.Check(diffAB[1].Right.String(), Equals, "app-1.1~bp2_i386")
-
-	c.Check(diffAB[2].Left.String(), Equals, "dpkg-1.7_i386")
-	c.Check(diffAB[2].Right, IsNil)
-
-	c.Check(diffAB[3].Left.String(), Equals, "xyz-3.0_sparc")
-	c.Check(diffAB[3].Right, IsNil)
-
-	diffBA, err := reflistB.Diff(reflistA, coll)
-	c.Check(err, IsNil)
-	c.Check(diffBA, HasLen, 4)
-
-	c.Check(diffBA[0].Right, IsNil)
-	c.Check(diffBA[0].Left.String(), Equals, "app-1.1~bp2_amd64")
-
-	c.Check(diffBA[1].Right.String(), Equals, "app-1.1~bp1_i386")
-	c.Check(diffBA[1].Left.String(), Equals, "app-1.1~bp2_i386")
-
-	c.Check(diffBA[2].Right.String(), Equals, "dpkg-1.7_i386")
-	c.Check(diffBA[2].Left, IsNil)
-
-	c.Check(diffBA[3].Right.String(), Equals, "xyz-3.0_sparc")
-	c.Check(diffBA[3].Left, IsNil)
-
-}
-
-func (s *PackageListSuite) TestMerge(c *C) {
-	db, _ := database.OpenDB(c.MkDir())
-	coll := NewPackageCollection(db)
-
-	packages := []*Package{
-		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},      //0
-		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386"},     //1
-		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all"},  //2
-		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386"},  //3
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "i386"},  //4
-		&Package{Name: "app", Version: "1.1~bp2", Architecture: "amd64"}, //5
-		&Package{Name: "dpkg", Version: "1.0", Architecture: "i386"},     //6
-		&Package{Name: "xyz", Version: "1.0", Architecture: "sparc"},     //7
-	}
-
-	for _, p := range packages {
-		coll.Update(p)
-	}
-
-	listA := NewPackageList()
-	listA.Add(packages[0])
-	listA.Add(packages[1])
-	listA.Add(packages[2])
-	listA.Add(packages[3])
-	listA.Add(packages[7])
-
-	listB := NewPackageList()
-	listB.Add(packages[0])
-	listB.Add(packages[2])
-	listB.Add(packages[4])
-	listB.Add(packages[5])
-	listB.Add(packages[6])
-
-	reflistA := NewPackageRefListFromPackageList(listA)
-	reflistB := NewPackageRefListFromPackageList(listB)
-
-	mergeAB := reflistA.Merge(reflistB)
-	mergeBA := reflistB.Merge(reflistA)
-
-	toStrSlice := func(reflist *PackageRefList) (result []string) {
-		result = make([]string, reflist.Len())
-		for i, r := range reflist.Refs {
-			result[i] = string(r)
-		}
-		return
-	}
-
-	c.Check(toStrSlice(mergeAB), DeepEquals,
-		[]string{"Pall data 1.1~bp1", "Pamd64 app 1.1~bp2", "Pi386 app 1.1~bp2", "Pi386 dpkg 1.0", "Pi386 lib 1.0", "Psparc xyz 1.0"})
-	c.Check(toStrSlice(mergeBA), DeepEquals,
-		[]string{"Pall data 1.1~bp1", "Pamd64 app 1.1~bp2", "Pi386 app 1.1~bp1", "Pi386 dpkg 1.7", "Pi386 lib 1.0", "Psparc xyz 1.0"})
-}

deb/local.go

@@ -0,0 +1,223 @@
+package deb
+
+import (
+	"bytes"
+	"code.google.com/p/go-uuid/uuid"
+	"fmt"
+	"github.com/smira/aptly/database"
+	"github.com/ugorji/go/codec"
+	"log"
+)
+
+// LocalRepo is a collection of packages created locally
+type LocalRepo struct {
+	// Permanent internal ID
+	UUID string
+	// User-assigned name
+	Name string
+	// Comment
+	Comment string
+	// DefaultDistribution
+	DefaultDistribution string `codec:",omitempty"`
+	// DefaultComponent
+	DefaultComponent string `codec:",omitempty"`
+	// "Snapshot" of current list of packages
+	packageRefs *PackageRefList
+}
+
+// NewLocalRepo creates new instance of Debian local repository
+func NewLocalRepo(name string, comment string) *LocalRepo {
+	return &LocalRepo{
+		UUID:    uuid.New(),
+		Name:    name,
+		Comment: comment,
+	}
+}
+
+// String interface
+func (repo *LocalRepo) String() string {
+	if repo.Comment != "" {
+		return fmt.Sprintf("[%s]: %s", repo.Name, repo.Comment)
+	}
+	return fmt.Sprintf("[%s]", repo.Name)
+}
+
+// NumPackages return number of packages in local repo
+func (repo *LocalRepo) NumPackages() int {
+	if repo.packageRefs == nil {
+		return 0
+	}
+	return repo.packageRefs.Len()
+}
+
+// RefList returns package list for repo
+func (repo *LocalRepo) RefList() *PackageRefList {
+	return repo.packageRefs
+}
+
+// UpdateRefList changes package list for local repo
+func (repo *LocalRepo) UpdateRefList(reflist *PackageRefList) {
+	repo.packageRefs = reflist
+}
+
+// Encode does msgpack encoding of LocalRepo
+func (repo *LocalRepo) Encode() []byte {
+	var buf bytes.Buffer
+
+	encoder := codec.NewEncoder(&buf, &codec.MsgpackHandle{})
+	encoder.Encode(repo)
+
+	return buf.Bytes()
+}
+
+// Decode decodes msgpack representation into LocalRepo
+func (repo *LocalRepo) Decode(input []byte) error {
+	decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
+	return decoder.Decode(repo)
+}
+
+// Key is a unique id in DB
+func (repo *LocalRepo) Key() []byte {
+	return []byte("L" + repo.UUID)
+}
+
+// RefKey is a unique id for package reference list
+func (repo *LocalRepo) RefKey() []byte {
+	return []byte("E" + repo.UUID)
+}
+
+// LocalRepoCollection does listing, updating/adding/deleting of LocalRepos
+type LocalRepoCollection struct {
+	db   database.Storage
+	list []*LocalRepo
+}
+
+// NewLocalRepoCollection loads LocalRepos from DB and makes up collection
+func NewLocalRepoCollection(db database.Storage) *LocalRepoCollection {
+	result := &LocalRepoCollection{
+		db: db,
+	}
+
+	blobs := db.FetchByPrefix([]byte("L"))
+	result.list = make([]*LocalRepo, 0, len(blobs))
+
+	for _, blob := range blobs {
+		r := &LocalRepo{}
+		if err := r.Decode(blob); err != nil {
+			log.Printf("Error decoding mirror: %s\n", err)
+		} else {
+			result.list = append(result.list, r)
+		}
+	}
+
+	return result
+}
+
+// Add appends new repo to collection and saves it
+func (collection *LocalRepoCollection) Add(repo *LocalRepo) error {
+	for _, r := range collection.list {
+		if r.Name == repo.Name {
+			return fmt.Errorf("local repo with name %s already exists", repo.Name)
+		}
+	}
+
+	err := collection.Update(repo)
+	if err != nil {
+		return err
+	}
+
+	collection.list = append(collection.list, repo)
+	return nil
+}
+
+// Update stores updated information about repo in DB
+func (collection *LocalRepoCollection) Update(repo *LocalRepo) error {
+	err := collection.db.Put(repo.Key(), repo.Encode())
+	if err != nil {
+		return err
+	}
+	if repo.packageRefs != nil {
+		err = collection.db.Put(repo.RefKey(), repo.packageRefs.Encode())
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// LoadComplete loads additional information for local repo
+func (collection *LocalRepoCollection) LoadComplete(repo *LocalRepo) error {
+	encoded, err := collection.db.Get(repo.RefKey())
+	if err == database.ErrNotFound {
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+
+	repo.packageRefs = &PackageRefList{}
+	return repo.packageRefs.Decode(encoded)
+}
+
+// ByName looks up repository by name
+func (collection *LocalRepoCollection) ByName(name string) (*LocalRepo, error) {
+	for _, r := range collection.list {
+		if r.Name == name {
+			return r, nil
+		}
+	}
+	return nil, fmt.Errorf("local repo with name %s not found", name)
+}
+
+// ByUUID looks up repository by uuid
+func (collection *LocalRepoCollection) ByUUID(uuid string) (*LocalRepo, error) {
+	for _, r := range collection.list {
+		if r.UUID == uuid {
+			return r, nil
+		}
+	}
+	return nil, fmt.Errorf("local repo with uuid %s not found", uuid)
+}
+
+// ForEach runs method for each repository
+func (collection *LocalRepoCollection) ForEach(handler func(*LocalRepo) error) error {
+	var err error
+	for _, r := range collection.list {
+		err = handler(r)
+		if err != nil {
+			return err
+		}
+	}
+	return err
+}
+
+// Len returns number of remote repos
+func (collection *LocalRepoCollection) Len() int {
+	return len(collection.list)
+}
+
+// Drop removes remote repo from collection
+func (collection *LocalRepoCollection) Drop(repo *LocalRepo) error {
+	repoPosition := -1
+
+	for i, r := range collection.list {
+		if r == repo {
+			repoPosition = i
+			break
+		}
+	}
+
+	if repoPosition == -1 {
+		panic("local repo not found!")
+	}
+
+	collection.list[len(collection.list)-1], collection.list[repoPosition], collection.list =
+		nil, collection.list[len(collection.list)-1], collection.list[:len(collection.list)-1]
+
+	err := collection.db.Delete(repo.Key())
+	if err != nil {
+		return err
+	}
+
+	return collection.db.Delete(repo.RefKey())
+}

deb/local_test.go

@@ -0,0 +1,195 @@
+package deb
+
+import (
+	"errors"
+	"github.com/smira/aptly/database"
+	. "launchpad.net/gocheck"
+)
+
+type LocalRepoSuite struct {
+	db      database.Storage
+	list    *PackageList
+	reflist *PackageRefList
+	repo    *LocalRepo
+}
+
+var _ = Suite(&LocalRepoSuite{})
+
+func (s *LocalRepoSuite) SetUpTest(c *C) {
+	s.db, _ = database.OpenDB(c.MkDir())
+	s.list = NewPackageList()
+	s.list.Add(&Package{Name: "lib", Version: "1.7", Architecture: "i386"})
+	s.list.Add(&Package{Name: "app", Version: "1.9", Architecture: "amd64"})
+
+	s.reflist = NewPackageRefListFromPackageList(s.list)
+
+	s.repo = NewLocalRepo("lrepo", "Super repo")
+	s.repo.packageRefs = s.reflist
+}
+
+func (s *LocalRepoSuite) TearDownTest(c *C) {
+	s.db.Close()
+}
+
+func (s *LocalRepoSuite) TestString(c *C) {
+	c.Check(NewLocalRepo("lrepo", "My first repo").String(), Equals, "[lrepo]: My first repo")
+	c.Check(NewLocalRepo("lrepo2", "").String(), Equals, "[lrepo2]")
+}
+
+func (s *LocalRepoSuite) TestNumPackages(c *C) {
+	c.Check(NewLocalRepo("lrepo", "My first repo").NumPackages(), Equals, 0)
+	c.Check(s.repo.NumPackages(), Equals, 2)
+}
+
+func (s *LocalRepoSuite) TestRefList(c *C) {
+	c.Check(NewLocalRepo("lrepo", "My first repo").RefList(), IsNil)
+	c.Check(s.repo.RefList(), Equals, s.reflist)
+}
+
+func (s *LocalRepoSuite) TestUpdateRefList(c *C) {
+	s.repo.UpdateRefList(nil)
+	c.Check(s.repo.RefList(), IsNil)
+}
+
+func (s *LocalRepoSuite) TestEncodeDecode(c *C) {
+	repo := &LocalRepo{}
+	err := repo.Decode(s.repo.Encode())
+	c.Assert(err, IsNil)
+
+	c.Check(repo.Name, Equals, s.repo.Name)
+	c.Check(repo.Comment, Equals, s.repo.Comment)
+}
+
+func (s *LocalRepoSuite) TestKey(c *C) {
+	c.Assert(len(s.repo.Key()), Equals, 37)
+	c.Assert(s.repo.Key()[0], Equals, byte('L'))
+}
+
+func (s *LocalRepoSuite) TestRefKey(c *C) {
+	c.Assert(len(s.repo.RefKey()), Equals, 37)
+	c.Assert(s.repo.RefKey()[0], Equals, byte('E'))
+	c.Assert(s.repo.RefKey()[1:], DeepEquals, s.repo.Key()[1:])
+}
+
+type LocalRepoCollectionSuite struct {
+	db         database.Storage
+	collection *LocalRepoCollection
+	list       *PackageList
+	reflist    *PackageRefList
+}
+
+var _ = Suite(&LocalRepoCollectionSuite{})
+
+func (s *LocalRepoCollectionSuite) SetUpTest(c *C) {
+	s.db, _ = database.OpenDB(c.MkDir())
+	s.collection = NewLocalRepoCollection(s.db)
+
+	s.list = NewPackageList()
+	s.list.Add(&Package{Name: "lib", Version: "1.7", Architecture: "i386"})
+	s.list.Add(&Package{Name: "app", Version: "1.9", Architecture: "amd64"})
+
+	s.reflist = NewPackageRefListFromPackageList(s.list)
+}
+
+func (s *LocalRepoCollectionSuite) TearDownTest(c *C) {
+	s.db.Close()
+}
+
+func (s *LocalRepoCollectionSuite) TestAddByName(c *C) {
+	r, err := s.collection.ByName("local1")
+	c.Assert(err, ErrorMatches, "*.not found")
+
+	repo := NewLocalRepo("local1", "Comment 1")
+	c.Assert(s.collection.Add(repo), IsNil)
+	c.Assert(s.collection.Add(repo), ErrorMatches, ".*already exists")
+
+	r, err = s.collection.ByName("local1")
+	c.Assert(err, IsNil)
+	c.Assert(r.String(), Equals, repo.String())
+
+	collection := NewLocalRepoCollection(s.db)
+	r, err = collection.ByName("local1")
+	c.Assert(err, IsNil)
+	c.Assert(r.String(), Equals, repo.String())
+}
+
+func (s *LocalRepoCollectionSuite) TestByUUID(c *C) {
+	r, err := s.collection.ByUUID("some-uuid")
+	c.Assert(err, ErrorMatches, "*.not found")
+
+	repo := NewLocalRepo("local1", "Comment 1")
+	c.Assert(s.collection.Add(repo), IsNil)
+
+	r, err = s.collection.ByUUID(repo.UUID)
+	c.Assert(err, IsNil)
+	c.Assert(r.String(), Equals, repo.String())
+}
+
+func (s *LocalRepoCollectionSuite) TestUpdateLoadComplete(c *C) {
+	repo := NewLocalRepo("local1", "Comment 1")
+	c.Assert(s.collection.Update(repo), IsNil)
+
+	collection := NewLocalRepoCollection(s.db)
+	r, err := collection.ByName("local1")
+	c.Assert(err, IsNil)
+	c.Assert(r.packageRefs, IsNil)
+
+	repo.packageRefs = s.reflist
+	c.Assert(s.collection.Update(repo), IsNil)
+
+	collection = NewLocalRepoCollection(s.db)
+	r, err = collection.ByName("local1")
+	c.Assert(err, IsNil)
+	c.Assert(r.packageRefs, IsNil)
+	c.Assert(r.NumPackages(), Equals, 0)
+	c.Assert(s.collection.LoadComplete(r), IsNil)
+	c.Assert(r.NumPackages(), Equals, 2)
+}
+
+func (s *LocalRepoCollectionSuite) TestForEachAndLen(c *C) {
+	repo := NewLocalRepo("local1", "Comment 1")
+	s.collection.Add(repo)
+
+	count := 0
+	err := s.collection.ForEach(func(*LocalRepo) error {
+		count++
+		return nil
+	})
+	c.Assert(count, Equals, 1)
+	c.Assert(err, IsNil)
+
+	c.Check(s.collection.Len(), Equals, 1)
+
+	e := errors.New("c")
+
+	err = s.collection.ForEach(func(*LocalRepo) error {
+		return e
+	})
+	c.Assert(err, Equals, e)
+}
+
+func (s *LocalRepoCollectionSuite) TestDrop(c *C) {
+	repo1 := NewLocalRepo("local1", "Comment 1")
+	s.collection.Add(repo1)
+
+	repo2 := NewLocalRepo("local2", "Comment 2")
+	s.collection.Add(repo2)
+
+	r1, _ := s.collection.ByUUID(repo1.UUID)
+	c.Check(r1, Equals, repo1)
+
+	err := s.collection.Drop(repo1)
+	c.Check(err, IsNil)
+
+	_, err = s.collection.ByUUID(repo1.UUID)
+	c.Check(err, ErrorMatches, "local repo .* not found")
+
+	collection := NewLocalRepoCollection(s.db)
+	_, err = collection.ByName("local1")
+	c.Check(err, ErrorMatches, "local repo .* not found")
+
+	r2, _ := collection.ByName("local2")
+	c.Check(r2.String(), Equals, repo2.String())
+
+	c.Check(func() { s.collection.Drop(repo1) }, Panics, "local repo not found!")
+}

deb/package.go

@@ -0,0 +1,504 @@
+package deb
+
+import (
+	"fmt"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/utils"
+	"path/filepath"
+	"strconv"
+	"strings"
+)
+
+// Package is single instance of Debian package
+type Package struct {
+	// Basic package properties
+	Name         string
+	Version      string
+	Architecture string
+	// If this source package, this field holds "real" architecture value,
+	// while Architecture would be equal to "source"
+	SourceArchitecture string
+	// For binary package, name of source package
+	Source string
+	// List of virtual packages this package provides
+	Provides []string
+	// Is this source package
+	IsSource bool
+	// Hash of files section
+	FilesHash uint64
+	// Is this >= 0.6 package?
+	V06Plus bool
+	// Offload fields
+	deps  *PackageDependencies
+	extra *Stanza
+	files *PackageFiles
+	// Mother collection
+	collection *PackageCollection
+}
+
+// NewPackageFromControlFile creates Package from parsed Debian control file
+func NewPackageFromControlFile(input Stanza) *Package {
+	result := &Package{
+		Name:         input["Package"],
+		Version:      input["Version"],
+		Architecture: input["Architecture"],
+		Source:       input["Source"],
+		V06Plus: 	  true,
+	}
+
+	delete(input, "Package")
+	delete(input, "Version")
+	delete(input, "Architecture")
+	delete(input, "Source")
+
+	filesize, _ := strconv.ParseInt(input["Size"], 10, 64)
+
+	result.UpdateFiles(PackageFiles{PackageFile{
+		Filename:     filepath.Base(input["Filename"]),
+		downloadPath: filepath.Dir(input["Filename"]),
+		Checksums: utils.ChecksumInfo{
+			Size:   filesize,
+			MD5:    strings.TrimSpace(input["MD5sum"]),
+			SHA1:   strings.TrimSpace(input["SHA1"]),
+			SHA256: strings.TrimSpace(input["SHA256"]),
+		},
+	}})
+
+	delete(input, "Filename")
+	delete(input, "MD5sum")
+	delete(input, "SHA1")
+	delete(input, "SHA256")
+	delete(input, "Size")
+
+	depends := &PackageDependencies{}
+	depends.Depends = parseDependencies(input, "Depends")
+	depends.PreDepends = parseDependencies(input, "Pre-Depends")
+	depends.Suggests = parseDependencies(input, "Suggests")
+	depends.Recommends = parseDependencies(input, "Recommends")
+	result.deps = depends
+
+	result.Provides = parseDependencies(input, "Provides")
+
+	result.extra = &input
+
+	return result
+}
+
+// NewSourcePackageFromControlFile creates Package from parsed Debian control file for source package
+func NewSourcePackageFromControlFile(input Stanza) (*Package, error) {
+	result := &Package{
+		IsSource:           true,
+		Name:               input["Package"],
+		Version:            input["Version"],
+		Architecture:       "source",
+		SourceArchitecture: input["Architecture"],
+		V06Plus: 	 	    true,
+	}
+
+	delete(input, "Package")
+	delete(input, "Version")
+	delete(input, "Architecture")
+
+	files := make(PackageFiles, 0, 3)
+
+	parseSums := func(field string, setter func(sum *utils.ChecksumInfo, data string)) error {
+		for _, line := range strings.Split(input[field], "\n") {
+			line = strings.TrimSpace(line)
+			if line == "" {
+				continue
+			}
+			parts := strings.Fields(line)
+
+			if len(parts) != 3 {
+				return fmt.Errorf("unparseable hash sum line: %#v", line)
+			}
+
+			size, err := strconv.ParseInt(parts[1], 10, 64)
+			if err != nil {
+				return fmt.Errorf("unable to parse size: %s", err)
+			}
+
+			filename := filepath.Base(parts[2])
+
+			found := false
+			pos := 0
+			for i, file := range files {
+				if file.Filename == filename {
+					found = true
+					pos = i
+					break
+				}
+			}
+
+			if !found {
+				files = append(files, PackageFile{Filename: filename, downloadPath: input["Directory"]})
+				pos = len(files) - 1
+			}
+
+			files[pos].Checksums.Size = size
+			setter(&files[pos].Checksums, parts[0])
+		}
+
+		delete(input, field)
+
+		return nil
+	}
+
+	err := parseSums("Files", func(sum *utils.ChecksumInfo, data string) { sum.MD5 = data })
+	if err != nil {
+		return nil, err
+	}
+	err = parseSums("Checksums-Sha1", func(sum *utils.ChecksumInfo, data string) { sum.SHA1 = data })
+	if err != nil {
+		return nil, err
+	}
+	err = parseSums("Checksums-Sha256", func(sum *utils.ChecksumInfo, data string) { sum.SHA256 = data })
+	if err != nil {
+		return nil, err
+	}
+
+	result.UpdateFiles(files)
+
+	depends := &PackageDependencies{}
+	depends.BuildDepends = parseDependencies(input, "Build-Depends")
+	depends.BuildDependsInDep = parseDependencies(input, "Build-Depends-Indep")
+	result.deps = depends
+
+	result.extra = &input
+
+	return result, nil
+}
+
+// Key returns unique key identifying package
+func (p *Package) Key(prefix string) []byte {
+	if p.V06Plus {
+		return []byte(fmt.Sprintf("%sP%s %s %s %08x", prefix, p.Architecture, p.Name, p.Version, p.FilesHash))
+	}
+
+	return p.ShortKey(prefix)
+}
+
+// ShortKey returns key for the package that should be unique in one list
+func (p *Package) ShortKey(prefix string) []byte {
+	return []byte(fmt.Sprintf("%sP%s %s %s", prefix, p.Architecture, p.Name, p.Version))
+}
+
+// String creates readable representation
+func (p *Package) String() string {
+	return fmt.Sprintf("%s_%s_%s", p.Name, p.Version, p.Architecture)
+}
+
+// MatchesArchitecture checks whether packages matches specified architecture
+func (p *Package) MatchesArchitecture(arch string) bool {
+	if p.Architecture == "all" && arch != "source" {
+		return true
+	}
+
+	return p.Architecture == arch
+}
+
+// MatchesDependency checks whether package matches specified dependency
+func (p *Package) MatchesDependency(dep Dependency) bool {
+	if dep.Pkg != p.Name {
+		return false
+	}
+
+	if dep.Architecture != "" && !p.MatchesArchitecture(dep.Architecture) {
+		return false
+	}
+
+	if dep.Relation == VersionDontCare {
+		return true
+	}
+
+	r := CompareVersions(p.Version, dep.Version)
+	switch dep.Relation {
+	case VersionEqual:
+		return r == 0
+	case VersionLess:
+		return r < 0
+	case VersionGreater:
+		return r > 0
+	case VersionLessOrEqual:
+		return r <= 0
+	case VersionGreaterOrEqual:
+		return r >= 0
+	}
+
+	panic("unknown relation")
+}
+
+// GetDependencies compiles list of dependenices by flags from options
+func (p *Package) GetDependencies(options int) (dependencies []string) {
+	deps := p.Deps()
+
+	dependencies = make([]string, 0, 30)
+	dependencies = append(dependencies, deps.Depends...)
+	dependencies = append(dependencies, deps.PreDepends...)
+
+	if options&DepFollowRecommends == DepFollowRecommends {
+		dependencies = append(dependencies, deps.Recommends...)
+	}
+
+	if options&DepFollowSuggests == DepFollowSuggests {
+		dependencies = append(dependencies, deps.Suggests...)
+	}
+
+	if options&DepFollowBuild == DepFollowBuild {
+		dependencies = append(dependencies, deps.BuildDepends...)
+		dependencies = append(dependencies, deps.BuildDependsInDep...)
+	}
+
+	if options&DepFollowSource == DepFollowSource {
+		source := p.Source
+		if source == "" {
+			source = p.Name
+		}
+		if strings.Index(source, ")") != -1 {
+			dependencies = append(dependencies, fmt.Sprintf("%s {source}", source))
+		} else {
+			dependencies = append(dependencies, fmt.Sprintf("%s (= %s) {source}", source, p.Version))
+		}
+	}
+
+	return
+}
+
+// Extra returns Stanza of extra fields (it may load it from collection)
+func (p *Package) Extra() Stanza {
+	if p.extra == nil {
+		if p.collection == nil {
+			panic("extra == nil && collection == nil")
+		}
+		p.extra = p.collection.loadExtra(p)
+	}
+
+	return *p.extra
+}
+
+// Deps returns parsed package dependencies (it may load it from collection)
+func (p *Package) Deps() *PackageDependencies {
+	if p.deps == nil {
+		if p.collection == nil {
+			panic("deps == nil && collection == nil")
+		}
+
+		p.deps = p.collection.loadDependencies(p)
+	}
+
+	return p.deps
+}
+
+// Files returns parsed files records (it may load it from collection)
+func (p *Package) Files() PackageFiles {
+	if p.files == nil {
+		if p.collection == nil {
+			panic("files == nil && collection == nil")
+		}
+
+		p.files = p.collection.loadFiles(p)
+	}
+
+	return *p.files
+}
+
+// UpdateFiles saves new state of files
+func (p *Package) UpdateFiles(files PackageFiles) {
+	p.files = &files
+	p.FilesHash = files.Hash()
+}
+
+// Stanza creates original stanza from package
+func (p *Package) Stanza() (result Stanza) {
+	result = p.Extra().Copy()
+	result["Package"] = p.Name
+	result["Version"] = p.Version
+
+	if p.IsSource {
+		result["Architecture"] = p.SourceArchitecture
+	} else {
+		result["Architecture"] = p.Architecture
+		result["Source"] = p.Source
+	}
+
+	if p.IsSource {
+		md5, sha1, sha256 := make([]string, 0), make([]string, 0), make([]string, 0)
+
+		for _, f := range p.Files() {
+			if f.Checksums.MD5 != "" {
+				md5 = append(md5, fmt.Sprintf(" %s %d %s\n", f.Checksums.MD5, f.Checksums.Size, f.Filename))
+			}
+			if f.Checksums.SHA1 != "" {
+				sha1 = append(sha1, fmt.Sprintf(" %s %d %s\n", f.Checksums.SHA1, f.Checksums.Size, f.Filename))
+			}
+			if f.Checksums.SHA256 != "" {
+				sha256 = append(sha256, fmt.Sprintf(" %s %d %s\n", f.Checksums.SHA256, f.Checksums.Size, f.Filename))
+			}
+		}
+
+		result["Files"] = strings.Join(md5, "")
+		result["Checksums-Sha1"] = strings.Join(sha1, "")
+		result["Checksums-Sha256"] = strings.Join(sha256, "")
+	} else {
+		f := p.Files()[0]
+		result["Filename"] = f.DownloadURL()
+		if f.Checksums.MD5 != "" {
+			result["MD5sum"] = f.Checksums.MD5
+		}
+		if f.Checksums.SHA1 != "" {
+			result["SHA1"] = " " + f.Checksums.SHA1
+		}
+		if f.Checksums.SHA256 != "" {
+			result["SHA256"] = " " + f.Checksums.SHA256
+		}
+		result["Size"] = fmt.Sprintf("%d", f.Checksums.Size)
+	}
+
+	deps := p.Deps()
+
+	if deps.Depends != nil {
+		result["Depends"] = strings.Join(deps.Depends, ", ")
+	}
+	if deps.PreDepends != nil {
+		result["Pre-Depends"] = strings.Join(deps.PreDepends, ", ")
+	}
+	if deps.Suggests != nil {
+		result["Suggests"] = strings.Join(deps.Suggests, ", ")
+	}
+	if deps.Recommends != nil {
+		result["Recommends"] = strings.Join(deps.Recommends, ", ")
+	}
+	if p.Provides != nil {
+		result["Provides"] = strings.Join(p.Provides, ", ")
+	}
+	if deps.BuildDepends != nil {
+		result["Build-Depends"] = strings.Join(deps.BuildDepends, ", ")
+	}
+	if deps.BuildDependsInDep != nil {
+		result["Build-Depends-Indep"] = strings.Join(deps.BuildDependsInDep, ", ")
+	}
+
+	return
+}
+
+// Equals compares two packages to be identical
+func (p *Package) Equals(p2 *Package) bool {
+	return p.Name == p2.Name && p.Version == p2.Version && p.SourceArchitecture == p2.SourceArchitecture &&
+		p.Architecture == p2.Architecture && p.Source == p2.Source && p.IsSource == p2.IsSource &&
+		p.FilesHash == p2.FilesHash
+}
+
+// LinkFromPool links package file from pool to dist's pool location
+func (p *Package) LinkFromPool(publishedStorage aptly.PublishedStorage, packagePool aptly.PackagePool, prefix string, component string) error {
+	poolDir, err := p.PoolDirectory()
+	if err != nil {
+		return err
+	}
+
+	for i, f := range p.Files() {
+		sourcePath, err := packagePool.Path(f.Filename, f.Checksums.MD5)
+		if err != nil {
+			return err
+		}
+
+		relPath := filepath.Join("pool", component, poolDir)
+		publishedDirectory := filepath.Join(prefix, relPath)
+
+		err = publishedStorage.LinkFromPool(publishedDirectory, packagePool, sourcePath)
+		if err != nil {
+			return err
+		}
+
+		if p.IsSource {
+			p.Extra()["Directory"] = relPath
+		} else {
+			p.Files()[i].downloadPath = relPath
+		}
+	}
+
+	return nil
+}
+
+// PoolDirectory returns directory in package pool of published repository for this package files
+func (p *Package) PoolDirectory() (string, error) {
+	source := p.Source
+	if source == "" {
+		source = p.Name
+	} else if pos := strings.Index(source, "("); pos != -1 {
+		source = strings.TrimSpace(source[:pos])
+	}
+
+	if len(source) < 2 {
+		return "", fmt.Errorf("package source %s too short", source)
+	}
+
+	var subdir string
+	if strings.HasPrefix(source, "lib") {
+		subdir = source[:4]
+	} else {
+		subdir = source[:1]
+
+	}
+
+	return filepath.Join(subdir, source), nil
+}
+
+// PackageDownloadTask is a element of download queue for the package
+type PackageDownloadTask struct {
+	RepoURI         string
+	DestinationPath string
+	Checksums       utils.ChecksumInfo
+}
+
+// DownloadList returns list of missing package files for download in format
+// [[srcpath, dstpath]]
+func (p *Package) DownloadList(packagePool aptly.PackagePool) (result []PackageDownloadTask, err error) {
+	result = make([]PackageDownloadTask, 0, 1)
+
+	for _, f := range p.Files() {
+		poolPath, err := packagePool.Path(f.Filename, f.Checksums.MD5)
+		if err != nil {
+			return nil, err
+		}
+
+		verified, err := f.Verify(packagePool)
+		if err != nil {
+			return nil, err
+		}
+
+		if !verified {
+			result = append(result, PackageDownloadTask{RepoURI: f.DownloadURL(), DestinationPath: poolPath, Checksums: f.Checksums})
+		}
+	}
+
+	return result, nil
+}
+
+// VerifyFiles verifies that all package files have neen correctly downloaded
+func (p *Package) VerifyFiles(packagePool aptly.PackagePool) (result bool, err error) {
+	result = true
+
+	for _, f := range p.Files() {
+		result, err = f.Verify(packagePool)
+		if err != nil || !result {
+			return
+		}
+	}
+
+	return
+}
+
+// FilepathList returns list of paths to files in package repository
+func (p *Package) FilepathList(packagePool aptly.PackagePool) ([]string, error) {
+	var err error
+	result := make([]string, len(p.Files()))
+
+	for i, f := range p.Files() {
+		result[i], err = packagePool.RelativePath(f.Filename, f.Checksums.MD5)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return result, nil
+}

deb/package_collection.go

@@ -0,0 +1,237 @@
+package deb
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/smira/aptly/database"
+	"github.com/ugorji/go/codec"
+	"path/filepath"
+)
+
+// PackageCollection does management of packages in DB
+type PackageCollection struct {
+	db           database.Storage
+	encodeBuffer bytes.Buffer
+}
+
+// NewPackageCollection creates new PackageCollection and binds it to database
+func NewPackageCollection(db database.Storage) *PackageCollection {
+	return &PackageCollection{
+		db: db,
+	}
+}
+
+// oldPackage is Package struct for aptly < 0.4 with all fields in one struct
+// It is used to decode old aptly DBs
+type oldPackage struct {
+	IsSource           bool
+	Name               string
+	Version            string
+	Architecture       string
+	SourceArchitecture string
+	Source             string
+	Provides           []string
+	Depends            []string
+	BuildDepends       []string
+	BuildDependsInDep  []string
+	PreDepends         []string
+	Suggests           []string
+	Recommends         []string
+	Files              []PackageFile
+	Extra              Stanza
+}
+
+// ByKey find package in DB by its key
+func (collection *PackageCollection) ByKey(key []byte) (*Package, error) {
+	encoded, err := collection.db.Get(key)
+	if err != nil {
+		return nil, err
+	}
+
+	p := &Package{}
+
+	if len(encoded) > 2 && (encoded[0] != 0xc1 || encoded[1] != 0x1) {
+		oldp := &oldPackage{}
+
+		decoder := codec.NewDecoderBytes(encoded, &codec.MsgpackHandle{})
+		err = decoder.Decode(oldp)
+		if err != nil {
+			return nil, err
+		}
+
+		p.Name = oldp.Name
+		p.Version = oldp.Version
+		p.Architecture = oldp.Architecture
+		p.IsSource = oldp.IsSource
+		p.SourceArchitecture = oldp.SourceArchitecture
+		p.Source = oldp.Source
+		p.Provides = oldp.Provides
+
+		p.deps = &PackageDependencies{
+			Depends:           oldp.Depends,
+			BuildDepends:      oldp.BuildDepends,
+			BuildDependsInDep: oldp.BuildDependsInDep,
+			PreDepends:        oldp.PreDepends,
+			Suggests:          oldp.Suggests,
+			Recommends:        oldp.Recommends,
+		}
+
+		p.extra = &oldp.Extra
+		for i := range oldp.Files {
+			oldp.Files[i].Filename = filepath.Base(oldp.Files[i].Filename)
+		}
+		p.UpdateFiles(PackageFiles(oldp.Files))
+
+		// Save in new format
+		err = collection.Update(p)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		decoder := codec.NewDecoderBytes(encoded[2:], &codec.MsgpackHandle{})
+		err = decoder.Decode(p)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	p.collection = collection
+
+	return p, nil
+}
+
+// loadExtra loads Stanza with all the xtra information about the package
+func (collection *PackageCollection) loadExtra(p *Package) *Stanza {
+	encoded, err := collection.db.Get(p.Key("xE"))
+	if err != nil {
+		panic("unable to load extra")
+	}
+
+	stanza := &Stanza{}
+
+	decoder := codec.NewDecoderBytes(encoded, &codec.MsgpackHandle{})
+	err = decoder.Decode(stanza)
+	if err != nil {
+		panic("unable to decode extra")
+	}
+
+	return stanza
+}
+
+// loadDependencies loads dependencies for the package
+func (collection *PackageCollection) loadDependencies(p *Package) *PackageDependencies {
+	encoded, err := collection.db.Get(p.Key("xD"))
+	if err != nil {
+		panic(fmt.Sprintf("unable to load deps: %s, %s", p, err))
+	}
+
+	deps := &PackageDependencies{}
+
+	decoder := codec.NewDecoderBytes(encoded, &codec.MsgpackHandle{})
+	err = decoder.Decode(deps)
+	if err != nil {
+		panic("unable to decode deps")
+	}
+
+	return deps
+}
+
+// loadFiles loads additional PackageFiles record
+func (collection *PackageCollection) loadFiles(p *Package) *PackageFiles {
+	encoded, err := collection.db.Get(p.Key("xF"))
+	if err != nil {
+		panic("unable to load files")
+	}
+
+	files := &PackageFiles{}
+
+	decoder := codec.NewDecoderBytes(encoded, &codec.MsgpackHandle{})
+	err = decoder.Decode(files)
+	if err != nil {
+		panic("unable to decode files")
+	}
+
+	return files
+}
+
+// Update adds or updates information about package in DB checking for conficts first
+func (collection *PackageCollection) Update(p *Package) error {
+	encoder := codec.NewEncoder(&collection.encodeBuffer, &codec.MsgpackHandle{})
+
+	collection.encodeBuffer.Reset()
+	collection.encodeBuffer.WriteByte(0xc1)
+	collection.encodeBuffer.WriteByte(0x1)
+	err := encoder.Encode(p)
+	if err != nil {
+		return err
+	}
+
+	err = collection.db.Put(p.Key(""), collection.encodeBuffer.Bytes())
+	if err != nil {
+		return err
+	}
+
+	// Encode offloaded fields one by one
+	if p.files != nil {
+		collection.encodeBuffer.Reset()
+		err = encoder.Encode(*p.files)
+		if err != nil {
+			return err
+		}
+
+		err = collection.db.Put(p.Key("xF"), collection.encodeBuffer.Bytes())
+		if err != nil {
+			return err
+		}
+	}
+
+	if p.deps != nil {
+		collection.encodeBuffer.Reset()
+		err = encoder.Encode(*p.deps)
+		if err != nil {
+			return err
+		}
+
+		err = collection.db.Put(p.Key("xD"), collection.encodeBuffer.Bytes())
+		if err != nil {
+			return err
+		}
+
+		p.deps = nil
+	}
+
+	if p.extra != nil {
+		collection.encodeBuffer.Reset()
+		err = encoder.Encode(*p.extra)
+		if err != nil {
+			return err
+		}
+
+		err = collection.db.Put(p.Key("xE"), collection.encodeBuffer.Bytes())
+		if err != nil {
+			return err
+		}
+
+		p.extra = nil
+	}
+
+	p.collection = collection
+
+	return nil
+}
+
+// AllPackageRefs returns list of all packages as PackageRefList
+func (collection *PackageCollection) AllPackageRefs() *PackageRefList {
+	return &PackageRefList{Refs: collection.db.KeysByPrefix([]byte("P"))}
+}
+
+// DeleteByKey deletes package in DB by key
+func (collection *PackageCollection) DeleteByKey(key []byte) error {
+	for _, key := range [][]byte{key, append([]byte("xF"), key...), append([]byte("xD"), key...), append([]byte("xE"), key...)} {
+		err := collection.db.Delete(key)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}

deb/package_collection_test.go

@@ -0,0 +1,191 @@
+package deb
+
+import (
+	"github.com/smira/aptly/database"
+	"github.com/smira/aptly/utils"
+	. "launchpad.net/gocheck"
+)
+
+type PackageCollectionSuite struct {
+	collection *PackageCollection
+	p          *Package
+	db         database.Storage
+}
+
+var _ = Suite(&PackageCollectionSuite{})
+
+func (s *PackageCollectionSuite) SetUpTest(c *C) {
+	s.p = NewPackageFromControlFile(packageStanza.Copy())
+	s.db, _ = database.OpenDB(c.MkDir())
+	s.collection = NewPackageCollection(s.db)
+}
+
+func (s *PackageCollectionSuite) TearDownTest(c *C) {
+	s.db.Close()
+}
+
+func (s *PackageCollectionSuite) TestUpdate(c *C) {
+	// package doesn't exist, update ok
+	err := s.collection.Update(s.p)
+	c.Assert(err, IsNil)
+	res, err := s.collection.ByKey(s.p.Key(""))
+	c.Assert(err, IsNil)
+	c.Assert(res.Equals(s.p), Equals, true)
+
+	// same package, ok
+	p2 := NewPackageFromControlFile(packageStanza.Copy())
+	err = s.collection.Update(p2)
+	c.Assert(err, IsNil)
+	res, err = s.collection.ByKey(p2.Key(""))
+	c.Assert(err, IsNil)
+	c.Assert(res.Equals(s.p), Equals, true)
+
+	// change some metadata
+	p2.Source = "lala"
+	err = s.collection.Update(p2)
+	c.Assert(err, IsNil)
+	res, err = s.collection.ByKey(p2.Key(""))
+	c.Assert(err, IsNil)
+	c.Assert(res.Equals(s.p), Equals, false)
+	c.Assert(res.Equals(p2), Equals, true)
+}
+
+func (s *PackageCollectionSuite) TestByKey(c *C) {
+	err := s.collection.Update(s.p)
+	c.Assert(err, IsNil)
+
+	p2, err := s.collection.ByKey(s.p.Key(""))
+	c.Assert(err, IsNil)
+	c.Assert(p2.Equals(s.p), Equals, true)
+
+	c.Check(p2.GetDependencies(0), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)"})
+	c.Check(p2.Extra()["Priority"], Equals, "extra")
+	c.Check(p2.Files()[0].Filename, Equals, "alien-arena-common_7.40-2_i386.deb")
+}
+
+func (s *PackageCollectionSuite) TestByKeyOld_0_3(c *C) {
+	key := []byte("Pi386 vmware-view-open-client 4.5.0-297975+dfsg-4+b1")
+	s.db.Put(key, old_0_3_Package)
+
+	p, err := s.collection.ByKey(key)
+	c.Check(err, IsNil)
+	c.Check(p.Name, Equals, "vmware-view-open-client")
+	c.Check(p.Version, Equals, "4.5.0-297975+dfsg-4+b1")
+	c.Check(p.Architecture, Equals, "i386")
+	c.Check(p.Files(), DeepEquals, PackageFiles{
+		PackageFile{Filename: "vmware-view-open-client_4.5.0-297975+dfsg-4+b1_i386.deb",
+			Checksums: utils.ChecksumInfo{
+				Size:   520080,
+				MD5:    "9c61b54e2638a18f955a695b9162d6af",
+				SHA1:   "5b7c99e64a70f4f509bfa3a674088ff9cef68163",
+				SHA256: "4a9e4b2d9b3db13f9a29e522f3ffbb34eee96fc6f34a0647042ab1b5b0f2e04d"}}})
+	c.Check(p.GetDependencies(0), DeepEquals, []string{"libatk1.0-0 (>= 1.12.4)", "libboost-signals1.49.0 (>= 1.49.0-1)",
+		"libc6 (>= 2.3.6-6~)", "libcairo2 (>= 1.2.4)", "libcurl3 (>= 7.18.0)", "libfontconfig1 (>= 2.8.0)", "libfreetype6 (>= 2.2.1)",
+		"libgcc1 (>= 1:4.1.1)", "libgdk-pixbuf2.0-0 (>= 2.22.0)", "libglib2.0-0 (>= 2.24.0)", "libgtk2.0-0 (>= 2.24.0)",
+		"libicu48 (>= 4.8-1)", "libpango1.0-0 (>= 1.14.0)", "libssl1.0.0 (>= 1.0.0)", "libstdc++6 (>= 4.6)", "libx11-6",
+		"libxml2 (>= 2.7.4)", "rdesktop"})
+	c.Check(p.Extra()["Priority"], Equals, "optional")
+}
+
+func (s *PackageCollectionSuite) TestAllPackageRefs(c *C) {
+	err := s.collection.Update(s.p)
+	c.Assert(err, IsNil)
+
+	refs := s.collection.AllPackageRefs()
+	c.Check(refs.Len(), Equals, 1)
+	c.Check(refs.Refs[0], DeepEquals, s.p.Key(""))
+}
+
+func (s *PackageCollectionSuite) TestDeleteByKey(c *C) {
+	err := s.collection.Update(s.p)
+	c.Assert(err, IsNil)
+
+	_, err = s.db.Get(s.p.Key(""))
+	c.Check(err, IsNil)
+
+	_, err = s.db.Get(s.p.Key("xD"))
+	c.Check(err, IsNil)
+
+	_, err = s.db.Get(s.p.Key("xE"))
+	c.Check(err, IsNil)
+
+	_, err = s.db.Get(s.p.Key("xF"))
+	c.Check(err, IsNil)
+
+	err = s.collection.DeleteByKey(s.p.Key(""))
+	c.Check(err, IsNil)
+
+	_, err = s.collection.ByKey(s.p.Key(""))
+	c.Check(err, ErrorMatches, "key not found")
+
+	_, err = s.db.Get(s.p.Key(""))
+	c.Check(err, ErrorMatches, "key not found")
+
+	_, err = s.db.Get(s.p.Key("xD"))
+	c.Check(err, ErrorMatches, "key not found")
+
+	_, err = s.db.Get(s.p.Key("xE"))
+	c.Check(err, ErrorMatches, "key not found")
+
+	_, err = s.db.Get(s.p.Key("xF"))
+	c.Check(err, ErrorMatches, "key not found")
+}
+
+// This is old package (pre-0.4) that would habe to be converted
+var old_0_3_Package = []byte{0x8f, 0xac, 0x41, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0xa4, 0x69, 0x33, 0x38, 0x36,
+	0xac, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0xc0, 0xb1, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x44, 0x65,
+	0x70, 0x65, 0x6e, 0x64, 0x73, 0x49, 0x6e, 0x44, 0x65, 0x70, 0xc0, 0xa7, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0xdc, 0x0, 0x12,
+	0xb7, 0x6c, 0x69, 0x62, 0x61, 0x74, 0x6b, 0x31, 0x2e, 0x30, 0x2d, 0x30, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x31, 0x32, 0x2e,
+	0x34, 0x29, 0xda, 0x0, 0x24, 0x6c, 0x69, 0x62, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x2d, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x73, 0x31,
+	0x2e, 0x34, 0x39, 0x2e, 0x30, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x34, 0x39, 0x2e, 0x30, 0x2d, 0x31, 0x29, 0xb3, 0x6c, 0x69,
+	0x62, 0x63, 0x36, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x32, 0x2e, 0x33, 0x2e, 0x36, 0x2d, 0x36, 0x7e, 0x29, 0xb4, 0x6c, 0x69, 0x62, 0x63,
+	0x61, 0x69, 0x72, 0x6f, 0x32, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x32, 0x2e, 0x34, 0x29, 0xb4, 0x6c, 0x69, 0x62, 0x63, 0x75,
+	0x72, 0x6c, 0x33, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x37, 0x2e, 0x31, 0x38, 0x2e, 0x30, 0x29, 0xb9, 0x6c, 0x69, 0x62, 0x66, 0x6f, 0x6e,
+	0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x31, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x32, 0x2e, 0x38, 0x2e, 0x30, 0x29, 0xb7, 0x6c, 0x69,
+	0x62, 0x66, 0x72, 0x65, 0x65, 0x74, 0x79, 0x70, 0x65, 0x36, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x32, 0x2e, 0x32, 0x2e, 0x31, 0x29, 0xb4,
+	0x6c, 0x69, 0x62, 0x67, 0x63, 0x63, 0x31, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x31, 0x3a, 0x34, 0x2e, 0x31, 0x2e, 0x31, 0x29, 0xbe, 0x6c,
+	0x69, 0x62, 0x67, 0x64, 0x6b, 0x2d, 0x70, 0x69, 0x78, 0x62, 0x75, 0x66, 0x32, 0x2e, 0x30, 0x2d, 0x30, 0x20, 0x28, 0x3e, 0x3d, 0x20,
+	0x32, 0x2e, 0x32, 0x32, 0x2e, 0x30, 0x29, 0xb8, 0x6c, 0x69, 0x62, 0x67, 0x6c, 0x69, 0x62, 0x32, 0x2e, 0x30, 0x2d, 0x30, 0x20, 0x28,
+	0x3e, 0x3d, 0x20, 0x32, 0x2e, 0x32, 0x34, 0x2e, 0x30, 0x29, 0xb7, 0x6c, 0x69, 0x62, 0x67, 0x74, 0x6b, 0x32, 0x2e, 0x30, 0x2d, 0x30,
+	0x20, 0x28, 0x3e, 0x3d, 0x20, 0x32, 0x2e, 0x32, 0x34, 0x2e, 0x30, 0x29, 0xb3, 0x6c, 0x69, 0x62, 0x69, 0x63, 0x75, 0x34, 0x38, 0x20,
+	0x28, 0x3e, 0x3d, 0x20, 0x34, 0x2e, 0x38, 0x2d, 0x31, 0x29, 0xb9, 0x6c, 0x69, 0x62, 0x70, 0x61, 0x6e, 0x67, 0x6f, 0x31, 0x2e, 0x30,
+	0x2d, 0x30, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x31, 0x34, 0x2e, 0x30, 0x29, 0xb6, 0x6c, 0x69, 0x62, 0x73, 0x73, 0x6c, 0x31,
+	0x2e, 0x30, 0x2e, 0x30, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x31, 0x2e, 0x30, 0x2e, 0x30, 0x29, 0xb3, 0x6c, 0x69, 0x62, 0x73, 0x74, 0x64,
+	0x63, 0x2b, 0x2b, 0x36, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x34, 0x2e, 0x36, 0x29, 0xa8, 0x6c, 0x69, 0x62, 0x78, 0x31, 0x31, 0x2d, 0x36,
+	0xb2, 0x6c, 0x69, 0x62, 0x78, 0x6d, 0x6c, 0x32, 0x20, 0x28, 0x3e, 0x3d, 0x20, 0x32, 0x2e, 0x37, 0x2e, 0x34, 0x29, 0xa8, 0x72, 0x64,
+	0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0xa5, 0x45, 0x78, 0x74, 0x72, 0x61, 0x88, 0xa3, 0x54, 0x61, 0x67, 0xbd, 0x72, 0x6f, 0x6c, 0x65,
+	0x3a, 0x3a, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x2c, 0x20, 0x75, 0x69, 0x74, 0x6f, 0x6f, 0x6c, 0x6b, 0x69, 0x74, 0x3a, 0x3a,
+	0x67, 0x74, 0x6b, 0xa8, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0xa8, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0xaa,
+	0x4d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0xda, 0x0, 0x28, 0x44, 0x65, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x51, 0x41,
+	0x20, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x73, 0x40, 0x71, 0x61, 0x2e, 0x64, 0x65,
+	0x62, 0x69, 0x61, 0x6e, 0x2e, 0x6f, 0x72, 0x67, 0x3e, 0xa8, 0x48, 0x6f, 0x6d, 0x65, 0x70, 0x61, 0x67, 0x65, 0xda, 0x0, 0x30, 0x68,
+	0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x70, 0x2f, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x2d, 0x63, 0x6c, 0x69,
+	0x65, 0x6e, 0x74, 0xaf, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x6d, 0x64, 0x35, 0xda, 0x0, 0x20,
+	0x62, 0x34, 0x34, 0x64, 0x34, 0x39, 0x62, 0x34, 0x37, 0x61, 0x65, 0x30, 0x35, 0x35, 0x32, 0x63, 0x62, 0x66, 0x61, 0x64, 0x32, 0x31,
+	0x30, 0x64, 0x65, 0x32, 0x31, 0x63, 0x64, 0x65, 0x31, 0x39, 0xa7, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0xab, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x69, 0x62, 0x2f, 0x78, 0x31, 0x31, 0xae, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x53, 0x69, 0x7a,
+	0x65, 0xa4, 0x31, 0x34, 0x35, 0x39, 0xab, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0xb9, 0x20, 0x56, 0x4d,
+	0x77, 0x61, 0x72, 0x65, 0x20, 0x56, 0x69, 0x65, 0x77, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0xa,
+	0xa5, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x91, 0x82, 0xa9, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x75, 0x6d, 0x73, 0x84, 0xa3, 0x4d, 0x44,
+	0x35, 0xda, 0x0, 0x20, 0x39, 0x63, 0x36, 0x31, 0x62, 0x35, 0x34, 0x65, 0x32, 0x36, 0x33, 0x38, 0x61, 0x31, 0x38, 0x66, 0x39, 0x35,
+	0x35, 0x61, 0x36, 0x39, 0x35, 0x62, 0x39, 0x31, 0x36, 0x32, 0x64, 0x36, 0x61, 0x66, 0xa4, 0x53, 0x48, 0x41, 0x31, 0xda, 0x0, 0x28,
+	0x35, 0x62, 0x37, 0x63, 0x39, 0x39, 0x65, 0x36, 0x34, 0x61, 0x37, 0x30, 0x66, 0x34, 0x66, 0x35, 0x30, 0x39, 0x62, 0x66, 0x61, 0x33,
+	0x61, 0x36, 0x37, 0x34, 0x30, 0x38, 0x38, 0x66, 0x66, 0x39, 0x63, 0x65, 0x66, 0x36, 0x38, 0x31, 0x36, 0x33, 0xa6, 0x53, 0x48, 0x41,
+	0x32, 0x35, 0x36, 0xda, 0x0, 0x40, 0x34, 0x61, 0x39, 0x65, 0x34, 0x62, 0x32, 0x64, 0x39, 0x62, 0x33, 0x64, 0x62, 0x31, 0x33, 0x66,
+	0x39, 0x61, 0x32, 0x39, 0x65, 0x35, 0x32, 0x32, 0x66, 0x33, 0x66, 0x66, 0x62, 0x62, 0x33, 0x34, 0x65, 0x65, 0x65, 0x39, 0x36, 0x66,
+	0x63, 0x36, 0x66, 0x33, 0x34, 0x61, 0x30, 0x36, 0x34, 0x37, 0x30, 0x34, 0x32, 0x61, 0x62, 0x31, 0x62, 0x35, 0x62, 0x30, 0x66, 0x32,
+	0x65, 0x30, 0x34, 0x64, 0xa4, 0x53, 0x69, 0x7a, 0x65, 0xce, 0x0, 0x7, 0xef, 0x90, 0xa8, 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d,
+	0x65, 0xda, 0x0, 0x5e, 0x70, 0x6f, 0x6f, 0x6c, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x2f, 0x76, 0x2f, 0x76, 0x6d, 0x77,
+	0x61, 0x72, 0x65, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2f, 0x76,
+	0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74,
+	0x5f, 0x34, 0x2e, 0x35, 0x2e, 0x30, 0x2d, 0x32, 0x39, 0x37, 0x39, 0x37, 0x35, 0x2b, 0x64, 0x66, 0x73, 0x67, 0x2d, 0x34, 0x2b, 0x62,
+	0x31, 0x5f, 0x69, 0x33, 0x38, 0x36, 0x2e, 0x64, 0x65, 0x62, 0xa8, 0x49, 0x73, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0xc2, 0xa4, 0x4e,
+	0x61, 0x6d, 0x65, 0xb7, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x2d, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0xaa, 0x50, 0x72, 0x65, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0xc0, 0xa8, 0x50, 0x72, 0x6f, 0x76,
+	0x69, 0x64, 0x65, 0x73, 0xc0, 0xaa, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x73, 0xc0, 0xa6, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0xda, 0x0, 0x2d, 0x76, 0x6d, 0x77, 0x61, 0x72, 0x65, 0x2d, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x2d,
+	0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x28, 0x34, 0x2e, 0x35, 0x2e, 0x30, 0x2d, 0x32, 0x39, 0x37, 0x39, 0x37, 0x35, 0x2b, 0x64,
+	0x66, 0x73, 0x67, 0x2d, 0x34, 0x29, 0xb2, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x41, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74,
+	0x75, 0x72, 0x65, 0xa0, 0xa8, 0x53, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, 0x73, 0xc0, 0xa7, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+	0xb6, 0x34, 0x2e, 0x35, 0x2e, 0x30, 0x2d, 0x32, 0x39, 0x37, 0x39, 0x37, 0x35, 0x2b, 0x64, 0x66, 0x73, 0x67, 0x2d, 0x34, 0x2b, 0x62, 0x31}

deb/package_deps.go

@@ -0,0 +1,30 @@
+package deb
+
+import (
+	"strings"
+)
+
+// PackageDependencies are various parsed dependencies
+type PackageDependencies struct {
+	Depends           []string
+	BuildDepends      []string
+	BuildDependsInDep []string
+	PreDepends        []string
+	Suggests          []string
+	Recommends        []string
+}
+
+func parseDependencies(input Stanza, key string) []string {
+	value, ok := input[key]
+	if !ok {
+		return nil
+	}
+
+	delete(input, key)
+
+	result := strings.Split(value, ",")
+	for i := range result {
+		result[i] = strings.TrimSpace(result[i])
+	}
+	return result
+}

deb/package_files.go

@@ -0,0 +1,78 @@
+package deb
+
+import (
+	"encoding/binary"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/utils"
+	"hash/fnv"
+	"os"
+	"path/filepath"
+	"sort"
+)
+
+// PackageFile is a single file entry in package
+type PackageFile struct {
+	// Filename is name of file for the package (without directory)
+	Filename string
+	// Hashes for the file
+	Checksums utils.ChecksumInfo
+	// Temporary field used while downloading, stored relative path on the mirror
+	downloadPath string
+}
+
+// Verify that package file is present and correct
+func (f *PackageFile) Verify(packagePool aptly.PackagePool) (bool, error) {
+	poolPath, err := packagePool.Path(f.Filename, f.Checksums.MD5)
+	if err != nil {
+		return false, err
+	}
+
+	st, err := os.Stat(poolPath)
+	if err != nil {
+		return false, nil
+	}
+
+	// verify size
+	// TODO: verify checksum if configured
+	return st.Size() == f.Checksums.Size, nil
+}
+
+// DownloadURL return relative URL to package download location
+func (f *PackageFile) DownloadURL() string {
+	return filepath.Join(f.downloadPath, f.Filename)
+}
+
+// PackageFiles is collection of package files
+type PackageFiles []PackageFile
+
+// Hash compute hash of all file items, sorting them first
+func (files PackageFiles) Hash() uint64 {
+	sort.Sort(files)
+
+	h := fnv.New64a()
+
+	for _, f := range files {
+		h.Write([]byte(f.Filename))
+		binary.Write(h, binary.BigEndian, f.Checksums.Size)
+		h.Write([]byte(f.Checksums.MD5))
+		h.Write([]byte(f.Checksums.SHA1))
+		h.Write([]byte(f.Checksums.SHA256))
+	}
+
+	return h.Sum64()
+}
+
+// Len returns number of files
+func (files PackageFiles) Len() int {
+	return len(files)
+}
+
+// Swap swaps elements
+func (files PackageFiles) Swap(i, j int) {
+	files[i], files[j] = files[j], files[i]
+}
+
+// Less compares by filename
+func (files PackageFiles) Less(i, j int) bool {
+	return files[i].Filename < files[j].Filename
+}

deb/package_files_test.go

@@ -0,0 +1,61 @@
+package deb
+
+import (
+	"github.com/smira/aptly/files"
+	"github.com/smira/aptly/utils"
+	. "launchpad.net/gocheck"
+	"os"
+	"path/filepath"
+)
+
+type PackageFilesSuite struct {
+	files PackageFiles
+}
+
+var _ = Suite(&PackageFilesSuite{})
+
+func (s *PackageFilesSuite) SetUpTest(c *C) {
+	s.files = PackageFiles{PackageFile{
+		Filename:     "alien-arena-common_7.40-2_i386.deb",
+		downloadPath: "pool/contrib/a/alien-arena",
+		Checksums: utils.ChecksumInfo{
+			Size:   187518,
+			MD5:    "1e8cba92c41420aa7baa8a5718d67122",
+			SHA1:   "46955e48cad27410a83740a21d766ce362364024",
+			SHA256: "eb4afb9885cba6dc70cccd05b910b2dbccc02c5900578be5e99f0d3dbf9d76a5",
+		}}}
+}
+
+func (s *PackageFilesSuite) TestVerify(c *C) {
+	packagePool := files.NewPackagePool(c.MkDir())
+	poolPath, _ := packagePool.Path(s.files[0].Filename, s.files[0].Checksums.MD5)
+
+	result, err := s.files[0].Verify(packagePool)
+	c.Check(err, IsNil)
+	c.Check(result, Equals, false)
+
+	err = os.MkdirAll(filepath.Dir(poolPath), 0755)
+	c.Assert(err, IsNil)
+
+	file, err := os.Create(poolPath)
+	c.Assert(err, IsNil)
+	file.WriteString("abcde")
+	file.Close()
+
+	result, err = s.files[0].Verify(packagePool)
+	c.Check(err, IsNil)
+	c.Check(result, Equals, false)
+
+	s.files[0].Checksums.Size = 5
+	result, err = s.files[0].Verify(packagePool)
+	c.Check(err, IsNil)
+	c.Check(result, Equals, true)
+}
+
+func (s *PackageFilesSuite) TestDownloadURL(c *C) {
+	c.Check(s.files[0].DownloadURL(), Equals, "pool/contrib/a/alien-arena/alien-arena-common_7.40-2_i386.deb")
+}
+
+func (s *PackageFilesSuite) TestHash(c *C) {
+	c.Check(s.files.Hash(), Equals, uint64(0xc8901eedd79ac51b))
+}

deb/package_test.go

@@ -0,0 +1,378 @@
+package deb
+
+import (
+	"bytes"
+	"github.com/smira/aptly/files"
+	"github.com/smira/aptly/utils"
+	. "launchpad.net/gocheck"
+	"os"
+	"path/filepath"
+)
+
+type PackageSuite struct {
+	stanza       Stanza
+	sourceStanza Stanza
+}
+
+var _ = Suite(&PackageSuite{})
+
+func (s *PackageSuite) SetUpTest(c *C) {
+	s.stanza = packageStanza.Copy()
+
+	buf := bytes.NewBufferString(sourcePackageMeta)
+	s.sourceStanza, _ = NewControlFileReader(buf).ReadStanza()
+}
+
+func (s *PackageSuite) TestNewFromPara(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+
+	c.Check(p.IsSource, Equals, false)
+	c.Check(p.Name, Equals, "alien-arena-common")
+	c.Check(p.Version, Equals, "7.40-2")
+	c.Check(p.Architecture, Equals, "i386")
+	c.Check(p.Provides, DeepEquals, []string(nil))
+	c.Check(p.Files(), HasLen, 1)
+	c.Check(p.Files()[0].Filename, Equals, "alien-arena-common_7.40-2_i386.deb")
+	c.Check(p.Files()[0].downloadPath, Equals, "pool/contrib/a/alien-arena")
+	c.Check(p.Files()[0].Checksums.Size, Equals, int64(187518))
+	c.Check(p.Files()[0].Checksums.MD5, Equals, "1e8cba92c41420aa7baa8a5718d67122")
+	c.Check(p.deps.Depends, DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)"})
+}
+
+func (s *PackageSuite) TestNewSourceFromPara(c *C) {
+	p, err := NewSourcePackageFromControlFile(s.sourceStanza)
+
+	c.Check(err, IsNil)
+	c.Check(p.IsSource, Equals, true)
+	c.Check(p.Name, Equals, "access-modifier-checker")
+	c.Check(p.Version, Equals, "1.0-4")
+	c.Check(p.Architecture, Equals, "source")
+	c.Check(p.SourceArchitecture, Equals, "all")
+	c.Check(p.Provides, IsNil)
+	c.Check(p.deps.BuildDepends, DeepEquals, []string{"cdbs", "debhelper (>= 7)", "default-jdk", "maven-debian-helper"})
+	c.Check(p.deps.BuildDependsInDep, DeepEquals, []string{"default-jdk-doc", "junit (>= 3.8.1)", "libannotation-indexer-java (>= 1.3)", "libannotation-indexer-java-doc", "libasm3-java", "libmaven-install-plugin-java", "libmaven-javadoc-plugin-java", "libmaven-scm-java", "libmaven2-core-java", "libmaven2-core-java-doc", "libmetainf-services-java", "libmetainf-services-java-doc", "libmaven-plugin-tools-java (>= 2.8)"})
+	c.Check(p.Files(), HasLen, 3)
+
+	c.Check(p.Files()[0].Filename, Equals, "access-modifier-checker_1.0-4.debian.tar.gz")
+	c.Check(p.Files()[0].downloadPath, Equals, "pool/main/a/access-modifier-checker")
+
+	c.Check(p.Files()[1].Filename, Equals, "access-modifier-checker_1.0-4.dsc")
+	c.Check(p.Files()[1].downloadPath, Equals, "pool/main/a/access-modifier-checker")
+	c.Check(p.Files()[1].Checksums.Size, Equals, int64(3))
+	c.Check(p.Files()[1].Checksums.MD5, Equals, "900150983cd24fb0d6963f7d28e17f72")
+	c.Check(p.Files()[1].Checksums.SHA1, Equals, "a9993e364706816aba3e25717850c26c9cd0d89d")
+	c.Check(p.Files()[1].Checksums.SHA256, Equals, "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
+
+	c.Check(p.Files()[2].Filename, Equals, "access-modifier-checker_1.0.orig.tar.gz")
+	c.Check(p.Files()[2].downloadPath, Equals, "pool/main/a/access-modifier-checker")
+	c.Check(p.Files()[2].Checksums.Size, Equals, int64(4))
+	c.Check(p.Files()[2].Checksums.MD5, Equals, "e2fc714c4727ee9395f324cd2e7f331f")
+	c.Check(p.Files()[2].Checksums.SHA1, Equals, "81fe8bfe87576c3ecb22426f8e57847382917acf")
+	c.Check(p.Files()[2].Checksums.SHA256, Equals, "88d4266fd4e6338d13b845fcf289579d209c897823b9217da3e161936f031589")
+
+	c.Check(p.deps.Depends, IsNil)
+}
+
+func (s *PackageSuite) TestWithProvides(c *C) {
+	s.stanza["Provides"] = "arena"
+	p := NewPackageFromControlFile(s.stanza)
+
+	c.Check(p.Name, Equals, "alien-arena-common")
+	c.Check(p.Provides, DeepEquals, []string{"arena"})
+
+	st := p.Stanza()
+	c.Check(st["Provides"], Equals, "arena")
+}
+
+func (s *PackageSuite) TestKey(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+
+	c.Check(p.Key(""), DeepEquals, []byte("Pi386 alien-arena-common 7.40-2 c8901eedd79ac51b"))
+	c.Check(p.Key("xD"), DeepEquals, []byte("xDPi386 alien-arena-common 7.40-2 c8901eedd79ac51b"))
+
+    p.V06Plus = false
+    c.Check(p.Key(""), DeepEquals, []byte("Pi386 alien-arena-common 7.40-2"))
+    c.Check(p.Key("xD"), DeepEquals, []byte("xDPi386 alien-arena-common 7.40-2"))
+}
+
+func (s *PackageSuite) TestShortKey(c *C) {
+    p := NewPackageFromControlFile(s.stanza)
+
+    c.Check(p.ShortKey(""), DeepEquals, []byte("Pi386 alien-arena-common 7.40-2"))
+    c.Check(p.ShortKey("xD"), DeepEquals, []byte("xDPi386 alien-arena-common 7.40-2"))
+}
+
+func (s *PackageSuite) TestStanza(c *C) {
+	p := NewPackageFromControlFile(s.stanza.Copy())
+	stanza := p.Stanza()
+
+	c.Assert(stanza, DeepEquals, s.stanza)
+
+	p, _ = NewSourcePackageFromControlFile(s.sourceStanza.Copy())
+	stanza = p.Stanza()
+
+	c.Assert(stanza, DeepEquals, s.sourceStanza)
+}
+
+func (s *PackageSuite) TestString(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+	c.Assert(p.String(), Equals, "alien-arena-common_7.40-2_i386")
+}
+
+func (s *PackageSuite) TestEquals(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+
+	p2 := NewPackageFromControlFile(packageStanza.Copy())
+	c.Check(p.Equals(p2), Equals, true)
+
+	p2.deps.Depends = []string{"package1"}
+	c.Check(p.Equals(p2), Equals, true) // strange, but Equals doesn't check deep
+
+	p2 = NewPackageFromControlFile(packageStanza.Copy())
+	files := p2.Files()
+	files[0].Checksums.MD5 = "abcdefabcdef"
+	p2.UpdateFiles(files)
+	c.Check(p.Equals(p2), Equals, false)
+
+	so, _ := NewSourcePackageFromControlFile(s.sourceStanza.Copy())
+	so2, _ := NewSourcePackageFromControlFile(s.sourceStanza.Copy())
+
+	c.Check(so.Equals(so2), Equals, true)
+
+	files = so2.Files()
+	files[2].Checksums.MD5 = "abcde"
+	so2.UpdateFiles(files)
+	c.Check(so.Equals(so2), Equals, false)
+
+	so2, _ = NewSourcePackageFromControlFile(s.sourceStanza.Copy())
+	files = so2.Files()
+	files[1].Filename = "other.deb"
+	so2.UpdateFiles(files)
+	c.Check(so.Equals(so2), Equals, false)
+}
+
+func (s *PackageSuite) TestMatchesArchitecture(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+	c.Check(p.MatchesArchitecture("i386"), Equals, true)
+	c.Check(p.MatchesArchitecture("amd64"), Equals, false)
+
+	s.stanza = packageStanza.Copy()
+	s.stanza["Architecture"] = "all"
+	p = NewPackageFromControlFile(s.stanza)
+	c.Check(p.MatchesArchitecture("i386"), Equals, true)
+	c.Check(p.MatchesArchitecture("amd64"), Equals, true)
+	c.Check(p.MatchesArchitecture("source"), Equals, false)
+
+	p, _ = NewSourcePackageFromControlFile(s.sourceStanza)
+	c.Check(p.MatchesArchitecture("source"), Equals, true)
+	c.Check(p.MatchesArchitecture("amd64"), Equals, false)
+}
+
+func (s *PackageSuite) TestMatchesDependency(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+
+	// exact match
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionEqual, Version: "7.40-2"}), Equals, true)
+
+	// different name
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena", Architecture: "i386", Relation: VersionEqual, Version: "7.40-2"}), Equals, false)
+
+	// different version
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionEqual, Version: "7.40-3"}), Equals, false)
+
+	// different arch
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "amd64", Relation: VersionEqual, Version: "7.40-2"}), Equals, false)
+
+	// empty arch
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "", Relation: VersionEqual, Version: "7.40-2"}), Equals, true)
+
+	// version don't care
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionDontCare, Version: ""}), Equals, true)
+
+	// >
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionGreater, Version: "7.40-2"}), Equals, false)
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionGreater, Version: "7.40-1"}), Equals, true)
+
+	// <
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionLess, Version: "7.40-2"}), Equals, false)
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionLess, Version: "7.40-3"}), Equals, true)
+
+	// >=
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionGreaterOrEqual, Version: "7.40-2"}), Equals, true)
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionGreaterOrEqual, Version: "7.40-3"}), Equals, false)
+
+	// <=
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionLessOrEqual, Version: "7.40-2"}), Equals, true)
+	c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionLessOrEqual, Version: "7.40-1"}), Equals, false)
+}
+
+func (s *PackageSuite) TestGetDependencies(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+	c.Check(p.GetDependencies(0), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)"})
+	c.Check(p.GetDependencies(DepFollowSuggests), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena-mars"})
+	c.Check(p.GetDependencies(DepFollowSuggests|DepFollowRecommends), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "aliean-arena-luna", "alien-arena-mars"})
+
+	c.Check(p.GetDependencies(DepFollowSource), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena (= 7.40-2) {source}"})
+	p.Source = "alien-arena (7.40-3)"
+	c.Check(p.GetDependencies(DepFollowSource), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena (7.40-3) {source}"})
+	p.Source = ""
+	c.Check(p.GetDependencies(DepFollowSource), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena-common (= 7.40-2) {source}"})
+
+	p, _ = NewSourcePackageFromControlFile(s.sourceStanza)
+	c.Check(p.GetDependencies(0), DeepEquals, []string{})
+	c.Check(p.GetDependencies(DepFollowBuild), DeepEquals, []string{"cdbs", "debhelper (>= 7)", "default-jdk", "maven-debian-helper", "default-jdk-doc", "junit (>= 3.8.1)", "libannotation-indexer-java (>= 1.3)", "libannotation-indexer-java-doc", "libasm3-java", "libmaven-install-plugin-java", "libmaven-javadoc-plugin-java", "libmaven-scm-java", "libmaven2-core-java", "libmaven2-core-java-doc", "libmetainf-services-java", "libmetainf-services-java-doc", "libmaven-plugin-tools-java (>= 2.8)"})
+}
+
+func (s *PackageSuite) TestPoolDirectory(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+	dir, err := p.PoolDirectory()
+	c.Check(err, IsNil)
+	c.Check(dir, Equals, "a/alien-arena")
+
+	p = NewPackageFromControlFile(packageStanza.Copy())
+	p.Source = ""
+	dir, err = p.PoolDirectory()
+	c.Check(err, IsNil)
+	c.Check(dir, Equals, "a/alien-arena-common")
+
+	p = NewPackageFromControlFile(packageStanza.Copy())
+	p.Source = "libarena"
+	dir, err = p.PoolDirectory()
+	c.Check(err, IsNil)
+	c.Check(dir, Equals, "liba/libarena")
+
+	p = NewPackageFromControlFile(packageStanza.Copy())
+	p.Source = "gcc-defaults (1.77)"
+	dir, err = p.PoolDirectory()
+	c.Check(err, IsNil)
+	c.Check(dir, Equals, "g/gcc-defaults")
+
+	p = NewPackageFromControlFile(packageStanza.Copy())
+	p.Source = "l"
+	_, err = p.PoolDirectory()
+	c.Check(err, ErrorMatches, ".* too short")
+}
+
+func (s *PackageSuite) TestLinkFromPool(c *C) {
+	packagePool := files.NewPackagePool(c.MkDir())
+	publishedStorage := files.NewPublishedStorage(c.MkDir())
+	p := NewPackageFromControlFile(s.stanza)
+
+	poolPath, _ := packagePool.Path(p.Files()[0].Filename, p.Files()[0].Checksums.MD5)
+	err := os.MkdirAll(filepath.Dir(poolPath), 0755)
+	c.Assert(err, IsNil)
+
+	file, err := os.Create(poolPath)
+	c.Assert(err, IsNil)
+	file.Close()
+
+	err = p.LinkFromPool(publishedStorage, packagePool, "", "non-free")
+	c.Check(err, IsNil)
+	c.Check(p.Files()[0].Filename, Equals, "alien-arena-common_7.40-2_i386.deb")
+	c.Check(p.Files()[0].downloadPath, Equals, "pool/non-free/a/alien-arena")
+
+	p.IsSource = true
+	err = p.LinkFromPool(publishedStorage, packagePool, "", "non-free")
+	c.Check(err, IsNil)
+	c.Check(p.Extra()["Directory"], Equals, "pool/non-free/a/alien-arena")
+}
+
+func (s *PackageSuite) TestFilepathList(c *C) {
+	packagePool := files.NewPackagePool(c.MkDir())
+	p := NewPackageFromControlFile(s.stanza)
+
+	list, err := p.FilepathList(packagePool)
+	c.Check(err, IsNil)
+	c.Check(list, DeepEquals, []string{"1e/8c/alien-arena-common_7.40-2_i386.deb"})
+}
+
+func (s *PackageSuite) TestDownloadList(c *C) {
+	packagePool := files.NewPackagePool(c.MkDir())
+	p := NewPackageFromControlFile(s.stanza)
+	p.Files()[0].Checksums.Size = 5
+	poolPath, _ := packagePool.Path(p.Files()[0].Filename, p.Files()[0].Checksums.MD5)
+
+	list, err := p.DownloadList(packagePool)
+	c.Check(err, IsNil)
+	c.Check(list, DeepEquals, []PackageDownloadTask{
+		PackageDownloadTask{
+			RepoURI:         "pool/contrib/a/alien-arena/alien-arena-common_7.40-2_i386.deb",
+			DestinationPath: poolPath,
+			Checksums: utils.ChecksumInfo{Size: 5,
+				MD5:    "1e8cba92c41420aa7baa8a5718d67122",
+				SHA1:   "46955e48cad27410a83740a21d766ce362364024",
+				SHA256: "eb4afb9885cba6dc70cccd05b910b2dbccc02c5900578be5e99f0d3dbf9d76a5"}}})
+
+	err = os.MkdirAll(filepath.Dir(poolPath), 0755)
+	c.Assert(err, IsNil)
+
+	file, err := os.Create(poolPath)
+	c.Assert(err, IsNil)
+	file.WriteString("abcde")
+	file.Close()
+
+	list, err = p.DownloadList(packagePool)
+	c.Check(err, IsNil)
+	c.Check(list, DeepEquals, []PackageDownloadTask{})
+}
+
+func (s *PackageSuite) TestVerifyFiles(c *C) {
+	p := NewPackageFromControlFile(s.stanza)
+
+	packagePool := files.NewPackagePool(c.MkDir())
+	poolPath, _ := packagePool.Path(p.Files()[0].Filename, p.Files()[0].Checksums.MD5)
+
+	err := os.MkdirAll(filepath.Dir(poolPath), 0755)
+	c.Assert(err, IsNil)
+
+	file, err := os.Create(poolPath)
+	c.Assert(err, IsNil)
+	file.WriteString("abcde")
+	file.Close()
+
+	result, err := p.VerifyFiles(packagePool)
+	c.Check(err, IsNil)
+	c.Check(result, Equals, false)
+
+	p.Files()[0].Checksums.Size = 5
+
+	result, err = p.VerifyFiles(packagePool)
+	c.Check(err, IsNil)
+	c.Check(result, Equals, true)
+}
+
+var packageStanza = Stanza{"Source": "alien-arena", "Pre-Depends": "dpkg (>= 1.6)", "Suggests": "alien-arena-mars", "Recommends": "aliean-arena-luna", "Depends": "libc6 (>= 2.7), alien-arena-data (>= 7.40)", "Filename": "pool/contrib/a/alien-arena/alien-arena-common_7.40-2_i386.deb", "SHA1": " 46955e48cad27410a83740a21d766ce362364024", "SHA256": " eb4afb9885cba6dc70cccd05b910b2dbccc02c5900578be5e99f0d3dbf9d76a5", "Priority": "extra", "Maintainer": "Debian Games Team <pkg-games-devel@lists.alioth.debian.org>", "Description": "Common files for Alien Arena client and server ALIEN ARENA is a standalone 3D first person online deathmatch shooter\n crafted from the original source code of Quake II and Quake III, released\n by id Software under the GPL license. With features including 32 bit\n graphics, new particle engine and effects, light blooms, reflective water,\n hi resolution textures and skins, hi poly models, stain maps, ALIEN ARENA\n pushes the envelope of graphical beauty rivaling today's top games.\n .\n This package installs the common files for Alien Arena.\n", "Homepage": "http://red.planetarena.org", "Tag": "role::app-data, role::shared-lib, special::auto-inst-parts", "Installed-Size": "456", "Version": "7.40-2", "Replaces": "alien-arena (<< 7.33-1)", "Size": "187518", "MD5sum": "1e8cba92c41420aa7baa8a5718d67122", "Package": "alien-arena-common", "Section": "contrib/games", "Architecture": "i386"}
+
+const sourcePackageMeta = `Package: access-modifier-checker
+Binary: libaccess-modifier-checker-java, libaccess-modifier-checker-java-doc
+Version: 1.0-4
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: James Page <james.page@ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
+Build-Depends-Indep: default-jdk-doc, junit (>= 3.8.1), libannotation-indexer-java (>= 1.3), libannotation-indexer-java-doc, libasm3-java, libmaven-install-plugin-java, libmaven-javadoc-plugin-java, libmaven-scm-java, libmaven2-core-java, libmaven2-core-java-doc, libmetainf-services-java, libmetainf-services-java-doc, libmaven-plugin-tools-java (>= 2.8)
+Architecture: all
+Standards-Version: 3.9.3
+Format: 3.0 (quilt)
+Files:
+ ab56b4d92b40713acc5af89985d4b786 5 access-modifier-checker_1.0-4.debian.tar.gz
+ 900150983cd24fb0d6963f7d28e17f72 3 access-modifier-checker_1.0-4.dsc
+ e2fc714c4727ee9395f324cd2e7f331f 4 access-modifier-checker_1.0.orig.tar.gz
+Dm-Upload-Allowed: yes
+Vcs-Browser: http://git.debian.org/?p=pkg-java/access-modifier-checker.git
+Vcs-Git: git://git.debian.org/git/pkg-java/access-modifier-checker.git
+Checksums-Sha1:
+ 03de6c570bfe24bfc328ccd7ca46b76eadaf4334 5 access-modifier-checker_1.0-4.debian.tar.gz
+ a9993e364706816aba3e25717850c26c9cd0d89d 3 access-modifier-checker_1.0-4.dsc
+ 81fe8bfe87576c3ecb22426f8e57847382917acf 4 access-modifier-checker_1.0.orig.tar.gz
+Checksums-Sha256:
+ 36bbe50ed96841d10443bcb670d6554f0a34b761be67ec9c4a8ad2c0c44ca42c 5 access-modifier-checker_1.0-4.debian.tar.gz
+ ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad 3 access-modifier-checker_1.0-4.dsc
+ 88d4266fd4e6338d13b845fcf289579d209c897823b9217da3e161936f031589 4 access-modifier-checker_1.0.orig.tar.gz
+Homepage: https://github.com/kohsuke/access-modifier
+Package-List:
+ libaccess-modifier-checker-java deb java optional
+ libaccess-modifier-checker-java-doc deb doc optional
+Directory: pool/main/a/access-modifier-checker
+Priority: source
+Section: java
+`

deb/ppa.go

@@ -0,0 +1,54 @@
+package deb
+
+import (
+	"fmt"
+	"github.com/smira/aptly/utils"
+	"os/exec"
+	"regexp"
+	"strings"
+)
+
+var ppaRegexp = regexp.MustCompile("^ppa:([^/]+)/(.+)$")
+
+// ParsePPA converts ppa URL like ppa:user/ppa-name to full HTTP url
+func ParsePPA(ppaURL string, config *utils.ConfigStructure) (url string, distribution string, components []string, err error) {
+	matches := ppaRegexp.FindStringSubmatch(ppaURL)
+	if matches == nil {
+		err = fmt.Errorf("unable to parse ppa URL: %v", ppaURL)
+		return
+	}
+
+	distributorID := config.PpaDistributorID
+	if distributorID == "" {
+		distributorID, err = getDistributorID()
+		if err != nil {
+			err = fmt.Errorf("unable to figure out Distributor ID: %s, please set config option ppaDistributorID", err)
+			return
+		}
+	}
+
+	codename := config.PpaCodename
+	if codename == "" {
+		codename, err = getCodename()
+		if err != nil {
+			err = fmt.Errorf("unable to figure out Codename: %s, please set config option ppaCodename", err)
+			return
+		}
+	}
+
+	distribution = codename
+	components = []string{"main"}
+	url = fmt.Sprintf("http://ppa.launchpad.net/%s/%s/%s", matches[1], matches[2], distributorID)
+
+	return
+}
+
+func getCodename() (string, error) {
+	out, err := exec.Command("lsb_release", "-sc").Output()
+	return strings.TrimSpace(string(out)), err
+}
+
+func getDistributorID() (string, error) {
+	out, err := exec.Command("lsb_release", "-si").Output()
+	return strings.ToLower(strings.TrimSpace(string(out))), err
+}

deb/ppa_test.go

@@ -0,0 +1,26 @@
+package deb
+
+import (
+	"github.com/smira/aptly/utils"
+	. "launchpad.net/gocheck"
+)
+
+type PpaSuite struct {
+	config utils.ConfigStructure
+}
+
+var _ = Suite(&PpaSuite{})
+
+func (s *PpaSuite) TestParsePPA(c *C) {
+	_, _, _, err := ParsePPA("ppa:dedeed", &s.config)
+	c.Check(err, ErrorMatches, "unable to parse ppa URL.*")
+
+	s.config.PpaDistributorID = "debian"
+	s.config.PpaCodename = "wheezy"
+
+	url, distribution, components, err := ParsePPA("ppa:user/project", &s.config)
+	c.Check(err, IsNil)
+	c.Check(url, Equals, "http://ppa.launchpad.net/user/project/debian")
+	c.Check(distribution, Equals, "wheezy")
+	c.Check(components, DeepEquals, []string{"main"})
+}

deb/publish_test.go

@@ -0,0 +1,716 @@
+package deb
+
+import (
+	"bytes"
+	"errors"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/database"
+	"github.com/smira/aptly/files"
+	"github.com/ugorji/go/codec"
+	. "launchpad.net/gocheck"
+	"os"
+	"path/filepath"
+)
+
+type pathExistsChecker struct {
+	*CheckerInfo
+}
+
+var PathExists = &pathExistsChecker{
+	&CheckerInfo{Name: "PathExists", Params: []string{"path"}},
+}
+
+func (checker *pathExistsChecker) Check(params []interface{}, names []string) (result bool, error string) {
+	_, err := os.Stat(params[0].(string))
+	return err == nil, ""
+}
+
+type NullSigner struct{}
+
+func (n *NullSigner) Init() error {
+	return nil
+}
+
+func (n *NullSigner) SetKey(keyRef string) {
+}
+
+func (n *NullSigner) SetKeyRing(keyring, secretKeyring string) {
+}
+
+func (n *NullSigner) DetachedSign(source string, destination string) error {
+	return nil
+}
+
+func (n *NullSigner) ClearSign(source string, destination string) error {
+	return nil
+}
+
+type PublishedRepoSuite struct {
+	PackageListMixinSuite
+	repo, repo2, repo3, repo4 *PublishedRepo
+	root                      string
+	publishedStorage          aptly.PublishedStorage
+	packagePool               aptly.PackagePool
+	localRepo                 *LocalRepo
+	snapshot, snapshot2       *Snapshot
+	db                        database.Storage
+	factory                   *CollectionFactory
+	packageCollection         *PackageCollection
+}
+
+var _ = Suite(&PublishedRepoSuite{})
+
+func (s *PublishedRepoSuite) SetUpTest(c *C) {
+	s.SetUpPackages()
+
+	s.db, _ = database.OpenDB(c.MkDir())
+	s.factory = NewCollectionFactory(s.db)
+
+	s.root = c.MkDir()
+	s.publishedStorage = files.NewPublishedStorage(s.root)
+	s.packagePool = files.NewPackagePool(s.root)
+
+	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
+	repo.packageRefs = s.reflist
+	s.factory.RemoteRepoCollection().Add(repo)
+
+	s.localRepo = NewLocalRepo("local1", "comment1")
+	s.localRepo.packageRefs = s.reflist
+	s.factory.LocalRepoCollection().Add(s.localRepo)
+
+	s.snapshot, _ = NewSnapshotFromRepository("snap", repo)
+	s.factory.SnapshotCollection().Add(s.snapshot)
+
+	s.snapshot2, _ = NewSnapshotFromRepository("snap", repo)
+	s.factory.SnapshotCollection().Add(s.snapshot2)
+
+	s.packageCollection = s.factory.PackageCollection()
+	s.packageCollection.Update(s.p1)
+	s.packageCollection.Update(s.p2)
+	s.packageCollection.Update(s.p3)
+
+	s.repo, _ = NewPublishedRepo("ppa", "squeeze", nil, []string{"main"}, []interface{}{s.snapshot}, s.factory)
+
+	s.repo2, _ = NewPublishedRepo("ppa", "maverick", nil, []string{"main"}, []interface{}{s.localRepo}, s.factory)
+
+	s.repo3, _ = NewPublishedRepo("linux", "natty", nil, []string{"main", "contrib"}, []interface{}{s.snapshot, s.snapshot2}, s.factory)
+
+	s.repo4, _ = NewPublishedRepo("ppa", "maverick", []string{"source"}, []string{"main"}, []interface{}{s.localRepo}, s.factory)
+
+	poolPath, _ := s.packagePool.Path(s.p1.Files()[0].Filename, s.p1.Files()[0].Checksums.MD5)
+	err := os.MkdirAll(filepath.Dir(poolPath), 0755)
+	f, err := os.Create(poolPath)
+	c.Assert(err, IsNil)
+	f.Close()
+}
+
+func (s *PublishedRepoSuite) TearDownTest(c *C) {
+	s.db.Close()
+}
+
+func (s *PublishedRepoSuite) TestNewPublishedRepo(c *C) {
+	c.Check(s.repo.sourceItems["main"].snapshot, Equals, s.snapshot)
+	c.Check(s.repo.SourceKind, Equals, "snapshot")
+	c.Check(s.repo.Sources["main"], Equals, s.snapshot.UUID)
+	c.Check(s.repo.Components(), DeepEquals, []string{"main"})
+
+	c.Check(s.repo2.sourceItems["main"].localRepo, Equals, s.localRepo)
+	c.Check(s.repo2.SourceKind, Equals, "local")
+	c.Check(s.repo2.Sources["main"], Equals, s.localRepo.UUID)
+	c.Check(s.repo2.sourceItems["main"].packageRefs.Len(), Equals, 3)
+	c.Check(s.repo2.Components(), DeepEquals, []string{"main"})
+
+	c.Check(s.repo.RefList("main").Len(), Equals, 3)
+	c.Check(s.repo2.RefList("main").Len(), Equals, 3)
+
+	c.Check(s.repo3.Sources, DeepEquals, map[string]string{"main": s.snapshot.UUID, "contrib": s.snapshot2.UUID})
+	c.Check(s.repo3.SourceKind, Equals, "snapshot")
+	c.Check(s.repo3.sourceItems["main"].snapshot, Equals, s.snapshot)
+	c.Check(s.repo3.sourceItems["contrib"].snapshot, Equals, s.snapshot2)
+	c.Check(s.repo3.Components(), DeepEquals, []string{"contrib", "main"})
+
+	c.Check(s.repo3.RefList("main").Len(), Equals, 3)
+	c.Check(s.repo3.RefList("contrib").Len(), Equals, 3)
+
+	c.Check(func() { NewPublishedRepo(".", "a", nil, nil, nil, s.factory) }, PanicMatches, "publish with empty sources")
+	c.Check(func() {
+		NewPublishedRepo(".", "a", nil, []string{"main"}, []interface{}{s.snapshot, s.snapshot2}, s.factory)
+	}, PanicMatches, "sources and components should be equal in size")
+	c.Check(func() {
+		NewPublishedRepo(".", "a", nil, []string{"main", "contrib"}, []interface{}{s.localRepo, s.snapshot2}, s.factory)
+	}, PanicMatches, "interface conversion:.*")
+
+	_, err := NewPublishedRepo(".", "a", nil, []string{"main", "main"}, []interface{}{s.snapshot, s.snapshot2}, s.factory)
+	c.Check(err, ErrorMatches, "duplicate component name: main")
+}
+
+func (s *PublishedRepoSuite) TestPrefixNormalization(c *C) {
+
+	for _, t := range []struct {
+		prefix        string
+		expected      string
+		errorExpected string
+	}{
+		{
+			prefix:   "ppa",
+			expected: "ppa",
+		},
+		{
+			prefix:   "",
+			expected: ".",
+		},
+		{
+			prefix:   "/",
+			expected: ".",
+		},
+		{
+			prefix:   "//",
+			expected: ".",
+		},
+		{
+			prefix:   "//ppa/",
+			expected: "ppa",
+		},
+		{
+			prefix:   "ppa/..",
+			expected: ".",
+		},
+		{
+			prefix:   "ppa/ubuntu/",
+			expected: "ppa/ubuntu",
+		},
+		{
+			prefix:   "ppa/../ubuntu/",
+			expected: "ubuntu",
+		},
+		{
+			prefix:        "../ppa/",
+			errorExpected: "invalid prefix .*",
+		},
+		{
+			prefix:        "../ppa/../ppa/",
+			errorExpected: "invalid prefix .*",
+		},
+		{
+			prefix:        "ppa/dists",
+			errorExpected: "invalid prefix .*",
+		},
+		{
+			prefix:        "ppa/pool",
+			errorExpected: "invalid prefix .*",
+		},
+	} {
+		repo, err := NewPublishedRepo(t.prefix, "squeeze", nil, []string{"main"}, []interface{}{s.snapshot}, s.factory)
+		if t.errorExpected != "" {
+			c.Check(err, ErrorMatches, t.errorExpected)
+		} else {
+			c.Check(repo.Prefix, Equals, t.expected)
+		}
+	}
+}
+
+func (s *PublishedRepoSuite) TestDistributionComponentGuessing(c *C) {
+	repo, err := NewPublishedRepo("ppa", "", nil, []string{""}, []interface{}{s.snapshot}, s.factory)
+	c.Check(err, IsNil)
+	c.Check(repo.Distribution, Equals, "squeeze")
+	c.Check(repo.Components(), DeepEquals, []string{"main"})
+
+	repo, err = NewPublishedRepo("ppa", "wheezy", nil, []string{""}, []interface{}{s.snapshot}, s.factory)
+	c.Check(err, IsNil)
+	c.Check(repo.Distribution, Equals, "wheezy")
+	c.Check(repo.Components(), DeepEquals, []string{"main"})
+
+	repo, err = NewPublishedRepo("ppa", "", nil, []string{"non-free"}, []interface{}{s.snapshot}, s.factory)
+	c.Check(err, IsNil)
+	c.Check(repo.Distribution, Equals, "squeeze")
+	c.Check(repo.Components(), DeepEquals, []string{"non-free"})
+
+	repo, err = NewPublishedRepo("ppa", "squeeze", nil, []string{""}, []interface{}{s.localRepo}, s.factory)
+	c.Check(err, IsNil)
+	c.Check(repo.Distribution, Equals, "squeeze")
+	c.Check(repo.Components(), DeepEquals, []string{"main"})
+
+	repo, err = NewPublishedRepo("ppa", "", nil, []string{"main"}, []interface{}{s.localRepo}, s.factory)
+	c.Check(err, ErrorMatches, "unable to guess distribution name, please specify explicitly")
+
+	s.localRepo.DefaultDistribution = "precise"
+	s.localRepo.DefaultComponent = "contrib"
+	s.factory.LocalRepoCollection().Update(s.localRepo)
+
+	repo, err = NewPublishedRepo("ppa", "", nil, []string{""}, []interface{}{s.localRepo}, s.factory)
+	c.Check(err, IsNil)
+	c.Check(repo.Distribution, Equals, "precise")
+	c.Check(repo.Components(), DeepEquals, []string{"contrib"})
+
+	repo, err = NewPublishedRepo("ppa", "", nil, []string{"", "contrib"}, []interface{}{s.snapshot, s.snapshot2}, s.factory)
+	c.Check(err, IsNil)
+	c.Check(repo.Distribution, Equals, "squeeze")
+	c.Check(repo.Components(), DeepEquals, []string{"contrib", "main"})
+
+	repo, err = NewPublishedRepo("ppa", "", nil, []string{"", ""}, []interface{}{s.snapshot, s.snapshot2}, s.factory)
+	c.Check(err, ErrorMatches, "duplicate component name: main")
+}
+
+func (s *PublishedRepoSuite) TestPublish(c *C) {
+	err := s.repo.Publish(s.packagePool, s.publishedStorage, s.factory, &NullSigner{}, nil)
+	c.Assert(err, IsNil)
+
+	c.Check(s.repo.Architectures, DeepEquals, []string{"i386"})
+
+	rf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/Release"))
+	c.Assert(err, IsNil)
+
+	cfr := NewControlFileReader(rf)
+	st, err := cfr.ReadStanza()
+	c.Assert(err, IsNil)
+
+	c.Check(st["Origin"], Equals, "ppa squeeze")
+	c.Check(st["Components"], Equals, "main")
+	c.Check(st["Architectures"], Equals, "i386")
+
+	pf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/main/binary-i386/Packages"))
+	c.Assert(err, IsNil)
+
+	cfr = NewControlFileReader(pf)
+
+	for i := 0; i < 3; i++ {
+		st, err = cfr.ReadStanza()
+		c.Assert(err, IsNil)
+
+		c.Check(st["Filename"], Equals, "pool/main/a/alien-arena/alien-arena-common_7.40-2_i386.deb")
+	}
+
+	st, err = cfr.ReadStanza()
+	c.Assert(err, IsNil)
+	c.Assert(st, IsNil)
+
+	drf, err := os.Open(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/main/binary-i386/Release"))
+	c.Assert(err, IsNil)
+
+	cfr = NewControlFileReader(drf)
+	st, err = cfr.ReadStanza()
+	c.Assert(err, IsNil)
+
+	c.Check(st["Archive"], Equals, "squeeze")
+	c.Check(st["Architecture"], Equals, "i386")
+
+	_, err = os.Stat(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main/a/alien-arena/alien-arena-common_7.40-2_i386.deb"))
+	c.Assert(err, IsNil)
+}
+
+func (s *PublishedRepoSuite) TestPublishNoSigner(c *C) {
+	err := s.repo.Publish(s.packagePool, s.publishedStorage, s.factory, nil, nil)
+	c.Assert(err, IsNil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/Release"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/squeeze/main/binary-i386/Release"), PathExists)
+}
+
+func (s *PublishedRepoSuite) TestPublishLocalRepo(c *C) {
+	err := s.repo2.Publish(s.packagePool, s.publishedStorage, s.factory, nil, nil)
+	c.Assert(err, IsNil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/maverick/Release"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/maverick/main/binary-i386/Release"), PathExists)
+}
+
+func (s *PublishedRepoSuite) TestPublishLocalSourceRepo(c *C) {
+	err := s.repo4.Publish(s.packagePool, s.publishedStorage, s.factory, nil, nil)
+	c.Assert(err, IsNil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/maverick/Release"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/maverick/main/source/Release"), PathExists)
+}
+
+func (s *PublishedRepoSuite) TestString(c *C) {
+	c.Check(s.repo.String(), Equals,
+		"ppa/squeeze [] publishes {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
+	c.Check(s.repo2.String(), Equals,
+		"ppa/maverick [] publishes {main: [local1]: comment1}")
+	repo, _ := NewPublishedRepo("", "squeeze", []string{"s390"}, []string{"main"}, []interface{}{s.snapshot}, s.factory)
+	c.Check(repo.String(), Equals,
+		"./squeeze [s390] publishes {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
+	repo, _ = NewPublishedRepo("", "squeeze", []string{"i386", "amd64"}, []string{"main"}, []interface{}{s.snapshot}, s.factory)
+	c.Check(repo.String(), Equals,
+		"./squeeze [i386, amd64] publishes {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
+	repo.Origin = "myorigin"
+	c.Check(repo.String(), Equals,
+		"./squeeze (origin: myorigin) [i386, amd64] publishes {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
+	repo.Label = "mylabel"
+	c.Check(repo.String(), Equals,
+		"./squeeze (origin: myorigin, label: mylabel) [i386, amd64] publishes {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
+	c.Check(s.repo3.String(), Equals,
+		"linux/natty [] publishes {contrib: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}, {main: [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze}")
+}
+
+func (s *PublishedRepoSuite) TestKey(c *C) {
+	c.Check(s.repo.Key(), DeepEquals, []byte("Uppa>>squeeze"))
+}
+
+func (s *PublishedRepoSuite) TestRefKey(c *C) {
+	c.Check(s.repo.RefKey(""), DeepEquals, []byte("E"+s.repo.UUID))
+	c.Check(s.repo.RefKey("main"), DeepEquals, []byte("E"+s.repo.UUID+"main"))
+}
+
+func (s *PublishedRepoSuite) TestEncodeDecode(c *C) {
+	encoded := s.repo.Encode()
+	repo := &PublishedRepo{}
+	err := repo.Decode(encoded)
+
+	s.repo.sourceItems = nil
+	c.Assert(err, IsNil)
+	c.Assert(repo, DeepEquals, s.repo)
+
+	encoded2 := s.repo2.Encode()
+	repo2 := &PublishedRepo{}
+	err = repo2.Decode(encoded2)
+
+	s.repo2.sourceItems = nil
+	c.Assert(err, IsNil)
+	c.Assert(repo2, DeepEquals, s.repo2)
+}
+
+type PublishedRepoCollectionSuite struct {
+	PackageListMixinSuite
+	db                         database.Storage
+	factory                    *CollectionFactory
+	snapshotCollection         *SnapshotCollection
+	collection                 *PublishedRepoCollection
+	snap1, snap2               *Snapshot
+	localRepo                  *LocalRepo
+	repo1, repo2, repo3, repo4 *PublishedRepo
+}
+
+var _ = Suite(&PublishedRepoCollectionSuite{})
+
+func (s *PublishedRepoCollectionSuite) SetUpTest(c *C) {
+	s.db, _ = database.OpenDB(c.MkDir())
+	s.factory = NewCollectionFactory(s.db)
+
+	s.snapshotCollection = s.factory.SnapshotCollection()
+
+	s.snap1 = NewSnapshotFromPackageList("snap1", []*Snapshot{}, NewPackageList(), "desc1")
+	s.snap2 = NewSnapshotFromPackageList("snap2", []*Snapshot{}, NewPackageList(), "desc2")
+
+	s.snapshotCollection.Add(s.snap1)
+	s.snapshotCollection.Add(s.snap2)
+
+	s.localRepo = NewLocalRepo("local1", "comment1")
+	s.factory.LocalRepoCollection().Add(s.localRepo)
+
+	s.repo1, _ = NewPublishedRepo("ppa", "anaconda", []string{}, []string{"main"}, []interface{}{s.snap1}, s.factory)
+	s.repo2, _ = NewPublishedRepo("", "anaconda", []string{}, []string{"main", "contrib"}, []interface{}{s.snap2, s.snap1}, s.factory)
+	s.repo3, _ = NewPublishedRepo("ppa", "anaconda", []string{}, []string{"main"}, []interface{}{s.snap2}, s.factory)
+	s.repo4, _ = NewPublishedRepo("ppa", "precise", []string{}, []string{"main"}, []interface{}{s.localRepo}, s.factory)
+
+	s.collection = s.factory.PublishedRepoCollection()
+}
+
+func (s *PublishedRepoCollectionSuite) TearDownTest(c *C) {
+	s.db.Close()
+}
+
+func (s *PublishedRepoCollectionSuite) TestAddByPrefixDistribution(c *C) {
+	r, err := s.collection.ByPrefixDistribution("ppa", "anaconda")
+	c.Assert(err, ErrorMatches, "*.not found")
+
+	c.Assert(s.collection.Add(s.repo1), IsNil)
+	c.Assert(s.collection.Add(s.repo1), ErrorMatches, ".*already exists")
+	c.Assert(s.collection.CheckDuplicate(s.repo2), IsNil)
+	c.Assert(s.collection.Add(s.repo2), IsNil)
+	c.Assert(s.collection.Add(s.repo3), ErrorMatches, ".*already exists")
+	c.Assert(s.collection.CheckDuplicate(s.repo3), Equals, s.repo1)
+	c.Assert(s.collection.Add(s.repo4), IsNil)
+
+	r, err = s.collection.ByPrefixDistribution("ppa", "anaconda")
+	c.Assert(err, IsNil)
+
+	err = s.collection.LoadComplete(r, s.factory)
+	c.Assert(err, IsNil)
+	c.Assert(r.String(), Equals, s.repo1.String())
+
+	collection := NewPublishedRepoCollection(s.db)
+	r, err = collection.ByPrefixDistribution("ppa", "anaconda")
+	c.Assert(err, IsNil)
+
+	err = s.collection.LoadComplete(r, s.factory)
+	c.Assert(err, IsNil)
+	c.Assert(r.String(), Equals, s.repo1.String())
+}
+
+func (s *PublishedRepoCollectionSuite) TestByUUID(c *C) {
+	r, err := s.collection.ByUUID(s.repo1.UUID)
+	c.Assert(err, ErrorMatches, "*.not found")
+
+	c.Assert(s.collection.Add(s.repo1), IsNil)
+
+	r, err = s.collection.ByUUID(s.repo1.UUID)
+	c.Assert(err, IsNil)
+
+	err = s.collection.LoadComplete(r, s.factory)
+	c.Assert(err, IsNil)
+	c.Assert(r.String(), Equals, s.repo1.String())
+}
+
+func (s *PublishedRepoCollectionSuite) TestUpdateLoadComplete(c *C) {
+	c.Assert(s.collection.Update(s.repo1), IsNil)
+	c.Assert(s.collection.Update(s.repo4), IsNil)
+
+	collection := NewPublishedRepoCollection(s.db)
+	r, err := collection.ByPrefixDistribution("ppa", "anaconda")
+	c.Assert(err, IsNil)
+	c.Assert(r.sourceItems["main"].snapshot, IsNil)
+	c.Assert(s.collection.LoadComplete(r, s.factory), IsNil)
+	c.Assert(r.Sources["main"], Equals, s.repo1.sourceItems["main"].snapshot.UUID)
+	c.Assert(r.RefList("main").Len(), Equals, 0)
+
+	r, err = collection.ByPrefixDistribution("ppa", "precise")
+	c.Assert(err, IsNil)
+	c.Assert(r.sourceItems["main"].localRepo, IsNil)
+	c.Assert(s.collection.LoadComplete(r, s.factory), IsNil)
+	c.Assert(r.sourceItems["main"].localRepo.UUID, Equals, s.repo4.sourceItems["main"].localRepo.UUID)
+	c.Assert(r.sourceItems["main"].packageRefs.Len(), Equals, 0)
+	c.Assert(r.RefList("main").Len(), Equals, 0)
+}
+
+func (s *PublishedRepoCollectionSuite) TestLoadPre0_6(c *C) {
+	type oldPublishedRepo struct {
+		UUID          string
+		Prefix        string
+		Distribution  string
+		Origin        string
+		Label         string
+		Architectures []string
+		SourceKind    string
+		Component     string
+		SourceUUID    string `codec:"SnapshotUUID"`
+	}
+
+	old := oldPublishedRepo{
+		UUID:          s.repo1.UUID,
+		Prefix:        "ppa",
+		Distribution:  "anaconda",
+		Architectures: []string{"i386"},
+		SourceKind:    "local",
+		Component:     "contrib",
+		SourceUUID:    s.localRepo.UUID,
+	}
+
+	var buf bytes.Buffer
+
+	encoder := codec.NewEncoder(&buf, &codec.MsgpackHandle{})
+	encoder.Encode(&old)
+
+	c.Assert(s.db.Put(s.repo1.Key(), buf.Bytes()), IsNil)
+	c.Assert(s.db.Put(s.repo1.RefKey(""), s.localRepo.RefList().Encode()), IsNil)
+
+	collection := NewPublishedRepoCollection(s.db)
+	repo, err := collection.ByPrefixDistribution("ppa", "anaconda")
+	c.Check(err, IsNil)
+	c.Check(repo.Component, Equals, "")
+	c.Check(repo.SourceUUID, Equals, "")
+	c.Check(repo.Sources, DeepEquals, map[string]string{"contrib": s.localRepo.UUID})
+
+	c.Check(collection.LoadComplete(repo, s.factory), IsNil)
+	c.Check(repo.sourceItems["contrib"].localRepo.UUID, Equals, s.localRepo.UUID)
+	c.Check(repo.RefList("contrib").Len(), Equals, 0)
+}
+
+func (s *PublishedRepoCollectionSuite) TestForEachAndLen(c *C) {
+	s.collection.Add(s.repo1)
+
+	count := 0
+	err := s.collection.ForEach(func(*PublishedRepo) error {
+		count++
+		return nil
+	})
+	c.Assert(count, Equals, 1)
+	c.Assert(err, IsNil)
+
+	c.Check(s.collection.Len(), Equals, 1)
+
+	e := errors.New("c")
+
+	err = s.collection.ForEach(func(*PublishedRepo) error {
+		return e
+	})
+	c.Assert(err, Equals, e)
+}
+
+func (s *PublishedRepoCollectionSuite) TestBySnapshot(c *C) {
+	c.Check(s.collection.Add(s.repo1), IsNil)
+	c.Check(s.collection.Add(s.repo2), IsNil)
+
+	c.Check(s.collection.BySnapshot(s.snap1), DeepEquals, []*PublishedRepo{s.repo1, s.repo2})
+	c.Check(s.collection.BySnapshot(s.snap2), DeepEquals, []*PublishedRepo{s.repo2})
+}
+
+func (s *PublishedRepoCollectionSuite) TestByLocalRepo(c *C) {
+	c.Check(s.collection.Add(s.repo1), IsNil)
+	c.Check(s.collection.Add(s.repo4), IsNil)
+
+	c.Check(s.collection.ByLocalRepo(s.localRepo), DeepEquals, []*PublishedRepo{s.repo4})
+}
+
+type PublishedRepoRemoveSuite struct {
+	PackageListMixinSuite
+	db                         database.Storage
+	factory                    *CollectionFactory
+	snapshotCollection         *SnapshotCollection
+	collection                 *PublishedRepoCollection
+	root                       string
+	publishedStorage           aptly.PublishedStorage
+	snap1                      *Snapshot
+	repo1, repo2, repo3, repo4 *PublishedRepo
+}
+
+var _ = Suite(&PublishedRepoRemoveSuite{})
+
+func (s *PublishedRepoRemoveSuite) SetUpTest(c *C) {
+	s.db, _ = database.OpenDB(c.MkDir())
+	s.factory = NewCollectionFactory(s.db)
+
+	s.snapshotCollection = s.factory.SnapshotCollection()
+
+	s.snap1 = NewSnapshotFromPackageList("snap1", []*Snapshot{}, NewPackageList(), "desc1")
+
+	s.snapshotCollection.Add(s.snap1)
+
+	s.repo1, _ = NewPublishedRepo("ppa", "anaconda", []string{}, []string{"main"}, []interface{}{s.snap1}, s.factory)
+	s.repo2, _ = NewPublishedRepo("", "anaconda", []string{}, []string{"main"}, []interface{}{s.snap1}, s.factory)
+	s.repo3, _ = NewPublishedRepo("ppa", "meduza", []string{}, []string{"main"}, []interface{}{s.snap1}, s.factory)
+	s.repo4, _ = NewPublishedRepo("ppa", "osminog", []string{}, []string{"contrib"}, []interface{}{s.snap1}, s.factory)
+
+	s.collection = s.factory.PublishedRepoCollection()
+	s.collection.Add(s.repo1)
+	s.collection.Add(s.repo2)
+	s.collection.Add(s.repo3)
+	s.collection.Add(s.repo4)
+
+	s.root = c.MkDir()
+	s.publishedStorage = files.NewPublishedStorage(s.root)
+	s.publishedStorage.MkDir("ppa/dists/anaconda")
+	s.publishedStorage.MkDir("ppa/dists/meduza")
+	s.publishedStorage.MkDir("ppa/dists/osminog")
+	s.publishedStorage.MkDir("ppa/pool/main")
+	s.publishedStorage.MkDir("ppa/pool/contrib")
+	s.publishedStorage.MkDir("dists/anaconda")
+	s.publishedStorage.MkDir("pool/main")
+}
+
+func (s *PublishedRepoRemoveSuite) TearDownTest(c *C) {
+	s.db.Close()
+}
+
+func (s *PublishedRepoRemoveSuite) TestRemoveFilesOnlyDist(c *C) {
+	s.repo1.RemoveFiles(s.publishedStorage, false, []string{}, nil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/osminog"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/main"), PathExists)
+}
+
+func (s *PublishedRepoRemoveSuite) TestRemoveFilesWithPool(c *C) {
+	s.repo1.RemoveFiles(s.publishedStorage, false, []string{"main"}, nil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/osminog"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/main"), PathExists)
+}
+
+func (s *PublishedRepoRemoveSuite) TestRemoveFilesWithTwoPools(c *C) {
+	s.repo1.RemoveFiles(s.publishedStorage, false, []string{"main", "contrib"}, nil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/osminog"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/main"), PathExists)
+}
+
+func (s *PublishedRepoRemoveSuite) TestRemoveFilesWithPrefix(c *C) {
+	s.repo1.RemoveFiles(s.publishedStorage, true, []string{"main"}, nil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/osminog"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/main"), PathExists)
+}
+
+func (s *PublishedRepoRemoveSuite) TestRemoveFilesWithPrefixRoot(c *C) {
+	s.repo2.RemoveFiles(s.publishedStorage, true, []string{"main"}, nil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/anaconda"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/main"), Not(PathExists))
+}
+
+func (s *PublishedRepoRemoveSuite) TestRemoveRepo1and2(c *C) {
+	err := s.collection.Remove(s.publishedStorage, "ppa", "anaconda", s.factory, nil)
+	c.Check(err, IsNil)
+
+	_, err = s.collection.ByPrefixDistribution("ppa", "anaconda")
+	c.Check(err, ErrorMatches, ".*not found")
+
+	collection := NewPublishedRepoCollection(s.db)
+	_, err = collection.ByPrefixDistribution("ppa", "anaconda")
+	c.Check(err, ErrorMatches, ".*not found")
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/osminog"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/main"), PathExists)
+
+	err = s.collection.Remove(s.publishedStorage, "ppa", "anaconda", s.factory, nil)
+	c.Check(err, ErrorMatches, ".*not found")
+
+	err = s.collection.Remove(s.publishedStorage, "ppa", "meduza", s.factory, nil)
+	c.Check(err, IsNil)
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/osminog"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/main"), PathExists)
+}
+
+func (s *PublishedRepoRemoveSuite) TestRemoveRepo3(c *C) {
+	err := s.collection.Remove(s.publishedStorage, ".", "anaconda", s.factory, nil)
+	c.Check(err, IsNil)
+
+	_, err = s.collection.ByPrefixDistribution(".", "anaconda")
+	c.Check(err, ErrorMatches, ".*not found")
+
+	collection := NewPublishedRepoCollection(s.db)
+	_, err = collection.ByPrefixDistribution(".", "anaconda")
+	c.Check(err, ErrorMatches, ".*not found")
+
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/anaconda"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/meduza"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/dists/osminog"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/main"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "ppa/pool/contrib"), PathExists)
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "dists/"), Not(PathExists))
+	c.Check(filepath.Join(s.publishedStorage.PublicPath(), "pool/"), Not(PathExists))
+}

deb/reflist.go

@@ -0,0 +1,342 @@
+package deb
+
+import (
+	"bytes"
+	"github.com/ugorji/go/codec"
+	"sort"
+)
+
+// PackageRefList is a list of keys of packages, this is basis for snapshot
+// and similar stuff
+//
+// Refs are sorted in lexicographical order
+type PackageRefList struct {
+	// List of package keys
+	Refs [][]byte
+}
+
+// Verify interface
+var (
+	_ sort.Interface = &PackageRefList{}
+)
+
+// NewPackageRefList creates empty PackageRefList
+func NewPackageRefList() *PackageRefList {
+	return &PackageRefList{}
+}
+
+// NewPackageRefListFromPackageList creates PackageRefList from PackageList
+func NewPackageRefListFromPackageList(list *PackageList) *PackageRefList {
+	reflist := &PackageRefList{}
+	reflist.Refs = make([][]byte, list.Len())
+
+	i := 0
+	for _, p := range list.packages {
+		reflist.Refs[i] = p.Key("")
+		i++
+	}
+
+	sort.Sort(reflist)
+
+	return reflist
+}
+
+// Len returns number of refs
+func (l *PackageRefList) Len() int {
+	return len(l.Refs)
+}
+
+// Swap swaps two refs
+func (l *PackageRefList) Swap(i, j int) {
+	l.Refs[i], l.Refs[j] = l.Refs[j], l.Refs[i]
+}
+
+// Compare compares two refs in lexographical order
+func (l *PackageRefList) Less(i, j int) bool {
+	return bytes.Compare(l.Refs[i], l.Refs[j]) < 0
+}
+
+// Encode does msgpack encoding of PackageRefList
+func (l *PackageRefList) Encode() []byte {
+	var buf bytes.Buffer
+
+	encoder := codec.NewEncoder(&buf, &codec.MsgpackHandle{})
+	encoder.Encode(l)
+
+	return buf.Bytes()
+}
+
+// Decode decodes msgpack representation into PackageRefLit
+func (l *PackageRefList) Decode(input []byte) error {
+	decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
+	return decoder.Decode(l)
+}
+
+// ForEach calls handler for each package ref in list
+func (l *PackageRefList) ForEach(handler func([]byte) error) error {
+	var err error
+	for _, p := range l.Refs {
+		err = handler(p)
+		if err != nil {
+			return err
+		}
+	}
+	return err
+}
+
+// Substract returns all packages in l that are not in r
+func (l *PackageRefList) Substract(r *PackageRefList) *PackageRefList {
+	result := &PackageRefList{Refs: make([][]byte, 0, 128)}
+
+	// pointer to left and right reflists
+	il, ir := 0, 0
+	// length of reflists
+	ll, lr := l.Len(), r.Len()
+
+	for il < ll || ir < lr {
+		if il == ll {
+			// left list exhausted, we got the result
+			break
+		}
+		if ir == lr {
+			// right list exhausted, append what is left to result
+			result.Refs = append(result.Refs, l.Refs[il:]...)
+			break
+		}
+
+		rel := bytes.Compare(l.Refs[il], r.Refs[ir])
+		if rel == 0 {
+			// r contains entry from l, so we skip it
+			il++
+			ir++
+		} else if rel < 0 {
+			// item il is not in r, append
+			result.Refs = append(result.Refs, l.Refs[il])
+			il++
+		} else {
+			// skip over to next item in r
+			ir++
+		}
+	}
+
+	return result
+}
+
+// PackageDiff is a difference between two packages in a list.
+//
+// If left & right are present, difference is in package version
+// If left is nil, package is present only in right
+// If right is nil, package is present only in left
+type PackageDiff struct {
+	Left, Right *Package
+}
+
+// PackageDiffs is a list of PackageDiff records
+type PackageDiffs []PackageDiff
+
+// Diff calculates difference between two reflists
+func (l *PackageRefList) Diff(r *PackageRefList, packageCollection *PackageCollection) (result PackageDiffs, err error) {
+	result = make(PackageDiffs, 0, 128)
+
+	// pointer to left and right reflists
+	il, ir := 0, 0
+	// length of reflists
+	ll, lr := l.Len(), r.Len()
+	// cached loaded packages on the left & right
+	pl, pr := (*Package)(nil), (*Package)(nil)
+
+	// until we reached end of both lists
+	for il < ll || ir < lr {
+		// if we've exhausted left list, pull the rest from the right
+		if il == ll {
+			pr, err = packageCollection.ByKey(r.Refs[ir])
+			if err != nil {
+				return nil, err
+			}
+			result = append(result, PackageDiff{Left: nil, Right: pr})
+			ir++
+			continue
+		}
+		// if we've exhausted right list, pull the rest from the left
+		if ir == lr {
+			pl, err = packageCollection.ByKey(l.Refs[il])
+			if err != nil {
+				return nil, err
+			}
+			result = append(result, PackageDiff{Left: pl, Right: nil})
+			il++
+			continue
+		}
+
+		// refs on both sides are present, load them
+		rl, rr := l.Refs[il], r.Refs[ir]
+		// compare refs
+		rel := bytes.Compare(rl, rr)
+
+		if rel == 0 {
+			// refs are identical, so are packages, advance pointer
+			il++
+			ir++
+			pl, pr = nil, nil
+		} else {
+			// load pl & pr if they haven't been loaded before
+			if pl == nil {
+				pl, err = packageCollection.ByKey(rl)
+				if err != nil {
+					return nil, err
+				}
+			}
+
+			if pr == nil {
+				pr, err = packageCollection.ByKey(rr)
+				if err != nil {
+					return nil, err
+				}
+			}
+
+			// otherwise pl or pr is missing on one of the sides
+			if rel < 0 {
+				// compaction: +(,A) -(B,) --> !(A,B)
+				if len(result) > 0 && result[len(result)-1].Left == nil && result[len(result)-1].Right.Name == pl.Name &&
+					result[len(result)-1].Right.Architecture == pl.Architecture {
+					result[len(result)-1] = PackageDiff{Left: pl, Right: result[len(result)-1].Right}
+				} else {
+					result = append(result, PackageDiff{Left: pl, Right: nil})
+				}
+				il++
+				pl = nil
+			} else {
+				// compaction: -(A,) +(,B) --> !(A,B)
+				if len(result) > 0 && result[len(result)-1].Right == nil && result[len(result)-1].Left.Name == pr.Name &&
+					result[len(result)-1].Left.Architecture == pr.Architecture {
+					result[len(result)-1] = PackageDiff{Left: result[len(result)-1].Left, Right: pr}
+				} else {
+					result = append(result, PackageDiff{Left: nil, Right: pr})
+				}
+				ir++
+				pr = nil
+			}
+		}
+	}
+
+	return
+}
+
+// Merge merges reflist r into current reflist. If overrideMatching, merge
+// replaces matching packages (by architecture/name) with reference from r.
+// Otherwise, all packages are saved.
+func (l *PackageRefList) Merge(r *PackageRefList, overrideMatching bool) (result *PackageRefList) {
+	var overriddenArch, overridenName []byte
+
+	// pointer to left and right reflists
+	il, ir := 0, 0
+	// length of reflists
+	ll, lr := l.Len(), r.Len()
+
+	result = &PackageRefList{}
+	result.Refs = make([][]byte, 0, ll+lr)
+
+	// until we reached end of both lists
+	for il < ll || ir < lr {
+		// if we've exhausted left list, pull the rest from the right
+		if il == ll {
+			result.Refs = append(result.Refs, r.Refs[ir:]...)
+			break
+		}
+		// if we've exhausted right list, pull the rest from the left
+		if ir == lr {
+			result.Refs = append(result.Refs, l.Refs[il:]...)
+			break
+		}
+
+		// refs on both sides are present, load them
+		rl, rr := l.Refs[il], r.Refs[ir]
+		// compare refs
+		rel := bytes.Compare(rl, rr)
+
+		if rel == 0 {
+			// refs are identical, so are packages, advance pointer
+			result.Refs = append(result.Refs, l.Refs[il])
+			il++
+			ir++
+			overridenName = nil
+			overriddenArch = nil
+		} else {
+			if overrideMatching {
+				partsL := bytes.Split(rl, []byte(" "))
+				archL, nameL := partsL[0][1:], partsL[1]
+
+				partsR := bytes.Split(rr, []byte(" "))
+				archR, nameR := partsR[0][1:], partsR[1]
+
+				if bytes.Equal(archL, overriddenArch) && bytes.Equal(nameL, overridenName) {
+					// this package has already been overriden on the right
+					il++
+					continue
+				}
+
+				if bytes.Equal(archL, archR) && bytes.Equal(nameL, nameR) {
+					// override with package from the right
+					result.Refs = append(result.Refs, r.Refs[ir])
+					il++
+					ir++
+					overriddenArch = archL
+					overridenName = nameL
+					continue
+				}
+			}
+
+			// otherwise append smallest of two
+			if rel < 0 {
+				result.Refs = append(result.Refs, l.Refs[il])
+				il++
+			} else {
+				result.Refs = append(result.Refs, r.Refs[ir])
+				ir++
+				overridenName = nil
+				overriddenArch = nil
+			}
+		}
+	}
+
+	return
+}
+
+// FilterLatestRefs takes in a reflist with potentially multiples of the same
+// packages and reduces it to only the latest of each package. The operations
+// are done in-place. This implements a "latest wins" approach which can be used
+// while merging two or more snapshots together.
+func FilterLatestRefs(r *PackageRefList) {
+	var (
+		lastArch, lastName, lastVer []byte
+		arch, name, ver             []byte
+		parts                       [][]byte
+	)
+
+	for i := 0; i < len(r.Refs); i++ {
+		parts = bytes.Split(r.Refs[i][1:], []byte(" "))
+		arch, name, ver = parts[0], parts[1], parts[2]
+
+		if bytes.Equal(arch, lastArch) && bytes.Equal(name, lastName) {
+			// Two packages are identical, check version and only one wins
+			vres := CompareVersions(string(ver), string(lastVer))
+
+			// Remove the older refs from the result
+			if vres > 0 {
+				// ver[i] > ver[i-1], remove element i-1
+				r.Refs = append(r.Refs[:i-1], r.Refs[i:]...)
+			} else {
+				// ver[i] < ver[i-1], remove element i
+				r.Refs = append(r.Refs[:i], r.Refs[i+1:]...)
+				arch, name, ver = lastArch, lastName, lastVer
+			}
+
+			// Compensate for the reduced set
+			i -= 1
+		}
+
+		lastArch, lastName, lastVer = arch, name, ver
+	}
+
+	return
+}

deb/reflist_test.go

@@ -0,0 +1,304 @@
+package deb
+
+import (
+	"errors"
+	"github.com/smira/aptly/database"
+	. "launchpad.net/gocheck"
+)
+
+type PackageRefListSuite struct {
+	// Simple list with "real" packages from stanzas
+	list                   *PackageList
+	p1, p2, p3, p4, p5, p6 *Package
+}
+
+var _ = Suite(&PackageRefListSuite{})
+
+func toStrSlice(reflist *PackageRefList) (result []string) {
+	result = make([]string, reflist.Len())
+	for i, r := range reflist.Refs {
+		result[i] = string(r)
+	}
+	return
+}
+
+func (s *PackageRefListSuite) SetUpTest(c *C) {
+	s.list = NewPackageList()
+
+	s.p1 = NewPackageFromControlFile(packageStanza.Copy())
+	s.p2 = NewPackageFromControlFile(packageStanza.Copy())
+	stanza := packageStanza.Copy()
+	stanza["Package"] = "mars-invaders"
+	s.p3 = NewPackageFromControlFile(stanza)
+	stanza = packageStanza.Copy()
+	stanza["Source"] = "unknown-planet"
+	s.p4 = NewPackageFromControlFile(stanza)
+	stanza = packageStanza.Copy()
+	stanza["Package"] = "lonely-strangers"
+	s.p5 = NewPackageFromControlFile(stanza)
+	stanza = packageStanza.Copy()
+	stanza["Version"] = "99.1"
+	s.p6 = NewPackageFromControlFile(stanza)
+}
+
+func (s *PackageRefListSuite) TestNewPackageListFromRefList(c *C) {
+	db, _ := database.OpenDB(c.MkDir())
+	coll := NewPackageCollection(db)
+	coll.Update(s.p1)
+	coll.Update(s.p3)
+
+	s.list.Add(s.p1)
+	s.list.Add(s.p3)
+	s.list.Add(s.p5)
+	s.list.Add(s.p6)
+
+	reflist := NewPackageRefListFromPackageList(s.list)
+
+	_, err := NewPackageListFromRefList(reflist, coll, nil)
+	c.Assert(err, ErrorMatches, "unable to load package with key.*")
+
+	coll.Update(s.p5)
+	coll.Update(s.p6)
+
+	list, err := NewPackageListFromRefList(reflist, coll, nil)
+	c.Assert(err, IsNil)
+	c.Check(list.Len(), Equals, 4)
+	c.Check(list.Add(s.p4), ErrorMatches, "conflict in package.*")
+
+	list, err = NewPackageListFromRefList(nil, coll, nil)
+	c.Assert(err, IsNil)
+	c.Check(list.Len(), Equals, 0)
+}
+
+func (s *PackageRefListSuite) TestNewPackageRefList(c *C) {
+	s.list.Add(s.p1)
+	s.list.Add(s.p3)
+	s.list.Add(s.p5)
+	s.list.Add(s.p6)
+
+	reflist := NewPackageRefListFromPackageList(s.list)
+	c.Assert(reflist.Len(), Equals, 4)
+	c.Check(reflist.Refs[0], DeepEquals, []byte(s.p1.Key("")))
+	c.Check(reflist.Refs[1], DeepEquals, []byte(s.p6.Key("")))
+	c.Check(reflist.Refs[2], DeepEquals, []byte(s.p5.Key("")))
+	c.Check(reflist.Refs[3], DeepEquals, []byte(s.p3.Key("")))
+
+	reflist = NewPackageRefList()
+	c.Check(reflist.Len(), Equals, 0)
+}
+
+func (s *PackageRefListSuite) TestPackageRefListEncodeDecode(c *C) {
+	s.list.Add(s.p1)
+	s.list.Add(s.p3)
+	s.list.Add(s.p5)
+	s.list.Add(s.p6)
+
+	reflist := NewPackageRefListFromPackageList(s.list)
+
+	reflist2 := &PackageRefList{}
+	err := reflist2.Decode(reflist.Encode())
+	c.Assert(err, IsNil)
+	c.Check(reflist2.Len(), Equals, reflist.Len())
+	c.Check(reflist2.Refs, DeepEquals, reflist.Refs)
+}
+
+func (s *PackageRefListSuite) TestPackageRefListForeach(c *C) {
+	s.list.Add(s.p1)
+	s.list.Add(s.p3)
+	s.list.Add(s.p5)
+	s.list.Add(s.p6)
+
+	reflist := NewPackageRefListFromPackageList(s.list)
+
+	Len := 0
+	err := reflist.ForEach(func([]byte) error {
+		Len++
+		return nil
+	})
+
+	c.Check(Len, Equals, 4)
+	c.Check(err, IsNil)
+
+	e := errors.New("b")
+
+	err = reflist.ForEach(func([]byte) error {
+		return e
+	})
+
+	c.Check(err, Equals, e)
+}
+
+func (s *PackageRefListSuite) TestSubstract(c *C) {
+	r1 := []byte("r1")
+	r2 := []byte("r2")
+	r3 := []byte("r3")
+	r4 := []byte("r4")
+	r5 := []byte("r5")
+
+	empty := &PackageRefList{Refs: [][]byte{}}
+	l1 := &PackageRefList{Refs: [][]byte{r1, r2, r3, r4}}
+	l2 := &PackageRefList{Refs: [][]byte{r1, r3}}
+	l3 := &PackageRefList{Refs: [][]byte{r2, r4}}
+	l4 := &PackageRefList{Refs: [][]byte{r4, r5}}
+	l5 := &PackageRefList{Refs: [][]byte{r1, r2, r3}}
+
+	c.Check(l1.Substract(empty), DeepEquals, l1)
+	c.Check(l1.Substract(l2), DeepEquals, l3)
+	c.Check(l1.Substract(l3), DeepEquals, l2)
+	c.Check(l1.Substract(l4), DeepEquals, l5)
+	c.Check(empty.Substract(l1), DeepEquals, empty)
+	c.Check(l2.Substract(l3), DeepEquals, l2)
+}
+
+func (s *PackageRefListSuite) TestDiff(c *C) {
+	db, _ := database.OpenDB(c.MkDir())
+	coll := NewPackageCollection(db)
+
+	packages := []*Package{
+		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},      //0
+		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386"},     //1
+		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all"},  //2
+		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386"},  //3
+		&Package{Name: "app", Version: "1.1~bp2", Architecture: "i386"},  //4
+		&Package{Name: "app", Version: "1.1~bp2", Architecture: "amd64"}, //5
+		&Package{Name: "xyz", Version: "3.0", Architecture: "sparc"},     //6
+	}
+
+	for _, p := range packages {
+		coll.Update(p)
+	}
+
+	listA := NewPackageList()
+	listA.Add(packages[0])
+	listA.Add(packages[1])
+	listA.Add(packages[2])
+	listA.Add(packages[3])
+	listA.Add(packages[6])
+
+	listB := NewPackageList()
+	listB.Add(packages[0])
+	listB.Add(packages[2])
+	listB.Add(packages[4])
+	listB.Add(packages[5])
+
+	reflistA := NewPackageRefListFromPackageList(listA)
+	reflistB := NewPackageRefListFromPackageList(listB)
+
+	diffAA, err := reflistA.Diff(reflistA, coll)
+	c.Check(err, IsNil)
+	c.Check(diffAA, HasLen, 0)
+
+	diffAB, err := reflistA.Diff(reflistB, coll)
+	c.Check(err, IsNil)
+	c.Check(diffAB, HasLen, 4)
+
+	c.Check(diffAB[0].Left, IsNil)
+	c.Check(diffAB[0].Right.String(), Equals, "app_1.1~bp2_amd64")
+
+	c.Check(diffAB[1].Left.String(), Equals, "app_1.1~bp1_i386")
+	c.Check(diffAB[1].Right.String(), Equals, "app_1.1~bp2_i386")
+
+	c.Check(diffAB[2].Left.String(), Equals, "dpkg_1.7_i386")
+	c.Check(diffAB[2].Right, IsNil)
+
+	c.Check(diffAB[3].Left.String(), Equals, "xyz_3.0_sparc")
+	c.Check(diffAB[3].Right, IsNil)
+
+	diffBA, err := reflistB.Diff(reflistA, coll)
+	c.Check(err, IsNil)
+	c.Check(diffBA, HasLen, 4)
+
+	c.Check(diffBA[0].Right, IsNil)
+	c.Check(diffBA[0].Left.String(), Equals, "app_1.1~bp2_amd64")
+
+	c.Check(diffBA[1].Right.String(), Equals, "app_1.1~bp1_i386")
+	c.Check(diffBA[1].Left.String(), Equals, "app_1.1~bp2_i386")
+
+	c.Check(diffBA[2].Right.String(), Equals, "dpkg_1.7_i386")
+	c.Check(diffBA[2].Left, IsNil)
+
+	c.Check(diffBA[3].Right.String(), Equals, "xyz_3.0_sparc")
+	c.Check(diffBA[3].Left, IsNil)
+
+}
+
+func (s *PackageRefListSuite) TestMerge(c *C) {
+	db, _ := database.OpenDB(c.MkDir())
+	coll := NewPackageCollection(db)
+
+	packages := []*Package{
+		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},      //0
+		&Package{Name: "dpkg", Version: "1.7", Architecture: "i386"},     //1
+		&Package{Name: "data", Version: "1.1~bp1", Architecture: "all"},  //2
+		&Package{Name: "app", Version: "1.1~bp1", Architecture: "i386"},  //3
+		&Package{Name: "app", Version: "1.1~bp2", Architecture: "i386"},  //4
+		&Package{Name: "app", Version: "1.1~bp2", Architecture: "amd64"}, //5
+		&Package{Name: "dpkg", Version: "1.0", Architecture: "i386"},     //6
+		&Package{Name: "xyz", Version: "1.0", Architecture: "sparc"},     //7
+	}
+
+	for _, p := range packages {
+		coll.Update(p)
+	}
+
+	listA := NewPackageList()
+	listA.Add(packages[0])
+	listA.Add(packages[1])
+	listA.Add(packages[2])
+	listA.Add(packages[3])
+	listA.Add(packages[7])
+
+	listB := NewPackageList()
+	listB.Add(packages[0])
+	listB.Add(packages[2])
+	listB.Add(packages[4])
+	listB.Add(packages[5])
+	listB.Add(packages[6])
+
+	reflistA := NewPackageRefListFromPackageList(listA)
+	reflistB := NewPackageRefListFromPackageList(listB)
+
+	mergeAB := reflistA.Merge(reflistB, true)
+	mergeBA := reflistB.Merge(reflistA, true)
+
+	c.Check(toStrSlice(mergeAB), DeepEquals,
+		[]string{"Pall data 1.1~bp1", "Pamd64 app 1.1~bp2", "Pi386 app 1.1~bp2", "Pi386 dpkg 1.0", "Pi386 lib 1.0", "Psparc xyz 1.0"})
+	c.Check(toStrSlice(mergeBA), DeepEquals,
+		[]string{"Pall data 1.1~bp1", "Pamd64 app 1.1~bp2", "Pi386 app 1.1~bp1", "Pi386 dpkg 1.7", "Pi386 lib 1.0", "Psparc xyz 1.0"})
+
+	mergeABall := reflistA.Merge(reflistB, false)
+	mergeBAall := reflistB.Merge(reflistA, false)
+
+	c.Check(mergeABall, DeepEquals, mergeBAall)
+	c.Check(toStrSlice(mergeBAall), DeepEquals,
+		[]string{"Pall data 1.1~bp1", "Pamd64 app 1.1~bp2", "Pi386 app 1.1~bp1", "Pi386 app 1.1~bp2", "Pi386 dpkg 1.0", "Pi386 dpkg 1.7", "Pi386 lib 1.0", "Psparc xyz 1.0"})
+}
+
+func (s *PackageRefListSuite) TestFilterLatestRefs(c *C) {
+	packages := []*Package{
+		&Package{Name: "lib", Version: "1.0", Architecture: "i386"},
+		&Package{Name: "lib", Version: "1.2~bp1", Architecture: "i386"},
+		&Package{Name: "lib", Version: "1.2", Architecture: "i386"},
+		&Package{Name: "dpkg", Version: "1.2", Architecture: "i386"},
+		&Package{Name: "dpkg", Version: "1.3", Architecture: "i386"},
+		&Package{Name: "dpkg", Version: "1.3~bp2", Architecture: "i386"},
+		&Package{Name: "dpkg", Version: "1.5", Architecture: "i386"},
+		&Package{Name: "dpkg", Version: "1.6", Architecture: "i386"},
+	}
+
+	rl := NewPackageList()
+	rl.Add(packages[0])
+	rl.Add(packages[1])
+	rl.Add(packages[2])
+	rl.Add(packages[3])
+	rl.Add(packages[4])
+	rl.Add(packages[5])
+	rl.Add(packages[6])
+	rl.Add(packages[7])
+
+	result := NewPackageRefListFromPackageList(rl)
+	FilterLatestRefs(result)
+
+	c.Check(toStrSlice(result), DeepEquals,
+		[]string{"Pi386 dpkg 1.6", "Pi386 lib 1.2"})
+}

deb/remote.go

@@ -1,16 +1,19 @@
-// Package debian implements Debian-specific repository handling
-package debian
+package deb
 
 import (
 	"bytes"
 	"code.google.com/p/go-uuid/uuid"
 	"fmt"
+	"github.com/smira/aptly/aptly"
 	"github.com/smira/aptly/database"
+	"github.com/smira/aptly/http"
 	"github.com/smira/aptly/utils"
 	"github.com/ugorji/go/codec"
 	"log"
 	"net/url"
 	"os"
+	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -19,7 +22,6 @@ import (
 // RemoteRepo represents remote (fetchable) Debian repository.
 //
 // Repostitory could be filtered when fetching by components, architectures
-// TODO: support flat format
 type RemoteRepo struct {
 	// Permanent internal ID
 	UUID string
@@ -33,6 +35,8 @@ type RemoteRepo struct {
 	Components []string
 	// List of architectures to fetch, if empty, then fetch all architectures
 	Architectures []string
+	// Should we download sources?
+	DownloadSources bool
 	// Meta-information about repository
 	Meta Stanza
 	// Last update date
@@ -46,14 +50,16 @@ type RemoteRepo struct {
 }
 
 // NewRemoteRepo creates new instance of Debian remote repository with specified params
-func NewRemoteRepo(name string, archiveRoot string, distribution string, components []string, architectures []string) (*RemoteRepo, error) {
+func NewRemoteRepo(name string, archiveRoot string, distribution string, components []string,
+	architectures []string, downloadSources bool) (*RemoteRepo, error) {
 	result := &RemoteRepo{
-		UUID:          uuid.New(),
-		Name:          name,
-		ArchiveRoot:   archiveRoot,
-		Distribution:  distribution,
-		Components:    components,
-		Architectures: architectures,
+		UUID:            uuid.New(),
+		Name:            name,
+		ArchiveRoot:     archiveRoot,
+		Distribution:    distribution,
+		Components:      components,
+		Architectures:   architectures,
+		DownloadSources: downloadSources,
 	}
 
 	err := result.prepare()
@@ -61,9 +67,11 @@ func NewRemoteRepo(name string, archiveRoot string, distribution string, compone
 		return nil, err
 	}
 
-	if result.Distribution == "." || result.Distribution == "./" {
+	if strings.HasSuffix(result.Distribution, "/") || strings.HasPrefix(result.Distribution, ".") {
 		// flat repo
-		result.Distribution = ""
+		if !strings.HasPrefix(result.Distribution, ".") {
+			result.Distribution = "./" + result.Distribution
+		}
 		result.Architectures = nil
 		if len(result.Components) > 0 {
 			return nil, fmt.Errorf("components aren't supported for flat repos")
@@ -76,21 +84,37 @@ func NewRemoteRepo(name string, archiveRoot string, distribution string, compone
 
 func (repo *RemoteRepo) prepare() error {
 	var err error
+
+	// Add final / to URL
+	if !strings.HasSuffix(repo.ArchiveRoot, "/") {
+		repo.ArchiveRoot = repo.ArchiveRoot + "/"
+	}
+
 	repo.archiveRootURL, err = url.Parse(repo.ArchiveRoot)
 	return err
 }
 
 // String interface
 func (repo *RemoteRepo) String() string {
-	return fmt.Sprintf("[%s]: %s %s", repo.Name, repo.ArchiveRoot, repo.Distribution)
+	srcFlag := ""
+	if repo.DownloadSources {
+		srcFlag = " [src]"
+	}
+	distribution := repo.Distribution
+	if distribution == "" {
+		distribution = "./"
+	}
+	return fmt.Sprintf("[%s]: %s %s%s", repo.Name, repo.ArchiveRoot, distribution, srcFlag)
 }
 
 // IsFlat determines if repository is flat
 func (repo *RemoteRepo) IsFlat() bool {
-	return repo.Distribution == ""
+	// aptly < 0.5.1 had Distribution = "" for flat repos
+	// aptly >= 0.5.1 had Distribution = "./[path]/" for flat repos
+	return repo.Distribution == "" || (strings.HasPrefix(repo.Distribution, ".") && strings.HasSuffix(repo.Distribution, "/"))
 }
 
-// NumPackages return number of packages retrived from remore repo
+// NumPackages return number of packages retrived from remote repo
 func (repo *RemoteRepo) NumPackages() int {
 	if repo.packageRefs == nil {
 		return 0
@@ -110,25 +134,37 @@ func (repo *RemoteRepo) ReleaseURL(name string) *url.URL {
 	if !repo.IsFlat() {
 		path = &url.URL{Path: fmt.Sprintf("dists/%s/%s", repo.Distribution, name)}
 	} else {
-		path = &url.URL{Path: name}
+		path = &url.URL{Path: filepath.Join(repo.Distribution, name)}
 	}
 
 	return repo.archiveRootURL.ResolveReference(path)
 }
 
-// FlatBinaryURL returns URL to Package files for flat repo
+// FlatBinaryURL returns URL to Packages files for flat repo
 func (repo *RemoteRepo) FlatBinaryURL() *url.URL {
-	path := &url.URL{Path: "Packages"}
+	path := &url.URL{Path: filepath.Join(repo.Distribution, "Packages")}
 	return repo.archiveRootURL.ResolveReference(path)
 }
 
-// BinaryURL returns URL of Packages file for given component and
+// FlatSourcesURL returns URL to Sources files for flat repo
+func (repo *RemoteRepo) FlatSourcesURL() *url.URL {
+	path := &url.URL{Path: filepath.Join(repo.Distribution, "Sources")}
+	return repo.archiveRootURL.ResolveReference(path)
+}
+
+// BinaryURL returns URL of Packages files for given component and
 // architecture
 func (repo *RemoteRepo) BinaryURL(component string, architecture string) *url.URL {
 	path := &url.URL{Path: fmt.Sprintf("dists/%s/%s/binary-%s/Packages", repo.Distribution, component, architecture)}
 	return repo.archiveRootURL.ResolveReference(path)
 }
 
+// SourcesURL returns URL of Sources files for given component
+func (repo *RemoteRepo) SourcesURL(component string) *url.URL {
+	path := &url.URL{Path: fmt.Sprintf("dists/%s/%s/source/Sources", repo.Distribution, component)}
+	return repo.archiveRootURL.ResolveReference(path)
+}
+
 // PackageURL returns URL of package file relative to repository root
 // architecture
 func (repo *RemoteRepo) PackageURL(filename string) *url.URL {
@@ -137,27 +173,34 @@ func (repo *RemoteRepo) PackageURL(filename string) *url.URL {
 }
 
 // Fetch updates information about repository
-func (repo *RemoteRepo) Fetch(d utils.Downloader, verifier utils.Verifier) error {
+func (repo *RemoteRepo) Fetch(d aptly.Downloader, verifier utils.Verifier) error {
 	var (
-		release *os.File
-		err     error
+		release, inrelease, releasesig *os.File
+		err                            error
 	)
 
 	if verifier == nil {
 		// 0. Just download release file to temporary URL
-		release, err = utils.DownloadTemp(d, repo.ReleaseURL("Release").String())
+		release, err = http.DownloadTemp(d, repo.ReleaseURL("Release").String())
 		if err != nil {
 			return err
 		}
 	} else {
 		// 1. try InRelease file
-		inrelease, err := utils.DownloadTemp(d, repo.ReleaseURL("InRelease").String())
+		inrelease, err = http.DownloadTemp(d, repo.ReleaseURL("InRelease").String())
 		if err != nil {
 			goto splitsignature
 		}
 		defer inrelease.Close()
 
-		release, err = verifier.VerifyClearsigned(inrelease)
+		err = verifier.VerifyClearsigned(inrelease)
+		if err != nil {
+			goto splitsignature
+		}
+
+		inrelease.Seek(0, 0)
+
+		release, err = verifier.ExtractClearsigned(inrelease)
 		if err != nil {
 			goto splitsignature
 		}
@@ -166,12 +209,12 @@ func (repo *RemoteRepo) Fetch(d utils.Downloader, verifier utils.Verifier) error
 
 	splitsignature:
 		// 2. try Release + Release.gpg
-		release, err = utils.DownloadTemp(d, repo.ReleaseURL("Release").String())
+		release, err = http.DownloadTemp(d, repo.ReleaseURL("Release").String())
 		if err != nil {
 			return err
 		}
 
-		releasesig, err := utils.DownloadTemp(d, repo.ReleaseURL("Release.gpg").String())
+		releasesig, err = http.DownloadTemp(d, repo.ReleaseURL("Release.gpg").String())
 		if err != nil {
 			return err
 		}
@@ -209,6 +252,9 @@ ok:
 		}
 
 		components := strings.Split(stanza["Components"], " ")
+		for i := range components {
+			components[i] = path.Base(components[i])
+		}
 		if len(repo.Components) == 0 {
 			repo.Components = components
 		} else {
@@ -234,7 +280,8 @@ ok:
 				return fmt.Errorf("unparseable hash sum line: %#v", line)
 			}
 
-			size, err := strconv.ParseInt(parts[1], 10, 64)
+			var size int64
+			size, err = strconv.ParseInt(parts[1], 10, 64)
 			if err != nil {
 				return fmt.Errorf("unable to parse size: %s", err)
 			}
@@ -273,31 +320,41 @@ ok:
 }
 
 // Download downloads all repo files
-func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageCollection, packageRepo *Repository, ignoreMismatch bool) error {
+func (repo *RemoteRepo) Download(progress aptly.Progress, d aptly.Downloader, collectionFactory *CollectionFactory, packagePool aptly.PackagePool, ignoreMismatch bool) error {
 	list := NewPackageList()
 
-	d.GetProgress().Printf("Downloading & parsing package files...\n")
+	progress.Printf("Downloading & parsing package files...\n")
 
-	// Download and parse all Packages files
-	packagesURLs := []string{}
+	// Download and parse all Packages & Source files
+	packagesURLs := [][]string{}
 
 	if repo.IsFlat() {
-		packagesURLs = append(packagesURLs, repo.FlatBinaryURL().String())
+		packagesURLs = append(packagesURLs, []string{repo.FlatBinaryURL().String(), "binary"})
+		if repo.DownloadSources {
+			packagesURLs = append(packagesURLs, []string{repo.FlatSourcesURL().String(), "source"})
+		}
 	} else {
 		for _, component := range repo.Components {
 			for _, architecture := range repo.Architectures {
-				packagesURLs = append(packagesURLs, repo.BinaryURL(component, architecture).String())
+				packagesURLs = append(packagesURLs, []string{repo.BinaryURL(component, architecture).String(), "binary"})
+			}
+			if repo.DownloadSources {
+				packagesURLs = append(packagesURLs, []string{repo.SourcesURL(component).String(), "source"})
 			}
 		}
 	}
 
-	for _, url := range packagesURLs {
-		packagesReader, packagesFile, err := utils.DownloadTryCompression(d, url, repo.ReleaseFiles, ignoreMismatch)
+	for _, info := range packagesURLs {
+		url, kind := info[0], info[1]
+		packagesReader, packagesFile, err := http.DownloadTryCompression(d, url, repo.ReleaseFiles, ignoreMismatch)
 		if err != nil {
 			return err
 		}
 		defer packagesFile.Close()
 
+		stat, _ := packagesFile.Stat()
+		progress.InitBar(stat.Size(), true)
+
 		sreader := NewControlFileReader(packagesReader)
 
 		for {
@@ -309,40 +366,46 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
 				break
 			}
 
-			p := NewPackageFromControlFile(stanza)
+			off, _ := packagesFile.Seek(0, 1)
+			progress.SetBar(int(off))
 
-			list.Add(p)
+			var p *Package
+
+			if kind == "binary" {
+				p = NewPackageFromControlFile(stanza)
+			} else if kind == "source" {
+				p, err = NewSourcePackageFromControlFile(stanza)
+				if err != nil {
+					return err
+				}
+			}
+			err = list.Add(p)
+			if err != nil {
+				return err
+			}
+
+			err = collectionFactory.PackageCollection().Update(p)
+			if err != nil {
+				return err
+			}
 		}
+
+		progress.ShutdownBar()
 	}
 
-	d.GetProgress().Printf("Saving packages to database...\n")
-
-	d.GetProgress().InitBar(int64(list.Len()), false)
-
-	// Save package meta information to DB
-	err := list.ForEach(func(p *Package) error {
-		d.GetProgress().AddBar(1)
-		return packageCollection.Update(p)
-	})
-
-	if err != nil {
-		return fmt.Errorf("unable to save packages to db: %s", err)
-	}
-
-	d.GetProgress().ShutdownBar()
-
-	d.GetProgress().Printf("Building download queue...\n")
+	progress.Printf("Building download queue...\n")
 
 	// Build download queue
 	queued := make(map[string]PackageDownloadTask, list.Len())
 	count := 0
 	downloadSize := int64(0)
 
-	err = list.ForEach(func(p *Package) error {
-		list, err := p.DownloadList(packageRepo)
-		if err != nil {
-			return err
+	err := list.ForEach(func(p *Package) error {
+		list, err2 := p.DownloadList(packagePool)
+		if err2 != nil {
+			return err2
 		}
+		p.files = nil
 
 		for _, task := range list {
 			key := task.RepoURI + "-" + task.DestinationPath
@@ -356,14 +419,17 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
 
 		return nil
 	})
-
 	if err != nil {
 		return fmt.Errorf("unable to build download queue: %s", err)
 	}
 
-	d.GetProgress().Printf("Download queue: %d items, %.2f GiB size\n", count, float64(downloadSize)/(1024.0*1024.0*1024.0))
+	repo.packageRefs = NewPackageRefListFromPackageList(list)
+	// free up package list, we don't need it after this point
+	list = nil
 
-	d.GetProgress().InitBar(downloadSize, true)
+	progress.Printf("Download queue: %d items (%s)\n", count, utils.HumanBytes(downloadSize))
+
+	progress.InitBar(downloadSize, true)
 
 	// Download all package files
 	ch := make(chan error, len(queued))
@@ -372,6 +438,9 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
 		d.DownloadWithChecksum(repo.PackageURL(task.RepoURI).String(), task.DestinationPath, ch, task.Checksums, ignoreMismatch)
 	}
 
+	// We don't need queued after this point
+	queued = nil
+
 	// Wait for all downloads to finish
 	errors := make([]string, 0)
 
@@ -383,14 +452,13 @@ func (repo *RemoteRepo) Download(d utils.Downloader, packageCollection *PackageC
 		count--
 	}
 
-	d.GetProgress().ShutdownBar()
+	progress.ShutdownBar()
 
 	if len(errors) > 0 {
 		return fmt.Errorf("download errors:\n  %s\n", strings.Join(errors, "\n  "))
 	}
 
 	repo.LastDownloadDate = time.Now()
-	repo.packageRefs = NewPackageRefListFromPackageList(list)
 
 	return nil
 }

deb/remote_test.go

@@ -1,21 +1,19 @@
-package debian
+package deb
 
 import (
 	"errors"
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/console"
 	"github.com/smira/aptly/database"
+	"github.com/smira/aptly/files"
+	"github.com/smira/aptly/http"
 	"github.com/smira/aptly/utils"
 	"io"
 	"io/ioutil"
 	. "launchpad.net/gocheck"
 	"os"
-	"testing"
 )
 
-// Launch gocheck tests
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
 type NullVerifier struct {
 }
 
@@ -30,7 +28,11 @@ func (n *NullVerifier) VerifyDetachedSignature(signature, cleartext io.Reader) e
 	return nil
 }
 
-func (n *NullVerifier) VerifyClearsigned(clearsigned io.Reader) (text *os.File, err error) {
+func (n *NullVerifier) VerifyClearsigned(clearsigned io.Reader) error {
+	return nil
+}
+
+func (n *NullVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File, err error) {
 	text, _ = ioutil.TempFile("", "aptly-test")
 	io.Copy(text, clearsigned)
 	text.Seek(0, 0)
@@ -67,42 +69,61 @@ type RemoteRepoSuite struct {
 	PackageListMixinSuite
 	repo              *RemoteRepo
 	flat              *RemoteRepo
-	downloader        *utils.FakeDownloader
+	downloader        *http.FakeDownloader
+	progress          aptly.Progress
 	db                database.Storage
-	packageCollection *PackageCollection
-	packageRepo       *Repository
+	collectionFactory *CollectionFactory
+	packagePool       aptly.PackagePool
 }
 
 var _ = Suite(&RemoteRepoSuite{})
 
 func (s *RemoteRepoSuite) SetUpTest(c *C) {
-	s.repo, _ = NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
-	s.flat, _ = NewRemoteRepo("exp42", "http://repos.express42.com/virool/precise/", "./", []string{}, []string{})
-	s.downloader = utils.NewFakeDownloader().ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile)
+	s.repo, _ = NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian", "squeeze", []string{"main"}, []string{}, false)
+	s.flat, _ = NewRemoteRepo("exp42", "http://repos.express42.com/virool/precise/", "./", []string{}, []string{}, false)
+	s.downloader = http.NewFakeDownloader().ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile)
+	s.progress = console.NewProgress()
 	s.db, _ = database.OpenDB(c.MkDir())
-	s.packageCollection = NewPackageCollection(s.db)
-	s.packageRepo = NewRepository(c.MkDir())
+	s.collectionFactory = NewCollectionFactory(s.db)
+	s.packagePool = files.NewPackagePool(c.MkDir())
 	s.SetUpPackages()
+	s.progress.Start()
 }
 
 func (s *RemoteRepoSuite) TearDownTest(c *C) {
+	s.progress.Shutdown()
 	s.db.Close()
 }
 
 func (s *RemoteRepoSuite) TestInvalidURL(c *C) {
-	_, err := NewRemoteRepo("s", "http://lolo%2", "squeeze", []string{"main"}, []string{})
+	_, err := NewRemoteRepo("s", "http://lolo%2", "squeeze", []string{"main"}, []string{}, false)
 	c.Assert(err, ErrorMatches, ".*hexadecimal escape in host.*")
 }
 
 func (s *RemoteRepoSuite) TestFlatCreation(c *C) {
-	c.Check(s.flat.Distribution, Equals, "")
+	c.Check(s.flat.IsFlat(), Equals, true)
+	c.Check(s.flat.Distribution, Equals, "./")
 	c.Check(s.flat.Architectures, IsNil)
 	c.Check(s.flat.Components, IsNil)
 
-	_, err := NewRemoteRepo("fl", "http://some.repo/", "./", []string{"main"}, []string{})
+	flat2, _ := NewRemoteRepo("flat2", "http://pkg.jenkins-ci.org/debian-stable", "binary/", []string{}, []string{}, false)
+	c.Check(flat2.IsFlat(), Equals, true)
+	c.Check(flat2.Distribution, Equals, "./binary/")
+
+	_, err := NewRemoteRepo("fl", "http://some.repo/", "./", []string{"main"}, []string{}, false)
 	c.Check(err, ErrorMatches, "components aren't supported for flat repos")
 }
 
+func (s *RemoteRepoSuite) TestString(c *C) {
+	c.Check(s.repo.String(), Equals, "[yandex]: http://mirror.yandex.ru/debian/ squeeze")
+	c.Check(s.flat.String(), Equals, "[exp42]: http://repos.express42.com/virool/precise/ ./")
+
+	s.repo.DownloadSources = true
+	s.flat.DownloadSources = true
+	c.Check(s.repo.String(), Equals, "[yandex]: http://mirror.yandex.ru/debian/ squeeze [src]")
+	c.Check(s.flat.String(), Equals, "[exp42]: http://repos.express42.com/virool/precise/ ./ [src]")
+}
+
 func (s *RemoteRepoSuite) TestNumPackages(c *C) {
 	c.Check(s.repo.NumPackages(), Equals, 0)
 	s.repo.packageRefs = s.reflist
@@ -130,10 +151,18 @@ func (s *RemoteRepoSuite) TestBinaryURL(c *C) {
 	c.Assert(s.repo.BinaryURL("main", "amd64").String(), Equals, "http://mirror.yandex.ru/debian/dists/squeeze/main/binary-amd64/Packages")
 }
 
+func (s *RemoteRepoSuite) TestSourcesURL(c *C) {
+	c.Assert(s.repo.SourcesURL("main").String(), Equals, "http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources")
+}
+
 func (s *RemoteRepoSuite) TestFlatBinaryURL(c *C) {
 	c.Assert(s.flat.FlatBinaryURL().String(), Equals, "http://repos.express42.com/virool/precise/Packages")
 }
 
+func (s *RemoteRepoSuite) TestFlatSourcesURL(c *C) {
+	c.Assert(s.flat.FlatSourcesURL().String(), Equals, "http://repos.express42.com/virool/precise/Sources")
+}
+
 func (s *RemoteRepoSuite) TestPackageURL(c *C) {
 	c.Assert(s.repo.PackageURL("pool/main/0/0ad/0ad_0~r11863-2_i386.deb").String(), Equals,
 		"http://mirror.yandex.ru/debian/pool/main/0/0ad/0ad_0~r11863-2_i386.deb")
@@ -156,7 +185,7 @@ func (s *RemoteRepoSuite) TestFetch(c *C) {
 }
 
 func (s *RemoteRepoSuite) TestFetchNullVerifier1(c *C) {
-	downloader := utils.NewFakeDownloader()
+	downloader := http.NewFakeDownloader()
 	downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/InRelease", errors.New("404"))
 	downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release", exampleReleaseFile)
 	downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/Release.gpg", "GPG")
@@ -169,7 +198,7 @@ func (s *RemoteRepoSuite) TestFetchNullVerifier1(c *C) {
 }
 
 func (s *RemoteRepoSuite) TestFetchNullVerifier2(c *C) {
-	downloader := utils.NewFakeDownloader()
+	downloader := http.NewFakeDownloader()
 	downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/InRelease", exampleReleaseFile)
 
 	err := s.repo.Fetch(downloader, &NullVerifier{})
@@ -180,13 +209,13 @@ func (s *RemoteRepoSuite) TestFetchNullVerifier2(c *C) {
 }
 
 func (s *RemoteRepoSuite) TestFetchWrongArchitecture(c *C) {
-	s.repo, _ = NewRemoteRepo("s", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{"xyz"})
+	s.repo, _ = NewRemoteRepo("s", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{"xyz"}, false)
 	err := s.repo.Fetch(s.downloader, nil)
 	c.Assert(err, ErrorMatches, "architecture xyz not available in repo.*")
 }
 
 func (s *RemoteRepoSuite) TestFetchWrongComponent(c *C) {
-	s.repo, _ = NewRemoteRepo("s", "http://mirror.yandex.ru/debian/", "squeeze", []string{"xyz"}, []string{"i386"})
+	s.repo, _ = NewRemoteRepo("s", "http://mirror.yandex.ru/debian/", "squeeze", []string{"xyz"}, []string{"i386"}, false)
 	err := s.repo.Fetch(s.downloader, nil)
 	c.Assert(err, ErrorMatches, "component xyz not available in repo.*")
 }
@@ -222,23 +251,65 @@ func (s *RemoteRepoSuite) TestDownload(c *C) {
 	s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages", examplePackagesFile)
 	s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb", "xyz")
 
-	err = s.repo.Download(s.downloader, s.packageCollection, s.packageRepo, false)
+	err = s.repo.Download(s.progress, s.downloader, s.collectionFactory, s.packagePool, false)
 	c.Assert(err, IsNil)
 	c.Assert(s.downloader.Empty(), Equals, true)
 	c.Assert(s.repo.packageRefs, NotNil)
 
-	pkg, err := s.packageCollection.ByKey(s.repo.packageRefs.Refs[0])
+	pkg, err := s.collectionFactory.PackageCollection().ByKey(s.repo.packageRefs.Refs[0])
 	c.Assert(err, IsNil)
 
-	result, err := pkg.VerifyFiles(s.packageRepo)
+	result, err := pkg.VerifyFiles(s.packagePool)
 	c.Check(result, Equals, true)
 	c.Check(err, IsNil)
 
 	c.Check(pkg.Name, Equals, "amanda-client")
 }
 
+func (s *RemoteRepoSuite) TestDownloadWithSources(c *C) {
+	s.repo.Architectures = []string{"i386"}
+	s.repo.DownloadSources = true
+
+	err := s.repo.Fetch(s.downloader, nil)
+	c.Assert(err, IsNil)
+
+	s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.bz2", errors.New("HTTP 404"))
+	s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages.gz", errors.New("HTTP 404"))
+	s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/binary-i386/Packages", examplePackagesFile)
+	s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources.bz2", errors.New("HTTP 404"))
+	s.downloader.ExpectError("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources.gz", errors.New("HTTP 404"))
+	s.downloader.ExpectResponse("http://mirror.yandex.ru/debian/dists/squeeze/main/source/Sources", exampleSourcesFile)
+	s.downloader.AnyExpectResponse("http://mirror.yandex.ru/debian/pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb", "xyz")
+	s.downloader.AnyExpectResponse("http://mirror.yandex.ru/debian/pool/main/a/access-modifier-checker/access-modifier-checker_1.0-4.dsc", "abc")
+	s.downloader.AnyExpectResponse("http://mirror.yandex.ru/debian/pool/main/a/access-modifier-checker/access-modifier-checker_1.0.orig.tar.gz", "abcd")
+	s.downloader.AnyExpectResponse("http://mirror.yandex.ru/debian/pool/main/a/access-modifier-checker/access-modifier-checker_1.0-4.debian.tar.gz", "abcde")
+
+	err = s.repo.Download(s.progress, s.downloader, s.collectionFactory, s.packagePool, false)
+	c.Assert(err, IsNil)
+	c.Assert(s.downloader.Empty(), Equals, true)
+	c.Assert(s.repo.packageRefs, NotNil)
+
+	pkg, err := s.collectionFactory.PackageCollection().ByKey(s.repo.packageRefs.Refs[0])
+	c.Assert(err, IsNil)
+
+	result, err := pkg.VerifyFiles(s.packagePool)
+	c.Check(result, Equals, true)
+	c.Check(err, IsNil)
+
+	c.Check(pkg.Name, Equals, "amanda-client")
+
+	pkg, err = s.collectionFactory.PackageCollection().ByKey(s.repo.packageRefs.Refs[1])
+	c.Assert(err, IsNil)
+
+	result, err = pkg.VerifyFiles(s.packagePool)
+	c.Check(result, Equals, true)
+	c.Check(err, IsNil)
+
+	c.Check(pkg.Name, Equals, "access-modifier-checker")
+}
+
 func (s *RemoteRepoSuite) TestDownloadFlat(c *C) {
-	downloader := utils.NewFakeDownloader()
+	downloader := http.NewFakeDownloader()
 	downloader.ExpectResponse("http://repos.express42.com/virool/precise/Release", exampleReleaseFile)
 	downloader.ExpectError("http://repos.express42.com/virool/precise/Packages.bz2", errors.New("HTTP 404"))
 	downloader.ExpectError("http://repos.express42.com/virool/precise/Packages.gz", errors.New("HTTP 404"))
@@ -248,21 +319,64 @@ func (s *RemoteRepoSuite) TestDownloadFlat(c *C) {
 	err := s.flat.Fetch(downloader, nil)
 	c.Assert(err, IsNil)
 
-	err = s.flat.Download(downloader, s.packageCollection, s.packageRepo, false)
+	err = s.flat.Download(s.progress, downloader, s.collectionFactory, s.packagePool, false)
 	c.Assert(err, IsNil)
 	c.Assert(downloader.Empty(), Equals, true)
 	c.Assert(s.flat.packageRefs, NotNil)
 
-	pkg, err := s.packageCollection.ByKey(s.flat.packageRefs.Refs[0])
+	pkg, err := s.collectionFactory.PackageCollection().ByKey(s.flat.packageRefs.Refs[0])
 	c.Assert(err, IsNil)
 
-	result, err := pkg.VerifyFiles(s.packageRepo)
+	result, err := pkg.VerifyFiles(s.packagePool)
 	c.Check(result, Equals, true)
 	c.Check(err, IsNil)
 
 	c.Check(pkg.Name, Equals, "amanda-client")
 }
 
+func (s *RemoteRepoSuite) TestDownloadWithSourcesFlat(c *C) {
+	s.flat.DownloadSources = true
+
+	downloader := http.NewFakeDownloader()
+	downloader.ExpectResponse("http://repos.express42.com/virool/precise/Release", exampleReleaseFile)
+	downloader.ExpectError("http://repos.express42.com/virool/precise/Packages.bz2", errors.New("HTTP 404"))
+	downloader.ExpectError("http://repos.express42.com/virool/precise/Packages.gz", errors.New("HTTP 404"))
+	downloader.ExpectResponse("http://repos.express42.com/virool/precise/Packages", examplePackagesFile)
+	downloader.ExpectError("http://repos.express42.com/virool/precise/Sources.bz2", errors.New("HTTP 404"))
+	downloader.ExpectError("http://repos.express42.com/virool/precise/Sources.gz", errors.New("HTTP 404"))
+	downloader.ExpectResponse("http://repos.express42.com/virool/precise/Sources", exampleSourcesFile)
+	downloader.AnyExpectResponse("http://repos.express42.com/virool/precise/pool/main/a/amanda/amanda-client_3.3.1-3~bpo60+1_amd64.deb", "xyz")
+	downloader.AnyExpectResponse("http://repos.express42.com/virool/precise/pool/main/a/access-modifier-checker/access-modifier-checker_1.0-4.dsc", "abc")
+	downloader.AnyExpectResponse("http://repos.express42.com/virool/precise/pool/main/a/access-modifier-checker/access-modifier-checker_1.0.orig.tar.gz", "abcd")
+	downloader.AnyExpectResponse("http://repos.express42.com/virool/precise/pool/main/a/access-modifier-checker/access-modifier-checker_1.0-4.debian.tar.gz", "abcde")
+
+	err := s.flat.Fetch(downloader, nil)
+	c.Assert(err, IsNil)
+
+	err = s.flat.Download(s.progress, downloader, s.collectionFactory, s.packagePool, false)
+	c.Assert(err, IsNil)
+	c.Assert(downloader.Empty(), Equals, true)
+	c.Assert(s.flat.packageRefs, NotNil)
+
+	pkg, err := s.collectionFactory.PackageCollection().ByKey(s.flat.packageRefs.Refs[0])
+	c.Assert(err, IsNil)
+
+	result, err := pkg.VerifyFiles(s.packagePool)
+	c.Check(result, Equals, true)
+	c.Check(err, IsNil)
+
+	c.Check(pkg.Name, Equals, "amanda-client")
+
+	pkg, err = s.collectionFactory.PackageCollection().ByKey(s.flat.packageRefs.Refs[1])
+	c.Assert(err, IsNil)
+
+	result, err = pkg.VerifyFiles(s.packagePool)
+	c.Check(result, Equals, true)
+	c.Check(err, IsNil)
+
+	c.Check(pkg.Name, Equals, "access-modifier-checker")
+}
+
 type RemoteRepoCollectionSuite struct {
 	PackageListMixinSuite
 	db         database.Storage
@@ -285,7 +399,7 @@ func (s *RemoteRepoCollectionSuite) TestAddByName(c *C) {
 	r, err := s.collection.ByName("yandex")
 	c.Assert(err, ErrorMatches, "*.not found")
 
-	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
+	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
 	c.Assert(s.collection.Add(repo), IsNil)
 	c.Assert(s.collection.Add(repo), ErrorMatches, ".*already exists")
 
@@ -303,7 +417,7 @@ func (s *RemoteRepoCollectionSuite) TestByUUID(c *C) {
 	r, err := s.collection.ByUUID("some-uuid")
 	c.Assert(err, ErrorMatches, "*.not found")
 
-	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
+	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
 	c.Assert(s.collection.Add(repo), IsNil)
 
 	r, err = s.collection.ByUUID(repo.UUID)
@@ -312,7 +426,7 @@ func (s *RemoteRepoCollectionSuite) TestByUUID(c *C) {
 }
 
 func (s *RemoteRepoCollectionSuite) TestUpdateLoadComplete(c *C) {
-	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
+	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
 	c.Assert(s.collection.Update(repo), IsNil)
 
 	collection := NewRemoteRepoCollection(s.db)
@@ -333,7 +447,7 @@ func (s *RemoteRepoCollectionSuite) TestUpdateLoadComplete(c *C) {
 }
 
 func (s *RemoteRepoCollectionSuite) TestForEachAndLen(c *C) {
-	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
+	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
 	s.collection.Add(repo)
 
 	count := 0
@@ -355,10 +469,10 @@ func (s *RemoteRepoCollectionSuite) TestForEachAndLen(c *C) {
 }
 
 func (s *RemoteRepoCollectionSuite) TestDrop(c *C) {
-	repo1, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
+	repo1, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
 	s.collection.Add(repo1)
 
-	repo2, _ := NewRemoteRepo("tyndex", "http://mirror.yandex.ru/debian/", "wheezy", []string{"main"}, []string{})
+	repo2, _ := NewRemoteRepo("tyndex", "http://mirror.yandex.ru/debian/", "wheezy", []string{"main"}, []string{}, false)
 	s.collection.Add(repo2)
 
 	r1, _ := s.collection.ByUUID(repo1.UUID)
@@ -426,7 +540,7 @@ MD5Sum:
  4059d198768f9f8dc9372dc1c54bc3c3               14 main/debian-installer/binary-powerpc/Packages.bz2
  9d10bb61e59bd799891ae4fbcf447ec9               29 main/debian-installer/binary-powerpc/Packages.gz
  3481d65651306df1596dca9078c2506a              135 main/source/Release
- 0531474bd4630bfcfd39048be830483d             1119 main/source/Sources
+ 0459b7e4512db5479cb982bac6e2f9a1             2003 main/source/Sources
  3d83a489f1bd3c04226aa6520b8a6d07              656 main/source/Sources.bz2
  b062b5b77094aeeb05ca8dbb1ecf68a9              592 main/source/Sources.gz
 SHA1:
@@ -466,7 +580,7 @@ SHA1:
  64a543afbb5f4bf728636bdcbbe7a2ed0804adc2               14 main/debian-installer/binary-powerpc/Packages.bz2
  3df6ca52b6e8ecfb4a8fac6b8e02c777e3c7960d               29 main/debian-installer/binary-powerpc/Packages.gz
  49cfec0c9b1df3a25e983a3ddf29d15b0e376e02              135 main/source/Release
- 4987db83999b0a8bbbbeeb183f066cadb87a5fa5             1119 main/source/Sources
+ 6b92e0fc84307226172696fde59ca5f33f380b57             2003 main/source/Sources
  ecb8afea11030a5df46941cb8ec297ca24c85736              656 main/source/Sources.bz2
  923e71383969c91146f12fa8cd121397f2467a2e              592 main/source/Sources.gz
 SHA256:
@@ -506,7 +620,7 @@ SHA256:
  d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058               14 main/debian-installer/binary-powerpc/Packages.bz2
  825d493158fe0f50ca1acd70367aefa391170563af2e4ee9cedbcbe6796c8384               29 main/debian-installer/binary-powerpc/Packages.gz
  d683102993b6f11067ce86d73111f067e36a199e9dc1f4295c8b19c274dc9ef8              135 main/source/Release
- a8707486566f1623f0e50c0f8f61d93a93d79fb3043b6e1c407fc9f2afb002ce             1119 main/source/Sources
+ 45f868fd5d9efe611d67572ffcf96a00a5b9ec38ea5102753290c38c36b8c282             2003 main/source/Sources
  d178f1e310218d9f0f16c37d0780637f1cf3640a94a7fb0e24dc940c51b1e115              656 main/source/Sources.bz2
  080228b550da407fb8ac73fb30b37323468fd2b2de98dd56a324ee7d701f6103              592 main/source/Sources.gz`
 
@@ -530,3 +644,5 @@ MD5sum: d16fb36f0911f878998c136191af705e
 SHA1: 66b27417d37e024c46526c2f6d358a754fc552f3
 SHA256: 3608bca1e44ea6c4d268eb6db02260269892c0b42b86bbf1e77a6fa16c3c9282
 `
+
+const exampleSourcesFile = sourcePackageMeta

deb/snapshot.go

@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bytes"
@@ -47,6 +47,23 @@ func NewSnapshotFromRepository(name string, repo *RemoteRepo) (*Snapshot, error)
 	}, nil
 }
 
+// NewSnapshotFromLocalRepo creates snapshot from current state of local repository
+func NewSnapshotFromLocalRepo(name string, repo *LocalRepo) (*Snapshot, error) {
+	if repo.packageRefs == nil {
+		return nil, errors.New("local repo doesn't have packages")
+	}
+
+	return &Snapshot{
+		UUID:        uuid.New(),
+		Name:        name,
+		CreatedAt:   time.Now(),
+		SourceKind:  "local",
+		SourceIDs:   []string{repo.UUID},
+		Description: fmt.Sprintf("Snapshot from local repo %s", repo),
+		packageRefs: repo.packageRefs,
+	}, nil
+}
+
 // NewSnapshotFromPackageList creates snapshot from PackageList
 func NewSnapshotFromPackageList(name string, sources []*Snapshot, list *PackageList, description string) *Snapshot {
 	return NewSnapshotFromRefList(name, sources, NewPackageRefListFromPackageList(list), description)
@@ -195,7 +212,7 @@ func (collection *SnapshotCollection) ByUUID(uuid string) (*Snapshot, error) {
 	return nil, fmt.Errorf("snapshot with uuid %s not found", uuid)
 }
 
-// ByRemoteRepoSource looks up snapshots that have specified RepoteRepo as a source
+// ByRemoteRepoSource looks up snapshots that have specified RemoteRepo as a source
 func (collection *SnapshotCollection) ByRemoteRepoSource(repo *RemoteRepo) []*Snapshot {
 	result := make([]*Snapshot, 0)
 
@@ -207,6 +224,18 @@ func (collection *SnapshotCollection) ByRemoteRepoSource(repo *RemoteRepo) []*Sn
 	return result
 }
 
+// ByLocalRepoSource looks up snapshots that have specified LocalRepo as a source
+func (collection *SnapshotCollection) ByLocalRepoSource(repo *LocalRepo) []*Snapshot {
+	result := make([]*Snapshot, 0)
+
+	for _, s := range collection.list {
+		if s.SourceKind == "local" && utils.StrSliceHasItem(s.SourceIDs, repo.UUID) {
+			result = append(result, s)
+		}
+	}
+	return result
+}
+
 // BySnapshotSource looks up snapshots that have specified snapshot as a source
 func (collection *SnapshotCollection) BySnapshotSource(snapshot *Snapshot) []*Snapshot {
 	result := make([]*Snapshot, 0)

deb/snapshot_test.go

@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"errors"
@@ -15,7 +15,7 @@ var _ = Suite(&SnapshotSuite{})
 
 func (s *SnapshotSuite) SetUpTest(c *C) {
 	s.SetUpPackages()
-	s.repo, _ = NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
+	s.repo, _ = NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
 	s.repo.packageRefs = s.reflist
 }
 
@@ -32,6 +32,22 @@ func (s *SnapshotSuite) TestNewSnapshotFromRepository(c *C) {
 	c.Check(err, ErrorMatches, ".*not updated")
 }
 
+func (s *SnapshotSuite) TestNewSnapshotFromLocalRepo(c *C) {
+	localRepo := NewLocalRepo("lala", "hoorah!")
+
+	_, err := NewSnapshotFromLocalRepo("snap2", localRepo)
+	c.Check(err, ErrorMatches, "local repo doesn't have packages")
+
+	localRepo.UpdateRefList(s.reflist)
+	snapshot, _ := NewSnapshotFromLocalRepo("snap1", localRepo)
+	c.Check(snapshot.Name, Equals, "snap1")
+	c.Check(snapshot.NumPackages(), Equals, 3)
+	c.Check(snapshot.RefList().Len(), Equals, 3)
+	c.Check(snapshot.SourceKind, Equals, "local")
+	c.Check(snapshot.SourceIDs, DeepEquals, []string{localRepo.UUID})
+
+}
+
 func (s *SnapshotSuite) TestNewSnapshotFromPackageList(c *C) {
 	snap, _ := NewSnapshotFromRepository("snap1", s.repo)
 
@@ -79,7 +95,9 @@ type SnapshotCollectionSuite struct {
 	PackageListMixinSuite
 	db                   database.Storage
 	repo1, repo2         *RemoteRepo
+	lrepo1, lrepo2       *LocalRepo
 	snapshot1, snapshot2 *Snapshot
+	snapshot3, snapshot4 *Snapshot
 	collection           *SnapshotCollection
 }
 
@@ -90,13 +108,21 @@ func (s *SnapshotCollectionSuite) SetUpTest(c *C) {
 	s.collection = NewSnapshotCollection(s.db)
 	s.SetUpPackages()
 
-	s.repo1, _ = NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
+	s.repo1, _ = NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{}, false)
 	s.repo1.packageRefs = s.reflist
 	s.snapshot1, _ = NewSnapshotFromRepository("snap1", s.repo1)
 
-	s.repo2, _ = NewRemoteRepo("android", "http://mirror.yandex.ru/debian/", "lenny", []string{"main"}, []string{})
+	s.repo2, _ = NewRemoteRepo("android", "http://mirror.yandex.ru/debian/", "lenny", []string{"main"}, []string{}, false)
 	s.repo2.packageRefs = s.reflist
 	s.snapshot2, _ = NewSnapshotFromRepository("snap2", s.repo2)
+
+	s.lrepo1 = NewLocalRepo("local1", "")
+	s.lrepo1.packageRefs = s.reflist
+	s.snapshot3, _ = NewSnapshotFromLocalRepo("snap3", s.lrepo1)
+
+	s.lrepo2 = NewLocalRepo("local2", "")
+	s.lrepo2.packageRefs = s.reflist
+	s.snapshot4, _ = NewSnapshotFromLocalRepo("snap4", s.lrepo2)
 }
 
 func (s *SnapshotCollectionSuite) TearDownTest(c *C) {
@@ -166,11 +192,25 @@ func (s *SnapshotCollectionSuite) TestFindByRemoteRepoSource(c *C) {
 	c.Check(s.collection.ByRemoteRepoSource(s.repo1), DeepEquals, []*Snapshot{s.snapshot1})
 	c.Check(s.collection.ByRemoteRepoSource(s.repo2), DeepEquals, []*Snapshot{s.snapshot2})
 
-	repo3, _ := NewRemoteRepo("other", "http://mirror.yandex.ru/debian/", "lenny", []string{"main"}, []string{})
+	repo3, _ := NewRemoteRepo("other", "http://mirror.yandex.ru/debian/", "lenny", []string{"main"}, []string{}, false)
 
 	c.Check(s.collection.ByRemoteRepoSource(repo3), DeepEquals, []*Snapshot{})
 }
 
+func (s *SnapshotCollectionSuite) TestFindByLocalRepoSource(c *C) {
+	c.Assert(s.collection.Add(s.snapshot1), IsNil)
+	c.Assert(s.collection.Add(s.snapshot2), IsNil)
+	c.Assert(s.collection.Add(s.snapshot3), IsNil)
+	c.Assert(s.collection.Add(s.snapshot4), IsNil)
+
+	c.Check(s.collection.ByLocalRepoSource(s.lrepo1), DeepEquals, []*Snapshot{s.snapshot3})
+	c.Check(s.collection.ByLocalRepoSource(s.lrepo2), DeepEquals, []*Snapshot{s.snapshot4})
+
+	lrepo3 := NewLocalRepo("other", "")
+
+	c.Check(s.collection.ByLocalRepoSource(lrepo3), DeepEquals, []*Snapshot{})
+}
+
 func (s *SnapshotCollectionSuite) TestFindSnapshotSource(c *C) {
 	snapshot3 := NewSnapshotFromRefList("snap3", []*Snapshot{s.snapshot1, s.snapshot2}, s.reflist, "desc1")
 	snapshot4 := NewSnapshotFromRefList("snap4", []*Snapshot{s.snapshot1}, s.reflist, "desc2")

deb/version.go

@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"fmt"
@@ -228,8 +228,19 @@ func ParseDependencyVariants(variants string) (l []Dependency, err error) {
 	return
 }
 
-// ParseDependency parses dependency in format "pkg (>= 1.35)" into parts
+// ParseDependency parses dependency in format "pkg (>= 1.35) [arch]" into parts
 func ParseDependency(dep string) (d Dependency, err error) {
+	if strings.HasSuffix(dep, "}") {
+		i := strings.LastIndex(dep, "{")
+		if i == -1 {
+			err = fmt.Errorf("unable to parse dependency: %s", dep)
+			return
+		}
+		d.Architecture = dep[i+1 : len(dep)-1]
+
+		dep = strings.TrimSpace(dep[:i])
+	}
+
 	if !strings.HasSuffix(dep, ")") {
 		d.Pkg = strings.TrimSpace(dep)
 		d.Relation = VersionDontCare
@@ -244,12 +255,17 @@ func ParseDependency(dep string) (d Dependency, err error) {
 
 	d.Pkg = strings.TrimSpace(dep[0:i])
 
-	rel := dep[i+1 : i+2]
-	if dep[i+2] == '>' || dep[i+2] == '<' || dep[i+2] == '=' {
-		rel += dep[i+2 : i+3]
-		d.Version = strings.TrimSpace(dep[i+3 : len(dep)-1])
+	rel := ""
+	if dep[i+1] == '>' || dep[i+1] == '<' || dep[i+1] == '=' {
+		rel += dep[i+1 : i+2]
+		if dep[i+2] == '>' || dep[i+2] == '<' || dep[i+2] == '=' {
+			rel += dep[i+2 : i+3]
+			d.Version = strings.TrimSpace(dep[i+3 : len(dep)-1])
+		} else {
+			d.Version = strings.TrimSpace(dep[i+2 : len(dep)-1])
+		}
 	} else {
-		d.Version = strings.TrimSpace(dep[i+2 : len(dep)-1])
+		d.Version = strings.TrimSpace(dep[i+1 : len(dep)-1])
 	}
 
 	switch rel {
@@ -261,10 +277,10 @@ func ParseDependency(dep string) (d Dependency, err error) {
 		d.Relation = VersionLess
 	case ">>":
 		d.Relation = VersionGreater
-	case "=":
+	case "", "=":
 		d.Relation = VersionEqual
 	default:
-		err = fmt.Errorf("relation unknown: %s", rel)
+		err = fmt.Errorf("relation unknown %#v in dependency %s", rel, dep)
 	}
 
 	return

deb/version_test.go

@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	. "launchpad.net/gocheck"
@@ -104,6 +104,7 @@ func (s *VersionSuite) TestParseDependency(c *C) {
 	c.Check(d.Pkg, Equals, "dpkg")
 	c.Check(d.Relation, Equals, VersionGreaterOrEqual)
 	c.Check(d.Version, Equals, "1.6")
+	c.Check(d.Architecture, Equals, "")
 
 	d, e = ParseDependency("dpkg(>>1.6)")
 	c.Check(e, IsNil)
@@ -111,6 +112,18 @@ func (s *VersionSuite) TestParseDependency(c *C) {
 	c.Check(d.Relation, Equals, VersionGreater)
 	c.Check(d.Version, Equals, "1.6")
 
+	d, e = ParseDependency("dpkg(1.6)")
+	c.Check(e, IsNil)
+	c.Check(d.Pkg, Equals, "dpkg")
+	c.Check(d.Relation, Equals, VersionEqual)
+	c.Check(d.Version, Equals, "1.6")
+
+	d, e = ParseDependency("dpkg ( 1.6)")
+	c.Check(e, IsNil)
+	c.Check(d.Pkg, Equals, "dpkg")
+	c.Check(d.Relation, Equals, VersionEqual)
+	c.Check(d.Version, Equals, "1.6")
+
 	d, e = ParseDependency("dpkg (> 1.6)")
 	c.Check(e, IsNil)
 	c.Check(d.Pkg, Equals, "dpkg")
@@ -141,6 +154,20 @@ func (s *VersionSuite) TestParseDependency(c *C) {
 	c.Check(d.Relation, Equals, VersionGreater)
 	c.Check(d.Version, Equals, "1.6")
 
+	d, e = ParseDependency("dpkg (>>1.6) {i386}")
+	c.Check(e, IsNil)
+	c.Check(d.Pkg, Equals, "dpkg")
+	c.Check(d.Relation, Equals, VersionGreater)
+	c.Check(d.Version, Equals, "1.6")
+	c.Check(d.Architecture, Equals, "i386")
+
+	d, e = ParseDependency("dpkg{i386}")
+	c.Check(e, IsNil)
+	c.Check(d.Pkg, Equals, "dpkg")
+	c.Check(d.Relation, Equals, VersionDontCare)
+	c.Check(d.Version, Equals, "")
+	c.Check(d.Architecture, Equals, "i386")
+
 	d, e = ParseDependency("dpkg ")
 	c.Check(e, IsNil)
 	c.Check(d.Pkg, Equals, "dpkg")
@@ -152,6 +179,12 @@ func (s *VersionSuite) TestParseDependency(c *C) {
 
 	d, e = ParseDependency("dpkg==1.6)")
 	c.Check(e, ErrorMatches, "unable to parse.*")
+
+	d, e = ParseDependency("dpkg i386}")
+	c.Check(e, ErrorMatches, "unable to parse.*")
+
+	d, e = ParseDependency("dpkg ) {i386}")
+	c.Check(e, ErrorMatches, "unable to parse.*")
 }
 
 func (s *VersionSuite) TestParseDependencyVariants(c *C) {

debian/package.go

@@ -1,347 +0,0 @@
-package debian
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/smira/aptly/database"
-	"github.com/smira/aptly/utils"
-	"github.com/ugorji/go/codec"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-)
-
-// PackageFile is a single file entry in package
-type PackageFile struct {
-	Filename  string
-	Checksums utils.ChecksumInfo
-}
-
-// Verify that package file is present and correct
-func (f *PackageFile) Verify(packageRepo *Repository) (bool, error) {
-	poolPath, err := packageRepo.PoolPath(f.Filename, f.Checksums.MD5)
-	if err != nil {
-		return false, err
-	}
-
-	st, err := os.Stat(poolPath)
-	if err != nil {
-		return false, nil
-	}
-
-	// verify size
-	// TODO: verify checksum if configured
-	return st.Size() == f.Checksums.Size, nil
-}
-
-// Package is single instance of Debian package
-type Package struct {
-	Name         string
-	Version      string
-	Architecture string
-	Source       string
-	Provides     []string
-	// Various dependencies
-	Depends    []string
-	PreDepends []string
-	Suggests   []string
-	Recommends []string
-	// Files in package
-	Files []PackageFile
-	// Extra information from stanza
-	Extra Stanza
-}
-
-func parseDependencies(input Stanza, key string) []string {
-	value, ok := input[key]
-	if !ok {
-		return nil
-	}
-
-	delete(input, key)
-
-	result := strings.Split(value, ",")
-	for i := range result {
-		result[i] = strings.TrimSpace(result[i])
-	}
-	return result
-}
-
-// NewPackageFromControlFile creates Package from parsed Debian control file
-func NewPackageFromControlFile(input Stanza) *Package {
-	result := &Package{
-		Name:         input["Package"],
-		Version:      input["Version"],
-		Architecture: input["Architecture"],
-		Source:       input["Source"],
-		Files:        make([]PackageFile, 0, 1),
-	}
-
-	delete(input, "Package")
-	delete(input, "Version")
-	delete(input, "Architecture")
-	delete(input, "Source")
-
-	filesize, _ := strconv.ParseInt(input["Size"], 10, 64)
-
-	result.Files = append(result.Files, PackageFile{
-		Filename: input["Filename"],
-		Checksums: utils.ChecksumInfo{
-			Size:   filesize,
-			MD5:    strings.TrimSpace(input["MD5sum"]),
-			SHA1:   strings.TrimSpace(input["SHA1"]),
-			SHA256: strings.TrimSpace(input["SHA256"]),
-		},
-	})
-
-	delete(input, "Filename")
-	delete(input, "MD5sum")
-	delete(input, "SHA1")
-	delete(input, "SHA256")
-	delete(input, "Size")
-
-	result.Depends = parseDependencies(input, "Depends")
-	result.PreDepends = parseDependencies(input, "Pre-Depends")
-	result.Suggests = parseDependencies(input, "Suggests")
-	result.Recommends = parseDependencies(input, "Recommends")
-	result.Provides = parseDependencies(input, "Provides")
-
-	result.Extra = input
-
-	return result
-}
-
-// Key returns unique key identifying package
-func (p *Package) Key() []byte {
-	return []byte("P" + p.Architecture + " " + p.Name + " " + p.Version)
-}
-
-// Encode does msgpack encoding of Package
-func (p *Package) Encode() []byte {
-	var buf bytes.Buffer
-
-	encoder := codec.NewEncoder(&buf, &codec.MsgpackHandle{})
-	encoder.Encode(p)
-
-	return buf.Bytes()
-}
-
-// Decode decodes msgpack representation into Package
-func (p *Package) Decode(input []byte) error {
-	decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
-	return decoder.Decode(p)
-}
-
-// String creates readable representation
-func (p *Package) String() string {
-	return fmt.Sprintf("%s-%s_%s", p.Name, p.Version, p.Architecture)
-}
-
-// MatchesArchitecture checks whether packages matches specified architecture
-func (p *Package) MatchesArchitecture(arch string) bool {
-	if p.Architecture == "all" {
-		return true
-	}
-
-	return p.Architecture == arch
-}
-
-// GetDependencies compiles list of dependenices by flags from options
-func (p *Package) GetDependencies(options int) (dependencies []string) {
-	dependencies = make([]string, 0, 30)
-	dependencies = append(dependencies, p.Depends...)
-	dependencies = append(dependencies, p.PreDepends...)
-
-	if options&DepFollowRecommends == DepFollowRecommends {
-		dependencies = append(dependencies, p.Recommends...)
-	}
-
-	if options&DepFollowSuggests == DepFollowSuggests {
-		dependencies = append(dependencies, p.Suggests...)
-	}
-
-	return
-}
-
-// Stanza creates original stanza from package
-func (p *Package) Stanza() (result Stanza) {
-	result = p.Extra.Copy()
-	result["Package"] = p.Name
-	result["Version"] = p.Version
-	result["Filename"] = p.Files[0].Filename
-	result["Architecture"] = p.Architecture
-	result["Source"] = p.Source
-
-	if p.Files[0].Checksums.MD5 != "" {
-		result["MD5sum"] = p.Files[0].Checksums.MD5
-	}
-	if p.Files[0].Checksums.SHA1 != "" {
-		result["SHA1"] = " " + p.Files[0].Checksums.SHA1
-	}
-	if p.Files[0].Checksums.SHA256 != "" {
-		result["SHA256"] = " " + p.Files[0].Checksums.SHA256
-	}
-
-	if p.Depends != nil {
-		result["Depends"] = strings.Join(p.Depends, ", ")
-	}
-	if p.PreDepends != nil {
-		result["Pre-Depends"] = strings.Join(p.PreDepends, ", ")
-	}
-	if p.Suggests != nil {
-		result["Suggests"] = strings.Join(p.Suggests, ", ")
-	}
-	if p.Recommends != nil {
-		result["Recommends"] = strings.Join(p.Recommends, ", ")
-	}
-	if p.Provides != nil {
-		result["Provides"] = strings.Join(p.Provides, ", ")
-	}
-
-	result["Size"] = fmt.Sprintf("%d", p.Files[0].Checksums.Size)
-
-	return
-}
-
-// Equals compares two packages to be identical
-func (p *Package) Equals(p2 *Package) bool {
-	if len(p.Files) != len(p2.Files) {
-		return false
-	}
-
-	for i, f := range p.Files {
-		if p2.Files[i] != f {
-			return false
-		}
-	}
-
-	return p.Name == p2.Name && p.Version == p2.Version &&
-		p.Architecture == p2.Architecture && utils.StrSlicesEqual(p.Depends, p2.Depends) &&
-		utils.StrSlicesEqual(p.PreDepends, p2.PreDepends) && utils.StrSlicesEqual(p.Suggests, p2.Suggests) &&
-		utils.StrSlicesEqual(p.Recommends, p2.Recommends) && utils.StrMapsEqual(p.Extra, p2.Extra) &&
-		p.Source == p2.Source && utils.StrSlicesEqual(p.Provides, p2.Provides)
-}
-
-// LinkFromPool links package file from pool to dist's pool location
-func (p *Package) LinkFromPool(packageRepo *Repository, prefix string, component string) error {
-	poolDir, err := p.PoolDirectory()
-	if err != nil {
-		return err
-	}
-
-	for i, f := range p.Files {
-		sourcePath, err := packageRepo.PoolPath(f.Filename, f.Checksums.MD5)
-		if err != nil {
-			return err
-		}
-
-		relPath, err := packageRepo.LinkFromPool(prefix, component, sourcePath, poolDir)
-		if err != nil {
-			return err
-		}
-
-		p.Files[i].Filename = relPath
-	}
-
-	return nil
-}
-
-// PoolDirectory returns directory in package pool for this package files
-func (p *Package) PoolDirectory() (string, error) {
-	source := p.Source
-	if source == "" {
-		source = p.Name
-	}
-
-	if len(source) < 2 {
-		return "", fmt.Errorf("package source %s too short", source)
-	}
-
-	var subdir string
-	if strings.HasPrefix(source, "lib") {
-		subdir = source[:4]
-	} else {
-		subdir = source[:1]
-
-	}
-
-	return filepath.Join(subdir, source), nil
-}
-
-// PackageDownloadTask is a element of download queue for the package
-type PackageDownloadTask struct {
-	RepoURI         string
-	DestinationPath string
-	Checksums       utils.ChecksumInfo
-}
-
-// DownloadList returns list of missing package files for download in format
-// [[srcpath, dstpath]]
-func (p *Package) DownloadList(packageRepo *Repository) (result []PackageDownloadTask, err error) {
-	result = make([]PackageDownloadTask, 0, 1)
-
-	for _, f := range p.Files {
-		poolPath, err := packageRepo.PoolPath(f.Filename, f.Checksums.MD5)
-		if err != nil {
-			return nil, err
-		}
-
-		verified, err := f.Verify(packageRepo)
-		if err != nil {
-			return nil, err
-		}
-
-		if !verified {
-			result = append(result, PackageDownloadTask{RepoURI: f.Filename, DestinationPath: poolPath, Checksums: f.Checksums})
-		}
-	}
-
-	return result, nil
-}
-
-// VerifyFiles verifies that all package files have neen correctly downloaded
-func (p *Package) VerifyFiles(packageRepo *Repository) (result bool, err error) {
-	result = true
-
-	for _, f := range p.Files {
-		result, err = f.Verify(packageRepo)
-		if err != nil || !result {
-			return
-		}
-	}
-
-	return
-}
-
-// PackageCollection does management of packages in DB
-type PackageCollection struct {
-	db database.Storage
-}
-
-// NewPackageCollection creates new PackageCollection and binds it to database
-func NewPackageCollection(db database.Storage) *PackageCollection {
-	return &PackageCollection{
-		db: db,
-	}
-}
-
-// ByKey find package in DB by its key
-func (collection *PackageCollection) ByKey(key []byte) (*Package, error) {
-	encoded, err := collection.db.Get(key)
-	if err != nil {
-		return nil, err
-	}
-
-	p := &Package{}
-	err = p.Decode(encoded)
-	if err != nil {
-		return nil, err
-	}
-	return p, nil
-}
-
-// Update adds or updates information about package in DB
-func (collection *PackageCollection) Update(p *Package) error {
-	return collection.db.Put(p.Key(), p.Encode())
-}

debian/package_test.go

@@ -1,240 +0,0 @@
-package debian
-
-import (
-	"github.com/smira/aptly/database"
-	"github.com/smira/aptly/utils"
-	. "launchpad.net/gocheck"
-	"os"
-	"path/filepath"
-)
-
-var packageStanza = Stanza{"Source": "alien-arena", "Pre-Depends": "dpkg (>= 1.6)", "Suggests": "alien-arena-mars", "Recommends": "aliean-arena-luna", "Depends": "libc6 (>= 2.7), alien-arena-data (>= 7.40)", "Filename": "pool/contrib/a/alien-arena/alien-arena-common_7.40-2_i386.deb", "SHA1": " 46955e48cad27410a83740a21d766ce362364024", "SHA256": " eb4afb9885cba6dc70cccd05b910b2dbccc02c5900578be5e99f0d3dbf9d76a5", "Priority": "extra", "Maintainer": "Debian Games Team <pkg-games-devel@lists.alioth.debian.org>", "Description": "Common files for Alien Arena client and server ALIEN ARENA is a standalone 3D first person online deathmatch shooter\n crafted from the original source code of Quake II and Quake III, released\n by id Software under the GPL license. With features including 32 bit\n graphics, new particle engine and effects, light blooms, reflective water,\n hi resolution textures and skins, hi poly models, stain maps, ALIEN ARENA\n pushes the envelope of graphical beauty rivaling today's top games.\n .\n This package installs the common files for Alien Arena.\n", "Homepage": "http://red.planetarena.org", "Tag": "role::app-data, role::shared-lib, special::auto-inst-parts", "Installed-Size": "456", "Version": "7.40-2", "Replaces": "alien-arena (<< 7.33-1)", "Size": "187518", "MD5sum": "1e8cba92c41420aa7baa8a5718d67122", "Package": "alien-arena-common", "Section": "contrib/games", "Architecture": "i386"}
-
-type PackageSuite struct {
-	stanza Stanza
-}
-
-var _ = Suite(&PackageSuite{})
-
-func (s *PackageSuite) SetUpTest(c *C) {
-	s.stanza = packageStanza.Copy()
-}
-
-func (s *PackageSuite) TestPackageFileVerify(c *C) {
-	packageRepo := NewRepository(c.MkDir())
-	p := NewPackageFromControlFile(s.stanza)
-	poolPath, _ := packageRepo.PoolPath(p.Files[0].Filename, p.Files[0].Checksums.MD5)
-
-	result, err := p.Files[0].Verify(packageRepo)
-	c.Check(err, IsNil)
-	c.Check(result, Equals, false)
-
-	err = os.MkdirAll(filepath.Dir(poolPath), 0755)
-	c.Assert(err, IsNil)
-
-	file, err := os.Create(poolPath)
-	c.Assert(err, IsNil)
-	file.WriteString("abcde")
-	file.Close()
-
-	result, err = p.Files[0].Verify(packageRepo)
-	c.Check(err, IsNil)
-	c.Check(result, Equals, false)
-
-	result, err = p.VerifyFiles(packageRepo)
-	c.Check(err, IsNil)
-	c.Check(result, Equals, false)
-
-	p.Files[0].Checksums.Size = 5
-	result, err = p.Files[0].Verify(packageRepo)
-	c.Check(err, IsNil)
-	c.Check(result, Equals, true)
-
-	result, err = p.VerifyFiles(packageRepo)
-	c.Check(err, IsNil)
-	c.Check(result, Equals, true)
-}
-
-func (s *PackageSuite) TestNewFromPara(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-
-	c.Check(p.Name, Equals, "alien-arena-common")
-	c.Check(p.Version, Equals, "7.40-2")
-	c.Check(p.Architecture, Equals, "i386")
-	c.Check(p.Provides, DeepEquals, []string(nil))
-	c.Check(p.Files, HasLen, 1)
-	c.Check(p.Files[0].Filename, Equals, "pool/contrib/a/alien-arena/alien-arena-common_7.40-2_i386.deb")
-	c.Check(p.Files[0].Checksums.Size, Equals, int64(187518))
-	c.Check(p.Files[0].Checksums.MD5, Equals, "1e8cba92c41420aa7baa8a5718d67122")
-	c.Check(p.Depends, DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)"})
-}
-
-func (s *PackageSuite) TestWithProvides(c *C) {
-	s.stanza["Provides"] = "arena"
-	p := NewPackageFromControlFile(s.stanza)
-
-	c.Check(p.Name, Equals, "alien-arena-common")
-	c.Check(p.Provides, DeepEquals, []string{"arena"})
-
-	st := p.Stanza()
-	c.Check(st["Provides"], Equals, "arena")
-}
-
-func (s *PackageSuite) TestKey(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-
-	c.Check(p.Key(), DeepEquals, []byte("Pi386 alien-arena-common 7.40-2"))
-}
-
-func (s *PackageSuite) TestEncodeDecode(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-	encoded := p.Encode()
-	p2 := &Package{}
-	err := p2.Decode(encoded)
-
-	c.Assert(err, IsNil)
-	c.Assert(p2, DeepEquals, p)
-}
-
-func (s *PackageSuite) TestStanza(c *C) {
-	p := NewPackageFromControlFile(s.stanza.Copy())
-	stanza := p.Stanza()
-
-	c.Assert(stanza, DeepEquals, s.stanza)
-}
-
-func (s *PackageSuite) TestString(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-	c.Assert(p.String(), Equals, "alien-arena-common-7.40-2_i386")
-}
-
-func (s *PackageSuite) TestEquals(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-
-	p2 := NewPackageFromControlFile(packageStanza.Copy())
-	c.Check(p.Equals(p2), Equals, true)
-
-	p2.Depends = []string{"package1"}
-	c.Check(p.Equals(p2), Equals, false)
-
-	p2 = NewPackageFromControlFile(packageStanza.Copy())
-	p2.Files[0].Checksums.MD5 = "abcdefabcdef"
-	c.Check(p.Equals(p2), Equals, false)
-}
-
-func (s *PackageSuite) TestMatchesArchitecture(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-	c.Check(p.MatchesArchitecture("i386"), Equals, true)
-	c.Check(p.MatchesArchitecture("amd64"), Equals, false)
-
-	s.stanza = packageStanza.Copy()
-	s.stanza["Architecture"] = "all"
-	p = NewPackageFromControlFile(s.stanza)
-	c.Check(p.MatchesArchitecture("i386"), Equals, true)
-	c.Check(p.MatchesArchitecture("amd64"), Equals, true)
-}
-
-func (s *PackageSuite) TestGetDependencies(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-	c.Check(p.GetDependencies(0), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)"})
-	c.Check(p.GetDependencies(DepFollowSuggests), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "alien-arena-mars"})
-	c.Check(p.GetDependencies(DepFollowSuggests|DepFollowRecommends), DeepEquals, []string{"libc6 (>= 2.7)", "alien-arena-data (>= 7.40)", "dpkg (>= 1.6)", "aliean-arena-luna", "alien-arena-mars"})
-}
-
-func (s *PackageSuite) TestPoolDirectory(c *C) {
-	p := NewPackageFromControlFile(s.stanza)
-	dir, err := p.PoolDirectory()
-	c.Check(err, IsNil)
-	c.Check(dir, Equals, "a/alien-arena")
-
-	p = NewPackageFromControlFile(packageStanza.Copy())
-	p.Source = ""
-	dir, err = p.PoolDirectory()
-	c.Check(err, IsNil)
-	c.Check(dir, Equals, "a/alien-arena-common")
-
-	p = NewPackageFromControlFile(packageStanza.Copy())
-	p.Source = "libarena"
-	dir, err = p.PoolDirectory()
-	c.Check(err, IsNil)
-	c.Check(dir, Equals, "liba/libarena")
-
-	p = NewPackageFromControlFile(packageStanza.Copy())
-	p.Source = "l"
-	_, err = p.PoolDirectory()
-	c.Check(err, ErrorMatches, ".* too short")
-}
-
-func (s *PackageSuite) TestLinkFromPool(c *C) {
-	packageRepo := NewRepository(c.MkDir())
-	p := NewPackageFromControlFile(s.stanza)
-
-	poolPath, _ := packageRepo.PoolPath(p.Files[0].Filename, p.Files[0].Checksums.MD5)
-	err := os.MkdirAll(filepath.Dir(poolPath), 0755)
-	c.Assert(err, IsNil)
-
-	file, err := os.Create(poolPath)
-	c.Assert(err, IsNil)
-	file.Close()
-
-	err = p.LinkFromPool(packageRepo, "", "non-free")
-	c.Check(err, IsNil)
-	c.Check(p.Files[0].Filename, Equals, "pool/non-free/a/alien-arena/alien-arena-common_7.40-2_i386.deb")
-}
-
-func (s *PackageSuite) TestDownloadList(c *C) {
-	packageRepo := NewRepository(c.MkDir())
-	p := NewPackageFromControlFile(s.stanza)
-	p.Files[0].Checksums.Size = 5
-	poolPath, _ := packageRepo.PoolPath(p.Files[0].Filename, p.Files[0].Checksums.MD5)
-
-	list, err := p.DownloadList(packageRepo)
-	c.Check(err, IsNil)
-	c.Check(list, DeepEquals, []PackageDownloadTask{
-		PackageDownloadTask{
-			RepoURI:         "pool/contrib/a/alien-arena/alien-arena-common_7.40-2_i386.deb",
-			DestinationPath: poolPath,
-			Checksums: utils.ChecksumInfo{Size: 5,
-				MD5:    "1e8cba92c41420aa7baa8a5718d67122",
-				SHA1:   "46955e48cad27410a83740a21d766ce362364024",
-				SHA256: "eb4afb9885cba6dc70cccd05b910b2dbccc02c5900578be5e99f0d3dbf9d76a5"}}})
-
-	err = os.MkdirAll(filepath.Dir(poolPath), 0755)
-	c.Assert(err, IsNil)
-
-	file, err := os.Create(poolPath)
-	c.Assert(err, IsNil)
-	file.WriteString("abcde")
-	file.Close()
-
-	list, err = p.DownloadList(packageRepo)
-	c.Check(err, IsNil)
-	c.Check(list, DeepEquals, []PackageDownloadTask{})
-}
-
-type PackageCollectionSuite struct {
-	collection *PackageCollection
-	p          *Package
-	db         database.Storage
-}
-
-var _ = Suite(&PackageCollectionSuite{})
-
-func (s *PackageCollectionSuite) SetUpTest(c *C) {
-	s.p = NewPackageFromControlFile(packageStanza.Copy())
-	s.db, _ = database.OpenDB(c.MkDir())
-	s.collection = NewPackageCollection(s.db)
-}
-
-func (s *PackageCollectionSuite) TearDownTest(c *C) {
-	s.db.Close()
-}
-
-func (s *PackageCollectionSuite) TestUpdateByKey(c *C) {
-	err := s.collection.Update(s.p)
-	c.Assert(err, IsNil)
-
-	p2, err := s.collection.ByKey(s.p.Key())
-	c.Assert(err, IsNil)
-	c.Assert(p2.Equals(s.p), Equals, true)
-}

debian/publish.go

@@ -1,431 +0,0 @@
-package debian
-
-import (
-	"bufio"
-	"bytes"
-	"code.google.com/p/go-uuid/uuid"
-	"fmt"
-	"github.com/smira/aptly/database"
-	"github.com/smira/aptly/utils"
-	"github.com/ugorji/go/codec"
-	"log"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-// PublishedRepo is a published for http/ftp representation of snapshot as Debian repository
-type PublishedRepo struct {
-	// Internal unique ID
-	UUID string
-	// Prefix & distribution should be unique across all published repositories
-	Prefix       string
-	Distribution string
-	Component    string
-	// Architectures is a list of all architectures published
-	Architectures []string
-	// Snapshot as a source of publishing
-	SnapshotUUID string
-
-	snapshot *Snapshot
-}
-
-// NewPublishedRepo creates new published repository
-func NewPublishedRepo(prefix string, distribution string, component string, architectures []string, snapshot *Snapshot) (*PublishedRepo, error) {
-	prefix = filepath.Clean(prefix)
-	if strings.HasPrefix(prefix, "/") {
-		prefix = prefix[1:]
-	}
-	if strings.HasSuffix(prefix, "/") {
-		prefix = prefix[:len(prefix)-1]
-	}
-	prefix = filepath.Clean(prefix)
-
-	for _, component := range strings.Split(prefix, "/") {
-		if component == ".." || component == "dists" || component == "pool" {
-			return nil, fmt.Errorf("invalid prefix %s", prefix)
-		}
-	}
-
-	return &PublishedRepo{
-		UUID:          uuid.New(),
-		Prefix:        prefix,
-		Distribution:  distribution,
-		Component:     component,
-		Architectures: architectures,
-		SnapshotUUID:  snapshot.UUID,
-		snapshot:      snapshot,
-	}, nil
-}
-
-// String returns human-readable represenation of PublishedRepo
-func (p *PublishedRepo) String() string {
-	var archs string
-
-	if len(p.Architectures) > 0 {
-		archs = fmt.Sprintf(" [%s]", strings.Join(p.Architectures, ", "))
-	}
-
-	return fmt.Sprintf("%s/%s (%s)%s publishes %s", p.Prefix, p.Distribution, p.Component, archs, p.snapshot.String())
-}
-
-// Key returns unique key identifying PublishedRepo
-func (p *PublishedRepo) Key() []byte {
-	return []byte("U" + p.Prefix + ">>" + p.Distribution)
-}
-
-// Encode does msgpack encoding of PublishedRepo
-func (p *PublishedRepo) Encode() []byte {
-	var buf bytes.Buffer
-
-	encoder := codec.NewEncoder(&buf, &codec.MsgpackHandle{})
-	encoder.Encode(p)
-
-	return buf.Bytes()
-}
-
-// Decode decodes msgpack representation into PublishedRepo
-func (p *PublishedRepo) Decode(input []byte) error {
-	decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
-	return decoder.Decode(p)
-}
-
-// Publish publishes snapshot (repository) contents, links package files, generates Packages & Release files, signs them
-func (p *PublishedRepo) Publish(repo *Repository, packageCollection *PackageCollection, signer utils.Signer) error {
-	err := repo.MkDir(filepath.Join(p.Prefix, "pool"))
-	if err != nil {
-		return err
-	}
-	basePath := filepath.Join(p.Prefix, "dists", p.Distribution)
-	err = repo.MkDir(basePath)
-	if err != nil {
-		return err
-	}
-
-	// Load all packages
-	list, err := NewPackageListFromRefList(p.snapshot.RefList(), packageCollection)
-	if err != nil {
-		return fmt.Errorf("unable to load packages: %s", err)
-	}
-
-	if list.Len() == 0 {
-		return fmt.Errorf("snapshot is empty")
-	}
-
-	if len(p.Architectures) == 0 {
-		p.Architectures = list.Architectures()
-	}
-
-	if len(p.Architectures) == 0 {
-		return fmt.Errorf("unable to figure out list of architectures, please supply explicit list")
-	}
-
-	generatedFiles := map[string]utils.ChecksumInfo{}
-
-	// For all architectures, generate release file
-	for _, arch := range p.Architectures {
-		relativePath := filepath.Join(p.Component, fmt.Sprintf("binary-%s", arch), "Packages")
-		err = repo.MkDir(filepath.Dir(filepath.Join(basePath, relativePath)))
-		if err != nil {
-			return err
-		}
-
-		packagesFile, err := repo.CreateFile(filepath.Join(basePath, relativePath))
-		if err != nil {
-			return fmt.Errorf("unable to creates Packages file: %s", err)
-		}
-
-		bufWriter := bufio.NewWriter(packagesFile)
-
-		err = list.ForEach(func(pkg *Package) error {
-			if pkg.MatchesArchitecture(arch) {
-				err = pkg.LinkFromPool(repo, p.Prefix, p.Component)
-				if err != nil {
-					return err
-				}
-
-				err = pkg.Stanza().WriteTo(bufWriter)
-				if err != nil {
-					return err
-				}
-				err = bufWriter.WriteByte('\n')
-				if err != nil {
-					return err
-				}
-
-			}
-
-			return nil
-		})
-
-		if err != nil {
-			return fmt.Errorf("unable to creates process packages: %s", err)
-		}
-
-		err = bufWriter.Flush()
-		if err != nil {
-			return fmt.Errorf("unable to write Packages file: %s", err)
-		}
-
-		err = utils.CompressFile(packagesFile)
-		if err != nil {
-			return fmt.Errorf("unable to compress Packages files: %s", err)
-		}
-
-		packagesFile.Close()
-
-		checksumInfo, err := repo.ChecksumsForFile(filepath.Join(basePath, relativePath))
-		if err != nil {
-			return fmt.Errorf("unable to collect checksums: %s", err)
-		}
-		generatedFiles[relativePath] = checksumInfo
-
-		checksumInfo, err = repo.ChecksumsForFile(filepath.Join(basePath, relativePath+".gz"))
-		if err != nil {
-			return fmt.Errorf("unable to collect checksums: %s", err)
-		}
-		generatedFiles[relativePath+".gz"] = checksumInfo
-
-		checksumInfo, err = repo.ChecksumsForFile(filepath.Join(basePath, relativePath+".bz2"))
-		if err != nil {
-			return fmt.Errorf("unable to collect checksums: %s", err)
-		}
-		generatedFiles[relativePath+".bz2"] = checksumInfo
-
-	}
-
-	release := make(Stanza)
-	release["Origin"] = p.Prefix + " " + p.Distribution
-	release["Label"] = p.Prefix + " " + p.Distribution
-	release["Codename"] = p.Distribution
-	release["Date"] = time.Now().UTC().Format("Mon, 2 Jan 2006 15:04:05 MST")
-	release["Components"] = p.Component
-	release["Architectures"] = strings.Join(p.Architectures, " ")
-	release["Description"] = " Generated by aptly\n"
-	release["MD5Sum"] = "\n"
-	release["SHA1"] = "\n"
-	release["SHA256"] = "\n"
-
-	for path, info := range generatedFiles {
-		release["MD5Sum"] += fmt.Sprintf(" %s %8d %s\n", info.MD5, info.Size, path)
-		release["SHA1"] += fmt.Sprintf(" %s %8d %s\n", info.SHA1, info.Size, path)
-		release["SHA256"] += fmt.Sprintf(" %s %8d %s\n", info.SHA256, info.Size, path)
-	}
-
-	releaseFile, err := repo.CreateFile(filepath.Join(basePath, "Release"))
-	if err != nil {
-		return fmt.Errorf("unable to create Release file: %s", err)
-	}
-
-	bufWriter := bufio.NewWriter(releaseFile)
-
-	err = release.WriteTo(bufWriter)
-	if err != nil {
-		return fmt.Errorf("unable to create Release file: %s", err)
-	}
-
-	err = bufWriter.Flush()
-	if err != nil {
-		return fmt.Errorf("unable to create Release file: %s", err)
-	}
-
-	releaseFilename := releaseFile.Name()
-	releaseFile.Close()
-
-	if signer != nil {
-		err = signer.DetachedSign(releaseFilename, releaseFilename+".gpg")
-		if err != nil {
-			return fmt.Errorf("unable to sign Release file: %s", err)
-		}
-
-		err = signer.ClearSign(releaseFilename, filepath.Join(filepath.Dir(releaseFilename), "InRelease"))
-		if err != nil {
-			return fmt.Errorf("unable to sign Release file: %s", err)
-		}
-	}
-
-	return nil
-}
-
-// RemoveFiles removes files that were created by Publish
-//
-// It can remove prefix fully, and part of pool (for specific component)
-func (p *PublishedRepo) RemoveFiles(repo *Repository, removePrefix, removePoolComponent bool) error {
-	if removePrefix {
-		err := repo.RemoveDirs(filepath.Join(p.Prefix, "dists"))
-		if err != nil {
-			return err
-		}
-
-		return repo.RemoveDirs(filepath.Join(p.Prefix, "pool"))
-	}
-
-	err := repo.RemoveDirs(filepath.Join(p.Prefix, "dists", p.Distribution))
-	if err != nil {
-		return err
-	}
-
-	if removePoolComponent {
-		err = repo.RemoveDirs(filepath.Join(p.Prefix, "pool", p.Component))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// PublishedRepoCollection does listing, updating/adding/deleting of PublishedRepos
-type PublishedRepoCollection struct {
-	db   database.Storage
-	list []*PublishedRepo
-}
-
-// NewPublishedRepoCollection loads PublishedRepos from DB and makes up collection
-func NewPublishedRepoCollection(db database.Storage) *PublishedRepoCollection {
-	result := &PublishedRepoCollection{
-		db: db,
-	}
-
-	blobs := db.FetchByPrefix([]byte("U"))
-	result.list = make([]*PublishedRepo, 0, len(blobs))
-
-	for _, blob := range blobs {
-		r := &PublishedRepo{}
-		if err := r.Decode(blob); err != nil {
-			log.Printf("Error decoding published repo: %s\n", err)
-		} else {
-			result.list = append(result.list, r)
-		}
-	}
-
-	return result
-}
-
-// Add appends new repo to collection and saves it
-func (collection *PublishedRepoCollection) Add(repo *PublishedRepo) error {
-	if collection.CheckDuplicate(repo) != nil {
-		return fmt.Errorf("published repo with prefix/distribution %s/%s already exists", repo.Prefix, repo.Distribution)
-	}
-
-	err := collection.Update(repo)
-	if err != nil {
-		return err
-	}
-
-	collection.list = append(collection.list, repo)
-	return nil
-}
-
-// CheckDuplicate verifies that there's no published repo with the same name
-func (collection *PublishedRepoCollection) CheckDuplicate(repo *PublishedRepo) *PublishedRepo {
-	for _, r := range collection.list {
-		if r.Prefix == repo.Prefix && r.Distribution == repo.Distribution {
-			return r
-		}
-	}
-
-	return nil
-}
-
-// Update stores updated information about repo in DB
-func (collection *PublishedRepoCollection) Update(repo *PublishedRepo) error {
-	err := collection.db.Put(repo.Key(), repo.Encode())
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// LoadComplete loads additional information for remote repo
-func (collection *PublishedRepoCollection) LoadComplete(repo *PublishedRepo, snapshotCollection *SnapshotCollection) error {
-	snapshot, err := snapshotCollection.ByUUID(repo.SnapshotUUID)
-	if err != nil {
-		return err
-	}
-
-	repo.snapshot = snapshot
-	return nil
-}
-
-// ByPrefixDistribution looks up repository by prefix & distribution
-func (collection *PublishedRepoCollection) ByPrefixDistribution(prefix, distribution string) (*PublishedRepo, error) {
-	for _, r := range collection.list {
-		if r.Prefix == prefix && r.Distribution == distribution {
-			return r, nil
-		}
-	}
-	return nil, fmt.Errorf("published repo with prefix/distribution %s/%s not found", prefix, distribution)
-}
-
-// ByUUID looks up repository by uuid
-func (collection *PublishedRepoCollection) ByUUID(uuid string) (*PublishedRepo, error) {
-	for _, r := range collection.list {
-		if r.UUID == uuid {
-			return r, nil
-		}
-	}
-	return nil, fmt.Errorf("published repo with uuid %s not found", uuid)
-}
-
-// BySnapshot looks up repository by snapshot source
-func (collection *PublishedRepoCollection) BySnapshot(snapshot *Snapshot) []*PublishedRepo {
-	result := make([]*PublishedRepo, 0)
-	for _, r := range collection.list {
-		if r.SnapshotUUID == snapshot.UUID {
-			result = append(result, r)
-		}
-	}
-	return result
-}
-
-// ForEach runs method for each repository
-func (collection *PublishedRepoCollection) ForEach(handler func(*PublishedRepo) error) error {
-	var err error
-	for _, r := range collection.list {
-		err = handler(r)
-		if err != nil {
-			return err
-		}
-	}
-	return err
-}
-
-// Len returns number of remote repos
-func (collection *PublishedRepoCollection) Len() int {
-	return len(collection.list)
-}
-
-// Remove removes published repository, cleaning up directories, files
-func (collection *PublishedRepoCollection) Remove(packageRepo *Repository, prefix, distribution string) error {
-	repo, err := collection.ByPrefixDistribution(prefix, distribution)
-	if err != nil {
-		return err
-	}
-
-	removePrefix := true
-	removePoolComponent := true
-	repoPosition := -1
-
-	for i, r := range collection.list {
-		if r == repo {
-			repoPosition = i
-			continue
-		}
-		if r.Prefix == repo.Prefix {
-			removePrefix = false
-			if r.Component == repo.Component {
-				removePoolComponent = false
-			}
-		}
-	}
-
-	err = repo.RemoveFiles(packageRepo, removePrefix, removePoolComponent)
-	if err != nil {
-		return err
-	}
-
-	collection.list[len(collection.list)-1], collection.list[repoPosition], collection.list =
-		nil, collection.list[len(collection.list)-1], collection.list[:len(collection.list)-1]
-
-	return collection.db.Delete(repo.Key())
-}

debian/publish_test.go

@@ -1,476 +0,0 @@
-package debian
-
-import (
-	"errors"
-	"github.com/smira/aptly/database"
-	. "launchpad.net/gocheck"
-	"os"
-	"path/filepath"
-)
-
-type pathExistsChecker struct {
-	*CheckerInfo
-}
-
-var PathExists = &pathExistsChecker{
-	&CheckerInfo{Name: "PathExists", Params: []string{"path"}},
-}
-
-func (checker *pathExistsChecker) Check(params []interface{}, names []string) (result bool, error string) {
-	_, err := os.Stat(params[0].(string))
-	return err == nil, ""
-}
-
-type NullSigner struct{}
-
-func (n *NullSigner) Init() error {
-	return nil
-}
-
-func (n *NullSigner) SetKey(keyRef string) {
-
-}
-
-func (n *NullSigner) DetachedSign(source string, destination string) error {
-	return nil
-}
-
-func (n *NullSigner) ClearSign(source string, destination string) error {
-	return nil
-}
-
-type PublishedRepoSuite struct {
-	PackageListMixinSuite
-	repo              *PublishedRepo
-	packageRepo       *Repository
-	snapshot          *Snapshot
-	db                database.Storage
-	packageCollection *PackageCollection
-}
-
-var _ = Suite(&PublishedRepoSuite{})
-
-func (s *PublishedRepoSuite) SetUpTest(c *C) {
-	s.SetUpPackages()
-
-	s.db, _ = database.OpenDB(c.MkDir())
-
-	s.packageRepo = NewRepository(c.MkDir())
-
-	repo, _ := NewRemoteRepo("yandex", "http://mirror.yandex.ru/debian/", "squeeze", []string{"main"}, []string{})
-	repo.packageRefs = s.reflist
-
-	s.snapshot, _ = NewSnapshotFromRepository("snap", repo)
-
-	s.repo, _ = NewPublishedRepo("ppa", "squeeze", "main", nil, s.snapshot)
-
-	s.packageCollection = NewPackageCollection(s.db)
-	s.packageCollection.Update(s.p1)
-	s.packageCollection.Update(s.p2)
-	s.packageCollection.Update(s.p3)
-
-	poolPath, _ := s.packageRepo.PoolPath(s.p1.Files[0].Filename, s.p1.Files[0].Checksums.MD5)
-	err := os.MkdirAll(filepath.Dir(poolPath), 0755)
-	f, err := os.Create(poolPath)
-	c.Assert(err, IsNil)
-	f.Close()
-}
-
-func (s *PublishedRepoSuite) TearDownTest(c *C) {
-	s.db.Close()
-}
-
-func (s *PublishedRepoSuite) TestPrefixNormalization(c *C) {
-
-	for _, t := range []struct {
-		prefix        string
-		expected      string
-		errorExpected string
-	}{
-		{
-			prefix:   "ppa",
-			expected: "ppa",
-		},
-		{
-			prefix:   "",
-			expected: ".",
-		},
-		{
-			prefix:   "/",
-			expected: ".",
-		},
-		{
-			prefix:   "//",
-			expected: ".",
-		},
-		{
-			prefix:   "//ppa/",
-			expected: "ppa",
-		},
-		{
-			prefix:   "ppa/..",
-			expected: ".",
-		},
-		{
-			prefix:   "ppa/ubuntu/",
-			expected: "ppa/ubuntu",
-		},
-		{
-			prefix:   "ppa/../ubuntu/",
-			expected: "ubuntu",
-		},
-		{
-			prefix:        "../ppa/",
-			errorExpected: "invalid prefix .*",
-		},
-		{
-			prefix:        "../ppa/../ppa/",
-			errorExpected: "invalid prefix .*",
-		},
-		{
-			prefix:        "ppa/dists",
-			errorExpected: "invalid prefix .*",
-		},
-		{
-			prefix:        "ppa/pool",
-			errorExpected: "invalid prefix .*",
-		},
-	} {
-		repo, err := NewPublishedRepo(t.prefix, "squeeze", "main", nil, s.snapshot)
-		if t.errorExpected != "" {
-			c.Check(err, ErrorMatches, t.errorExpected)
-		} else {
-			c.Check(repo.Prefix, Equals, t.expected)
-		}
-	}
-}
-
-func (s *PublishedRepoSuite) TestPublish(c *C) {
-	err := s.repo.Publish(s.packageRepo, s.packageCollection, &NullSigner{})
-	c.Assert(err, IsNil)
-
-	c.Check(s.repo.Architectures, DeepEquals, []string{"i386"})
-
-	rf, err := os.Open(filepath.Join(s.packageRepo.RootPath, "public/ppa/dists/squeeze/Release"))
-	c.Assert(err, IsNil)
-
-	cfr := NewControlFileReader(rf)
-	st, err := cfr.ReadStanza()
-	c.Assert(err, IsNil)
-
-	c.Check(st["Origin"], Equals, "ppa squeeze")
-	c.Check(st["Components"], Equals, "main")
-	c.Check(st["Architectures"], Equals, "i386")
-
-	pf, err := os.Open(filepath.Join(s.packageRepo.RootPath, "public/ppa/dists/squeeze/main/binary-i386/Packages"))
-	c.Assert(err, IsNil)
-
-	cfr = NewControlFileReader(pf)
-
-	for i := 0; i < 3; i++ {
-		st, err = cfr.ReadStanza()
-		c.Assert(err, IsNil)
-
-		c.Check(st["Filename"], Equals, "pool/main/a/alien-arena/alien-arena-common_7.40-2_i386.deb")
-	}
-
-	st, err = cfr.ReadStanza()
-	c.Assert(err, IsNil)
-	c.Assert(st, IsNil)
-
-	_, err = os.Stat(filepath.Join(s.packageRepo.RootPath, "public/ppa/pool/main/a/alien-arena/alien-arena-common_7.40-2_i386.deb"))
-	c.Assert(err, IsNil)
-}
-
-func (s *PublishedRepoSuite) TestPublishNoSigner(c *C) {
-	err := s.repo.Publish(s.packageRepo, s.packageCollection, nil)
-	c.Assert(err, IsNil)
-
-	c.Check(filepath.Join(s.packageRepo.RootPath, "public/ppa/dists/squeeze/Release"), PathExists)
-}
-
-func (s *PublishedRepoSuite) TestString(c *C) {
-	c.Check(s.repo.String(), Equals,
-		"ppa/squeeze (main) publishes [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze")
-	repo, _ := NewPublishedRepo("", "squeeze", "main", nil, s.snapshot)
-	c.Check(repo.String(), Equals,
-		"./squeeze (main) publishes [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze")
-	repo, _ = NewPublishedRepo("", "squeeze", "main", []string{"i386", "amd64"}, s.snapshot)
-	c.Check(repo.String(), Equals,
-		"./squeeze (main) [i386, amd64] publishes [snap]: Snapshot from mirror [yandex]: http://mirror.yandex.ru/debian/ squeeze")
-}
-
-func (s *PublishedRepoSuite) TestKey(c *C) {
-	c.Check(s.repo.Key(), DeepEquals, []byte("Uppa>>squeeze"))
-}
-
-func (s *PublishedRepoSuite) TestEncodeDecode(c *C) {
-	encoded := s.repo.Encode()
-	repo := &PublishedRepo{}
-	err := repo.Decode(encoded)
-
-	s.repo.snapshot = nil
-	c.Assert(err, IsNil)
-	c.Assert(repo, DeepEquals, s.repo)
-}
-
-type PublishedRepoCollectionSuite struct {
-	PackageListMixinSuite
-	db                  database.Storage
-	snapshotCollection  *SnapshotCollection
-	collection          *PublishedRepoCollection
-	snap1, snap2        *Snapshot
-	repo1, repo2, repo3 *PublishedRepo
-}
-
-var _ = Suite(&PublishedRepoCollectionSuite{})
-
-func (s *PublishedRepoCollectionSuite) SetUpTest(c *C) {
-	s.db, _ = database.OpenDB(c.MkDir())
-
-	s.snapshotCollection = NewSnapshotCollection(s.db)
-
-	s.snap1 = NewSnapshotFromPackageList("snap1", []*Snapshot{}, NewPackageList(), "desc1")
-	s.snap2 = NewSnapshotFromPackageList("snap2", []*Snapshot{}, NewPackageList(), "desc2")
-
-	s.snapshotCollection.Add(s.snap1)
-	s.snapshotCollection.Add(s.snap2)
-
-	s.repo1, _ = NewPublishedRepo("ppa", "anaconda", "main", []string{}, s.snap1)
-	s.repo2, _ = NewPublishedRepo("", "anaconda", "main", []string{}, s.snap2)
-	s.repo3, _ = NewPublishedRepo("ppa", "anaconda", "main", []string{}, s.snap2)
-
-	s.collection = NewPublishedRepoCollection(s.db)
-}
-
-func (s *PublishedRepoCollectionSuite) TearDownTest(c *C) {
-	s.db.Close()
-}
-
-func (s *PublishedRepoCollectionSuite) TestAddByPrefixDistribution(c *C) {
-	r, err := s.collection.ByPrefixDistribution("ppa", "anaconda")
-	c.Assert(err, ErrorMatches, "*.not found")
-
-	c.Assert(s.collection.Add(s.repo1), IsNil)
-	c.Assert(s.collection.Add(s.repo1), ErrorMatches, ".*already exists")
-	c.Assert(s.collection.CheckDuplicate(s.repo2), IsNil)
-	c.Assert(s.collection.Add(s.repo2), IsNil)
-	c.Assert(s.collection.Add(s.repo3), ErrorMatches, ".*already exists")
-	c.Assert(s.collection.CheckDuplicate(s.repo3), Equals, s.repo1)
-
-	r, err = s.collection.ByPrefixDistribution("ppa", "anaconda")
-	c.Assert(err, IsNil)
-
-	err = s.collection.LoadComplete(r, s.snapshotCollection)
-	c.Assert(err, IsNil)
-	c.Assert(r.String(), Equals, s.repo1.String())
-
-	collection := NewPublishedRepoCollection(s.db)
-	r, err = collection.ByPrefixDistribution("ppa", "anaconda")
-	c.Assert(err, IsNil)
-
-	err = s.collection.LoadComplete(r, s.snapshotCollection)
-	c.Assert(err, IsNil)
-	c.Assert(r.String(), Equals, s.repo1.String())
-}
-
-func (s *PublishedRepoCollectionSuite) TestByUUID(c *C) {
-	r, err := s.collection.ByUUID(s.repo1.UUID)
-	c.Assert(err, ErrorMatches, "*.not found")
-
-	c.Assert(s.collection.Add(s.repo1), IsNil)
-
-	r, err = s.collection.ByUUID(s.repo1.UUID)
-	c.Assert(err, IsNil)
-
-	err = s.collection.LoadComplete(r, s.snapshotCollection)
-	c.Assert(err, IsNil)
-	c.Assert(r.String(), Equals, s.repo1.String())
-}
-
-func (s *PublishedRepoCollectionSuite) TestUpdateLoadComplete(c *C) {
-	c.Assert(s.collection.Update(s.repo1), IsNil)
-
-	collection := NewPublishedRepoCollection(s.db)
-	r, err := collection.ByPrefixDistribution("ppa", "anaconda")
-	c.Assert(err, IsNil)
-	c.Assert(r.snapshot, IsNil)
-	c.Assert(s.collection.LoadComplete(r, s.snapshotCollection), IsNil)
-	c.Assert(r.snapshot.UUID, Equals, s.repo1.snapshot.UUID)
-}
-
-func (s *PublishedRepoCollectionSuite) TestForEachAndLen(c *C) {
-	s.collection.Add(s.repo1)
-
-	count := 0
-	err := s.collection.ForEach(func(*PublishedRepo) error {
-		count++
-		return nil
-	})
-	c.Assert(count, Equals, 1)
-	c.Assert(err, IsNil)
-
-	c.Check(s.collection.Len(), Equals, 1)
-
-	e := errors.New("c")
-
-	err = s.collection.ForEach(func(*PublishedRepo) error {
-		return e
-	})
-	c.Assert(err, Equals, e)
-}
-
-func (s *PublishedRepoCollectionSuite) TestBySnapshot(c *C) {
-	c.Check(s.collection.Add(s.repo1), IsNil)
-	c.Check(s.collection.Add(s.repo2), IsNil)
-
-	c.Check(s.collection.BySnapshot(s.snap1), DeepEquals, []*PublishedRepo{s.repo1})
-	c.Check(s.collection.BySnapshot(s.snap2), DeepEquals, []*PublishedRepo{s.repo2})
-}
-
-type PublishedRepoRemoveSuite struct {
-	PackageListMixinSuite
-	db                         database.Storage
-	snapshotCollection         *SnapshotCollection
-	collection                 *PublishedRepoCollection
-	packageRepo                *Repository
-	snap1                      *Snapshot
-	repo1, repo2, repo3, repo4 *PublishedRepo
-}
-
-var _ = Suite(&PublishedRepoRemoveSuite{})
-
-func (s *PublishedRepoRemoveSuite) SetUpTest(c *C) {
-	s.db, _ = database.OpenDB(c.MkDir())
-
-	s.snapshotCollection = NewSnapshotCollection(s.db)
-
-	s.snap1 = NewSnapshotFromPackageList("snap1", []*Snapshot{}, NewPackageList(), "desc1")
-
-	s.snapshotCollection.Add(s.snap1)
-
-	s.repo1, _ = NewPublishedRepo("ppa", "anaconda", "main", []string{}, s.snap1)
-	s.repo2, _ = NewPublishedRepo("", "anaconda", "main", []string{}, s.snap1)
-	s.repo3, _ = NewPublishedRepo("ppa", "meduza", "main", []string{}, s.snap1)
-	s.repo4, _ = NewPublishedRepo("ppa", "osminog", "contrib", []string{}, s.snap1)
-
-	s.collection = NewPublishedRepoCollection(s.db)
-	s.collection.Add(s.repo1)
-	s.collection.Add(s.repo2)
-	s.collection.Add(s.repo3)
-	s.collection.Add(s.repo4)
-
-	s.packageRepo = NewRepository(c.MkDir())
-	s.packageRepo.MkDir("ppa/dists/anaconda")
-	s.packageRepo.MkDir("ppa/dists/meduza")
-	s.packageRepo.MkDir("ppa/dists/osminog")
-	s.packageRepo.MkDir("ppa/pool/main")
-	s.packageRepo.MkDir("ppa/pool/contrib")
-	s.packageRepo.MkDir("dists/anaconda")
-	s.packageRepo.MkDir("pool/main")
-}
-
-func (s *PublishedRepoRemoveSuite) TearDownTest(c *C) {
-	s.db.Close()
-}
-
-func (s *PublishedRepoRemoveSuite) TestRemoveFilesOnlyDist(c *C) {
-	s.repo1.RemoveFiles(s.packageRepo, false, false)
-
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/meduza"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/osminog"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/main"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/contrib"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "dists/anaconda"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "pool/main"), PathExists)
-}
-
-func (s *PublishedRepoRemoveSuite) TestRemoveFilesWithPool(c *C) {
-	s.repo1.RemoveFiles(s.packageRepo, false, true)
-
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/meduza"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/osminog"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/main"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/contrib"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "dists/anaconda"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "pool/main"), PathExists)
-}
-
-func (s *PublishedRepoRemoveSuite) TestRemoveFilesWithPrefix(c *C) {
-	s.repo1.RemoveFiles(s.packageRepo, true, true)
-
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/meduza"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/osminog"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/main"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/contrib"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "dists/anaconda"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "pool/main"), PathExists)
-}
-
-func (s *PublishedRepoRemoveSuite) TestRemoveFilesWithPrefixRoot(c *C) {
-	s.repo2.RemoveFiles(s.packageRepo, true, true)
-
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/anaconda"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/meduza"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/main"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/contrib"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "dists/anaconda"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "pool/main"), Not(PathExists))
-}
-
-func (s *PublishedRepoRemoveSuite) TestRemoveRepo1and2(c *C) {
-	err := s.collection.Remove(s.packageRepo, "ppa", "anaconda")
-	c.Check(err, IsNil)
-
-	_, err = s.collection.ByPrefixDistribution("ppa", "anaconda")
-	c.Check(err, ErrorMatches, ".*not found")
-
-	collection := NewPublishedRepoCollection(s.db)
-	_, err = collection.ByPrefixDistribution("ppa", "anaconda")
-	c.Check(err, ErrorMatches, ".*not found")
-
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/meduza"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/osminog"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/main"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/contrib"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "dists/anaconda"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "pool/main"), PathExists)
-
-	err = s.collection.Remove(s.packageRepo, "ppa", "anaconda")
-	c.Check(err, ErrorMatches, ".*not found")
-
-	err = s.collection.Remove(s.packageRepo, "ppa", "meduza")
-	c.Check(err, IsNil)
-
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/anaconda"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/meduza"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/osminog"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/main"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/contrib"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "dists/anaconda"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "pool/main"), PathExists)
-}
-
-func (s *PublishedRepoRemoveSuite) TestRemoveRepo3(c *C) {
-	err := s.collection.Remove(s.packageRepo, ".", "anaconda")
-	c.Check(err, IsNil)
-
-	_, err = s.collection.ByPrefixDistribution(".", "anaconda")
-	c.Check(err, ErrorMatches, ".*not found")
-
-	collection := NewPublishedRepoCollection(s.db)
-	_, err = collection.ByPrefixDistribution(".", "anaconda")
-	c.Check(err, ErrorMatches, ".*not found")
-
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/anaconda"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/meduza"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/dists/osminog"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/main"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "ppa/pool/contrib"), PathExists)
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "dists/"), Not(PathExists))
-	c.Check(filepath.Join(s.packageRepo.PublicPath(), "pool/"), Not(PathExists))
-}

debian/repository.go

@@ -1,93 +0,0 @@
-package debian
-
-import (
-	"fmt"
-	"github.com/smira/aptly/utils"
-	"os"
-	"path/filepath"
-)
-
-// Repository directory structure:
-// <root>
-// \- pool
-//    \- ab
-//       \- ae
-//          \- package.deb
-// \- public
-//    \- dists
-//       \- squeeze
-//          \- Release
-//          \- main
-//             \- binary-i386
-//                \- Packages.bz2
-//                   references packages from pool
-//    \- pool
-//       contains symlinks to main pool
-
-// Repository abstract file system with package pool and published package repos
-type Repository struct {
-	RootPath string
-}
-
-// NewRepository creates new instance of repository which specified root
-func NewRepository(root string) *Repository {
-	return &Repository{RootPath: root}
-}
-
-// PoolPath returns full path to package file in pool givan any name and hash of file contents
-func (r *Repository) PoolPath(filename string, hashMD5 string) (string, error) {
-	filename = filepath.Base(filename)
-	if filename == "." || filename == "/" {
-		return "", fmt.Errorf("filename %s is invalid", filename)
-	}
-
-	return filepath.Join(r.RootPath, "pool", hashMD5[0:2], hashMD5[2:4], filename), nil
-}
-
-// PublicPath returns root of public part of repository
-func (r *Repository) PublicPath() string {
-	return filepath.Join(r.RootPath, "public")
-}
-
-// MkDir creates directory recursively under public path
-func (r *Repository) MkDir(path string) error {
-	return os.MkdirAll(filepath.Join(r.RootPath, "public", path), 0755)
-}
-
-// CreateFile creates file for writing under public path
-func (r *Repository) CreateFile(path string) (*os.File, error) {
-	return os.Create(filepath.Join(r.RootPath, "public", path))
-}
-
-// RemoveDirs removes directory structure under public path
-func (r *Repository) RemoveDirs(path string) error {
-	filepath := filepath.Join(r.RootPath, "public", path)
-	fmt.Printf("Removing %s...\n", filepath)
-	return os.RemoveAll(filepath)
-}
-
-// LinkFromPool links package file from pool to dist's pool location
-func (r *Repository) LinkFromPool(prefix string, component string, sourcePath string, poolDirectory string) (string, error) {
-	baseName := filepath.Base(sourcePath)
-
-	relPath := filepath.Join("pool", component, poolDirectory, baseName)
-	poolPath := filepath.Join(r.RootPath, "public", prefix, "pool", component, poolDirectory)
-
-	err := os.MkdirAll(poolPath, 0755)
-	if err != nil {
-		return "", err
-	}
-
-	_, err = os.Stat(filepath.Join(poolPath, baseName))
-	if err == nil { // already exists, skip
-		return relPath, nil
-	}
-
-	err = os.Link(sourcePath, filepath.Join(poolPath, baseName))
-	return relPath, err
-}
-
-// ChecksumsForFile proxies requests to utils.ChecksumsForFile, joining public path
-func (r *Repository) ChecksumsForFile(path string) (utils.ChecksumInfo, error) {
-	return utils.ChecksumsForFile(filepath.Join(r.RootPath, "public", path))
-}

debian/repository_test.go

@@ -1,130 +0,0 @@
-package debian
-
-import (
-	. "launchpad.net/gocheck"
-	"os"
-	"path/filepath"
-	"syscall"
-)
-
-type RepositorySuite struct {
-	repo *Repository
-}
-
-var _ = Suite(&RepositorySuite{})
-
-func (s *RepositorySuite) SetUpTest(c *C) {
-	s.repo = NewRepository(c.MkDir())
-}
-
-func (s *RepositorySuite) TestPoolPath(c *C) {
-	path, err := s.repo.PoolPath("a/b/package.deb", "91b1a1480b90b9e269ca44d897b12575")
-	c.Assert(err, IsNil)
-	c.Assert(path, Equals, filepath.Join(s.repo.RootPath, "pool", "91/b1/package.deb"))
-
-	_, err = s.repo.PoolPath("/", "91b1a1480b90b9e269ca44d897b12575")
-	c.Assert(err, ErrorMatches, ".*is invalid")
-	_, err = s.repo.PoolPath("", "91b1a1480b90b9e269ca44d897b12575")
-	c.Assert(err, ErrorMatches, ".*is invalid")
-}
-
-func (s *RepositorySuite) TestPublicPath(c *C) {
-	c.Assert(s.repo.PublicPath(), Equals, filepath.Join(s.repo.RootPath, "public"))
-}
-
-func (s *RepositorySuite) TestMkDir(c *C) {
-	err := s.repo.MkDir("ppa/dists/squeeze/")
-	c.Assert(err, IsNil)
-
-	_, err = os.Stat(filepath.Join(s.repo.RootPath, "public/ppa/dists/squeeze/"))
-	c.Assert(err, IsNil)
-}
-
-func (s *RepositorySuite) TestCreateFile(c *C) {
-	err := s.repo.MkDir("ppa/dists/squeeze/")
-	c.Assert(err, IsNil)
-
-	file, err := s.repo.CreateFile("ppa/dists/squeeze/Release")
-	c.Assert(err, IsNil)
-	defer file.Close()
-
-	_, err = os.Stat(filepath.Join(s.repo.RootPath, "public/ppa/dists/squeeze/Release"))
-	c.Assert(err, IsNil)
-}
-
-func (s *RepositorySuite) TestRemoveDirs(c *C) {
-	err := s.repo.MkDir("ppa/dists/squeeze/")
-	c.Assert(err, IsNil)
-
-	file, err := s.repo.CreateFile("ppa/dists/squeeze/Release")
-	c.Assert(err, IsNil)
-	defer file.Close()
-
-	err = s.repo.RemoveDirs("ppa/dists/")
-
-	_, err = os.Stat(filepath.Join(s.repo.RootPath, "public/ppa/dists/squeeze/Release"))
-	c.Assert(err, NotNil)
-	c.Assert(os.IsNotExist(err), Equals, true)
-}
-
-func (s *RepositorySuite) TestLinkFromPool(c *C) {
-	tests := []struct {
-		prefix           string
-		component        string
-		sourcePath       string
-		poolDirectory    string
-		expectedFilename string
-	}{
-		{ // package name regular
-			prefix:           "",
-			component:        "main",
-			sourcePath:       "pool/01/ae/mars-invaders_1.03.deb",
-			poolDirectory:    "m/mars-invaders",
-			expectedFilename: "pool/main/m/mars-invaders/mars-invaders_1.03.deb",
-		},
-		{ // lib-like filename
-			prefix:           "",
-			component:        "main",
-			sourcePath:       "pool/01/ae/libmars-invaders_1.03.deb",
-			poolDirectory:    "libm/libmars-invaders",
-			expectedFilename: "pool/main/libm/libmars-invaders/libmars-invaders_1.03.deb",
-		},
-		{ // duplicate link, shouldn't panic
-			prefix:           "",
-			component:        "main",
-			sourcePath:       "pool/01/ae/mars-invaders_1.03.deb",
-			poolDirectory:    "m/mars-invaders",
-			expectedFilename: "pool/main/m/mars-invaders/mars-invaders_1.03.deb",
-		},
-		{ // prefix & component
-			prefix:           "ppa",
-			component:        "contrib",
-			sourcePath:       "pool/01/ae/libmars-invaders_1.04.deb",
-			poolDirectory:    "libm/libmars-invaders",
-			expectedFilename: "pool/contrib/libm/libmars-invaders/libmars-invaders_1.04.deb",
-		},
-	}
-
-	for _, t := range tests {
-		t.sourcePath = filepath.Join(s.repo.RootPath, t.sourcePath)
-
-		err := os.MkdirAll(filepath.Dir(t.sourcePath), 0755)
-		c.Assert(err, IsNil)
-
-		file, err := os.Create(t.sourcePath)
-		c.Assert(err, IsNil)
-
-		file.Write([]byte("Contents"))
-		file.Close()
-
-		path, err := s.repo.LinkFromPool(t.prefix, t.component, t.sourcePath, t.poolDirectory)
-		c.Assert(err, IsNil)
-		c.Assert(path, Equals, t.expectedFilename)
-
-		st, err := os.Stat(filepath.Join(s.repo.RootPath, "public", t.prefix, t.expectedFilename))
-		c.Assert(err, IsNil)
-
-		info := st.Sys().(*syscall.Stat_t)
-		c.Check(int(info.Nlink), Equals, 2)
-	}
-}

files/files.go

@@ -0,0 +1,19 @@
+// Package files handles operation on filesystem for both public pool and published files
+package files
+
+// Repository directory structure:
+// <root>
+// \- pool
+//    \- ab
+//       \- ae
+//          \- package.deb
+// \- public
+//    \- dists
+//       \- squeeze
+//          \- Release
+//          \- main
+//             \- binary-i386
+//                \- Packages.bz2
+//                   references packages from pool
+//    \- pool
+//       contains symlinks to main pool

files/files_test.go

@@ -0,0 +1,11 @@
+package files
+
+import (
+	. "launchpad.net/gocheck"
+	"testing"
+)
+
+// Launch gocheck tests
+func Test(t *testing.T) {
+	TestingT(t)
+}

files/package_pool.go

@@ -0,0 +1,154 @@
+package files
+
+import (
+	"fmt"
+	"github.com/smira/aptly/aptly"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+// PackagePool is deduplicated storage of package files on filesystem
+type PackagePool struct {
+	rootPath string
+}
+
+// Check interface
+var (
+	_ aptly.PackagePool = (*PackagePool)(nil)
+)
+
+// NewPackagePool creates new instance of PackagePool which specified root
+func NewPackagePool(root string) *PackagePool {
+	return &PackagePool{rootPath: filepath.Join(root, "pool")}
+}
+
+// RelativePath returns path relative to pool's root for package files given MD5 and original filename
+func (pool *PackagePool) RelativePath(filename string, hashMD5 string) (string, error) {
+	filename = filepath.Base(filename)
+	if filename == "." || filename == "/" {
+		return "", fmt.Errorf("filename %s is invalid", filename)
+	}
+
+	if len(hashMD5) < 4 {
+		return "", fmt.Errorf("unable to compute pool location for filename %v, MD5 is missing", filename)
+	}
+
+	return filepath.Join(hashMD5[0:2], hashMD5[2:4], filename), nil
+}
+
+// Path returns full path to package file in pool given any name and hash of file contents
+func (pool *PackagePool) Path(filename string, hashMD5 string) (string, error) {
+	relative, err := pool.RelativePath(filename, hashMD5)
+	if err != nil {
+		return "", err
+	}
+
+	return filepath.Join(pool.rootPath, relative), nil
+}
+
+// FilepathList returns file paths of all the files in the pool
+func (pool *PackagePool) FilepathList(progress aptly.Progress) ([]string, error) {
+	dirs, err := ioutil.ReadDir(pool.rootPath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	if len(dirs) == 0 {
+		return nil, nil
+	}
+
+	if progress != nil {
+		progress.InitBar(int64(len(dirs)), false)
+		defer progress.ShutdownBar()
+	}
+
+	result := []string{}
+
+	for _, dir := range dirs {
+		err = filepath.Walk(filepath.Join(pool.rootPath, dir.Name()), func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
+			if !info.IsDir() {
+				result = append(result, path[len(pool.rootPath)+1:])
+			}
+			return nil
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		if progress != nil {
+			progress.AddBar(1)
+		}
+	}
+
+	return result, nil
+}
+
+// Remove deletes file in package pool returns its size
+func (pool *PackagePool) Remove(path string) (size int64, err error) {
+	path = filepath.Join(pool.rootPath, path)
+
+	info, err := os.Stat(path)
+	if err != nil {
+		return 0, err
+	}
+
+	err = os.Remove(path)
+	return info.Size(), err
+}
+
+// Import copies file into package pool
+func (pool *PackagePool) Import(path string, hashMD5 string) error {
+	source, err := os.Open(path)
+	if err != nil {
+		return err
+	}
+	defer source.Close()
+
+	sourceInfo, err := source.Stat()
+	if err != nil {
+		return err
+	}
+
+	poolPath, err := pool.Path(path, hashMD5)
+	if err != nil {
+		return err
+	}
+
+	targetInfo, err := os.Stat(poolPath)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			// unable to stat target location?
+			return err
+		}
+		// file doesn't exist, that's ok
+	} else {
+		if targetInfo.Size() != sourceInfo.Size() {
+			// trying to overwrite file?
+			return fmt.Errorf("unable to import into pool: file %s already exists", poolPath)
+		}
+	}
+
+	// create subdirs as necessary
+	err = os.MkdirAll(filepath.Dir(poolPath), 0755)
+	if err != nil {
+		return err
+	}
+
+	target, err := os.Create(poolPath)
+	if err != nil {
+		return err
+	}
+	defer target.Close()
+
+	_, err = io.Copy(target, source)
+
+	return err
+}

files/package_pool_test.go

@@ -0,0 +1,119 @@
+package files
+
+import (
+	"io/ioutil"
+	. "launchpad.net/gocheck"
+	"os"
+	"path/filepath"
+	"runtime"
+)
+
+type PackagePoolSuite struct {
+	pool *PackagePool
+}
+
+var _ = Suite(&PackagePoolSuite{})
+
+func (s *PackagePoolSuite) SetUpTest(c *C) {
+	s.pool = NewPackagePool(c.MkDir())
+
+}
+
+func (s *PackagePoolSuite) TestRelativePath(c *C) {
+	path, err := s.pool.RelativePath("a/b/package.deb", "91b1a1480b90b9e269ca44d897b12575")
+	c.Assert(err, IsNil)
+	c.Assert(path, Equals, "91/b1/package.deb")
+
+	_, err = s.pool.RelativePath("/", "91b1a1480b90b9e269ca44d897b12575")
+	c.Assert(err, ErrorMatches, ".*is invalid")
+	_, err = s.pool.RelativePath("", "91b1a1480b90b9e269ca44d897b12575")
+	c.Assert(err, ErrorMatches, ".*is invalid")
+	_, err = s.pool.RelativePath("a/b/package.deb", "9")
+	c.Assert(err, ErrorMatches, ".*MD5 is missing")
+}
+
+func (s *PackagePoolSuite) TestPath(c *C) {
+	path, err := s.pool.Path("a/b/package.deb", "91b1a1480b90b9e269ca44d897b12575")
+	c.Assert(err, IsNil)
+	c.Assert(path, Equals, filepath.Join(s.pool.rootPath, "91/b1/package.deb"))
+
+	_, err = s.pool.Path("/", "91b1a1480b90b9e269ca44d897b12575")
+	c.Assert(err, ErrorMatches, ".*is invalid")
+}
+
+func (s *PackagePoolSuite) TestFilepathList(c *C) {
+	list, err := s.pool.FilepathList(nil)
+	c.Check(err, IsNil)
+	c.Check(list, IsNil)
+
+	os.MkdirAll(filepath.Join(s.pool.rootPath, "bd", "0b"), 0755)
+	os.MkdirAll(filepath.Join(s.pool.rootPath, "bd", "0a"), 0755)
+	os.MkdirAll(filepath.Join(s.pool.rootPath, "ae", "0c"), 0755)
+
+	list, err = s.pool.FilepathList(nil)
+	c.Check(err, IsNil)
+	c.Check(list, DeepEquals, []string{})
+
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "ae", "0c", "1.deb"), nil, 0644)
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "ae", "0c", "2.deb"), nil, 0644)
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "bd", "0a", "3.deb"), nil, 0644)
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "bd", "0b", "4.deb"), nil, 0644)
+
+	list, err = s.pool.FilepathList(nil)
+	c.Check(err, IsNil)
+	c.Check(list, DeepEquals, []string{"ae/0c/1.deb", "ae/0c/2.deb", "bd/0a/3.deb", "bd/0b/4.deb"})
+}
+
+func (s *PackagePoolSuite) TestRemove(c *C) {
+	os.MkdirAll(filepath.Join(s.pool.rootPath, "bd", "0b"), 0755)
+	os.MkdirAll(filepath.Join(s.pool.rootPath, "bd", "0a"), 0755)
+	os.MkdirAll(filepath.Join(s.pool.rootPath, "ae", "0c"), 0755)
+
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "ae", "0c", "1.deb"), []byte("1"), 0644)
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "ae", "0c", "2.deb"), []byte("22"), 0644)
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "bd", "0a", "3.deb"), []byte("333"), 0644)
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "bd", "0b", "4.deb"), []byte("4444"), 0644)
+
+	size, err := s.pool.Remove("ae/0c/2.deb")
+	c.Check(err, IsNil)
+	c.Check(size, Equals, int64(2))
+
+	_, err = s.pool.Remove("ae/0c/2.deb")
+	c.Check(err, ErrorMatches, ".*no such file or directory")
+
+	list, err := s.pool.FilepathList(nil)
+	c.Check(err, IsNil)
+	c.Check(list, DeepEquals, []string{"ae/0c/1.deb", "bd/0a/3.deb", "bd/0b/4.deb"})
+}
+
+func (s *PackagePoolSuite) TestImportOk(c *C) {
+	_, _File, _, _ := runtime.Caller(0)
+	debFile := filepath.Join(filepath.Dir(_File), "../system/files/libboost-program-options-dev_1.49.0.1_i386.deb")
+
+	err := s.pool.Import(debFile, "91b1a1480b90b9e269ca44d897b12575")
+	c.Check(err, IsNil)
+
+	info, err := os.Stat(filepath.Join(s.pool.rootPath, "91", "b1", "libboost-program-options-dev_1.49.0.1_i386.deb"))
+	c.Check(err, IsNil)
+	c.Check(info.Size(), Equals, int64(2738))
+
+	// double import, should be ok
+	err = s.pool.Import(debFile, "91b1a1480b90b9e269ca44d897b12575")
+	c.Check(err, IsNil)
+}
+
+func (s *PackagePoolSuite) TestImportNotExist(c *C) {
+	err := s.pool.Import("no-such-file", "91b1a1480b90b9e269ca44d897b12575")
+	c.Check(err, ErrorMatches, ".*no such file or directory")
+}
+
+func (s *PackagePoolSuite) TestImportOverwrite(c *C) {
+	_, _File, _, _ := runtime.Caller(0)
+	debFile := filepath.Join(filepath.Dir(_File), "../system/files/libboost-program-options-dev_1.49.0.1_i386.deb")
+
+	os.MkdirAll(filepath.Join(s.pool.rootPath, "91", "b1"), 0755)
+	ioutil.WriteFile(filepath.Join(s.pool.rootPath, "91", "b1", "libboost-program-options-dev_1.49.0.1_i386.deb"), []byte("1"), 0644)
+
+	err := s.pool.Import(debFile, "91b1a1480b90b9e269ca44d897b12575")
+	c.Check(err, ErrorMatches, "unable to import into pool.*")
+}

files/public.go

@@ -0,0 +1,108 @@
+package files
+
+import (
+	"github.com/smira/aptly/aptly"
+	"github.com/smira/aptly/utils"
+	"os"
+	"path/filepath"
+)
+
+// PublishedStorage abstract file system with public dirs (published repos)
+type PublishedStorage struct {
+	rootPath string
+}
+
+// Check interface
+var (
+	_ aptly.PublishedStorage = (*PublishedStorage)(nil)
+)
+
+// NewPublishedStorage creates new instance of PublishedStorage which specified root
+func NewPublishedStorage(root string) *PublishedStorage {
+	return &PublishedStorage{rootPath: filepath.Join(root, "public")}
+}
+
+// PublicPath returns root of public part
+func (storage *PublishedStorage) PublicPath() string {
+	return storage.rootPath
+}
+
+// MkDir creates directory recursively under public path
+func (storage *PublishedStorage) MkDir(path string) error {
+	return os.MkdirAll(filepath.Join(storage.rootPath, path), 0755)
+}
+
+// CreateFile creates file for writing under public path
+func (storage *PublishedStorage) CreateFile(path string) (*os.File, error) {
+	return os.Create(filepath.Join(storage.rootPath, path))
+}
+
+// Remove removes single file under public path
+func (storage *PublishedStorage) Remove(path string) error {
+	filepath := filepath.Join(storage.rootPath, path)
+	return os.Remove(filepath)
+}
+
+// RemoveDirs removes directory structure under public path
+func (storage *PublishedStorage) RemoveDirs(path string, progress aptly.Progress) error {
+	filepath := filepath.Join(storage.rootPath, path)
+	if progress != nil {
+		progress.Printf("Removing %s...\n", filepath)
+	}
+	return os.RemoveAll(filepath)
+}
+
+// LinkFromPool links package file from pool to dist's pool location
+//
+// publishedDirectory is desired location in pool (like prefix/pool/component/liba/libav/)
+// sourcePool is instance of aptly.PackagePool
+// sourcePath is filepath to package file in package pool
+//
+// LinkFromPool returns relative path for the published file to be included in package index
+func (storage *PublishedStorage) LinkFromPool(publishedDirectory string, sourcePool aptly.PackagePool, sourcePath string) error {
+	// verify that package pool is local pool is filesystem pool
+	_ = sourcePool.(*PackagePool)
+
+	baseName := filepath.Base(sourcePath)
+	poolPath := filepath.Join(storage.rootPath, publishedDirectory)
+
+	err := os.MkdirAll(poolPath, 0755)
+	if err != nil {
+		return err
+	}
+
+	_, err = os.Stat(filepath.Join(poolPath, baseName))
+	if err == nil { // already exists, skip
+		return nil
+	}
+
+	return os.Link(sourcePath, filepath.Join(poolPath, baseName))
+}
+
+// Filelist returns list of files under prefix
+func (storage *PublishedStorage) Filelist(prefix string) ([]string, error) {
+	root := filepath.Join(storage.rootPath, prefix)
+	result := []string{}
+
+	err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !info.IsDir() {
+			result = append(result, path[len(root)+1:])
+		}
+		return nil
+	})
+
+	return result, err
+}
+
+// ChecksumsForFile proxies requests to utils.ChecksumsForFile, joining public path
+func (storage *PublishedStorage) ChecksumsForFile(path string) (utils.ChecksumInfo, error) {
+	return utils.ChecksumsForFile(filepath.Join(storage.rootPath, path))
+}
+
+// RenameFile renames (moves) file
+func (storage *PublishedStorage) RenameFile(oldName, newName string) error {
+	return os.Rename(filepath.Join(storage.rootPath, oldName), filepath.Join(storage.rootPath, newName))
+}

files/public_test.go

@@ -0,0 +1,167 @@
+package files
+
+import (
+	"io/ioutil"
+	. "launchpad.net/gocheck"
+	"os"
+	"path/filepath"
+	"syscall"
+)
+
+type PublishedStorageSuite struct {
+	root    string
+	storage *PublishedStorage
+}
+
+var _ = Suite(&PublishedStorageSuite{})
+
+func (s *PublishedStorageSuite) SetUpTest(c *C) {
+	s.root = c.MkDir()
+	s.storage = NewPublishedStorage(s.root)
+}
+
+func (s *PublishedStorageSuite) TestPublicPath(c *C) {
+	c.Assert(s.storage.PublicPath(), Equals, filepath.Join(s.root, "public"))
+}
+
+func (s *PublishedStorageSuite) TestMkDir(c *C) {
+	err := s.storage.MkDir("ppa/dists/squeeze/")
+	c.Assert(err, IsNil)
+
+	_, err = os.Stat(filepath.Join(s.storage.rootPath, "ppa/dists/squeeze/"))
+	c.Assert(err, IsNil)
+}
+
+func (s *PublishedStorageSuite) TestCreateFile(c *C) {
+	err := s.storage.MkDir("ppa/dists/squeeze/")
+	c.Assert(err, IsNil)
+
+	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	c.Assert(err, IsNil)
+	defer file.Close()
+
+	_, err = os.Stat(filepath.Join(s.storage.rootPath, "ppa/dists/squeeze/Release"))
+	c.Assert(err, IsNil)
+}
+
+func (s *PublishedStorageSuite) TestFilelist(c *C) {
+	err := s.storage.MkDir("ppa/pool/main/a/ab/")
+	c.Assert(err, IsNil)
+
+	file, err := s.storage.CreateFile("ppa/pool/main/a/ab/a.deb")
+	c.Assert(err, IsNil)
+	defer file.Close()
+
+	file2, err := s.storage.CreateFile("ppa/pool/main/a/ab/b.deb")
+	c.Assert(err, IsNil)
+	defer file2.Close()
+
+	list, err := s.storage.Filelist("ppa/pool/main/")
+	c.Check(err, IsNil)
+	c.Check(list, DeepEquals, []string{"a/ab/a.deb", "a/ab/b.deb"})
+}
+
+func (s *PublishedStorageSuite) TestRenameFile(c *C) {
+	err := s.storage.MkDir("ppa/dists/squeeze/")
+	c.Assert(err, IsNil)
+
+	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	c.Assert(err, IsNil)
+	defer file.Close()
+
+	err = s.storage.RenameFile("ppa/dists/squeeze/Release", "ppa/dists/squeeze/InRelease")
+	c.Check(err, IsNil)
+
+	_, err = os.Stat(filepath.Join(s.storage.rootPath, "ppa/dists/squeeze/InRelease"))
+	c.Assert(err, IsNil)
+}
+
+func (s *PublishedStorageSuite) TestRemoveDirs(c *C) {
+	err := s.storage.MkDir("ppa/dists/squeeze/")
+	c.Assert(err, IsNil)
+
+	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	c.Assert(err, IsNil)
+	defer file.Close()
+
+	err = s.storage.RemoveDirs("ppa/dists/", nil)
+
+	_, err = os.Stat(filepath.Join(s.storage.rootPath, "ppa/dists/squeeze/Release"))
+	c.Assert(err, NotNil)
+	c.Assert(os.IsNotExist(err), Equals, true)
+}
+
+func (s *PublishedStorageSuite) TestRemove(c *C) {
+	err := s.storage.MkDir("ppa/dists/squeeze/")
+	c.Assert(err, IsNil)
+
+	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	c.Assert(err, IsNil)
+	defer file.Close()
+
+	err = s.storage.Remove("ppa/dists/squeeze/Release")
+
+	_, err = os.Stat(filepath.Join(s.storage.rootPath, "ppa/dists/squeeze/Release"))
+	c.Assert(err, NotNil)
+	c.Assert(os.IsNotExist(err), Equals, true)
+}
+
+func (s *PublishedStorageSuite) TestLinkFromPool(c *C) {
+	tests := []struct {
+		prefix           string
+		component        string
+		sourcePath       string
+		poolDirectory    string
+		expectedFilename string
+	}{
+		{ // package name regular
+			prefix:           "",
+			component:        "main",
+			sourcePath:       "pool/01/ae/mars-invaders_1.03.deb",
+			poolDirectory:    "m/mars-invaders",
+			expectedFilename: "pool/main/m/mars-invaders/mars-invaders_1.03.deb",
+		},
+		{ // lib-like filename
+			prefix:           "",
+			component:        "main",
+			sourcePath:       "pool/01/ae/libmars-invaders_1.03.deb",
+			poolDirectory:    "libm/libmars-invaders",
+			expectedFilename: "pool/main/libm/libmars-invaders/libmars-invaders_1.03.deb",
+		},
+		{ // duplicate link, shouldn't panic
+			prefix:           "",
+			component:        "main",
+			sourcePath:       "pool/01/ae/mars-invaders_1.03.deb",
+			poolDirectory:    "m/mars-invaders",
+			expectedFilename: "pool/main/m/mars-invaders/mars-invaders_1.03.deb",
+		},
+		{ // prefix & component
+			prefix:           "ppa",
+			component:        "contrib",
+			sourcePath:       "pool/01/ae/libmars-invaders_1.04.deb",
+			poolDirectory:    "libm/libmars-invaders",
+			expectedFilename: "pool/contrib/libm/libmars-invaders/libmars-invaders_1.04.deb",
+		},
+	}
+
+	pool := NewPackagePool(s.root)
+
+	for _, t := range tests {
+		t.sourcePath = filepath.Join(s.root, t.sourcePath)
+
+		err := os.MkdirAll(filepath.Dir(t.sourcePath), 0755)
+		c.Assert(err, IsNil)
+
+		err = ioutil.WriteFile(t.sourcePath, []byte("Contents"), 0644)
+		c.Assert(err, IsNil)
+
+		err = s.storage.LinkFromPool(filepath.Join(t.prefix, "pool", t.component, t.poolDirectory), pool, t.sourcePath)
+		c.Assert(err, IsNil)
+
+		st, err := os.Stat(filepath.Join(s.storage.rootPath, t.prefix, t.expectedFilename))
+		c.Assert(err, IsNil)
+
+		info := st.Sys().(*syscall.Stat_t)
+		c.Check(int(info.Nlink), Equals, 2)
+	}
+}