bosh_cli 0.19.6 → 1.0.rc1

data/lib/cli/commands/package.rb

@@ -3,36 +3,8 @@
 module Bosh::Cli::Command
   class Package < Base
 
-    def create_all
-      specs_glob = File.join(work_dir, "packages", "*", "spec")
-
-      Dir[specs_glob].each do |spec|
-        create(spec)
-      end
-    end
-
-    def create(name_or_path)
-      if name_or_path == "--all"
-        redirect(:package, :create_all)
-      end
-
-      spec = read_spec(name_or_path)
-
-      unless spec.is_a?(Hash) && spec.has_key?("name") && spec.has_key?("files")
-        err("Sorry, '#{name_or_path}' doesn't look like a valid package spec")
-      end
-
-      package_name = spec["name"]
-      header("Found '#{package_name}' spec")
-      print_spec(spec)
-      header("Building package...")
-
-      builder = Bosh::Cli::PackageBuilder.new(spec, work_dir,
-                                              false, release.blobstore)
-      builder.build
-      builder
-    end
-
+    usage "generate package"
+    desc "Generate package template"
     def generate(name)
       check_if_release_dir
 
@@ -50,11 +22,13 @@ module Bosh::Cli::Command
       FileUtils.mkdir_p(package_dir)
 
       generate_file(package_dir, "packaging") do
-        "# abort script on any command that exit with a non zero value\nset -e\n"
+        "# abort script on any command that exit " +
+        "with a non zero value\nset -e\n"
       end
 
       generate_file(package_dir, "pre_packaging") do
-        "# abort script on any command that exit with a non zero value\nset -e\n"
+        "# abort script on any command that exit " +
+        "with a non zero value\nset -e\n"
       end
 
       generate_file(package_dir, "spec") do
@@ -75,38 +49,5 @@ module Bosh::Cli::Command
       end
     end
 
-    def print_spec(spec)
-      say("Package name: #{spec["name"]}")
-      say("Files:")
-      for file in spec["files"]
-        say("  - #{file}")
-      end
-    end
-
-    def read_spec(name)
-      load_yaml_file(find_spec(name))
-    end
-
-    def find_spec(name)
-      if File.directory?(name)
-        spec_path = File.join(name, "spec")
-        if File.exists?(spec_path)
-          spec_path
-        else
-          err("Cannot find spec file in '#{name}' directory")
-        end
-      elsif File.file?(name)
-        name
-      else
-        package_dir = File.join(work_dir, "packages", name)
-        if File.directory?(package_dir)
-          find_spec(package_dir)
-        else
-          err("Cannot find package '#{name}' (tried '#{package_dir}')")
-        end
-
-      end
-    end
-
   end
 end

data/lib/cli/commands/property_management.rb

@@ -4,6 +4,9 @@ module Bosh::Cli::Command
   class PropertyManagement < Base
     include Bosh::Cli::DeploymentHelper
 
+    # bosh set property
+    usage "set property"
+    desc "Set deployment property"
     def set(name, value)
       prepare
       show_header
@@ -23,10 +26,9 @@ module Bosh::Cli::Command
       end
 
       prompt = "Are you sure you want to set property" +
-          " `#{name.green}' to `#{format_property(value).green}'? " +
-          "(type yes to proceed): "
+        " `#{name.green}' to `#{format_property(value).green}'?"
 
-      if interactive? && ask(prompt) != "yes"
+      unless confirmed?(prompt)
         err("Canceled")
       end
 
@@ -43,14 +45,17 @@ module Bosh::Cli::Command
       end
     end
 
+    # bosh unset property
+    usage "unset property"
+    desc "Unset deployment property"
     def unset(name)
       prepare
       show_header
 
       prompt = "Are you sure you want to unset property " +
-          "`#{name.green}'? (type yes to proceed): "
+        "`#{name.green}'?"
 
-      if interactive? && ask(prompt) != "yes"
+      unless confirmed?(prompt)
         err("Canceled")
       end
 
