bosh_cli 1.2847.0 → 1.2849.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cfc5df8739eb9e7d78d6a9a2c84c0f1f2fd0e1a
-  data.tar.gz: a1c755ce722b3f95391f3ba5e380d13fd11ff40f
+  metadata.gz: 15572f106adf4372613bf2daf782092f696a5b28
+  data.tar.gz: 6aedb3168ea8c5f5fe762ed5380febfa65474567
 SHA512:
-  metadata.gz: 1dc06fa69265c241c855cc4d93710ddda55b63c82e4cfa4f9a48340e0f97c84763eb1b75ed2ce729f493b41c0cc34507e1660c94a3384f16eeec095b29bf1f0f
-  data.tar.gz: cb3e88d9a6958aa4ec9da5ce26a28ab1588be46b6eedb4120a90b95ebab4b16916c76873b427722e0a240eaec79afc382c5e69f9f9dc3d5df58c462d330e17bd
+  metadata.gz: 805c2d2a0d62d845ddcbea0baec28f33bc2b2994a91e02b34caf8ff6e3854e75fb874fb51105aca90349e4d9ba22a89bed6346c4b1b305a507ba880dc85c8dd1
+  data.tar.gz: e9cc95b1a3a407b14db8ab1dfaf230b28aa194b172032329eead4431f274a9714ceddf619564db7033354c0aa2b1e044c032754026bc78fadd183f3e790650d0

data/lib/cli.rb

@@ -81,6 +81,7 @@ require 'cli/archive_repository_provider'
 require 'cli/archive_repository'
 require 'cli/build_artifact'
 require 'cli/resources/job'
+require 'cli/resources/license'
 require 'cli/resources/package'
 require 'cli/changeset_helper'
 require 'cli/deployment_manifest_compiler'

data/lib/cli/archive_builder.rb

@@ -15,6 +15,9 @@ module Bosh::Cli
       with_indent('  ') do
         artifact = locate_artifact(resource)
         if artifact.nil?
+          return unless validate(resource)
+
+          say("No artifact found for #{resource.name}".make_red)
           artifact = create_artifact(resource)
           say("Generated version '#{artifact.fingerprint}'".make_green)
 
@@ -60,10 +63,7 @@ module Bosh::Cli
     def locate_artifact(resource)
       artifact = @archive_repository.lookup(resource)
 
-      if artifact.nil?
-        say("No artifact found for #{resource.name}".make_red)
-        return nil
-      end
+      return nil if artifact.nil?
 
       if artifact.dev_artifact? && final? && !dry_run?
         @archive_repository.promote_from_dev_to_final(artifact)
@@ -76,10 +76,10 @@ module Bosh::Cli
     end
 
     def create_artifact(resource)
-      tarball_path = safe_temp_file(resource.name, '.tgz')
-
       say('Generating...')
 
+      tarball_path = safe_temp_file(resource.name, '.tgz')
+
       copy_files(resource)
       resource.run_script(:pre_packaging, staging_dir)
 
@@ -94,6 +94,16 @@ module Bosh::Cli
 
       sha1 = BuildArtifact.checksum(tarball_path)
       BuildArtifact.new(resource.name, fingerprint, tarball_path, sha1, resource.dependencies, true, !final?)
+    ensure
+      cleanup
+    end
+
+    def validate(resource)
+      resource.validate!
+      true
+    rescue Bosh::Cli::MissingLicense => e
+      say("#{'Warning'.make_red}: #{e.message}")
+      false
     end
 
     def file_checksum(path)
@@ -115,5 +125,9 @@ module Bosh::Cli
         File.open(tmpname, File::RDWR|File::CREAT|File::EXCL).close
       end
     end
+
+    def cleanup
+      FileUtils.rm_rf(staging_dir)
+    end
   end
 end

data/lib/cli/archive_repository.rb

@@ -48,8 +48,8 @@ module Bosh::Cli
         end
       end
 
-    rescue Bosh::Blobstore::NotFound
-      raise BlobstoreError, "Final version of '#{name}' not found in blobstore"
+    rescue Bosh::Blobstore::NotFound => e
+      raise BlobstoreError, "Final version of '#{resource.name}' not found in blobstore: #{e}"
     rescue Bosh::Blobstore::BlobstoreError => e
       raise BlobstoreError, "Blobstore error: #{e}"
     end

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

