vagrant-bosh 0.0.3 → 0.0.4

data/lib/vagrant-bosh/deployment/manifest_factory.rb

@@ -0,0 +1,29 @@
+require "vagrant-bosh/deployment/manifest"
+
+module VagrantPlugins
+  module VagrantBosh
+    module Deployment
+      class ManifestFactory
+        def initialize(uploadable_release_factory, ui)
+          @uploadable_release_factory = uploadable_release_factory
+          @ui = ui
+        end
+
+        def new_manifest(manifest)
+          if manifest.empty?
+            EmptyManifest.new
+          else
+            Manifest.new(manifest, @uploadable_release_factory, @ui)
+          end
+        end
+      end
+
+      class EmptyManifest
+        def resolve_releases; end
+        def as_string;    ""; end
+      end
+
+      #~
+    end
+  end
+end

data/lib/vagrant-bosh/deployment/release_uploader.rb

@@ -0,0 +1,40 @@
+require "log4r"
+
+require Vagrant.source_root.join("plugins/synced_folders/rsync/helper")
+
+module VagrantPlugins
+  module VagrantBosh
+    module Deployment
+      class ReleaseUploader
+        def initialize(machine, ui)
+          @machine = machine
+
+          @ui = ui.for(:deployment, :release_uploader)
+          @logger = Log4r::Logger.new("vagrant::provisioners::bosh::deployment::release_uploader")
+        end
+
+        def sync(host_dir, guest_dir)
+          # RsyncHelper uses @machine.ui internally
+
+          # .dev_builds/ contains jobs/ and packages/ tgzs
+          SyncedFolderRSync::RsyncHelper.rsync_single(@machine, @machine.ssh_info, {
+            type:      :rsync, 
+            hostpath:  File.join(host_dir, ".dev_builds"),
+            guestpath: File.join(guest_dir, ".dev_builds"),
+            disabled:  false,
+          })
+
+          # dev_releases/ contains dev release manifest files
+          SyncedFolderRSync::RsyncHelper.rsync_single(@machine, @machine.ssh_info, {
+            type:      :rsync, 
+            hostpath:  File.join(host_dir, "dev_releases"),
+            guestpath: File.join(guest_dir, "dev_releases"),
+            disabled:  false,
+          })
+        end
+      end
+
+      #~
+    end
+  end
+end

data/lib/vagrant-bosh/deployment/uploadable_release.rb

@@ -0,0 +1,82 @@
+require "log4r"
+require "vagrant/util/subprocess"
+require "vagrant-bosh/errors"
+
+require Vagrant.source_root.join("plugins/synced_folders/rsync/helper")
+
+module VagrantPlugins
+  module VagrantBosh
+    module Deployment
+      # UplodableRelease represents a release 
+      # that *can be* synced to a guest FS location.
+      class UplodableRelease
+        def initialize(name, version, host_dir, guest_root_dir, release_uploader, ui)
+          @name = name
+          @version = version
+          @host_dir = host_dir
+          @release_uploader = release_uploader
+
+          @ui = ui.for(:deployment, :uploadable_release)
+          @logger = Log4r::Logger.new("vagrant::provisioners::bosh::deployment::uploadable_release")
+
+          @guest_dir = File.join(guest_root_dir, name)
+        end
+
+        def upload
+          version = @version == "latest" ? create_release : @version
+
+          # Sync either existing or newly-created release
+          @release_uploader.sync(@host_dir, @guest_dir)
+
+          UploadedRelease.new(@name, version, @guest_dir)
+        end
+
+        private
+
+        def create_release
+          result = @ui.timed_msg(:create_release, name: @name) do
+            # Without clearing out environment Vagrant ruby env will be inherited
+            Vagrant::Util::Subprocess.execute(
+              "env",  "-i", "HOME=#{ENV["HOME"]}", "TERM=#{ENV["TERM"]}", 
+              "bash", "-l", "-c", 
+              "bosh create release --force", 
+              {workdir: @host_dir},
+            )
+          end
+
+          if result.exit_code != 0
+            error_msg = @ui.msg_string(:create_release_error, {
+              name: @name,
+              stdout: result.stdout,
+              stderr: result.stderr,
+            })
+            raise VagrantPlugins::VagrantBosh::Errors::BoshReleaseError, error_msg
+          end
+
+          if result.stdout =~ /^Release version: (.+)$/
+            version = $1
+          else
+            error_msg = @ui.msg_string(:missing_release_version_error, {
+              name: @name,
+              stdout: result.stdout,
+              stderr: result.stderr,
+            })
+            raise VagrantPlugins::VagrantBosh::Errors::BoshReleaseError, error_msg
+          end
+
+          version
+        end
+      end
+
+      # UploadedRelease represents a release 
+      # that *was* synced to a guest FS location.
+      class UploadedRelease < Struct.new(:name, :version, :guest_dir)
+        def as_hash
+          {"name" => name, "version" => version, "url" => "dir://#{guest_dir}"}
+        end
+      end
+
+      #~
+    end
+  end
+end