@@ -63,6 +68,9 @@ module Bosh::Cli::Command
       end
     end
 
+    # bosh get property
+    usage "get property"
+    desc "Get deployment property"
     def get(name)
       prepare
       show_header
@@ -76,9 +84,13 @@ module Bosh::Cli::Command
       end
     end
 
-    def list(*args)
+    # bosh properties
+    usage "properties"
+    desc "List deployment properties"
+    option "--terse", "easy to parse output"
+    def list
       prepare
-      terse = args.include?("--terse")
+      terse = options[:terse]
       show_header unless terse
 
       properties = director.list_properties(@deployment_name)
@@ -97,7 +109,7 @@ module Bosh::Cli::Command
       else
         if output.size > 0
           properties_table = table do |t|
-            t.headings = ["Name", "Value"]
+            t.headings = %w(Name Value)
             output.each { |row| t << [row[0], row[1].truncate(40)] }
           end
           say(properties_table)

data/lib/cli/commands/release.rb

@@ -7,21 +7,18 @@ module Bosh::Cli::Command
     include Bosh::Cli::DependencyHelper
     include Bosh::Cli::VersionCalc
 
-    def init(base=nil, *options)
-      if base[0..0] == "-"
-        # TODO: need to add some option parsing helpers to avoid that
-        options.unshift(base)
-        base = nil
-      end
-      git = options.include?("--git")
-
+    # bosh init release
+    usage "init release"
+    desc "Initialize release directory"
+    option "--git", "initialize git repository"
+    def init(base = nil)
       if base
-        FileUtils.mkdir_p(base) unless Dir.exist?(base)
+        FileUtils.mkdir_p(base)
         Dir.chdir(base)
       end
 
       err("Release already initialized") if in_release_dir?
-      git_init if git
+      git_init if options[:git]
 
       %w[config jobs packages src blobs].each do |dir|
         FileUtils.mkdir(dir)
@@ -35,55 +32,65 @@ module Bosh::Cli::Command
       say("Release directory initialized".green)
     end
 
-    def git_init
-      out = %x{git init 2>&1}
-      if $? != 0
-        say("error running 'git init':\n#{out}")
+    # bosh create release
+    usage "create release"
+    desc "Create release (assumes current directory " +
+         "to be a release repository)"
+    option "--force", "bypass git dirty state check"
+    option "--final", "create final release"
+    option "--with-tarball", "create release tarball"
+    option "--dry-run", "stop before writing release manifest"
+    def create(manifest_file = nil)
+      check_if_release_dir
+
+      if manifest_file && File.file?(manifest_file)
+        release_filename = create_from_manifest(manifest_file)
       else
-        File.open(".gitignore", "w") do |f|
-          f << <<-EOS.gsub(/^\s{10}/, '')
-          config/dev.yml
-          config/private.yml
-          releases/*.tgz
-          dev_releases
-          .blobs
-          blobs
-          .dev_builds
-          .idea
-          .DS_Store
-          .final_builds/jobs/**/*.tgz
-          .final_builds/packages/**/*.tgz
-          *.swp
-          *~
-          *#
-          #*
-          EOS
-        end
+        release_filename = create_from_spec
+      end
+
+      if release_filename
+        release.latest_release_filename = release_filename
+        release.save_config
       end
-    rescue Errno::ENOENT
-      say("Unable to run 'git init'".red)
     end
 
-    def verify(tarball_path, *options)
+    # bosh verify release
+    usage "verify release"
+    desc "Verify release"
+    def verify(tarball_path)
       tarball = Bosh::Cli::ReleaseTarball.new(tarball_path)
 
-      say("\nVerifying release...")
+      nl
+      say("Verifying release...")
       tarball.validate
       nl
 
       if tarball.valid?
-        say("'%s' is a valid release" % [tarball_path] )
+        say("`#{tarball_path}' is a valid release".green)
       else
