bosh_cli 1.3200.0 → 1.3202.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd94fb8759f3cc9ca5ad4b899a4f29bff7d8e3c
-  data.tar.gz: 70cb8cf9616d0fcf9b6ed37b73c982693a559e13
+  metadata.gz: 57bf0c54be21cb26fe042e6cb2a3153187a4a9a9
+  data.tar.gz: b2639e85670849be3a505b9f4d99ca2784a2814d
 SHA512:
-  metadata.gz: 5ab61c54f0ef38880cd3e166b98630cbe42476bfd08967f746c805522c73729c6c920641e31be22ad0a0a117c15cc49a1cc14985067815b8b4b4bdb0f5cd6923
-  data.tar.gz: e9e4c662fb4a30fb7f4b75e03f2560a4143f327d98fb202a2f7fb7f6c84596202de37d11af861da1f3aab19f2cb005a60022b118c885f8317ba3a622db7aa7d1
+  metadata.gz: 6593b135fbd3099be5a2f6e68df6fc50ab46ead9583e4d1b13ea216efea37ffa6497f1bf1bdb0f608f7227b302ec41cde2ebe21dbb13280dc4dcb6c91823b07a
+  data.tar.gz: 33af5651442751fca69b45a64c530ec561085b72cab80a66abe1217e6fb69491b23e5f01ead8a1bc8bebc85b2c8ff2e40f80d3e01b73e49fa1ac7b90b4f97c20

data/lib/cli/base_command.rb

@@ -121,7 +121,6 @@ module Bosh::Cli
         elsif username && password
           @credentials = Client::BasicCredentials.new(username, password)
         end
-
         @credentials
       end
 
@@ -145,7 +144,7 @@ module Bosh::Cli
 
     def auth_info
       @auth_info ||= begin
-        ca_cert = config.ca_cert(target)
+        ca_cert = options[:ca_cert] || config.ca_cert(target)
         director_client = Client::Director.new(target, nil, ca_cert: ca_cert)
         Client::Uaa::AuthInfo.new(director_client, ENV, ca_cert)
       end

data/lib/cli/commands/misc.rb

@@ -66,7 +66,6 @@ module Bosh::Cli::Command
     usage "target"
     desc  "Choose director to talk to (optionally creating an alias). " +
           "If no arguments given, show currently targeted director"
-    option '--ca-cert FILE', String, 'Path to client certificate provided to UAA server'
     def set_target(director_url = nil, name = nil)
       if director_url.nil?
         show_target

data/lib/cli/runner.rb

@@ -21,11 +21,11 @@ module Bosh::Cli
       @args = args
       @options = options.dup
 
-      banner = "Usage: bosh [<options>] <command> [<args>]"
+      banner = 'Usage: bosh [<options>] <command> [<args>]'
       @option_parser = OptionParser.new(banner)
 
       Config.colorize = nil
-      if ENV.has_key?("BOSH_COLOR") && ENV["BOSH_COLOR"] == "false"
+      if ENV.has_key?('BOSH_COLOR') && ENV['BOSH_COLOR'] == 'false'
         Config.colorize = false
       end
       Config.output ||= STDOUT
@@ -51,7 +51,7 @@ module Bosh::Cli
       end
 
       if command.nil?
-        err("Unknown command: #{@args.join(" ")}")
+        err("Unknown command: #{@args.join(' ')}")
       end
 
       command.runner = self
@@ -104,63 +104,67 @@ module Bosh::Cli
     def parse_global_options
       # -v is reserved for verbose but having 'bosh -v' is handy,
       # hence the little hack
-      if @args.size == 1 && (@args[0] == "-v" || @args[0] == "--version")
+      if @args.size == 1 && (@args[0] == '-v' || @args[0] == '--version')
         @args = %w(version)
         return
       end
 
       opts = @option_parser
-      config_desc = "Override configuration file. Also can be overridden " +
-                    "by BOSH_CONFIG environment variable. Defaults to " +
-                    "$HOME/.bosh_config. Override precedence is command-" +
-                    "line option, then environment variable, then home directory."
-      opts.on("-c", "--config FILE", config_desc) do |file|
+      config_desc = 'Override configuration file. Also can be overridden ' +
+        'by BOSH_CONFIG environment variable. Defaults to ' +
+        '$HOME/.bosh_config. Override precedence is command-' +
+        'line option, then environment variable, then home directory.'
+      opts.on('-c', '--config FILE', config_desc) do |file|
         @options[:config] = file
       end
 
-      opts.on("--parallel MAX", "Sets the max number of parallel downloads") do |max|
+      opts.on('--parallel MAX', 'Sets the max number of parallel downloads') do |max|
         Config.max_parallel_downloads = Integer(max)
       end
 