@@ -40,7 +40,7 @@ module Bosh::Cli::Command
           release.save_config
         end
       rescue SemiSemantic::ParseError
-        err("Invalid version: `#{version}'. Please specify a valid version (ex: 1.0.0 or 1.0-beta.2+dev.10).".make_red)
+        err("Invalid version: '#{version}'. Please specify a valid version (ex: 1.0.0 or 1.0-beta.2+dev.10).".make_red)
       rescue Bosh::Cli::ReleaseVersionError => e
         err(e.message.make_red)
       end
@@ -55,13 +55,11 @@ module Bosh::Cli::Command
 
         Bosh::Cli::Versions::MultiReleaseSupport.new(@work_dir, default_release_name, self).migrate
       end
-
+      
       def create_from_spec(version)
-        final = options[:final]
         force = options[:force]
         name = options[:name]
         manifest_only = !options[:with_tarball]
-        dry_run = options[:dry_run]
 
         release.blobstore # prime & validate blobstore config
 
@@ -70,7 +68,7 @@ module Bosh::Cli::Command
         raise_dirty_state_error if dirty_state? && !force
 
         if final
-          confirm_final_release(dry_run)
+          confirm_final_release
           unless name
             save_final_release_name if release.final_name.blank?
             name = release.final_name
@@ -86,14 +84,17 @@ module Bosh::Cli::Command
 
         say("Release artifact cache: #{cache_dir}")
 
+        header('Building license')
+        license_artifacts = build_licenses
+
         header('Building packages')
-        package_artifacts = build_packages(dry_run, final)
+        package_artifacts = build_packages
 
         header('Building jobs')
-        job_artifacts = build_jobs(package_artifacts.map { |artifact| artifact.name }, dry_run, final)
+        job_artifacts = build_jobs(package_artifacts.map { |artifact| artifact.name })
 
         header('Building release')
-        release_builder = build_release(dry_run, final, job_artifacts, manifest_only, package_artifacts, name, version)
+        release_builder = build_release(job_artifacts, manifest_only, package_artifacts, license_artifacts, name, version)
 
         header('Release summary')
         show_summary(release_builder)
@@ -115,7 +116,7 @@ module Bosh::Cli::Command
         release_builder.manifest_path
       end
 
-      def confirm_final_release(dry_run)
+      def confirm_final_release
         confirmed = non_interactive? || agree("Are you sure you want to generate #{'final'.make_red} version? ")
         if !dry_run && !confirmed
           say('Canceled release generation'.make_green)
@@ -135,9 +136,31 @@ module Bosh::Cli::Command
         end
       end
 
-      def build_packages(dry_run, final)
-        archive_builder = Bosh::Cli::ArchiveBuilder.new(archive_repository_provider,
-          dry_run: dry_run, final: final)
+      def archive_repository_provider
+        @archive_repository_provider ||= Bosh::Cli::ArchiveRepositoryProvider.new(work_dir, cache_dir, release.blobstore)
+      end
+
+      def build_release(job_artifacts, manifest_only, package_artifacts, license_artifacts, name, version)
+        license_artifact = license_artifacts.first
+        release_builder = Bosh::Cli::ReleaseBuilder.new(release, package_artifacts, job_artifacts, license_artifact, name,
+          final: final,
+          commit_hash: commit_hash,
+          version: version,
+          uncommitted_changes: dirty_state?
+        )
+
+        unless dry_run
+          if manifest_only
+            release_builder.build(:generate_tarball => false)
+          else
+            release_builder.build(:generate_tarball => true)
+          end
+        end
+
+        release_builder
+      end
+
+      def build_packages
         packages = Bosh::Cli::Resources::Package.discover(work_dir)
         artifacts = packages.map do |package|
           say("Building #{package.name.make_green}...")
@@ -163,32 +186,7 @@ module Bosh::Cli::Command
         artifacts
       end
 
