bosh_cli 1.2950.0 → 1.2957.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f727dbd9afbf9d8be9252cea9c0254281a0a71e3
-  data.tar.gz: 8e10c4f49edf71767d9ce958357558c01a70adc0
+  metadata.gz: c4c43e590bd60e19d51b6f40052a5e25552712a0
+  data.tar.gz: 730712d500e6fd5ba18029aff88faa046c65751d
 SHA512:
-  metadata.gz: 392fe73728e5288f25fb66ce992ed02b12b63460e46fbd83c1a5ad72680b1edd04f76418cb975769d1e8747d3650055bf206647c7827bcd04011556db72fd512
-  data.tar.gz: 2f5a1da34ea92805da6ec255fa021fdd8738cb93a5195a29b57970b9353ad1d1fc185122cccb9873c90620272c866867c9fa857bbc324c0cdd409bc18332c257
+  metadata.gz: fb127e885dfe3d743023318b5f8c06d89604987196171d107b5382566be403e0d372458797023fac29a3003bca12ea0f972476e37fad496aa416ebdc3bf03928
+  data.tar.gz: bd75913d2e3bb252325fc4ab647ff81a8afa2632e40434dda861870f865207e06112bb6769186dbd283b3d2c729b66f03f289439c1d49b91173bfab618da0889

data/lib/cli/commands/release/create_release.rb

@@ -1,6 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../release_print_helper.rb')
 module Bosh::Cli::Command
   module Release
     class CreateRelease < Base
+      include ReleasePrintHelper
       include Bosh::Cli::DependencyHelper
 
       DEFAULT_RELEASE_NAME = 'bosh-release'
@@ -236,63 +238,6 @@ module Bosh::Cli::Command
         release.save_config
       end
 
-      def show_summary(builder)
-        packages_table = table do |t|
-          t.headings = %w(Name Version Notes)
-          builder.packages.each do |package_artifact|
-            t << artifact_summary(package_artifact)
-          end
-        end
-
-        jobs_table = table do |t|
-          t.headings = %w(Name Version Notes)
-          builder.jobs.each do |job_artifact|
-            t << artifact_summary(job_artifact)
-          end
-        end
-
-        if builder.license
-          license_table = table do |t|
-            t.headings = %w(Name Version Notes)
-            t << artifact_summary(builder.license)
-          end
-
-          say('License')
-          say(license_table)
-          nl
-        end
-
-        say('Packages')
-        say(packages_table)
-        nl
-        say('Jobs')
-        say(jobs_table)
-
-        affected_jobs = builder.affected_jobs
-
-        if affected_jobs.size > 0
-          nl
-          say('Jobs affected by changes in this release')
-
-          affected_jobs_table = table do |t|
-            t.headings = %w(Name Version)
-            affected_jobs.each do |job|
-              t << [job.name, job.version]
-            end
-          end
-
-          say(affected_jobs_table)
-        end
-      end
-
-      def artifact_summary(artifact)
-        [
-          artifact.name,
-          artifact.version,
-          artifact.new_version? ? 'new version' : '',
-        ]
-      end
-
       def commit_hash
         status = Bosh::Exec.sh('git show-ref --head --hash=8 2> /dev/null')
         status.output.split.first

data/lib/cli/commands/release/finalize_release.rb

