Revert "Add code and tests to include master LICENSE file in root of …

…release"

This reverts several commits:
  7ae35fe~..18c935b
  cb44ace
  2e2c654~..7cda92d

  7cda92d - Move release git ignored files from root .gitignore to release/.gitignore (25 hours ago) <Corey Innis>
  2e2c654 - License tarballs added to release/.gitignore. [#84810956] (25 hours ago) <Corey Innis>

  cb44ace - Remove spec helper ReleaseDirectory#to_str and use ReleaseDirectory for other builder specs (2 days ago) <Corey Innis>

  18c935b - Add ReleaseDirectory#has_file? and refactor LicenseBuilder and PackageBuilder specs to use helpers better (2 days ago) <Corey Innis>
  0aa71fe - Refactor ReleaseDirectory spec helper to not subclass String and add cleanup (2 days ago) <Corey Innis>
  cbd5e2c - Refactor LicenseBuilder to remove a bit of unused/unwanted logic (2 days ago) <Corey Innis>
  49806d2 - Rework #add_version spec helper to simplify/clarify specs (2 days ago) <Corey Innis>
  29cb8f1 - Refactor LicenseBuilderSpec examples for dev/final build (2 days ago) <Corey Innis>
  d28f779 - Refactor: rename SpecPackage as ReleaseDirectory (2 days ago) <Corey Innis>
  dca5cf8 - Refactor some of LicenseBuilder specs and improve LICENSE/NOTICE logic (2 days ago) <Corey Innis>
  c5a82fa - Refactor: move file-related spec helpers into SpecPackage (2 days ago) <Corey Innis>
  911fff2 - Refactor: simplify spec's #make_builder helper (2 days ago) <Corey Innis>
  f82306b - Refactor: move #add_version helper to FileHelpers (2 days ago) <Corey Innis>
  83fa21f - Refactor: extract spec tmp files helpers to Support::FileHelpers (2 days ago) <Corey Innis>
  7ae35fe - Add code and tests to include master LICENSE file in root of release (2 days ago) <Dies Koper>

Signed-off-by: Christian Williams <cwilliams@pivotal.io>

.gitignore

@@ -36,6 +36,23 @@ micro/tmp
 
 pkg/
 
+/release/.blobs
+/release/.dev_builds
+/release/.final_builds/jobs/**/*.tgz
+/release/.final_builds/packages/**/*.tgz
+/release/.idea
+/release/blobs
+/release/blobs
+/release/config/dev.yml
+/release/config/private.yml
+/release/dev-releases
+/release/dev_releases
+/release/jobs/micro_*/monit
+/release/jobs/micro_*/spec
+/release/jobs/micro_*/templates/
+/release/releases/*.tgz
+/release/src/bosh/*
+
 /vsphere-cpi-release/.blobs
 /vsphere-cpi-release/.dev_builds
 /vsphere-cpi-release/.final_builds/jobs/**/*.tgz

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

@@ -1,5 +1,3 @@
-require 'cli/license_builder'
-
 module Bosh::Cli::Command
   module Release
     class CreateRelease < Base
@@ -92,11 +90,8 @@ def create_from_spec(version)
         header('Building jobs')
         jobs = build_jobs(packages.map(&:name), dry_run, final)
 
-        header('Building license')
-        license_builders = build_licenses(dry_run, final)
-
         header('Building release')
-        release_builder = build_release(dry_run, final, jobs, manifest_only, packages, license_builders, name, version)
+        release_builder = build_release(dry_run, final, jobs, manifest_only, packages, name, version)
 
         header('Release summary')
         show_summary(release_builder)
@@ -138,23 +133,6 @@ def dirty_blob_check(force)
         end
       end
 
-      def build_licenses(dry_run, final)
-        licenses = Bosh::Cli::LicenseBuilder.discover(
-            work_dir,
-            :final => final,
-            :blobstore => release.blobstore,
-            :dry_run => dry_run
-        )
-
-        licenses.each do |license|
-          say("Building #{license.name.make_green}...")
-          license.build
-          nl
-        end
-
-        licenses
-      end
-
       def build_packages(dry_run, final)
         packages = Bosh::Cli::PackageBuilder.discover(
           work_dir,
@@ -186,8 +164,8 @@ def build_packages(dry_run, final)
         packages
       end
 
-      def build_release(dry_run, final, jobs, manifest_only, packages, license_builders, name, version)
-        release_builder = Bosh::Cli::ReleaseBuilder.new(release, packages, jobs, license_builders, name,
+      def build_release(dry_run, final, jobs, manifest_only, packages, name, version)
+        release_builder = Bosh::Cli::ReleaseBuilder.new(release, packages, jobs, name,
           final: final,
           commit_hash: commit_hash,
           version: version,
@@ -259,21 +237,11 @@ def show_summary(builder)
           end
         end
 
-        licenses_table = table do |t|
-          t.headings = %w(Name Version Notes)
-          builder.licenses.each do |license|
-            t << artifact_summary(license)
-          end
-        end
-
         say('Packages')
         say(packages_table)
         nl
         say('Jobs')
         say(jobs_table)
-        nl
-        say('Licenses')
-        say(licenses_table)
 
         affected_jobs = builder.affected_jobs
 

bosh_cli/lib/cli/packaging_helper.rb

@@ -194,7 +194,7 @@ def checksum
         file_checksum(@tarball_path)
       else
         raise RuntimeError,
-          'cannot read checksum for not yet generated package/job/license'
+          'cannot read checksum for not yet generated package/job'
       end
     end
 

bosh_cli/lib/cli/release_builder.rb

@@ -2,21 +2,19 @@ module Bosh::Cli
   class ReleaseBuilder
     include Bosh::Cli::DependencyHelper
 
-    attr_reader :release, :packages, :jobs, :licenses, :name, :version, :build_dir, :commit_hash, :uncommitted_changes
+    attr_reader :release, :packages, :jobs, :name, :version, :build_dir, :commit_hash, :uncommitted_changes
 
     # @param [Bosh::Cli::Release] release Current release
     # @param [Array<Bosh::Cli::PackageBuilder>] packages Built packages
     # @param [Array<Bosh::Cli::JobBuilder>] jobs Built jobs
-    # @param [Array<Bosh::Cli::LicenseBuilder>] licenses Built licenses
     # @param [Hash] options Release build options
-    def initialize(release, packages, jobs, licenses, name, options = { })
+    def initialize(release, packages, jobs, 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 = packages
       @jobs = jobs
-      @licenses = licenses
       @name = name
       raise 'Release name is blank' if name.blank?
 
@@ -29,7 +27,6 @@ def initialize(release, packages, jobs, licenses, name, options = { })
       @index = @final ? @final_index : @dev_index
       @release_storage = Versions::LocalVersionStorage.new(@index.storage_dir, @name)
 
-      release_dir = @release.dir
       if @version && @release_storage.has_file?(@version)
         raise ReleaseVersionError.new('Release version already exists')
       end
@@ -96,17 +93,6 @@ def copy_packages
       @packages_copied = true
     end
 
-    # Copies licenses into release (LICENSE on the root repo only now)
-    def copy_licenses
-      licenses.each do |license|
-        say("%-40s %s" % [license.name.make_green,
-                          pretty_size(license.tarball_path)])
-	`tar -xvf #{license.tarball_path} -C #{build_dir} `
-
-      end
-      @licenses_copied = true
-    end
-
     # Copies jobs into release
     def copy_jobs
       jobs.each do |job|
@@ -142,14 +128,6 @@ def generate_manifest
         }
       end
 
-      manifest["license"] = licenses.map do |license|
-        {
-          "version" => license.version,
-          "fingerprint" => license.fingerprint,
-          "sha1" => license.checksum
-        }
-      end
-
       manifest["commit_hash"] = commit_hash
       manifest["uncommitted_changes"] = uncommitted_changes
 
@@ -192,13 +170,6 @@ def generate_tarball
         nl
       end
 
-      unless @licenses_copied
-        header("Copying licenses...")
-        copy_licenses
-        nl
-      end
-
-
       FileUtils.mkdir_p(File.dirname(tarball_path))
 
       in_build_dir do