-      def archive_repository_provider
-        @archive_repository_provider ||= Bosh::Cli::ArchiveRepositoryProvider.new(work_dir, cache_dir, release.blobstore)
-      end
-
-      def build_release(dry_run, final, job_artifacts, manifest_only, package_artifacts, name, version)
-        release_builder = Bosh::Cli::ReleaseBuilder.new(release, package_artifacts, job_artifacts, name,
-          final: final,
-          commit_hash: commit_hash,
-          version: version,
-          uncommitted_changes: dirty_state?
-        )
-
-        unless dry_run
-          if manifest_only
-            release_builder.build(:generate_tarball => false)
-          else
-            release_builder.build(:generate_tarball => true)
-          end
-        end
-
-        release_builder
-      end
-
-      def build_jobs(packages, dry_run, final)
-        archive_builder = Bosh::Cli::ArchiveBuilder.new(archive_repository_provider,
-          :final => final, :dry_run => dry_run)
+      def build_jobs(packages)
         jobs = Bosh::Cli::Resources::Job.discover(work_dir, packages)
         artifacts = jobs.map do |job|
           say("Building #{job.name.make_green}...")
@@ -200,6 +198,23 @@ module Bosh::Cli::Command
         artifacts
       end
 
+      def build_licenses
+        licenses = Bosh::Cli::Resources::License.discover(work_dir)
+        artifacts = licenses.map do |license|
+          say("Building #{'license'.make_green}...")
+          artifact = archive_builder.build(license)
+          nl
+          artifact
+        end.compact
+
+        artifacts
+      end
+
+      def archive_builder
+        @archive_builder ||= Bosh::Cli::ArchiveBuilder.new(archive_repository_provider,
+          :final => final, :dry_run => dry_run)
+      end
+
       def save_final_release_name
         release.final_name = DEFAULT_RELEASE_NAME
         if interactive?
@@ -236,6 +251,17 @@ module Bosh::Cli::Command
           end
         end
 
+        if builder.license_artifact
+          license_table = table do |t|
+            t.headings = %w(Name Version Notes)
+            t << artifact_summary(builder.license_artifact)
+          end
+
+          say('License')
+          say(license_table)
+          nl
+        end
+
         say('Packages')
         say(packages_table)
         nl
@@ -273,6 +299,14 @@ module Bosh::Cli::Command
       rescue Bosh::Exec::Error
         '00000000'
       end
+
+      def dry_run
+        dry_run ||= options[:dry_run]
+      end
+
+      def final
+        final ||= options[:final]
+      end
     end
   end
 end

data/lib/cli/errors.rb

@@ -34,6 +34,7 @@ module Bosh::Cli
 
   class InvalidPackage         < CliError; error_code(500); end
   class InvalidJob             < CliError; error_code(501); end
+  class MissingLicense         < CliError; error_code(502); end
   class InvalidRelease         < CliError; error_code(503); end
   class MissingDependency      < CliError; error_code(504); end
   class CircularDependency     < CliError; error_code(505); end

data/lib/cli/release_builder.rb

@@ -2,19 +2,30 @@ module Bosh::Cli
   class ReleaseBuilder
     include Bosh::Cli::DependencyHelper
 
-    attr_reader :release, :packages, :jobs, :name, :version, :build_dir, :commit_hash, :uncommitted_changes
+    attr_reader(
+      :release,
+      :license_artifact,
+      :packages,
+      :jobs,
+      :name,
+      :version,
+      :build_dir,
+      :commit_hash,
+      :uncommitted_changes
+    )
 
     # @param [Bosh::Cli::Release] release Current release
     # @param [Array<Bosh::Cli::BuildArtifact>] package_artifacts Built packages
     # @param [Array<Bosh::Cli::BuildArtifact>] job_artifacts Built jobs
     # @param [Hash] options Release build options
-    def initialize(release, package_artifacts, job_artifacts, name, options = { })
+    def initialize(release, package_artifacts, job_artifacts, license_artifact, name, options = { })
       @release = release
       @final = options.has_key?(:final) ? !!options[:final] : false
       @commit_hash = options.fetch(:commit_hash, '00000000')
       @uncommitted_changes = options.fetch(:uncommitted_changes, true)
       @packages = package_artifacts # todo
       @jobs = job_artifacts # todo
+      @license_artifact = license_artifact
       @name = name
       raise 'Release name is blank' if name.blank?
 
@@ -84,32 +95,6 @@ module Bosh::Cli
       @build_complete = true
     end
 