data/lib/vagrant-bosh/deployment/uploadable_release_factory.rb

@@ -0,0 +1,28 @@
+require "vagrant-bosh/deployment/uploadable_release"
+
+module VagrantPlugins
+  module VagrantBosh
+    module Deployment
+      class UploadableReleaseFactory
+        def initialize(guest_root_dir, release_uploader, ui)
+          @guest_root_dir = guest_root_dir
+          @release_uploader = release_uploader
+          @ui = ui
+        end
+
+        def new_uploadable_release(name, version, host_dir)
+          UplodableRelease.new(
+            name,
+            version,
+            host_dir, 
+            @guest_root_dir, 
+            @release_uploader, 
+            @ui,
+          )
+        end
+      end
+
+      #~
+    end
+  end
+end

data/lib/vagrant-bosh/errors.rb

@@ -3,9 +3,7 @@ require "vagrant"
 module VagrantPlugins
   module VagrantBosh
     module Errors
-      class BoshReleaseError < Vagrant::Errors::VagrantError
-        error_namespace("bosh")
-      end
+      class BoshReleaseError < StandardError; end
     end
   end
 end

data/lib/vagrant-bosh/provisioner.rb

@@ -4,6 +4,9 @@ require "vagrant-bosh/communicator"
 require "vagrant-bosh/asset_uploader"
 require "vagrant-bosh/bootstrapper"
 require "vagrant-bosh/provisioner_tracker"
+require "vagrant-bosh/deployment/release_uploader"
+require "vagrant-bosh/deployment/uploadable_release_factory"
+require "vagrant-bosh/deployment/manifest_factory"
 
 module VagrantPlugins
   module VagrantBosh
@@ -17,18 +20,34 @@ module VagrantPlugins
 
         asset_uploader = AssetUploader.new(
           communicator,
-          machine_ui,
           File.absolute_path("../assets", __FILE__),
+          machine_ui,
         )
 
         provisioner_tracker = ProvisionerTracker.new(machine_ui)
 
+        release_uploader = Deployment::ReleaseUploader.new(
+          machine, 
+          machine_ui,
+        )
+
+        uploadable_release_factory = Deployment::UploadableReleaseFactory.new(
+          config.synced_releases_dir,
+          release_uploader,
+          machine_ui,
+        )
+
+        manifest_factory = Deployment::ManifestFactory.new(
+          uploadable_release_factory,
+          machine_ui,
+        )
+
         @bootstrapper = Bootstrapper.new(
-          communicator,
-          asset_uploader,
-          "/opt/vagrant-bosh",
-          config,
+          communicator, 
+          config, 
+          asset_uploader, 
           provisioner_tracker,
+          manifest_factory, 
         )
 
         logger = Log4r::Logger.new("vagrant::provisioners::bosh")

data/lib/vagrant-bosh/ui.rb

@@ -22,10 +22,10 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::provisioners::bosh::ui")
       end
 
-      def for(extra_i18n_prefix)
+      def for(*extra_i18n_prefix)
         self.class.new(@machine, { 
           show_debug:  @show_debug, 
-          i18n_prefix: [@i18n_prefix, extra_i18n_prefix].compact.join("."),
+          i18n_prefix: ([@i18n_prefix] + extra_i18n_prefix).compact.join("."),
           start_time:  @start_time,
         })
       end
