bosh_cli 1.0.3 → 1.5.0.pre.1113

data/bin/bosh

@@ -1,14 +1,5 @@
 #!/usr/bin/env ruby
 
-gemfile = File.expand_path("../../Gemfile", __FILE__)
-
-if File.exists?(gemfile)
-  ENV["BUNDLE_GEMFILE"] = gemfile
-  require "rubygems"
-  require "bundler/setup"
-end
-
-$:.unshift(File.expand_path("../../lib", __FILE__))
 require "cli"
 
 begin

data/lib/cli.rb

@@ -2,88 +2,93 @@
 
 module Bosh
   module Cli
-    DEFAULT_CONFIG_PATH = File.expand_path("~/.bosh_config")
-    DEFAULT_CACHE_DIR = File.expand_path("~/.bosh_cache")
+    DEFAULT_CONFIG_PATH = File.expand_path('~/.bosh_config')
+    DEFAULT_CACHE_DIR = File.expand_path('~/.bosh_cache')
   end
 end
 
-autoload :HTTPClient, "httpclient"
-Bosh.autoload :Blobstore, "blobstore_client"
+autoload :HTTPClient, 'httpclient'
 
-require "base64"
-require "digest/sha1"
-require "fileutils"
-require "highline/import"
-require "json"
-require "monitor"
-require "optparse"
-require "ostruct"
-require "pathname"
-require "progressbar"
-require "set"
-require "tempfile"
-require "terminal-table/import"
-require "time"
-require "timeout"
-require "tmpdir"
-require "uri"
-require "yaml"
-require "netaddr"
+require 'blobstore_client'
+require 'base64'
+require 'digest/sha1'
+require 'fileutils'
+require 'highline/import'
+require 'json'
+require 'monitor'
+require 'optparse'
+require 'ostruct'
+require 'pathname'
+require 'progressbar'
+require 'resolv'
+require 'set'
+require 'tempfile'
+require 'terminal-table/import'
+require 'time'
+require 'timeout'
+require 'tmpdir'
+require 'uri'
+require 'yaml'
+require 'netaddr'
+require 'zlib'
+require 'archive/tar/minitar'
+include Archive::Tar
 
 unless defined?(Bosh::Cli::VERSION)
-  require "cli/version"
+  require 'cli/version'
 end
 
-require "common/common"
+require 'common/common'
+require 'common/exec'
 
-require "cli/config"
-require "cli/core_ext"
-require "cli/errors"
-require "cli/yaml_helper"
-require "cli/version_calc"
-require "cli/dependency_helper"
-require "cli/deployment_helper"
-require "cli/validation"
-require "cli/cache"
-require "cli/stemcell"
-require "cli/director"
-require "cli/director_task"
+require 'cli/config'
+require 'cli/core_ext'
+require 'cli/errors'
+require 'cli/yaml_helper'
+require 'cli/version_calc'
+require 'cli/dependency_helper'
+require 'cli/deployment_manifest'
+require 'cli/deployment_helper'
+require 'cli/validation'
+require 'cli/cache'
+require 'cli/stemcell'
+require 'cli/client/director'
+require 'cli/director_task'
 
-require "cli/versions_index"
-require "cli/packaging_helper"
-require "cli/package_builder"
-require "cli/job_builder"
-require "cli/changeset_helper"
-require "cli/task_tracker"
-require "cli/task_log_renderer"
-require "cli/event_log_renderer"
-require "cli/null_renderer"
-require "cli/deployment_manifest_compiler"
+require 'cli/line_wrap'
+require 'cli/backup_destination_path'
 
-require "cli/release"
-require "cli/release_builder"
-require "cli/release_compiler"
-require "cli/release_tarball"
+require 'cli/versions_index'
+require 'cli/packaging_helper'
+require 'cli/package_builder'
+require 'cli/job_builder'
+require 'cli/changeset_helper'
+require 'cli/task_tracker'
+require 'cli/task_log_renderer'
+require 'cli/event_log_renderer'
+require 'cli/null_renderer'
+require 'cli/deployment_manifest_compiler'
 
-require "cli/blob_manager"
+require 'cli/release'
+require 'cli/release_builder'
+require 'cli/release_compiler'
+require 'cli/release_tarball'
 
