bosh_cli 0.19.4 → 0.19.5

data/lib/cli/commands/base.rb

@@ -3,12 +3,11 @@
 module Bosh::Cli
   module Command
     class Base
-      BLOBS_DIR = "blobs"
-      BLOBS_INDEX_FILE = "blob_index.yml"
-
       attr_reader :cache, :config, :options, :work_dir
       attr_accessor :out, :usage
 
+      DEFAULT_DIRECTOR_PORT = 25555
+
       def initialize(options = {})
         @options = options.dup
         @work_dir = Dir.pwd
@@ -16,6 +15,8 @@ module Bosh::Cli
         @config = Config.new(config_file)
         @cache = Config.cache
         @exit_code = 0
+        @out = nil
+        @usage = nil
       end
 
       class << self
@@ -81,17 +82,31 @@ module Bosh::Cli
 
       def confirmed?(question = "Are you sure?")
         non_interactive? ||
-            ask("#{question} (type 'yes' to continue): ") == "yes"
+          ask("#{question} (type 'yes' to continue): ") == "yes"
       end
 
-      [:username, :password, :target, :deployment].each do |attr_name|
-        define_method attr_name do
-          config.send(attr_name)
-        end
+      # @return [String] Target director URL
+      def target
+        url = options[:target] || config.target
+        config.resolve_alias(:target, url) || url
       end
-
       alias_method :target_url, :target
 
+      # @return [String] Deployment manifest path
+      def deployment
+        options[:deployment] || config.deployment
+      end
+
+      # @return [String] Director username
+      def username
+        options[:username] || ENV["BOSH_USER"] || config.username(target)
+      end
+
+      # @return [String] Director password
+      def password
+        options[:password] || ENV["BOSH_PASSWORD"] || config.password(target)
+      end
+
       def target_name
         config.target_name || target_url
       end
@@ -175,8 +190,8 @@ module Bosh::Cli
 
       def in_release_dir?
         File.directory?("packages") &&
-            File.directory?("jobs") &&
-            File.directory?("src")
+          File.directory?("jobs") &&
+          File.directory?("src")
       end
 
       def dirty_state?
@@ -186,8 +201,11 @@ module Bosh::Cli
       end
 
       def normalize_url(url)
+        had_port = url.to_s =~ /:\d+$/
         url = "http://#{url}" unless url.match(/^https?/)
-        URI.parse(url).to_s
+        uri = URI.parse(url)
+        uri.port = DEFAULT_DIRECTOR_PORT unless had_port
+        uri.to_s.strip.gsub(/\/$/, "")
       end
 
     end

data/lib/cli/commands/biff.rb

@@ -244,8 +244,17 @@ module Bosh::Cli::Command
     def ip_range(range, netw_name)
       netw_cidr = get_helper(netw_name)
       first, last = get_first_last_from_range(range, netw_cidr)
-      unless netw_cidr[first] and netw_cidr[last]
-        raise "Ip range '#{range}' not in #{netw_name}."
+      raise_range_err = false
+      begin
+        unless netw_cidr[first] and netw_cidr[last]
+          raise_range_err = true
+        end
+      rescue NetAddr::BoundaryError => e
+        raise_range_err = true
+      end
+      if raise_range_err
+        err("IP range '#{range}' is not within the bounds of network " +
+            "'#{netw_name}', which only has #{netw_cidr.size} IPs.")
       end
       first == last ? "#{netw_cidr[first].ip}" :
           "#{netw_cidr[first].ip} - #{netw_cidr[last].ip}"
@@ -303,7 +312,7 @@ module Bosh::Cli::Command
       helper = {}
       netw_arr = find("networks")
       if netw_arr.nil?
-        raise "Must have a network section."
+        err("Must have a network section.")
       end
       netw_arr.each do |netw|
         subnets = netw["subnets"]
@@ -322,18 +331,18 @@ module Bosh::Cli::Command
     # @param [Array] subnets The subnets in the network.
     def check_valid_network_config(netw, subnets)
       if subnets.nil?
-        raise "You must have subnets in #{netw["name"]}"
+        err("You must have subnets in #{netw["name"]}")
       end
       unless subnets.length == 1
