Refactor compile to its own first class package

cmd/deploy_cmd.go

@@ -7,9 +7,9 @@ import (
 	bosherr "github.com/cloudfoundry/bosh-agent/errors"
 	boshsys "github.com/cloudfoundry/bosh-agent/system"
 
+	bmcomp "github.com/cloudfoundry/bosh-micro-cli/compile"
 	bmconfig "github.com/cloudfoundry/bosh-micro-cli/config"
 	bmrel "github.com/cloudfoundry/bosh-micro-cli/release"
-	bmrelcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile"
 	bmrelvalidation "github.com/cloudfoundry/bosh-micro-cli/release/validation"
 	bmtar "github.com/cloudfoundry/bosh-micro-cli/tar"
 	bmui "github.com/cloudfoundry/bosh-micro-cli/ui"
@@ -22,7 +22,7 @@ type deployCmd struct {
 	fs        boshsys.FileSystem
 	extractor bmtar.Extractor
 	validator bmrelvalidation.ReleaseValidator
-	compiler  bmrelcomp.ReleaseCompiler
+	compiler  bmcomp.ReleaseCompiler
 }
 
 func NewDeployCmd(
@@ -31,7 +31,7 @@ func NewDeployCmd(
 	fs boshsys.FileSystem,
 	extractor bmtar.Extractor,
 	validator bmrelvalidation.ReleaseValidator,
-	compiler bmrelcomp.ReleaseCompiler,
+	compiler bmcomp.ReleaseCompiler,
 ) *deployCmd {
 	return &deployCmd{
 		ui:        ui,

cmd/deploy_cmd_test.go

@@ -10,7 +10,7 @@ import (
 	bmcmd "github.com/cloudfoundry/bosh-micro-cli/cmd"
 	bmconfig "github.com/cloudfoundry/bosh-micro-cli/config"
 
-	fakebmrelcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile/fakes"
+	fakebmcomp "github.com/cloudfoundry/bosh-micro-cli/compile/fakes"
 	fakebmrel "github.com/cloudfoundry/bosh-micro-cli/release/fakes"
 	faketar "github.com/cloudfoundry/bosh-micro-cli/tar/fakes"
 	fakeui "github.com/cloudfoundry/bosh-micro-cli/ui/fakes"
@@ -24,7 +24,7 @@ var _ = Describe("DeploymentCmd", func() {
 		fakeUI               *fakeui.FakeUI
 		fakeExtractor        *faketar.FakeExtractor
 		fakeReleaseValidator *fakebmrel.FakeValidator
-		fakeReleaseCompiler  *fakebmrelcomp.FakeReleaseCompiler
+		fakeReleaseCompiler  *fakebmcomp.FakeReleaseCompiler
 	)
 
 	BeforeEach(func() {
@@ -33,7 +33,7 @@ var _ = Describe("DeploymentCmd", func() {
 		config = bmconfig.Config{}
 		fakeExtractor = faketar.NewFakeExtractor()
 		fakeReleaseValidator = fakebmrel.NewFakeValidator()
-		fakeReleaseCompiler = fakebmrelcomp.NewFakeReleaseCompiler()
+		fakeReleaseCompiler = fakebmcomp.NewFakeReleaseCompiler()
 
 		command = bmcmd.NewDeployCmd(
 			fakeUI,

cmd/factory.go

@@ -5,8 +5,8 @@ import (
 
 	boshsys "github.com/cloudfoundry/bosh-agent/system"
 
+	bmcomp "github.com/cloudfoundry/bosh-micro-cli/compile"
 	bmconfig "github.com/cloudfoundry/bosh-micro-cli/config"
-	bmrelcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile"
 	bmrelvalidation "github.com/cloudfoundry/bosh-micro-cli/release/validation"
 	bmtar "github.com/cloudfoundry/bosh-micro-cli/tar"
 	bmui "github.com/cloudfoundry/bosh-micro-cli/ui"
@@ -27,7 +27,7 @@ func NewFactory(
 	ui bmui.UI,
 	extractor bmtar.Extractor,
 	releaseValidator bmrelvalidation.ReleaseValidator,
-	releaseCompiler bmrelcomp.ReleaseCompiler,
+	releaseCompiler bmcomp.ReleaseCompiler,
 ) Factory {
 	return &factory{
 		commands: map[string]Cmd{

cmd/factory_test.go

@@ -13,8 +13,8 @@ import (
 	. "github.com/onsi/gomega"
 
 	fakesys "github.com/cloudfoundry/bosh-agent/system/fakes"
+	fakebmcomp "github.com/cloudfoundry/bosh-micro-cli/compile/fakes"
 	fakeconfig "github.com/cloudfoundry/bosh-micro-cli/config/fakes"
-	fakebmrelcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile/fakes"
 	fakebmrel "github.com/cloudfoundry/bosh-micro-cli/release/fakes"
 	fakeui "github.com/cloudfoundry/bosh-micro-cli/ui/fakes"
 )
@@ -28,7 +28,7 @@ var _ = Describe("cmd.Factory", func() {
 		ui               bmui.UI
 		extractor        bmtar.Extractor
 		releaseValidator *fakebmrel.FakeValidator
-		releaseCompiler  *fakebmrelcomp.FakeReleaseCompiler
+		releaseCompiler  *fakebmcomp.FakeReleaseCompiler
 	)
 
 	BeforeEach(func() {
@@ -40,7 +40,7 @@ var _ = Describe("cmd.Factory", func() {
 		logger := boshlog.NewLogger(boshlog.LevelNone)
 		extractor = bmtar.NewCmdExtractor(runner, logger)
 		releaseValidator = fakebmrel.NewFakeValidator()
-		releaseCompiler = fakebmrelcomp.NewFakeReleaseCompiler()
+		releaseCompiler = fakebmcomp.NewFakeReleaseCompiler()
 
 		factory = NewFactory(
 			config,

release/compile/compiled_package_repo_test.go → compile/compiled_package_repo_test.go

@@ -6,13 +6,13 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
+	bmcomp "github.com/cloudfoundry/bosh-micro-cli/compile"
 	bmindex "github.com/cloudfoundry/bosh-micro-cli/index"
 	bmrel "github.com/cloudfoundry/bosh-micro-cli/release"
-	bmrelcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile"
 
 	fakesys "github.com/cloudfoundry/bosh-agent/system/fakes"
 
-	. "github.com/cloudfoundry/bosh-micro-cli/release/compile"
+	. "github.com/cloudfoundry/bosh-micro-cli/compile"
 )
 
 var _ = Describe("CompiledPackageRepo", func() {
@@ -30,7 +30,7 @@ var _ = Describe("CompiledPackageRepo", func() {
 
 	Context("Save and Find", func() {
 		It("saves the compiled package to the index", func() {
-			record := bmrelcomp.CompiledPackageRecord{
+			record := bmcomp.CompiledPackageRecord{
 				BlobID:      "fake-blob-id",
 				Fingerprint: "fake-sha1",
 			}
@@ -60,12 +60,12 @@ var _ = Describe("CompiledPackageRepo", func() {
 
 		Context("when storing the packages", func() {
 			var (
-				record bmrelcomp.CompiledPackageRecord
+				record bmcomp.CompiledPackageRecord
 				pkg    bmrel.Package
 			)
 
 			BeforeEach(func() {
-				record = bmrelcomp.CompiledPackageRecord{
+				record = bmcomp.CompiledPackageRecord{
 					BlobID:      "fake-blob-id",
 					Fingerprint: "fake-sha1",
 				}
@@ -103,7 +103,7 @@ var _ = Describe("CompiledPackageRepo", func() {
 		Context("when saving to index fails", func() {
 			It("returns error", func() {
 				fs.WriteToFileError = errors.New("Could not save")
-				record := bmrelcomp.CompiledPackageRecord{
+				record := bmcomp.CompiledPackageRecord{
 					BlobID:      "fake-blob-id",
 					Fingerprint: "fake-sha1",
 				}
@@ -120,7 +120,7 @@ var _ = Describe("CompiledPackageRepo", func() {
 
 		Context("when reading from index fails", func() {
 			It("returns error", func() {
-				record := bmrelcomp.CompiledPackageRecord{
+				record := bmcomp.CompiledPackageRecord{
 					BlobID:      "fake-blob-id",
 					Fingerprint: "fake-sha1",
 				}

release/compile/dependency_analysis_test.go → compile/dependency_analysis_test.go

@@ -8,7 +8,7 @@ import (
 
 	gomegafmt "github.com/onsi/gomega/format"
 
-	. "github.com/cloudfoundry/bosh-micro-cli/release/compile"
+	. "github.com/cloudfoundry/bosh-micro-cli/compile"
 
 	bmrel "github.com/cloudfoundry/bosh-micro-cli/release"
 )

release/compile/fakes/fake_compiled_package_repo.go → compile/fakes/fake_compiled_package_repo.go

@@ -1,13 +1,13 @@
 package fakes
 
 import (
+	bmcomp "github.com/cloudfoundry/bosh-micro-cli/compile"
 	bmrel "github.com/cloudfoundry/bosh-micro-cli/release"
-	bmrelcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile"
 )
 
 type FakeCompiledPackageRepo struct {
 	SavePackage bmrel.Package
-	SaveRecord  bmrelcomp.CompiledPackageRecord
+	SaveRecord  bmcomp.CompiledPackageRecord
 	SaveError   error
 }
 
@@ -17,13 +17,13 @@ func NewFakeCompiledPackageRepo() *FakeCompiledPackageRepo {
 
 func (cpr *FakeCompiledPackageRepo) Save(
 	pkg bmrel.Package,
-	record bmrelcomp.CompiledPackageRecord,
+	record bmcomp.CompiledPackageRecord,
 ) error {
 	cpr.SavePackage = pkg
 	cpr.SaveRecord = record
 	return cpr.SaveError
 }
 
-func (cpr *FakeCompiledPackageRepo) Find(pkg bmrel.Package) (bmrelcomp.CompiledPackageRecord, bool, error) {
-	return bmrelcomp.CompiledPackageRecord{}, false, nil
+func (cpr *FakeCompiledPackageRepo) Find(pkg bmrel.Package) (bmcomp.CompiledPackageRecord, bool, error) {
+	return bmcomp.CompiledPackageRecord{}, false, nil
 }

release/compile/package_compiler_test.go → compile/package_compiler_test.go

@@ -10,11 +10,11 @@ import (
 	fakeblobstore "github.com/cloudfoundry/bosh-agent/blobstore/fakes"
 	fakecmd "github.com/cloudfoundry/bosh-agent/platform/commands/fakes"
 	fakesys "github.com/cloudfoundry/bosh-agent/system/fakes"
-	fakeboshcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile/fakes"
+	fakeboshcomp "github.com/cloudfoundry/bosh-micro-cli/compile/fakes"
 
 	boshsys "github.com/cloudfoundry/bosh-agent/system"
+	. "github.com/cloudfoundry/bosh-micro-cli/compile"
 	bmrel "github.com/cloudfoundry/bosh-micro-cli/release"
-	. "github.com/cloudfoundry/bosh-micro-cli/release/compile"
 )
 
 var _ = Describe("PackageCompiler", func() {

release/compile/release_compiler_test.go → compile/release_compiler_test.go

@@ -8,10 +8,10 @@ import (
 
 	bmrel "github.com/cloudfoundry/bosh-micro-cli/release"
 
-	fakeboshcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile/fakes"
+	fakeboshcomp "github.com/cloudfoundry/bosh-micro-cli/compile/fakes"
 	fakebmreal "github.com/cloudfoundry/bosh-micro-cli/release/fakes"
 
-	. "github.com/cloudfoundry/bosh-micro-cli/release/compile"
+	. "github.com/cloudfoundry/bosh-micro-cli/compile"
 )
 
 var _ = Describe("ReleaseCompiler", func() {

main.go

@@ -11,9 +11,9 @@ import (
 	boshuuid "github.com/cloudfoundry/bosh-agent/uuid"
 
 	bmcmd "github.com/cloudfoundry/bosh-micro-cli/cmd"
+	bmcomp "github.com/cloudfoundry/bosh-micro-cli/compile"
 	bmconfig "github.com/cloudfoundry/bosh-micro-cli/config"
 	bmindex "github.com/cloudfoundry/bosh-micro-cli/index"
-	bmrelcomp "github.com/cloudfoundry/bosh-micro-cli/release/compile"
 	bmrelvalidation "github.com/cloudfoundry/bosh-micro-cli/release/validation"
 	bmtar "github.com/cloudfoundry/bosh-micro-cli/tar"
 	bmui "github.com/cloudfoundry/bosh-micro-cli/ui"
@@ -51,17 +51,17 @@ func main() {
 
 	indexFilePath := path.Join(boshMicroDir, "index.json")
 	index := bmindex.NewFileIndex(indexFilePath, fileSystem)
-	compiledPackageRepo := bmrelcomp.NewCompiledPackageRepo(index)
-	packageCompiler := bmrelcomp.NewPackageCompiler(
+	compiledPackageRepo := bmcomp.NewCompiledPackageRepo(index)
+	packageCompiler := bmcomp.NewPackageCompiler(
 		runner,
 		path.Join(boshMicroDir, "packages"),
 		fileSystem,
 		compressor,
 		blobstore,
 		compiledPackageRepo,
 	)
-	da := bmrelcomp.NewDependencyAnalysis()
-	releaseCompiler := bmrelcomp.NewReleaseCompiler(da, packageCompiler)
+	da := bmcomp.NewDependencyAnalysis()
+	releaseCompiler := bmcomp.NewReleaseCompiler(da, packageCompiler)
 
 	cmdFactory := bmcmd.NewFactory(
 		config,