-        say("'%s' is not a valid release:" % [tarball_path] )
-        for error in tarball.errors
-          say("- %s" % [error])
+        say("Validation errors:".red)
+        tarball.errors.each do |error|
+          say("- #{error}")
         end
+        err("`#{tarball_path}' is not a valid release".red)
       end
     end
 
+    usage "upload release"
+    desc "Upload release"
+    option "--rebase",
+           "Rebases this release onto the latest version",
+           "known by director (discards local job/package",
+           "versions in favor of versions assigned by director)"
     def upload(release_file = nil)
       auth_required
 
+      upload_options = {
+        :rebase => options[:rebase],
+        :repack => true
+      }
+
       if release_file.nil?
         check_if_release_dir
         release_file = release.latest_release_filename
@@ -98,18 +105,95 @@ module Bosh::Cli::Command
         end
       end
 
+      unless File.exist?(release_file)
+        err("Release file doesn't exist")
+      end
+
       file_type = `file --mime-type -b '#{release_file}'`
 
       if file_type =~ /text\/(plain|yaml)/
-        upload_manifest(release_file)
-      else # Just assume tarball
-        upload_tarball(release_file)
+        upload_manifest(release_file, upload_options)
+      else
+        upload_tarball(release_file, upload_options)
+      end
+    end
+
+    usage "reset release"
+    desc "Reset dev release"
+    def reset
+      check_if_release_dir
+
+      say("Your dev release environment will be completely reset".red)
+      if confirmed?
+        say("Removing dev_builds index...")
+        FileUtils.rm_rf(".dev_builds")
+        say("Clearing dev name...")
+        release.dev_name = nil
+        release.save_config
+        say("Removing dev tarballs...")
+        FileUtils.rm_rf("dev_releases")
+
+        say("Release has been reset".green)
+      else
+        say("Canceled")
+      end
+    end
+
+    usage "releases"
+    desc "Show the list of available releases"
+    def list
+      auth_required
+      releases = director.list_releases.sort do |r1, r2|
+        r1["name"] <=> r2["name"]
+      end
+
+      err("No releases") if releases.empty?
+
+      releases_table = table do |t|
+        t.headings = "Name", "Versions"
+        releases.each do |r|
+          versions = r["versions"].sort do |v1, v2|
+            version_cmp(v1, v2)
+          end
+
+          t << [r["name"], versions.join(", ")]
+        end
       end
+
+      nl
+      say(releases_table)
+      nl
+      say("Releases total: %d" % releases.size)
     end
 
-    def upload_manifest(manifest_path)
-      manifest = load_yaml_file(manifest_path)
-      remote_release = get_remote_release(manifest["name"]) rescue nil
+    usage "delete release"
+    desc "Delete release (or a particular release version)"
+    option "--force", "ignore errors during deletion"
+    def delete(name, version = nil)
+      auth_required
+      force = !!options[:force]
+
+      desc = "#{name}"
+      desc << "/#{version}" if version
+
+      if force
+        say("Deleting `#{desc}' (FORCED DELETE, WILL IGNORE ERRORS)".red)
+      else
+        say("Deleting `#{desc}'".red)
+      end
+
+      if confirmed?
+        status, _ = director.delete_release(
+          name, :force => force, :version => version)
+        task_report(status, "Deleted `#{desc}'")
+      else
+        say("Canceled deleting release".green)
+      end
+    end
+
+    protected
+
+    def upload_manifest(manifest_path, upload_options = {})
       package_matches = match_remote_packages(File.read(manifest_path))
 
       find_release_dir(manifest_path)
@@ -117,11 +201,8 @@ module Bosh::Cli::Command
       blobstore = release.blobstore
       tmpdir = Dir.mktmpdir
 
-      at_exit { FileUtils.rm_rf(tmpdir) }
-
-      compiler =
-        Bosh::Cli::ReleaseCompiler.new(manifest_path, blobstore,
-                                       remote_release, package_matches)
+      compiler = Bosh::Cli::ReleaseCompiler.new(
+        manifest_path, blobstore, package_matches)
       need_repack = true
 
       unless compiler.exists?
@@ -129,13 +210,16 @@ module Bosh::Cli::Command
         compiler.compile
         need_repack = false
       end
-      upload_tarball(compiler.tarball_path, :repack => need_repack)
+
+      upload_options[:repack] = need_repack
+      upload_tarball(compiler.tarball_path, upload_options)
     end
 
-    def upload_tarball(tarball_path, options = {})
+    def upload_tarball(tarball_path, upload_options = {})
       tarball = Bosh::Cli::ReleaseTarball.new(tarball_path)
       # Trying to repack release by default
-      repack  = options.has_key?(:repack) ? !!options[:repack] : true
+      repack = upload_options[:repack]
+      rebase = upload_options[:rebase]
 
       say("\nVerifying release...")
       tarball.validate(:allow_sparse => true)
@@ -148,7 +232,7 @@ module Bosh::Cli::Command
       begin
         remote_release = get_remote_release(tarball.release_name) rescue nil
 
-        if remote_release &&
+        if remote_release && !rebase &&
           remote_release["versions"].include?(tarball.version)
           err("This release version has already been uploaded")
         end
@@ -157,7 +241,7 @@ module Bosh::Cli::Command
           package_matches = match_remote_packages(tarball.manifest)
 
           say("Checking if can repack release for faster upload...")
-          repacked_path = tarball.repack(remote_release, package_matches)
+          repacked_path = tarball.repack(package_matches)
           if repacked_path.nil?
             say("Uploading the whole release".green)
           else
@@ -171,49 +255,31 @@ module Bosh::Cli::Command
         # a release info (think new releases)
       end
 
-      say("\nUploading release...\n")
-      status, _ = director.upload_release(tarball_path)
-
-      task_report(status, "Release uploaded")
-    end
-
-    def create(*options)
-      check_if_release_dir
-      if options.size == 1 && File.file?(options[0])
-        create_from_manifest(options[0])
-        release_filename = options[0]
+      if rebase
+        say("Uploading release (#{"will be rebased".yellow})")
+        status, _ = director.rebase_release(tarball_path)
+        task_report(status, "Release rebased")
       else
-        release_filename = create_from_spec(*options)
-      end
-
-      if release_filename
-        release.latest_release_filename = release_filename
-        release.save_config
+        say("\nUploading release\n")
+        status, _ = director.upload_release(tarball_path)
+        task_report(status, "Release uploaded")
       end
     end
 
     def create_from_manifest(manifest_file)
       say("Recreating release from the manifest")
       Bosh::Cli::ReleaseCompiler.compile(manifest_file, release.blobstore)
+      manifest_file
     end
 
-    def create_from_spec(*options)
-      flags = options.inject({}) { |h, option| h[option] = true; h }
-
-      final = flags.delete("--final")
-      force = flags.delete("--force")
-      manifest_only = !flags.delete("--with-tarball")
-      dry_run = flags.delete("--dry-run")
+    def create_from_spec
+      final = options[:final]
+      force = options[:force]
+      manifest_only = !options[:with_tarball]
+      dry_run = options[:dry_run]
 
       if final && !release.has_blobstore_secret?
-        say("Can't create final release without blobstore secret".red)
-        exit(1)
-      end
-
-      if flags.size > 0
-        say("Unknown flags: #{flags.keys.join(", ")}".red)
-        show_usage
-        exit(1)
+        err("Can't create final release without blobstore secret")
       end
 
       blob_manager.sync
@@ -229,16 +295,13 @@ module Bosh::Cli::Command
       check_if_dirty_state unless force
 
       confirmation = "Are you sure you want to " +
-                     "generate #{'final'.red} version? "
+        "generate #{'final'.red} version? "
 
       if final && !dry_run && !confirmed?(confirmation)
         say("Canceled release generation".green)
         exit(1)
       end
 
-      packages = []
-      jobs = []
-
       if final
         header("Building FINAL release".green)
         release_name = release.final_name