-    # Copies packages into release
-    def copy_packages
-      packages.each do |package_artifact|
-        name = package_artifact.name
-        tarball_path = package_artifact.tarball_path
-        say("%-40s %s" % [name.make_green, pretty_size(tarball_path)])
-        FileUtils.cp(tarball_path,
-                     File.join(build_dir, "packages", "#{name}.tgz"),
-                     :preserve => true)
-      end
-      @packages_copied = true
-    end
-
-    # Copies jobs into release todo DRY vs copy_packages
-    def copy_jobs
-      jobs.each do |job_artifact|
-        name = job_artifact.name
-        tarball_path = job_artifact.tarball_path
-        say("%-40s %s" % [name.make_green, pretty_size(tarball_path)])
-        FileUtils.cp(tarball_path,
-                     File.join(build_dir, "jobs", "#{name}.tgz"),
-                     :preserve => true)
-      end
-      @jobs_copied = true
-    end
-
     # Generates release manifest
     def generate_manifest
       manifest = {}
@@ -122,6 +107,7 @@ module Bosh::Cli
           'dependencies' => build_artifact.dependencies,
         }
       end
+
       manifest['jobs'] = jobs.map do |build_artifact|
         {
           'name' => build_artifact.name,
@@ -131,6 +117,14 @@ module Bosh::Cli
         }
       end
 
+      unless @license_artifact.nil?
+        manifest['license'] = {
+          'version' => @license_artifact.version,
+          'fingerprint' => @license_artifact.fingerprint,
+          'sha1' => @license_artifact.sha1,
+        }
+      end
+
       manifest['commit_hash'] = commit_hash
       manifest['uncommitted_changes'] = uncommitted_changes
 
@@ -162,16 +156,9 @@ module Bosh::Cli
       generate_manifest unless @manifest_generated
       return if @release_storage.has_file?(release_filename)
 
-      unless @jobs_copied
-        header("Copying jobs...")
-        copy_jobs
-        nl
-      end
-      unless @packages_copied
-        header("Copying packages...")
-        copy_packages
-        nl
-      end
+      copy_jobs
+      copy_packages
+      copy_license
 
       FileUtils.mkdir_p(File.dirname(tarball_path))
 
@@ -206,6 +193,41 @@ module Bosh::Cli
 
     private
 
+    # Copies packages into release
+    def copy_packages
+      header("Copying packages...")
+      packages.each do |package_artifact|
+        copy_artifact(package_artifact, 'packages')
+      end
+      nl
+    end
+
+    # Copies jobs into release todo DRY vs copy_packages
+    def copy_jobs
+      header("Copying jobs...")
+      jobs.each do |job_artifact|
+        copy_artifact(job_artifact, 'jobs')
+      end
+      nl
+    end
+
+    def copy_license
+      return if @license_artifact.nil?
+
+      header("Copying license...")
+      copy_artifact(@license_artifact)
+      nl
+    end
+
+    def copy_artifact(artifact, dest = nil)
+      name = artifact.name
+      tarball_path = artifact.tarball_path
+      say("%-40s %s" % [name.make_green, pretty_size(tarball_path)])
+      FileUtils.cp(tarball_path,
+        File.join([build_dir, dest, "#{name}.tgz"].compact),
+        :preserve => true)
+    end
+
     def assign_version
       latest_final_version = Versions::ReleaseVersionsIndex.new(@final_index).latest_version
       latest_final_version ||= Bosh::Common::Version::ReleaseVersion.parse('0')

data/lib/cli/release_compiler.rb

@@ -37,8 +37,9 @@ module Bosh::Cli
 
       @name = @manifest["name"]
       @version = @manifest["version"]
-      @packages = @manifest["packages"].map { |pkg| OpenStruct.new(pkg) }
-      @jobs = @manifest["jobs"].map { |job| OpenStruct.new(job) }
+      @packages = @manifest.fetch("packages", []).map { |pkg| OpenStruct.new(pkg) }
+      @jobs = @manifest.fetch("jobs", []).map { |job| OpenStruct.new(job) }
+      @license = @manifest["license"] ? OpenStruct.new(@manifest["license"]) : nil
     end
 
     def compile
@@ -55,6 +56,7 @@ module Bosh::Cli
           say("SKIP".make_yellow)
           next
         end