@@ -0,0 +1,143 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../release_print_helper.rb')
+module Bosh::Cli::Command
+  module Release
+    class FinalizeRelease < Base
+      include ReleasePrintHelper
+      include Bosh::Cli::DependencyHelper
+
+      # bosh finalize release
+      usage 'finalize release'
+      desc 'Create final release from dev release tarball (assumes current directory to be a release repository)'
+      option '--dry-run', 'stop before writing release manifest'
+      option '--name NAME', 'specify a custom release name'
+      option '--version VERSION', 'specify a custom version number (ex: 1.0.0 or 1.0-beta.2+dev.10)'
+
+      def finalize(tarball_path)
+        options[:final] = true
+
+        # validate preconditions
+        check_if_release_dir
+
+        tarball = extract_and_validate_tarball(tarball_path)
+
+        manifest = Psych.load(tarball.manifest)
+
+        dev_release_name = manifest["name"]
+        dev_release_ver = manifest["version"]
+        final_release_name = options[:name] || dev_release_name
+
+        final_release_dir = File.join('releases', final_release_name)
+        @release_index = Bosh::Cli::Versions::VersionsIndex.new(final_release_dir)
+        final_release_ver = options[:version] || next_final_version
+
+        if options[:version] && @release_index.version_strings.include?(options[:version])
+          raise Bosh::Cli::ReleaseVersionError.new('Release version already exists')
+        end
+
+        check_if_blob_manager_is_dirty
+
+        @progress_renderer = Bosh::Cli::InteractiveProgressRenderer.new
+
+        if !options[:dry_run] then
+          release.blobstore # prime & validate blobstore config
+
+          manifest["version"] = final_release_ver
+          manifest["name"] = final_release_name
+
+          tarball.replace_manifest(manifest)
+
+          FileUtils.mkdir_p(final_release_dir)
+          final_release_manifest_path = File.absolute_path(File.join(final_release_dir, "#{final_release_name}-#{final_release_ver}.yml"))
+          File.open(final_release_manifest_path, 'w') do |release_manifest_file|
+            release_manifest_file.puts(tarball.manifest)
+          end
+
+          @release_index.add_version(SecureRandom.uuid, "version" => final_release_ver)
+
+          final_release_tarball_path = File.absolute_path(File.join(final_release_dir, "#{final_release_name}-#{final_release_ver}.tgz"))
+          tarball.create_from_unpacked(final_release_tarball_path)
+
+          upload_package_and_job_blobs(manifest, tarball)
+
+          nl
+          say("Creating final release #{final_release_name}/#{final_release_ver} from dev release #{dev_release_name}/#{dev_release_ver}")
+
+          release.latest_release_filename = final_release_manifest_path
+          release.save_config
+
+          header('Release summary')
+          show_summary(tarball)
+          nl
+
+          say("Release name: #{final_release_name.make_green}")
+          say("Release version: #{final_release_ver.to_s.make_green}")
+          say("Release manifest: #{release.latest_release_filename.make_green}")
+          say("Release tarball (#{pretty_size(final_release_tarball_path)}): " + final_release_tarball_path.make_green)
+        end
+      end
+
+      def upload_package_and_job_blobs(manifest, tarball)
+        manifest['packages'].each do |package|
+          upload_to_blobstore(package, 'packages', tarball.package_tarball_path(package['name']))
+        end
+
+        manifest['jobs'].each do |job|
+          upload_to_blobstore(job, 'jobs', tarball.job_tarball_path(job['name']))
+        end
+
+        if manifest['license']
+          license_metadata = manifest['license'].clone
+          license_metadata['name'] = 'license'
+          upload_to_blobstore(license_metadata, '', tarball.license_tarball_path)
+        end
+      end
+
+      def extract_and_validate_tarball(tarball_path)
+        tarball = Bosh::Cli::ReleaseTarball.new(tarball_path)
+        err("Cannot find release tarball #{tarball_path}") if !tarball.exists?
+
+        err("#{tarball_path} is not a valid release tarball") if !tarball.valid?(:print_release_info => false)
+        tarball
+      end
+
+      def check_if_blob_manager_is_dirty
+        nl
+        blob_manager.sync
+        if blob_manager.dirty?
+          blob_manager.print_status
+          err("Please use '--force' or upload new blobs")
+        end
+      end
+
+      def next_final_version
+        latest_final_version = Bosh::Cli::Versions::ReleaseVersionsIndex.new(@release_index).latest_version
+        latest_final_version ||= Bosh::Common::Version::ReleaseVersion.parse('0')
+        latest_final_version = latest_final_version.increment_release
+        latest_final_version.to_s
+      end
+
+      def upload_to_blobstore(artifact, plural_type, artifact_path)
+        err("Cannot find artifact complete information, please upgrade tarball to newer version") if !artifact['fingerprint']
+
+        final_builds_dir = File.join('.final_builds', plural_type, artifact['name']).to_s
+        FileUtils.mkdir_p(final_builds_dir)
+        final_builds_index = Bosh::Cli::Versions::VersionsIndex.new(final_builds_dir)
+
+        return artifact if final_builds_index[artifact['fingerprint']]
+
+        @progress_renderer.start(artifact['name'], "uploading...")
+        blobstore_id = nil
+        File.open(artifact_path, 'r') do |f|
+          blobstore_id = @release.blobstore.create(f)
+        end
+
+        final_builds_index.add_version(artifact['fingerprint'], {
+            'version' => artifact['version'],
+            'sha1' => artifact['sha1'],
+            'blobstore_id' => blobstore_id
+          })
+        @progress_renderer.finish(artifact['name'], "uploaded")
+      end
+    end
+  end
+end

data/lib/cli/release_print_helper.rb

@@ -0,0 +1,60 @@
+module ReleasePrintHelper
+
+  private
+  def artifact_summary(artifact)
+    [
+        artifact.name,
+        artifact.version,
+        artifact.new_version? ? 'new version' : '',
+    ]
+  end
+
+  def show_summary(builder)
+    packages_table = table do |t|
+      t.headings = %w(Name Version Notes)
+      builder.packages.each do |package_artifact|
+        t << artifact_summary(package_artifact)
+      end
+    end
+
+    jobs_table = table do |t|
+      t.headings = %w(Name Version Notes)
+      builder.jobs.each do |job_artifact|
+        t << artifact_summary(job_artifact)
+      end
+    end
+
+    if builder.license
+      license_table = table do |t|
+        t.headings = %w(Name Version Notes)
+        t << artifact_summary(builder.license)
+      end
+
+      say('License')
+      say(license_table)
+      nl
+    end
+
+    say('Packages')
+    say(packages_table)
+    nl
+    say('Jobs')
+    say(jobs_table)
+
+    affected_jobs = builder.affected_jobs
+
+    if affected_jobs.size > 0
+      nl
+      say('Jobs affected by changes in this release')
+
+      affected_jobs_table = table do |t|
+        t.headings = %w(Name Version)
+        affected_jobs.each do |job|
+          t << [job.name, job.version]
+        end
+      end
+
+      say(affected_jobs_table)
+    end
+  end
+end