@@ -249,12 +312,12 @@ module Bosh::Cli::Command
 
       if version_greater(release.min_cli_version, Bosh::Cli::VERSION)
         err("You should use CLI >= #{release.min_cli_version} " +
-            "with this release, you have #{Bosh::Cli::VERSION}")
+              "with this release, you have #{Bosh::Cli::VERSION}")
       end
 
       if release_name.blank?
         confirmation = "Please enter %s release name: " % [
-            final ? "final" : "development"]
+          final ? "final" : "development"]
         name = interactive? ? ask(confirmation).to_s : DEFAULT_RELEASE_NAME
         err("Canceled release creation, no name given") if name.blank?
         if final
@@ -266,23 +329,17 @@ module Bosh::Cli::Command
       end
 
       header("Building packages")
-      Dir[File.join(work_dir, "packages", "*")].each do |package_dir|
-        next unless File.directory?(package_dir)
-        package_dirname = File.basename(package_dir)
-        package_spec = load_yaml_file(File.join(package_dir, "spec"))
-
-        if package_spec["name"] != package_dirname
-          err("Found `#{package_spec["name"]}' package in " +
-              "`#{package_dirname}' directory, please fix it")
-        end
 
-        package = Bosh::Cli::PackageBuilder.new(package_spec, work_dir,
-                                                final, release.blobstore)
-        package.dry_run = true if dry_run
+      packages = Bosh::Cli::PackageBuilder.discover(
+        work_dir,
+        :final => final,
+        :blobstore => release.blobstore,
+        :dry_run => dry_run
+      )
 
+      packages.each do |package|
         say("Building #{package.name.green}...")
         package.build
-        packages << package
         nl
       end
 
@@ -294,7 +351,7 @@ module Bosh::Cli::Command
         sorted_packages = tsort_packages(package_index)
         header("Resolving dependencies")
         say("Dependencies resolved, correct build order is:")
-        for package_name in sorted_packages
+        sorted_packages.each do |package_name|
           say("- %s" % [package_name])
         end
         nl
@@ -303,28 +360,17 @@ module Bosh::Cli::Command
       built_package_names = packages.map { |package| package.name }
 
       header("Building jobs")
-      Dir[File.join(work_dir, "jobs", "*")].each do |job_dir|
-        next unless File.directory?(job_dir)
-        job_dirname = File.basename(job_dir)
-
-        prepare_script = File.join(job_dir, "prepare")
-        if File.exists?(prepare_script)
-          say("Found prepare script in `#{File.basename(job_dir)}'")
-          Bosh::Cli::JobBuilder.run_prepare_script(prepare_script)
-        end
-
-        job_spec = load_yaml_file(File.join(job_dir, "spec"))
-        if job_spec["name"] != job_dirname
-          err("Found `#{job_spec["name"]}' job in " +
-              "`#{job_dirname}' directory, please fix it")
-        end
-
-        job = Bosh::Cli::JobBuilder.new(job_spec, work_dir, final,
-                                        release.blobstore, built_package_names)
-        job.dry_run = dry_run
+      jobs = Bosh::Cli::JobBuilder.discover(
+        work_dir,
+        :final => final,
+        :blobstore => release.blobstore,
+        :dry_run => dry_run,
+        :package_names => built_package_names
+      )
+
+      jobs.each do |job|
         say("Building #{job.name.green}...")
         job.build
-        jobs << job
         nl
       end
 
@@ -350,7 +396,7 @@ module Bosh::Cli::Command
 
       unless manifest_only
         say("Release tarball (#{pretty_size(builder.tarball_path)}): " +
-            builder.tarball_path.green)
+              builder.tarball_path.green)
       end
 
       release.min_cli_version = Bosh::Cli::VERSION
@@ -359,74 +405,33 @@ module Bosh::Cli::Command
       builder.manifest_path
     end
 