+        nl
         package_file_path = find_package(package)
         FileUtils.cp(package_file_path,
                      File.join(@packages_dir, "#{package.name}.tgz"),
@@ -68,12 +70,21 @@ module Bosh::Cli
           say("SKIP".make_yellow)
           next
         end
+        nl
         job_file_path = find_job(job)
         FileUtils.cp(job_file_path,
                      File.join(@jobs_dir, "#{job.name}.tgz"),
                      :preserve => true)
       end
 
+      header("Copying license")
+      if @license
+        say("license (#{@license.version})".ljust(30), " ")
+        nl
+        license_file_path = find_license(@license)
+        FileUtils.cp(license_file_path, File.join(@build_dir, 'license.tgz'), preserve: true)
+      end
+
       header("Building tarball")
       Dir.chdir(@build_dir) do
         tar_out = `tar -czf #{tarball_path} . 2>&1`
@@ -112,6 +123,14 @@ module Bosh::Cli
       find_in_indices(final_index, dev_index, job, 'job')
     end
 
+    def find_license(license)
+      final_dir = File.join(@release_source, '.final_builds', 'license')
+      final_index = Versions::VersionsIndex.new(final_dir)
+      dev_dir = File.join(@release_source, '.dev_builds', 'license')
+      dev_index = Versions::VersionsIndex.new(dev_dir)
+      find_in_indices(final_index, dev_index, license, 'license')
+    end
+
     def find_version_by_sha1(index, sha1)
       index.select{ |_, build| build['sha1'] == sha1 }.values.first
     end

data/lib/cli/release_tarball.rb

@@ -281,8 +281,14 @@ module Bosh::Cli
       for job in manifest["jobs"]
         say("  - #{job["name"]} (#{job["version"]})")
       end
-    end
 
+      say("\nLicense")
+      if manifest["license"].nil? || manifest["license"].empty?
+        say("  - none")
+      else
+        say("  - license (#{manifest["license"]["version"]})")
+      end
+    end
   end
 end
 

data/lib/cli/resources/job.rb

@@ -28,6 +28,10 @@ module Bosh::Cli::Resources
       spec['name']
     end
 
+    def additional_fingerprints
+      []
+    end
+
     def dependencies
       package_dependencies #TODO: should this be packages or package_dependencies?
     end
@@ -41,8 +45,6 @@ module Bosh::Cli::Resources
     end
 
     def files
-      validate!
-
       files = (templates_files + monit_files).map { |absolute_path| [absolute_path, relative_path(absolute_path)] }
       files << [File.join(job_base, 'spec'), 'job.MF']
       files
@@ -85,10 +87,6 @@ module Bosh::Cli::Resources
       end
     end
 
-    def additional_fingerprints
-      []
-    end
-
     def format_fingerprint(digest, filename, name, file_mode)
       "%s%s%s" % [File.basename(filename), digest, file_mode]
     end

data/lib/cli/resources/license.rb

@@ -0,0 +1,52 @@
+module Bosh::Cli::Resources
+  class License
+    # @param [String] directory base Release directory
+    def self.discover(release_base)
+      [new(release_base)]
+    end
+
+    attr_reader :release_base
+
+    def initialize(release_base)
+      @release_base = Pathname.new(release_base)
+    end
+
+    def singular_type
+      'license'
+    end
+
+    def plural_type
+      ''
+    end
+
+    def name
+      'license'
+    end
+
+    def files
+      Dir[File.join(release_base, "{LICENSE,NOTICE}{,.*}")].map { |entry| [entry, File.basename(entry)] }
+    end
+
+    def validate!
+      if files.empty?
+        raise Bosh::Cli::MissingLicense, "Missing LICENSE or NOTICE in #{release_base.to_s}"
+      end
+    end
+
+    def format_fingerprint(digest, filename, name, file_mode)
+      "%s%s" % [File.basename(filename), digest]
+    end
+
+    def additional_fingerprints
+      []
+    end
+
+    def dependencies
+      []
+    end
+
+    def run_script(script_name, *args)
+      # no-op
+    end
+  end
+end

data/lib/cli/resources/package.rb

@@ -47,7 +47,7 @@ module Bosh::Cli::Resources
     end
 
     def files
-      validate!
+      resolve_globs
       known_files = {}
 
       files = []

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2847.0'
+    VERSION = '1.2849.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2847.0
+  version: 1.2849.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-18 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.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2847.0
+        version: 1.2849.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: 0.5.4
 description: |-
   BOSH CLI
-  139553
+  4f117d
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -278,6 +278,7 @@ files:
 - lib/cli/release_compiler.rb
 - lib/cli/release_tarball.rb
 - lib/cli/resources/job.rb
+- lib/cli/resources/license.rb
 - lib/cli/resources/package.rb
 - lib/cli/resurrection.rb
 - lib/cli/runner.rb