data/lib/cli/release_tarball.rb

@@ -4,7 +4,7 @@ module Bosh::Cli
     include DependencyHelper
 
     attr_reader :release_name, :jobs, :packages, :version
-    attr_reader :skipped # Mostly for tests
+    attr_reader :skipped, :unpack_dir # Mostly for tests
 
     def initialize(tarball_path)
       @tarball_path = File.expand_path(tarball_path, Dir.pwd)
@@ -20,6 +20,13 @@ module Bosh::Cli
       @unpacked = $?.exitstatus == 0
     end
 
+    # Creates a new tarball from the current contents of @unpack_dir
+    def create_from_unpacked(target_path)
+      raise "Not unpacked yet!" unless @unpacked
+      `tar -C #{@unpack_dir} -pczf '#{File.expand_path(target_path)}' . 2>&1`
+      $?.exitstatus == 0
+    end
+
     def exists?
       File.exists?(@tarball_path) && File.readable?(@tarball_path)
     end
@@ -30,6 +37,35 @@ module Bosh::Cli
       File.read(File.join(@unpack_dir, "release.MF"))
     end
 
+    def replace_manifest(hash)
+      return nil unless valid?
+      unpack
+      write_yaml(hash, File.join(@unpack_dir, "release.MF"))
+    end
+
+    def job_tarball_path(name)
+      return nil unless valid?
+      unpack
+      File.join(@unpack_dir, 'jobs', "#{name}.tgz")
+    end
+
+    def package_tarball_path(name)
+      return nil unless valid?
+      unpack
+      File.join(@unpack_dir, 'packages', "#{name}.tgz")
+    end
+
+    def license_tarball_path
+      return nil unless valid?
+      unpack
+      l = Resources::License.new(@unpack_dir)
+      if l.files
+        l.files[0][0]
+      else
+        nil
+      end
+    end
+
     def convert_to_old_format
       step('Converting to old format',
            "Cannot extract tarball #{@tarball_path}", :fatal) do
@@ -95,10 +131,8 @@ module Bosh::Cli
     # and packages in place when we do validation. However for jobs and packages
     # that are present we still need to validate checksums
     def perform_validation(options = {})
-      # CLEANUP this syntax
-      allow_sparse = options.has_key?(:allow_sparse) ?
-          !!options[:allow_sparse] :
-          false
+      allow_sparse = options.fetch(:allow_sparse, false)
+      should_print_release_info = options.fetch(:print_release_info, true)
 
       step("File exists and readable",
            "Cannot find release file #{@tarball_path}", :fatal) do
@@ -252,7 +286,44 @@ module Bosh::Cli
         end
       end
 
-      print_info(manifest)
+      print_info(manifest) if should_print_release_info
+    end
+
+    class TarballArtifact
+      def initialize(info)
+        @name = info['name']
+        @version = info['version']
+      end
+
+      attr_reader :name, :version
+
+      def new_version?
+        false
+      end
+    end
+
+    def license
+      m = Psych.load(manifest)
+      license = m['license']
+      return nil if !license
+      license['name'] = 'license'
+      TarballArtifact.new(license)
+    end
+
+    def packages
+      m = Psych.load(manifest)
+      packages = m['packages'] || []
+      packages.map { |pkg| TarballArtifact.new(pkg) }
+    end
+
+    def jobs
+      m = Psych.load(manifest)
+      jobs = m['jobs'] || []
+      jobs.map { |job| TarballArtifact.new(job) }
+    end
+
+    def affected_jobs
+      []
     end
 
     def print_info(manifest)

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2950.0'
+    VERSION = '1.2957.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2950.0
+  version: 1.2957.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2950.0
+        version: 1.2957.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2950.0
+        version: 1.2957.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2950.0
+        version: 1.2957.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2950.0
+        version: 1.2957.0
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2950.0
+        version: 1.2957.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2950.0
+        version: 1.2957.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +306,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH CLI
-  f41407
+  c9cf4f
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -361,6 +361,7 @@ files:
 - lib/cli/commands/property_management.rb
 - lib/cli/commands/release/create_release.rb
 - lib/cli/commands/release/delete_release.rb
+- lib/cli/commands/release/finalize_release.rb
 - lib/cli/commands/release/init_release.rb
 - lib/cli/commands/release/list_releases.rb
 - lib/cli/commands/release/reset_release.rb
@@ -401,6 +402,7 @@ files:
 - lib/cli/release_archiver.rb
 - lib/cli/release_builder.rb
 - lib/cli/release_compiler.rb
+- lib/cli/release_print_helper.rb
 - lib/cli/release_tarball.rb
 - lib/cli/resources/job.rb
 - lib/cli/resources/license.rb