@@ -34,11 +34,13 @@ module VagrantPlugins
         msg(key, hash)
       end
 
-      def msg(key, hash)
+      def msg_string(key, hash)
         path = @i18n_prefix ? "#{@i18n_prefix}.#{key}" : key
-        title = I18n.t("bosh.ui.#{path}", hash)
-        
-        @machine.ui.info(time_prefix(title))
+        I18n.t("bosh.ui.#{path}", hash)
+      end
+
+      def msg(key, hash)
+        @machine.ui.info(time_prefix(msg_string(key, hash)))
       end
 
       def timed_msg(key, hash, &blk)
@@ -52,7 +54,7 @@ module VagrantPlugins
           return
         end
 
-        # In non-debug mode show "Uploading /var/vcap/bosh/bin/bosh-agent (sudo)... 1.33s"
+        # In non-debug mode show e.g. "Uploading /var/vcap/bosh/bin/bosh-agent (sudo)... 1.33s"
         begin
           t1 = Time.now
           @machine.ui.info(time_prefix("#{title}..."), new_line: false)

data/lib/vagrant-bosh/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantBosh
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/templates/locales/en.yml

@@ -9,6 +9,33 @@ en:
       asset_uploader:
         upload: "Uploading %{dst_path}"
 
+      deployment:
+        manifest:
+          parse_error: "Failed to parse deployment manifest: %{details}"
+
+          non_hash_class_error: |-
+            Deployment manifest must be parseable into a Hash (was %{actual_class})
+
+        uploadable_release:
+          create_release: "Creating new dev release for %{name}"
+
+          create_release_error: |-
+            === stdout
+            %{stdout}            
+            === stderr
+            %{stderr}
+            !!! Failed to create new dev release for %{name}
+
+          missing_release_version_error: |-
+            === stdout
+            %{stdout}
+            === stderr
+            %{stderr}
+            !!! Failed to find release version for %{name}
+
+        release_uploader:
+          upload: "Uploading BOSH release %{dst_path}"
+
       provisioner_tracker:
         event:         "%{state} %{stage} > %{task}"
         invalid_event: "%{content}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bosh
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies: []
 description: BOSH provisioner allows to provision guest VM by specifying regular BOSH
   deployment manifest.
@@ -29,6 +29,8 @@ files:
 - dev/Vagrantfile
 - dev/example-bosh-manifest.yml
 - dev/example-winston-manifest.yml
+- docs/build-aws-stemcell.md
+- docs/release-url.md
 - go/.gitignore
 - go/bin/build
 - go/bin/build-linux-amd64
@@ -94,7 +96,9 @@ files:
 - go/src/boshprovisioner/instance/updater/waiter.go
 - go/src/boshprovisioner/instance/updater/waiter_test.go
 - go/src/boshprovisioner/main/config.go
+- go/src/boshprovisioner/main/config_test.go
 - go/src/boshprovisioner/main/main.go
+- go/src/boshprovisioner/main/main_suite_test.go
 - go/src/boshprovisioner/main/repos_factory.go
 - go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/compiled_packages_repository_interface.go
 - go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/concrete_compiled_packages_repository.go
@@ -105,8 +109,12 @@ files:
 - go/src/boshprovisioner/packagescompiler/packagesrepo/packages_repository_interface.go
 - go/src/boshprovisioner/provisioner/blobstore_config.go
 - go/src/boshprovisioner/provisioner/blobstore_provisioner.go
-- go/src/boshprovisioner/provisioner/deployment_provisioner.go
+- go/src/boshprovisioner/provisioner/deployment_provisioner_interface.go
 - go/src/boshprovisioner/provisioner/release_compiler.go
+- go/src/boshprovisioner/provisioner/single_configured_vm_provisioner.go
+- go/src/boshprovisioner/provisioner/single_non_configured_vm_provisioner.go
+- go/src/boshprovisioner/provisioner/single_vm_provisioner_factory.go
+- go/src/boshprovisioner/release/dir_reader.go
 - go/src/boshprovisioner/release/job/job.go
 - go/src/boshprovisioner/release/job/manifest/manifest.go
 - go/src/boshprovisioner/release/job/manifest/manifest_suite_test.go