-    def reset
-      check_if_release_dir
-
-      say("Your dev release environment will be completely reset".red)
-      if confirmed?
-        say("Removing dev_builds index...")
-        FileUtils.rm_rf(".dev_builds")
-        say("Clearing dev name...")
-        release.dev_name = nil
-        release.save_config
-        say("Removing dev tarballs...")
-        FileUtils.rm_rf("dev_releases")
-
-        say("Release has been reset".green)
+    def git_init
+      out = %x{git init 2>&1}
+      if $? != 0
+        say("error running 'git init':\n#{out}")
       else
-        say("Canceled")
-      end
-    end
-
-    def list
-      auth_required
-      releases = director.list_releases.sort do |r1, r2|
-        r1["name"] <=> r2["name"]
-      end
-
-      err("No releases") if releases.empty?
-
-      releases_table = table do |t|
-        t.headings = "Name", "Versions"
-        releases.each do |r|
-          versions = r["versions"].sort do |v1, v2|
-            version_cmp(v1, v2)
-          end
-
-          t << [r["name"], versions.join(", ")]
+        File.open(".gitignore", "w") do |f|
+          f << <<-EOS.gsub(/^\s{10}/, '')
+          config/dev.yml
+          config/private.yml
+          releases/*.tgz
+          dev_releases
+          .blobs
+          blobs
+          .dev_builds
+          .idea
+          .DS_Store
+          .final_builds/jobs/**/*.tgz
+          .final_builds/packages/**/*.tgz
+          *.swp
+          *~
+          *#
+          #*
+          EOS
         end
       end
-
-      nl
-      say(releases_table)
-      nl
-      say("Releases total: %d" % releases.size)
-    end
-
-    def delete(name, *options)
-      auth_required
-      force = options.include?("--force")
-      options.delete("--force")
-      version = options.shift
-
-      desc = "release `#{name}'"
-      desc << " version #{version}" if version
-
-      if force
-        say("Deleting #{desc} (FORCED DELETE, WILL IGNORE ERRORS)".red)
-      elsif options.size > 0
-        err("Unknown option, currently only '--force' is supported")
-      else
-        say("Deleting #{desc}".red)
-      end
-
-      if confirmed?
-        status, _ = director.delete_release(name, :force => force,
-                                               :version => version)
-        task_report(status, "Deleted #{desc}")
-      else
-        say("Canceled deleting release".green)
-      end
+    rescue Errno::ENOENT
+      say("Unable to run 'git init'".red)
     end
 
     private
@@ -446,14 +451,14 @@ module Bosh::Cli::Command
 
     def show_summary(builder)
       packages_table = table do |t|
-        t.headings = %w(Name Version Notes Fingerprint)
+        t.headings = %w(Name Version Notes)
         builder.packages.each do |package|
           t << artefact_summary(package)
         end
       end
 
       jobs_table = table do |t|
-        t.headings = %w(Name Version Notes Fingerprint)
+        t.headings = %w(Name Version Notes)
         builder.jobs.each do |job|
           t << artefact_summary(job)
         end
@@ -487,7 +492,6 @@ module Bosh::Cli::Command
       result << artefact.name
       result << artefact.version
       result << artefact.notes.join(", ")
-      result << artefact.fingerprint
       result
     end
 
@@ -506,14 +510,15 @@ module Bosh::Cli::Command
     end
 
     def match_remote_packages(manifest_yaml)
-      # Catch exceptions to be friendly to old directors
-      result = director.match_packages(manifest_yaml) rescue []
-
-      unless result.is_a?(Array)
-        say("Cannot find existing packages info " +
-            "in the director response, maybe old director?")
-      end
-      result
+      director.match_packages(manifest_yaml)
+    rescue Bosh::Cli::DirectorError
+      msg = "You are using CLI >= 0.20 with director that doesn't support " +
+        "package matches.\nThis will result in uploading all packages " +
+        "and jobs to your director.\nIt is recommended to update your " +
+        "director or downgrade your CLI to 0.19.6"
+
+      say(msg.yellow)
+      exit(1) unless confirmed?
     end
   end
 end