-require "common/properties"
-require "cli/job_property_collection"
-require "cli/job_property_validator"
+require 'cli/blob_manager'
 
-require "cli/command_discovery"
-require "cli/command_handler"
-require "cli/runner"
-require "cli/base_command"
+require 'common/properties'
+require 'cli/job_property_collection'
+require 'cli/job_property_validator'
 
-if defined?(YAML::ENGINE.yamler)
-  YAML::ENGINE.yamler = "syck"
-end
+require 'cli/command_discovery'
+require 'cli/command_handler'
+require 'cli/runner'
+require 'cli/base_command'
 
 tmpdir = Dir.mktmpdir
 at_exit { FileUtils.rm_rf(tmpdir) }
-ENV["TMPDIR"] = tmpdir
+ENV['TMPDIR'] = tmpdir
 
-Dir[File.dirname(__FILE__) + "/cli/commands/*.rb"].each do |file|
+Dir[File.dirname(__FILE__) + '/cli/commands/*.rb'].each do |file|
   require file
 end

data/lib/cli/backup_destination_path.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+
+module Bosh::Cli
+  class BackupDestinationPath
+    def initialize(director)
+      @director = director
+    end
+
+    def create_from_path(dest_path = nil)
+      dest_path ||= Dir.pwd
+
+      if File.directory?(dest_path)
+        File.join(dest_path, default_backup_name)
+      else
+        is_tar_path?(dest_path) ? dest_path : "#{dest_path}.tgz"
+      end
+    end
+
+    private
+
+    def default_backup_name
+      "bosh_backup_#{bosh_director_name}_#{Time.now.to_i}.tgz"
+    end
+
+    def bosh_director_name
+      @director.get_status['name']
+    end
+
+    def is_tar_path?(path)
+      path.end_with?('.tar.gz') || path.end_with?('.tgz')
+    end
+  end
+end

data/lib/cli/base_command.rb

@@ -4,21 +4,17 @@ module Bosh::Cli
   module Command
     class Base
       extend Bosh::Cli::CommandDiscovery
+      include Bosh::Cli::DeploymentHelper
 
-      attr_reader :options
-      attr_reader :work_dir
-      attr_reader :runner
-
-      attr_accessor :out
-
-      # @return [Array] Arguments passed to command handler
-      attr_accessor :args
+      attr_accessor :options, :out, :args
+      attr_reader :work_dir, :exit_code, :runner
 
       DEFAULT_DIRECTOR_PORT = 25555
 
       # @param [Bosh::Cli::Runner] runner
-      def initialize(runner = nil)
+      def initialize(runner = nil, director = nil)
         @runner = runner
+        @director = director
         @options = {}
         @work_dir = Dir.pwd
         @exit_code = 0
@@ -34,7 +30,9 @@ module Bosh::Cli
       # @return [Bosh::Cli::Config] Current configuration
       def config
         @config ||= begin
-          config_file = options[:config] || Bosh::Cli::DEFAULT_CONFIG_PATH
+          # Handle the environment variable being set to the empty string.
+          env_bosh_config = ENV['BOSH_CONFIG'].to_s.empty? ? nil : ENV['BOSH_CONFIG']
+          config_file = options[:config] || env_bosh_config || Bosh::Cli::DEFAULT_CONFIG_PATH
           Bosh::Cli::Config.new(config_file)
         end
       end
@@ -48,8 +46,8 @@ module Bosh::Cli
       end
 
       def director
-        @director ||= Bosh::Cli::Director.new(
-          target, username, password, @options.select {|k,v| k == :no_track})
+        @director ||= Bosh::Cli::Client::Director.new(
+            target, username, password, @options.select { |k, _| k == :no_track })
       end
 
       def release
@@ -86,9 +84,9 @@ module Bosh::Cli
         Bosh::Cli::Runner.new(args, @options).run
       end
 
-      def confirmed?(question = "Are you sure?")
+      def confirmed?(question = 'Are you sure?')
         return true if non_interactive?
-        ask("#{question} (type 'yes' to continue): ") == "yes"
+        ask("#{question} (type 'yes' to continue): ") == 'yes'
       end
 
       # @return [String] Target director URL
@@ -106,28 +104,19 @@ module Bosh::Cli
 
       # @return [String] Director username
       def username
-        options[:username] || ENV["BOSH_USER"] || config.username(target)
+        options[:username] || ENV['BOSH_USER'] || config.username(target)
       end
 
       # @return [String] Director password
       def password
-        options[:password] || ENV["BOSH_PASSWORD"] || config.password(target)
+        options[:password] || ENV['BOSH_PASSWORD'] || config.password(target)
       end
 
       def target_name
-        config.target_name || target_url
+        options[:target] || config.target_name || target_url
       end
 
-      # Sets or returns command exit code
-      # @param [optional,Integer] code If param is given, sets exit code. If
-      #   it's nil, returns previously set exit_code
-      def exit_code(code = nil)
-        if code
-          @exit_code = code
-        else
-          @exit_code
-        end
-      end
+      protected
 
       # Prints director task completion report. Note that event log usually
       # contains pretty detailed error report and other UI niceties, so most
@@ -137,11 +126,11 @@ module Bosh::Cli
       def task_report(status, task_id, success_msg = nil, error_msg = nil)
         case status
           when :non_trackable
-            report = "Can't track director task".red
+            report = "Can't track director task".make_red
           when :track_timeout
-            report = "Task tracking timeout".red
+            report = 'Task tracking timeout'.make_red
           when :running
-            report = "Director task #{task_id.yellow} is running"
+            report = "Task #{task_id.make_yellow} running"
           when :error
             report = error_msg
           when :done
@@ -150,70 +139,82 @@ module Bosh::Cli
             report = nil
         end
 
-        if status != :done
-          exit_code(1)
+        unless [:running, :done].include?(status)
+          @exit_code = 1
         end
 
         say("\n#{report}") if report
+        say("\nFor a more detailed error report, run: bosh task #{task_id} --debug") if status == :error
       end
 
-      protected
-
       def auth_required
         target_required
-        err("Please log in first") unless logged_in?
+        err('Please log in first') unless logged_in?
       end
 
       def target_required
-        err("Please choose target first") if target.nil?
+        err('Please choose target first') if target.nil?
       end
 
       def deployment_required
-        err("Please choose deployment first") if deployment.nil?
+        err('Please choose deployment first') if deployment.nil?
+      end
+
+      def show_deployment
+        say("Current deployment is #{deployment.make_green}")
       end
 
       def no_track_unsupported
         if @options.delete(:no_track)
-          say("Ignoring `" + "--no-track".yellow + "' option")
+          say('Ignoring `' + '--no-track'.make_yellow + "' option")
         end
       end
 
       def check_if_release_dir
         unless in_release_dir?
-          err("Sorry, your current directory doesn't look " +
-              "like release directory")
+          err("Sorry, your current directory doesn't look like release directory")
         end
       end
 
-      def check_if_dirty_state
-        if dirty_state?
-          say("\n%s\n" % [`git status`])
-          err("Your current directory has some local modifications, " +
-              "please discard or commit them first.\n\n" +
-              "Use the --force option to skip this check.")
-        end
+      def raise_dirty_state_error
+        say("\n%s\n" % [`git status`])
+        err('Your current directory has some local modifications, ' +
+                "please discard or commit them first.\n\n" +
+                'Use the --force option to skip this check.')
       end
 
       def in_release_dir?
-        File.directory?("packages") &&
-          File.directory?("jobs") &&
-          File.directory?("src")
+        File.directory?('packages') &&
+            File.directory?('jobs') &&
+            File.directory?('src')
       end
 
       def dirty_state?
-        `which git`
-        return false unless $? == 0
-        File.directory?(".git") && `git status --porcelain | wc -l`.to_i > 0
+        git_status = `git status 2>&1`
+        case $?.exitstatus
+          when 128 # Not in a git repo
+            false
+          when 127 # git command not found
+            false
+          else
+            !git_status.lines.to_a.last.include?('nothing to commit')
+        end
+      end
+
+      def valid_index_for(job, index, options = {})
+        index = '0' if job_unique_in_deployment?(job)
+        err('You should specify the job index. There is more than one instance of this job type.') if index.nil?
+        index = index.to_i if options[:integer_index]
+        index
       end
 
       def normalize_url(url)
         had_port = url.to_s =~ /:\d+$/
-        url = "http://#{url}" unless url.match(/^https?/)
+        url = "https://#{url}" unless url.match(/^http:?/)
         uri = URI.parse(url)
         uri.port = DEFAULT_DIRECTOR_PORT unless had_port
-        uri.to_s.strip.gsub(/\/$/, "")
+        uri.to_s.strip.gsub(/\/$/, '')
       end
-
     end
   end
 end

data/lib/cli/blob_manager.rb

@@ -77,7 +77,7 @@ module Bosh::Cli
       process_blobs_directory
 
       unless dirty?
-        say("No blobs to upload".green)
+        say("No blobs to upload".make_green)
         return
       end
 
@@ -85,16 +85,16 @@ module Bosh::Cli
       say("You have some blobs that need to be uploaded:")
       @new_blobs.each do |blob|
         size = File.size(File.join(@blobs_dir, blob))
-        say("%s\t%s\t%s" % ["new".green, blob, pretty_size(size)])
+        say("%s\t%s\t%s" % ["new".make_green, blob, pretty_size(size)])
       end
 
       @updated_blobs.each do |blob|
         size = File.size(File.join(@blobs_dir, blob))
-        say("%s\t%s\t%s" % ["new version".yellow, blob, pretty_size(size)])
+        say("%s\t%s\t%s" % ["new version".make_yellow, blob, pretty_size(size)])
       end
 
       nl
-      say("When ready please run `#{"bosh upload blobs".green}'")
+      say("When ready please run `#{"bosh upload blobs".make_green}'")
     end
 
     # Registers a file as BOSH blob
@@ -137,13 +137,13 @@ module Bosh::Cli
       FileUtils.cp(local_path, blob_dst, :preserve => true)
       FileUtils.chmod(0644, blob_dst)
       if update
-        say("Updated #{blob_path.yellow}")
+        say("Updated #{blob_path.make_yellow}")
       else
-        say("Added #{blob_path.yellow}")
+        say("Added #{blob_path.make_yellow}")
       end
 
       say("When you are done testing the new blob, please run\n" +
-          "`#{"bosh upload blobs".green}' and commit changes.")
+          "`#{"bosh upload blobs".make_green}' and commit changes.")
     end
 
     # Synchronizes the contents of blobs directory with blobs index.
@@ -222,7 +222,7 @@ module Bosh::Cli
           if checksum == entry["sha"]
             need_download = false
           else
-            progress(path, "checksum mismatch, re-downloading...\n".red)
+            progress(path, "checksum mismatch, re-downloading...\n".make_red)
           end
         end
 
@@ -251,7 +251,7 @@ module Bosh::Cli
 
       progress(path, "uploading...")
       object_id = @blobstore.create(File.open(blob_path, "r"))
-      progress(path, "uploaded\n".green)
+      progress(path, "uploaded\n".make_green)
 
       @index[path] = {
         "object_id" => object_id,
@@ -295,7 +295,7 @@ module Bosh::Cli
       @blobstore.get(blob["object_id"], tmp_file)
       tmp_file.close
       progress_bar.kill
-      progress(path, "downloaded\n".green)
+      progress(path, "downloaded\n".make_green)
 
       if file_checksum(tmp_file.path) != blob["sha"]
         err("Checksum mismatch for downloaded blob `#{path}'")
@@ -311,7 +311,7 @@ module Bosh::Cli
     # @param [String] label Operation happening to a blob
     def progress(path, label)
       say("\r", " " * 80)
-      say("\r#{path.truncate(40).yellow} #{label}", "")
+      say("\r#{path.truncate(40).make_yellow} #{label}", "")
       Bosh::Cli::Config.output.flush # Ruby 1.8 compatibility
     end
 
@@ -352,7 +352,7 @@ module Bosh::Cli
 
     # Updates blobs index
     def update_index
-      yaml = YAML.dump(@index).gsub(/\s*$/, "")
+      yaml = Psych.dump(@index).gsub(/\s*$/, "")
 
       index_file = Tempfile.new("blob_index")
       index_file.puts(yaml)