-        raise "Biff doesn't know how to deal with anything other than one " +
-              "subnet in #{netw["name"]}"
+        err("Biff doesn't know how to deal with anything other than one " +
+            "subnet in #{netw["name"]}")
       end
       if subnets.first["range"].nil? || subnets.first["dns"].nil?
-        raise "Biff requires each network to have range and dns entries."
+        err("Biff requires each network to have range and dns entries.")
       end
       if subnets.first["gateway"] && subnets.first["gateway"].match(/.*\.1$/).nil?
-        raise "Biff only supports configurations where the gateway is the " +
-              "first IP (e.g. 172.31.196.1)."
+        err("Biff only supports configurations where the gateway is the " +
+            "first IP (e.g. 172.31.196.1).")
       end
     end
 
@@ -355,7 +364,7 @@ module Bosh::Cli::Command
     def setup(template)
       @template_file = template
       @deployment_file = deployment
-      raise "Deployment not set." if @deployment_file.nil?
+      err("Deployment not set.") if @deployment_file.nil?
       @deployment_obj = load_yaml_file(@deployment_file)
       @template_obj = load_template_as_yaml
       @ip_helper = create_ip_helper

data/lib/cli/commands/cloudcheck.rb

@@ -6,6 +6,8 @@ module Bosh::Cli::Command
 
     def perform(*options)
       auth_required
+      # TODO: introduce option helpers
+      deployment_name = options.shift unless options[0] =~ /^--/
 
       @auto_mode = options.delete("--auto")
       @report_mode = options.delete("--report")
@@ -24,9 +26,7 @@ module Bosh::Cli::Command
       end
 
       say("Performing cloud check...")
-
-      manifest = prepare_deployment_manifest
-      deployment_name = manifest["name"]
+      deployment_name ||= prepare_deployment_manifest["name"]
 
       status, _ = director.perform_cloud_scan(deployment_name)
 

data/lib/cli/commands/deployment.rb

@@ -6,15 +6,15 @@ module Bosh::Cli::Command
 
     def show_current
       say(deployment ?
-              "Current deployment is '#{deployment.green}'" :
-              "Deployment not set")
+            "Current deployment is `#{deployment.green}'" :
+            "Deployment not set".red)
     end
 
     def set_current(name)
       manifest_filename = find_deployment(name)
 
       unless File.exists?(manifest_filename)
-        err("Missing manifest for #{name} (tried '#{manifest_filename}')")
+        err("Missing manifest for #{name} (tried `#{manifest_filename}')")
       end
 
       manifest = load_yaml_file(manifest_filename)
@@ -62,7 +62,7 @@ module Bosh::Cli::Command
             "changed to `#{target.red}'!")
       end
 
-      say("Deployment set to '#{manifest_filename.green}'")
+      say("Deployment set to `#{manifest_filename.green}'")
       config.set_deployment(manifest_filename)
       config.save
     end
@@ -71,8 +71,8 @@ module Bosh::Cli::Command
       auth_required
       recreate = options.include?("--recreate")
 
-      manifest_yaml = prepare_deployment_manifest(:yaml => true,
-                                                  :resolve_properties => true)
+      manifest_yaml =
+        prepare_deployment_manifest(:yaml => true, :resolve_properties => true)
 
       if interactive?
         inspect_deployment_changes(YAML.load(manifest_yaml))

data/lib/cli/commands/misc.rb

@@ -96,10 +96,10 @@ module Bosh::Cli::Command
         director = Bosh::Cli::Director.new(target, username, password)
 
         if director.authenticated?
-          say("Logged in as '#{username}'")
+          say("Logged in as `#{username}'")
           logged_in = true
         else
-          say("Cannot log in as '#{username}', please try again")
+          say("Cannot log in as `#{username}', please try again")
           unless options[:non_interactive]
             redirect(:misc, :login, username, nil)
           end
@@ -121,7 +121,7 @@ module Bosh::Cli::Command
 
     def purge_cache
       if cache.cache_dir != Bosh::Cli::DEFAULT_CACHE_DIR