-      opts.on("--[no-]color", "Toggle colorized output") do |v|
+      opts.on('--[no-]color', 'Toggle colorized output') do |v|
         Config.colorize = v
       end
 
-      opts.on("-v", "--verbose", "Show additional output") do
+      opts.on('-v', '--verbose', 'Show additional output') do
         @options[:verbose] = true
       end
-      opts.on("-q", "--quiet", "Suppress all output") do
+      opts.on('-q', '--quiet', 'Suppress all output') do
         Config.output = nil
       end
-      opts.on("-n", "--non-interactive", "Don't ask for user input") do
+      opts.on('-n', '--non-interactive', "Don't ask for user input") do
         @options[:non_interactive] = true
       end
-      opts.on("-N", "--no-track", "Return Task ID and don't track") do
+      opts.on('-N', '--no-track', "Return Task ID and don't track") do
         @options[:no_track] = true
       end
-      opts.on("-P", "--poll INTERVAL", "Director task polling interval") do |interval|
+      opts.on('-P', '--poll INTERVAL', 'Director task polling interval') do |interval|
         @options[:poll_interval] = Integer(interval)
       end
-      opts.on("-t", "--target URL", "Override target") do |target|
+      opts.on('-t', '--target URL', 'Override target') do |target|
         @options[:target] = target
       end
-      opts.on("-u", "--user USER", "Override username") do |user|
+      opts.on('-u', '--user USER', 'Override username') do |user|
         @options[:username] = user
       end
-      opts.on("-p", "--password PASSWORD", "Override password") do |pass|
+      opts.on('-p', '--password PASSWORD', 'Override password') do |pass|
         @options[:password] = pass
       end
-      opts.on("-d", "--deployment FILE", "Override deployment") do |file|
+      opts.on('-d', '--deployment FILE', 'Override deployment') do |file|
         @options[:deployment] = file
       end
-      opts.on("-h", "--help", "here you go") do
+      opts.on('-h', '--help', 'here you go') do
         @args << 'help'
       end
+      opts.on('--ca-cert FILE', 'Override CA certificate') do |file|
+        @options[:ca_cert] = file
+      end
 
       @args = @option_parser.order!(@args)
     end
 
-    def plugins_glob; "bosh/cli/commands/*.rb"; end
+    def plugins_glob; 'bosh/cli/commands/*.rb'
+    ; end
 
     # Discover and load CLI plugins from all available gems
     # @return [void]
@@ -170,7 +174,7 @@ module Bosh::Cli
     end
 
     def load_local_plugins
-      Dir.glob(File.join("lib", plugins_glob)).each do |file|
+      Dir.glob(File.join('lib', plugins_glob)).each do |file|
         say("WARNING: loading local plugin: #{file}")
         require_plugin(file)
       end
@@ -189,7 +193,7 @@ module Bosh::Cli
         if Config.commands =~ original_commands
           say(("File #{plugin_path} has been loaded as plugin but it didn't " +
               "contain any commands.\nMake sure this plugin is updated to be " +
-              "compatible with BOSH CLI 1.0.").columnize(80).make_yellow)
+              'compatible with BOSH CLI 1.0.').columnize(80).make_yellow)
         end
       end
     end
@@ -199,9 +203,9 @@ module Bosh::Cli
         spec.matches_for_glob(plugins_glob)
       }.flatten.uniq
     rescue
-      err("Cannot load plugins, ".make_yellow +
+      err('Cannot load plugins, '.make_yellow +
               "please run `gem update --system' to ".make_yellow +
-              "update your RubyGems".make_yellow)
+              'update your RubyGems'.make_yellow)
     end
 
     def require_plugin(file)
@@ -225,9 +229,9 @@ module Bosh::Cli
 
     def add_shortcuts
       {
-        "st" => "status",
-        "props" => "properties",
-        "cck" => "cloudcheck"
+        'st' => 'status',
+        'props' => 'properties',
+        'cck' => 'cloudcheck'
       }.each do |short, long|
         @parse_tree[short] = @parse_tree[long]
       end
@@ -262,7 +266,7 @@ module Bosh::Cli
 
       while (arg = @args.shift)
         candidate << arg
-        resolved = config.resolve_alias(:cli, candidate.join(" "))
+        resolved = config.resolve_alias(:cli, candidate.join(' '))
         if best_match && resolved.nil?
           @args.unshift(arg)
           break

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3200.0'
+    VERSION = '1.3202.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.3200.0
+  version: 1.3202.0
 platform: ruby
 authors:
 - VMware
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3200.0
+        version: 1.3202.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3200.0
+        version: 1.3202.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3200.0
+        version: 1.3202.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3200.0
+        version: 1.3202.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.3200.0
+        version: 1.3202.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3200.0
+        version: 1.3202.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement