bosh_cli 1.0.1 → 1.0.2

data/lib/cli.rb

@@ -29,9 +29,6 @@ require "tmpdir"
 require "uri"
 require "yaml"
 require "netaddr"
-require "net/ssh"
-require "net/scp"
-require "net/ssh/gateway"
 
 unless defined?(Bosh::Cli::VERSION)
   require "cli/version"

data/lib/cli/base_command.rb

@@ -48,7 +48,8 @@ module Bosh::Cli
       end
 
       def director
-        @director ||= Bosh::Cli::Director.new(target, username, password)
+        @director ||= Bosh::Cli::Director.new(
+          target, username, password, @options.select {|k,v| k == :no_track})
       end
 
       def release
@@ -132,12 +133,15 @@ module Bosh::Cli
       # contains pretty detailed error report and other UI niceties, so most
       # of the time this could just do nothing
       # @param [Symbol] status Task status
-      def task_report(status, success_msg = nil, error_msg = nil)
+      # @param [#to_s] task_id Task ID
+      def task_report(status, task_id, success_msg = nil, error_msg = nil)
         case status
           when :non_trackable
             report = "Can't track director task".red
           when :track_timeout
             report = "Task tracking timeout".red
+          when :running
+            report = "Director task #{task_id.yellow} is running"
           when :error
             report = error_msg
           when :done
@@ -168,6 +172,12 @@ module Bosh::Cli
         err("Please choose deployment first") if deployment.nil?
       end
 
+      def no_track_unsupported
+        if @options.delete(:no_track)
+          say("Ignoring `" + "--no-track".yellow + "' option")
+        end
+      end
+
       def check_if_release_dir
         unless in_release_dir?
           err("Sorry, your current directory doesn't look " +
@@ -179,7 +189,8 @@ module Bosh::Cli
         if dirty_state?
           say("\n%s\n" % [`git status`])
           err("Your current directory has some local modifications, " +
-              "please discard or commit them first")
+              "please discard or commit them first.\n\n" +
+              "Use the --force option to skip this check.")
         end
       end
 

data/lib/cli/commands/cloudcheck.rb

@@ -15,6 +15,7 @@ module Bosh::Cli::Command
            "don't attempt to resolve problems"
     def perform(deployment_name = nil)
       auth_required
+      no_track_unsupported
       @auto_mode = options[:auto]
       @report_mode = options[:report]
 
@@ -30,10 +31,10 @@ module Bosh::Cli::Command
       say("Performing cloud check...")
       deployment_name ||= prepare_deployment_manifest["name"]
 
-      status, _ = director.perform_cloud_scan(deployment_name)
+      status, task_id = director.perform_cloud_scan(deployment_name)
 
       if status != :done
-        task_report(status)
+        task_report(status, task_id)
         exit(1)
       end
 
@@ -75,10 +76,10 @@ module Bosh::Cli::Command
         hash
       end
 
-      status, _ = director.apply_resolutions(deployment_name, action_map)
+      status, task_id = director.apply_resolutions(deployment_name, action_map)
 
       if status != :done
-        task_report(status)
+        task_report(status, task_id)
         exit(1)
       end
 

data/lib/cli/commands/deployment.rb

@@ -101,9 +101,9 @@ module Bosh::Cli::Command
         cancel_deployment
       end
 
-      status, _ = director.deploy(manifest_yaml, :recreate => recreate)
+      status, task_id = director.deploy(manifest_yaml, :recreate => recreate)
 
-      task_report(status, "Deployed #{desc}")
+      task_report(status, task_id, "Deployed #{desc}")
     end
 
     # bosh delete deployment
@@ -123,9 +123,9 @@ module Bosh::Cli::Command
         return
       end
 
-      status, _ = director.delete_deployment(name, :force => force)
+      status, task_id = director.delete_deployment(name, :force => force)
 
-      task_report(status, "Deleted deployment `#{name}'")
+      task_report(status, task_id, "Deleted deployment `#{name}'")
     end
 
     # bosh validate jobs
@@ -136,8 +136,19 @@ module Bosh::Cli::Command
       check_if_release_dir
       manifest = prepare_deployment_manifest(:resolve_properties => true)
 
-      nl
-      say("Analyzing release directory...".yellow)
+      if manifest["release"]
+        release_name = manifest["release"]["name"]
+      elsif manifest["releases"].count > 1
+        err("Cannot validate a deployment manifest with more than 1 release")
+      else
+        release_name = manifest["releases"].first["name"]
+      end
+      if release_name == release.dev_name || release_name == release.final_name
+        nl
+        say("Analyzing release directory...".yellow)
+      else
+        err("This release was not found in deployment manifest")
+      end
 
       say(" - discovering packages")
       packages = Bosh::Cli::PackageBuilder.discover(

data/lib/cli/commands/help.rb

@@ -78,10 +78,14 @@ module Bosh::Cli::Command
         end
       end
 
+      self.class.list_commands(good_matches)
+    end
+
+    def self.list_commands(commands)
       help_column_width = terminal_width - 5
       help_indent = 4
 
-      good_matches.each_with_index do |command, i|
+      commands.each_with_index do |command, i|
         nl if i > 0
         margin = command.usage.size + 1
         say("#{command.usage_with_params.columnize(70, margin).green}")
@@ -93,4 +97,4 @@ module Bosh::Cli::Command
     end
 
   end
-end
+end

data/lib/cli/commands/job_management.rb

@@ -115,10 +115,10 @@ module Bosh::Cli::Command
       nl
       say("Performing `#{op_desc}'...")
 
-      status, _ = director.change_job_state(
+      status, task_id = director.change_job_state(
         manifest["name"], manifest_yaml, job, index, new_state)
 
-      task_report(status, completion_desc)
+      task_report(status, task_id, completion_desc)
     end
 
   end

data/lib/cli/commands/job_rename.rb

@@ -25,10 +25,10 @@ module Bosh::Cli::Command
 
       sanity_check_job_rename(manifest_yaml, old_name, new_name)
 
-      status, _ = director.rename_job(
+      status, task_id = director.rename_job(
         manifest["name"], manifest_yaml, old_name, new_name, force)
 
-      task_report(status, "Rename successful")
+      task_report(status, task_id, "Rename successful")
     end
 
     def sanity_check_job_rename(manifest_yaml, old_name, new_name)

data/lib/cli/commands/log_management.rb

@@ -16,6 +16,7 @@ module Bosh::Cli::Command
     def fetch_logs(job, index)
       auth_required
       target_required
+      no_track_unsupported
 
       if index !~ /^\d+$/
         err("Job index is expected to be a positive integer")

data/lib/cli/commands/misc.rb

@@ -15,6 +15,9 @@ module Bosh::Cli::Command
     usage "status"
     desc  "Show current status (current target, user, deployment info etc)"
     def status
+      cpi = nil
+      features = nil
+
       if config.target
         say("Updating director data...", " ")
 
@@ -26,6 +29,8 @@ module Bosh::Cli::Command
             config.target_name = status["name"]
             config.target_version = status["version"]
             config.target_uuid = status["uuid"]
+            cpi = status["cpi"]
+            features = status["features"]
             config.save
             say("done".green)
           end
@@ -46,6 +51,8 @@ module Bosh::Cli::Command
         print_value("Version", config.target_version)
         print_value("User", username, "not logged in")
         print_value("UUID", config.target_uuid)
+        print_value("CPI", cpi, "n/a (update director)")
+        print_feature_list(features) if features
       end
 
       nl
@@ -313,5 +320,24 @@ module Bosh::Cli::Command
       say(t) unless t.rows.empty?
     end
 
+    def print_feature_list(features)
+      if features.respond_to?(:each)
+        features.each do |feature, status|
+          print_value(feature, format_feature_status(status))
+        end
+      else
+        say("Unknown feature list: #{features.inspect}".red)
+      end
+    end
+
+    def format_feature_status(status)
+      if status.nil?
+        "n/a"
+      elsif status
+        "enabled"
+      else
+        "disabled"
+      end
+    end
   end
 end

data/lib/cli/commands/release.rb

@@ -184,9 +184,9 @@ module Bosh::Cli::Command
       end
 
       if confirmed?
-        status, _ = director.delete_release(
+        status, task_id = director.delete_release(
           name, :force => force, :version => version)
-        task_report(status, "Deleted `#{desc}'")
+        task_report(status, task_id, "Deleted `#{desc}'")
       else
         say("Canceled deleting release".green)
       end
@@ -258,12 +258,12 @@ module Bosh::Cli::Command
 
       if rebase
         say("Uploading release (#{"will be rebased".yellow})")
-        status, _ = director.rebase_release(tarball_path)
-        task_report(status, "Release rebased")
+        status, task_id = director.rebase_release(tarball_path)
+        task_report(status, task_id, "Release rebased")
       else
         say("\nUploading release\n")
-        status, _ = director.upload_release(tarball_path)
-        task_report(status, "Release uploaded")
+        status, task_id = director.upload_release(tarball_path)
+        task_report(status, task_id, "Release uploaded")
       end
     end
 

data/lib/cli/commands/ssh.rb

@@ -121,6 +121,7 @@ module Bosh::Cli::Command
       end
 
       if options[:gateway_host]
+        require "net/ssh/gateway"
         gw_host = options[:gateway_host]
         gw_user = options[:gateway_user] || ENV["USER"]
         gateway = Net::SSH::Gateway.new(gw_host, gw_user)
@@ -255,6 +256,8 @@ module Bosh::Cli::Command
       if gateway
         gateway.ssh(ip, user) { |ssh| yield ssh }
       else
+        require "net/ssh"
+        require "net/scp"
         Net::SSH.start(ip, user) { |ssh| yield ssh }
       end
     end

data/lib/cli/commands/stemcell.rb

@@ -69,9 +69,9 @@ module Bosh::Cli::Command
       say("Uploading stemcell...")
       nl
 
-      status, _ = director.upload_stemcell(stemcell.stemcell_file)
+      status, task_id = director.upload_stemcell(stemcell.stemcell_file)
 
-      task_report(status, "Stemcell uploaded and created")
+      task_report(status, task_id, "Stemcell uploaded and created")
     end
 
     # bosh stemcells
@@ -105,9 +105,11 @@ module Bosh::Cli::Command
     desc "Show the list of publicly available stemcells for download."
     option "--full", "show the full download url"
     option "--tags tag1,tag2...", Array, "filter by tag"
+    option "--all", "show all stemcells"
     def list_public
       full = !!options[:full]
       tags = options[:tags] || [DEFAULT_PUB_STEMCELL_TAG]
+      tags = [ALL_STEMCELLS_TAG] if options[:all]
 
       yaml = get_public_stemcell_list
       stemcells_table = table do |t|
@@ -191,9 +193,9 @@ module Bosh::Cli::Command
         return
       end
 
-      status, _ = director.delete_stemcell(name, version)
+      status, task_id = director.delete_stemcell(name, version)
 
-      task_report(status, "Deleted stemcell `#{name}/#{version}'")
+      task_report(status, task_id, "Deleted stemcell `#{name}/#{version}'")
     end
 
     private

data/lib/cli/commands/vms.rb

@@ -9,6 +9,7 @@ module Bosh::Cli::Command
     option "--full", "Return detailed VM information"
     def list(deployment_name = nil)
       auth_required
+      no_track_unsupported
       show_full_stats = options[:full]
 
       if deployment_name.nil?

data/lib/cli/core_ext.rb

@@ -88,7 +88,7 @@ module BoshExtensions
 
   # @return [Fixnum]
   def terminal_width
-    [HighLine::SystemExtensions.terminal_size[0], 120].min
+    STDIN.tty? ? [HighLine::SystemExtensions.terminal_size[0], 120].min : 80
   end
 end
 

data/lib/cli/release_compiler.rb

@@ -146,11 +146,12 @@ module Bosh::Cli
       elsif blobstore_id
         say("FOUND REMOTE".yellow)
         say("Downloading #{blobstore_id.to_s.green}...")
+        tmp_file = Tempfile.new("")
+        @blobstore.get(blobstore_id, tmp_file)
+        tmp_file.close
 
-        payload = @blobstore.get(blobstore_id)
-
-        if Digest::SHA1.hexdigest(payload) == sha1
-          File.open(filename, "w") { |f| f.write(payload) }
+        if Digest::SHA1.file(tmp_file.path).hexdigest == sha1
+          FileUtils.mv(tmp_file.path, filename)
         else
           err("#{desc} is corrupted in blobstore (id=#{blobstore_id})")
         end

data/lib/cli/runner.rb

@@ -126,6 +126,9 @@ module Bosh::Cli
         @options[:non_interactive] = true
         Config.colorize = false
       end
+      opts.on("-N", "--no-track", "Return Task ID and don't track") do
+        @options[:no_track] = true
+      end
       opts.on("-t", "--target URL", "Override target") do |target|
         @options[:target] = target
       end
@@ -147,19 +150,17 @@ module Bosh::Cli
     def load_plugins
       plugins_glob = "bosh/cli/commands/*.rb"
 
-      unless Gem.respond_to?(:find_files)
+      unless Gem::Specification.respond_to?(:latest_specs) &&
+             Gem::Specification.instance_methods.include?(:matches_for_glob)
         say("Cannot load plugins, ".yellow +
             "please run `gem update --system' to ".yellow +
             "update your RubyGems".yellow)
         return
       end
 
-      plugins = begin
-        Gem.find_files(plugins_glob, true)
-      rescue ArgumentError
-        # Handling rubygems compatibility issue
-        Gem.find_files(plugins_glob)
-      end
+      plugins = Gem::Specification.latest_specs(true).map { |spec|
+        spec.matches_for_glob(plugins_glob)
+      }.flatten
 
       plugins.each do |plugin|
         n_commands = Config.commands.size
@@ -252,4 +253,4 @@ module Bosh::Cli
       search_parse_tree(@parse_tree)
     end
   end
-end
+end

data/lib/cli/task_tracker.rb

@@ -10,6 +10,8 @@ module Bosh
 
       attr_reader :output
 
+      attr_reader :renderer
+
       # @param [Bosh::Cli::Director] director
       # @param [Integer] task_id
       # @param [Hash] options
@@ -28,7 +30,9 @@ module Bosh
         @cache = Config.cache
         @task = Bosh::Cli::DirectorTask.new(@director, @task_id, @log_type)
 
-        if options[:raw_output]
+        if options[:renderer]
+          @renderer = options[:renderer]
+        elsif options[:raw_output]
           @renderer = Bosh::Cli::TaskLogRenderer.new
         else
           @renderer = Bosh::Cli::TaskLogRenderer.create_for_log_type(@log_type)

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/spec/unit/job_property_validator_spec.rb

@@ -3,5 +3,5 @@
 require "spec_helper"
 
 describe Bosh::Cli::JobPropertyValidator do
-
+  pending "needs tests"
 end

data/spec/unit/task_tracker_spec.rb

@@ -124,4 +124,8 @@ describe Bosh::Cli::TaskTracker do
     tracker.track.should == :cancelled
   end
 
+  it "accepts alternate :renderer option" do
+    tracker = make_tracker("42", {:renderer => "I'm a renderer"})
+    tracker.renderer.should == "I'm a renderer"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -355,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3824294478508982037
+      hash: 1768623608399422134
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -364,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3824294478508982037
+      hash: 1768623608399422134
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24