@@ -115,14 +123,15 @@ files:
 - go/src/boshprovisioner/release/job/reader_factory.go
 - go/src/boshprovisioner/release/job/tar_reader.go
 - go/src/boshprovisioner/release/manifest/manifest.go
-- go/src/boshprovisioner/release/manifest_reader.go
+- go/src/boshprovisioner/release/manifest/manifest_suite_test.go
+- go/src/boshprovisioner/release/manifest/manifest_test.go
+- go/src/boshprovisioner/release/manifest/syntax_validator.go
 - go/src/boshprovisioner/release/reader_factory.go
+- go/src/boshprovisioner/release/reader_interface.go
 - go/src/boshprovisioner/release/release.go
 - go/src/boshprovisioner/release/release_suite_test.go
 - go/src/boshprovisioner/release/release_test.go
 - go/src/boshprovisioner/release/tar_reader.go
-- go/src/boshprovisioner/releasesrepo/blobstore_releases_repository.go
-- go/src/boshprovisioner/releasesrepo/releases_repository_interface.go
 - go/src/boshprovisioner/tar/cmd_compressor.go
 - go/src/boshprovisioner/tar/cmd_extractor.go
 - go/src/boshprovisioner/tar/compressor_interface.go
@@ -130,12 +139,13 @@ files:
 - go/src/boshprovisioner/util/string_keyed.go
 - go/src/boshprovisioner/vm/vagrant/agent_provisioner.go
 - go/src/boshprovisioner/vm/vagrant/asset_manager.go
+- go/src/boshprovisioner/vm/vagrant/configured_vm.go
 - go/src/boshprovisioner/vm/vagrant/deps_provisioner.go
 - go/src/boshprovisioner/vm/vagrant/monit_provisioner.go
+- go/src/boshprovisioner/vm/vagrant/non_configured_vm.go
 - go/src/boshprovisioner/vm/vagrant/runit_provisioner.go
 - go/src/boshprovisioner/vm/vagrant/simple_cmds.go
 - go/src/boshprovisioner/vm/vagrant/vcap_user_provisioner.go
-- go/src/boshprovisioner/vm/vagrant/vm.go
 - go/src/boshprovisioner/vm/vagrant/vm_provisioner.go
 - go/src/boshprovisioner/vm/vagrant/vm_provisioner_factory.go
 - go/src/boshprovisioner/vm/vm_interface.go
@@ -157,6 +167,11 @@ files:
 - lib/vagrant-bosh/bootstrapper.rb
 - lib/vagrant-bosh/communicator.rb
 - lib/vagrant-bosh/config.rb
+- lib/vagrant-bosh/deployment/manifest.rb
+- lib/vagrant-bosh/deployment/manifest_factory.rb
+- lib/vagrant-bosh/deployment/release_uploader.rb
+- lib/vagrant-bosh/deployment/uploadable_release.rb
+- lib/vagrant-bosh/deployment/uploadable_release_factory.rb
 - lib/vagrant-bosh/errors.rb
 - lib/vagrant-bosh/plugin.rb
 - lib/vagrant-bosh/provisioner.rb

data/go/src/boshprovisioner/release/manifest_reader.go

@@ -1,29 +0,0 @@
-package release
-
-import (
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-)
-
-type ManifestReader struct {
-	path   string
-	fs     boshsys.FileSystem
-	logger boshlog.Logger
-}
-
-func NewManifestReader(
-	path string,
-	fs boshsys.FileSystem,
-	logger boshlog.Logger,
-) ManifestReader {
-	return ManifestReader{path: path, fs: fs, logger: logger}
-}
-
-func (r ManifestReader) Read() (Release, error) {
-	return Release{}, bosherr.New("Not implemented")
-}
-
-func (r ManifestReader) Close() error {
-	return nil
-}

data/go/src/boshprovisioner/releasesrepo/blobstore_releases_repository.go

@@ -1,114 +0,0 @@
-package releasesrepo
-
-import (
-	boshblob "bosh/blobstore"
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-
-	bpdep "boshprovisioner/deployment"
-	bpdload "boshprovisioner/downloader"
-	bpindex "boshprovisioner/index"
-)
-
-type BlobstoreReleasesRepository struct {
-	downloader bpdload.Downloader
-	blobstore  boshblob.Blobstore
-	index      bpindex.Index
-	logger     boshlog.Logger
-}
-
-type blobstoreRecord struct {
-	BlobID      string
-	Fingerprint string
-}
-
-func NewBlobstoreReleasesRepository(
-	downloader bpdload.Downloader,
-	blobstore boshblob.Blobstore,
-	index bpindex.Index,
-	logger boshlog.Logger,
-) BlobstoreReleasesRepository {
-	return BlobstoreReleasesRepository{
-		downloader: downloader,
-		blobstore:  blobstore,
-		index:      index,
-		logger:     logger,
-	}
-}
-
-func (rr BlobstoreReleasesRepository) Pull(release bpdep.Release) error {
-	var record blobstoreRecord
-
-	err := rr.index.Find(release, &record)
-	if err == nil {
-		return nil // nothing to do if already exists
-	} else if err != bpindex.ErrNotFound {
-		return bosherr.WrapError(err, "Finding release in index")
-	}
-
-	path, err := rr.downloader.Download(release.URL)
-	if err != nil {
-		return bosherr.WrapError(err, "Downloading release")
-	}
-
-	defer rr.downloader.CleanUp(path)
-
-	blobID, fingerprint, err := rr.blobstore.Create(path)
-	if err != nil {
-		return bosherr.WrapError(err, "Creating release blob")
-	}
-
-	record = blobstoreRecord{
-		BlobID:      blobID,
-		Fingerprint: fingerprint,
-	}
-
-	err = rr.index.Save(release, record)
-	if err != nil {
-		// todo delete from blobstore
-
-		return bosherr.WrapError(err, "Saving release to index")
-	}
-
-	return nil
-}
-
-func (rr BlobstoreReleasesRepository) KeepOnly(releasesToKeep []bpdep.Release) error {
-	var allReleases []bpdep.Release
-
-	err := rr.index.ListKeys(&allReleases)
-	if err != nil {
-		return bosherr.WrapError(err, "Listing releases in index")
-	}
-
-	for _, foundRelease := range allReleases {
-		var keep bool
-
-		for _, releaseToKeep := range releasesToKeep {
-			if foundRelease == releaseToKeep {
-				keep = true
-				break
-			}
-		}
-
-		if keep {
-			continue
-		}
-
-		var record blobstoreRecord
-
-		err := rr.index.Find(foundRelease, &record)
-		if err != nil {
-			return bosherr.WrapError(err, "Finding release to delete")
-		}
-
-		// todo delete from blobstore
-
-		err = rr.index.Remove(foundRelease)
-		if err != nil {
-			return bosherr.WrapError(err, "Deleting release from index")
-		}
-	}
-
-	return nil
-}

data/go/src/boshprovisioner/releasesrepo/releases_repository_interface.go

@@ -1,15 +0,0 @@
-package releasesrepo
-
-import (
-	bpdep "boshprovisioner/deployment"
-)
-
-// ReleasesRepository manages collection of releases
-// available to use for provisioning
-type ReleasesRepository interface {
-	// Pull downloads/copies/retrieves a release
-	Pull(bpdep.Release) error
-
-	// KeepOnly deletes all releases but the provided ones
-	KeepOnly([]bpdep.Release) error
-}

data/go/src/boshprovisioner/vm/vagrant/vm.go

@@ -1,27 +0,0 @@
-package vm
-
-import (
-	bpagclient "boshprovisioner/agent/client"
-)
-
-// VM represents already provisioned Vagrant machine
-// that can be communicated with via an AgentClient.
-type VM struct {
-	vmProvisioner *VMProvisioner
-	agentClient   bpagclient.Client
-}
-
-func NewVM(vmProvisioner *VMProvisioner, agentClient bpagclient.Client) VM {
-	return VM{
-		vmProvisioner: vmProvisioner,
-		agentClient:   agentClient,
-	}
-}
-
-func (vm VM) AgentClient() bpagclient.Client {
-	return vm.agentClient
-}
-
-func (vm VM) Deprovision() error {
-	return vm.vmProvisioner.Deprovision(vm)
-}