-        say("Cache directory '#{@cache.cache_dir}' differs from default, " +
+        say("Cache directory `#{@cache.cache_dir}' differs from default, " +
             "please remove manually")
       else
         FileUtils.rm_rf(cache.cache_dir)
@@ -131,14 +131,14 @@ module Bosh::Cli::Command
 
     def show_target
       say(target ?
-              "Current target is '#{full_target_name.green}'" :
-              "Target not set")
+              "Current target is `#{full_target_name.green}'" :
+              "Target not set".red)
     end
 
     def set_target(director_url, name = nil)
       if name.nil?
-        director_url = config.resolve_alias(:target, director_url) ||
-            director_url
+        director_url =
+          config.resolve_alias(:target, director_url) || director_url
       end
 
       if director_url.blank?
@@ -146,8 +146,8 @@ module Bosh::Cli::Command
       end
 
       director_url = normalize_url(director_url)
-      if director_url == target
-        say("Target already set to '#{full_target_name.green}'")
+      if target && director_url == normalize_url(target)
+        say("Target already set to `#{full_target_name.green}'")
         return
       end
 
@@ -159,11 +159,11 @@ module Bosh::Cli::Command
         rescue Bosh::Cli::AuthError
           status = {}
         rescue Bosh::Cli::DirectorError
-          err("Cannot talk to director at '#{director_url}', " +
+          err("Cannot talk to director at `#{director_url}', " +
               "please set correct target")
         end
       else
-        status = { "name" => "Unknown Director", "version" => "n/a" }
+        status = {"name" => "Unknown Director", "version" => "n/a"}
       end
 
       config.target = director_url
@@ -180,19 +180,54 @@ module Bosh::Cli::Command
       end
 
       config.save
-      say("Target set to '#{full_target_name.green}'")
+      say("Target set to `#{full_target_name.green}'")
 
-      if interactive? && (config.username.blank? || config.password.blank?)
+      if interactive? && !logged_in?
         redirect(:misc, :login)
       end
     end
 
+    def list_targets
+      # TODO: Bonus point will be checking each director status
+      # (maybe an --status option?)
+      targets = config.aliases(:target) || {}
+
+      err("No targets found") if targets.size == 0
+
+      targets_table = table do |t|
+        t.headings = [ "Name", "Director URL" ]
+        targets.each { |row| t << [row[0], row[1]] }
+      end
+
+      say("\n")
+      say(targets_table)
+      say("\n")
+      say("Targets total: %d" % targets.size)
+    end
+
     def set_alias(name, value)
       config.set_alias(:cli, name, value.to_s.strip)
       config.save
       say("Alias `#{name.green}' created for command `#{value.green}'")
     end
 
+    def list_aliases
+      aliases = config.aliases(:cli) || {}
+
+      err("No aliases found") if aliases.size == 0
+
+      sorted = aliases.sort_by { |name, value| name }
+      aliases_table = table do |t|
+        t.headings = [ "Alias", "Command" ]
+        sorted.each { |row| t << [row[0], row[1]] }
+      end
+
+      say("\n")
+      say(aliases_table)
+      say("\n")
+      say("Aliases total: %d" % aliases.size)
+    end
+
     private
 
     def print_specs(entity, dir)

data/lib/cli/commands/property_management.rb

@@ -8,8 +8,12 @@ module Bosh::Cli::Command
       prepare
       show_header
 
-      status, body = director.get_property(@deployment_name, name)
-      existing_property = status == 200
+      begin
+        status, body = director.get_property(@deployment_name, name)
+        existing_property = status == 200
+      rescue Bosh::Cli::DirectorError
+        existing_property = false
+      end
 
       if existing_property
         say("Current `#{name.green}' value is " +

data/lib/cli/commands/release.rb

@@ -264,10 +264,20 @@ module Bosh::Cli::Command
       end
 
       header("Building packages")
-      Dir[File.join(work_dir, "packages", "*", "spec")].each do |package_spec|
+      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 = dry_run
+        package.dry_run = true if dry_run
+
         say("Building #{package.name.green}...")
         package.build
         packages << package
@@ -293,14 +303,20 @@ module Bosh::Cli::Command
       header("Building jobs")
       Dir[File.join(work_dir, "jobs", "*")].each do |job_dir|
         next unless File.directory?(job_dir)
-        prepare_script = File.join(job_dir, "prepare")
-        job_spec = File.join(job_dir, "spec")
+        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

data/lib/cli/commands/stemcell.rb

@@ -137,6 +137,7 @@ module Bosh::Cli::Command
 
       url = yaml[stemcell_name]["url"]
       size = yaml[stemcell_name]["size"]
+      sha1 = yaml[stemcell_name]["sha"]
       progress_bar = ProgressBar.new(stemcell_name, size)
       progress_bar.file_transfer_mode
       File.open("#{stemcell_name}", "w") { |file|
@@ -146,7 +147,13 @@ module Bosh::Cli::Command
         end
       }
       progress_bar.finish
-      puts("Download complete.")
+      file_sha1 = Digest::SHA1.file(stemcell_name).hexdigest
+      if file_sha1 != sha1
+        err("The downloaded file sha1 '#{file_sha1}' does not match the " +
+            "expected sha1 '#{sha1}'.")
+      else
+        puts("Download complete.")
+      end
     end
 
     def delete(name, version)

data/lib/cli/config.rb

@@ -23,33 +23,47 @@ module Bosh::Cli
       @config_file = load_yaml_file(@filename, nil)
 
       unless @config_file.is_a?(Hash)
-        @config_file = { } # Just ignore it if it's malformed
+        @config_file = {} # Just ignore it if it's malformed
       end
 
     rescue SystemCallError => e
       raise ConfigError, "Cannot read config file: #{e.message}"
     end
 
-    def auth
-      if @config_file.has_key?("auth") && @config_file["auth"].is_a?(Hash)
+    # @return [Hash] Director credentials
+    def credentials_for(target)
+      if @config_file["auth"].is_a?(Hash) && @config_file["auth"][target]
         @config_file["auth"][target]
       else
-        nil
+        {
+          "username" => nil,
+          "password" => nil
+        }
       end
     end
 
     def set_credentials(target, username, password)
-      @config_file["auth"] ||= { }
-      @config_file["auth"][target] = { "username" => username,
-                                       "password" => password }
+      @config_file["auth"] ||= {}
+      @config_file["auth"][target] = {
+        "username" => username,
+        "password" => password
+      }
     end
 
     def set_alias(category, alias_name, value)
-      @config_file["aliases"] ||= { }
-      @config_file["aliases"][category.to_s] ||= { }
+      @config_file["aliases"] ||= {}
+      @config_file["aliases"][category.to_s] ||= {}
       @config_file["aliases"][category.to_s][alias_name] = value
     end
 
+    def aliases(category)
+      if @config_file.has_key?("aliases") && @config_file["aliases"].is_a?(Hash)
+        @config_file["aliases"][category.to_s]
+      else
+        nil
+      end
+    end
+
     def resolve_alias(category, alias_name)
       category = category.to_s
 
@@ -64,16 +78,20 @@ module Bosh::Cli
       end
     end
 
-    def username
-      auth ? auth["username"] : nil
+    # @param [String] target Target director url
+    # @return [String] Username associated with target
+    def username(target)
+      credentials_for(target)["username"]
     end
 
-    def password
-      auth ? auth["password"] : nil
+    # @param [String] target Target director url
+    # @return [String] Password associated with target
+    def password(target)
+      credentials_for(target)["password"]
     end
 
     # Deployment used to be a string that was only stored for your
-    # current target.  As soon as you switched targets, the deployment
+    # current target. As soon as you switched targets, the deployment
     # was erased. If the user has the old config we convert it to the
     # new config.
     #
@@ -106,7 +124,7 @@ module Bosh::Cli
     # @param [String] deployment_file_path The string path to the
     #     deployment file.
     def set_deployment(deployment_file_path)
-      raise MissingTarget, "Must have a target set." if target.nil?
+      raise MissingTarget, "Must have a target set" if target.nil?
       @config_file["deployment"] = {} if is_old_deployment_config?
       @config_file["deployment"] ||= {}
       @config_file["deployment"][target] = deployment_file_path