bosh_cli 1.0.3 → 1.5.0.pre.1113

data/lib/cli/release_builder.rb

@@ -7,7 +7,7 @@ module Bosh::Cli
 
     DEFAULT_RELEASE_NAME = "bosh_release"
 
-    attr_reader :release, :packages, :jobs, :version, :build_dir
+    attr_reader :release, :packages, :jobs, :version, :build_dir, :commit_hash, :uncommitted_changes
 
     # @param [Bosh::Cli::Release] release Current release
     # @param [Array<Bosh::Cli::PackageBuilder>] packages Built packages
@@ -16,6 +16,8 @@ module Bosh::Cli
     def initialize(release, packages, jobs, options = { })
       @release = release
       @final = options.has_key?(:final) ? !!options[:final] : false
+      @commit_hash = options.fetch(:commit_hash, '00000000')
+      @uncommitted_changes = options.fetch(:uncommitted_changes, true)
       @packages = packages
       @jobs = jobs
 
@@ -82,7 +84,7 @@ module Bosh::Cli
     # Copies packages into release
     def copy_packages
       packages.each do |package|
-        say("%-40s %s" % [package.name.green,
+        say("%-40s %s" % [package.name.make_green,
                            pretty_size(package.tarball_path)])
         FileUtils.cp(package.tarball_path,
                      File.join(build_dir, "packages", "#{package.name}.tgz"),
@@ -94,7 +96,7 @@ module Bosh::Cli
     # Copies jobs into release
     def copy_jobs
       jobs.each do |job|
-        say("%-40s %s" % [job.name.green, pretty_size(job.tarball_path)])
+        say("%-40s %s" % [job.name.make_green, pretty_size(job.tarball_path)])
         FileUtils.cp(job.tarball_path,
                      File.join(build_dir, "jobs", "#{job.name}.tgz"),
                      :preserve => true)
@@ -126,6 +128,9 @@ module Bosh::Cli
         }
       end
 
+      manifest["commit_hash"] = commit_hash
+      manifest["uncommitted_changes"] = uncommitted_changes
+
       manifest["name"] = release_name
 
       unless manifest["name"].bosh_valid_id?
@@ -145,7 +150,7 @@ module Bosh::Cli
       end
 
       manifest["version"] = @version
-      manifest_yaml = YAML.dump(manifest)
+      manifest_yaml = Psych.dump(manifest)
 
       say("Writing manifest...")
       File.open(File.join(build_dir, "release.MF"), "w") do |f|

data/lib/cli/release_compiler.rb

@@ -42,7 +42,7 @@ module Bosh::Cli
 
     def compile
       if exists?
-        quit("You already have this version in `#{tarball_path.green}'")
+        quit("You already have this version in `#{tarball_path.make_green}'")
       end
 
       FileUtils.cp(@manifest_file,
@@ -53,7 +53,7 @@ module Bosh::Cli
       @packages.each do |package|
         say("#{package.name} (#{package.version})".ljust(30), " ")
         if remote_package_exists?(package)
-          say("SKIP".yellow)
+          say("SKIP".make_yellow)
           next
         end
         package_filename = find_package(package)
@@ -69,7 +69,7 @@ module Bosh::Cli
       @jobs.each do |job|
         say("#{job.name} (#{job.version})".ljust(30), " ")
         if remote_job_exists?(job)
-          say("SKIP".yellow)
+          say("SKIP".make_yellow)
           next
         end
         job_filename = find_job(job)
@@ -87,8 +87,8 @@ module Bosh::Cli
         unless $?.exitstatus == 0
           raise InvalidRelease, "Cannot create release tarball: #{tar_out}"
         end
-        say("Generated #{tarball_path.green}")
-        say("Release size: #{pretty_size(tarball_path).green}")
+        say("Generated #{tarball_path.make_green}")
+        say("Release size: #{pretty_size(tarball_path).make_green}")
       end
     end
 
@@ -129,7 +129,7 @@ module Bosh::Cli
       end
 
       if build_data.nil?
-        say("MISSING".red)
+        say("MISSING".make_red)
         err("Cannot find object with given checksum")
       end
 
@@ -139,13 +139,13 @@ module Bosh::Cli
       filename = index.filename(version)
 
       if File.exists?(filename)
-        say("FOUND LOCAL".green)
+        say("FOUND LOCAL".make_green)
         if Digest::SHA1.file(filename) != sha1
           err("#{desc} is corrupted locally")
         end
       elsif blobstore_id
-        say("FOUND REMOTE".yellow)
-        say("Downloading #{blobstore_id.to_s.green}...")
+        say("FOUND REMOTE".make_yellow)
+        say("Downloading #{blobstore_id.to_s.make_green}...")
         tmp_file = Tempfile.new("")
         @blobstore.get(blobstore_id, tmp_file)
         tmp_file.close

data/lib/cli/release_tarball.rb

@@ -47,25 +47,22 @@ module Bosh::Cli
       @skipped = 0
 
       Dir.chdir(@unpack_dir) do
-        # TODO: this code can be dried up a little bit (as it is somewhat
-        # similar to what's going on in ReleaseCompiler)
-
         local_packages.each do |package|
           say("#{package["name"]} (#{package["version"]})".ljust(30), " ")
           if package_matches.include?(package["sha1"]) ||
              (package["fingerprint"] &&
               package_matches.include?(package["fingerprint"]))
-            say("SKIP".green)
+            say("SKIP".make_green)
             @skipped += 1
             FileUtils.rm_rf(File.join("packages", "#{package["name"]}.tgz"))
           else
-            say("UPLOAD".red)
+            say("UPLOAD".make_red)
           end
         end
 
         local_jobs.each do |job|
           say("#{job["name"]} (#{job["version"]})".ljust(30), " ")
-          say("UPLOAD".red)
+          say("UPLOAD".make_red)
         end
 
         return nil if @skipped == 0

data/lib/cli/resurrection.rb

@@ -0,0 +1,31 @@
+module Bosh::Cli
+  class Resurrection
+    def initialize(state)
+      @state = state
+
+      validate_state!
+    end
+
+    def paused?
+      !enabled?
+    end
+
+    def enabled?
+      %w[true yes on enable].include?(state)
+    end
+
+    def disabled?
+      %w[false no off disable].include?(state)
+    end
+
+    def validate_state!
+      unless enabled? || disabled?
+        err("Resurrection paused state should be on/off, true/false, yes/no or enable/disable received #{state.inspect}")
+      end
+    end
+
+    private
+
+    attr_reader :state
+  end
+end

data/lib/cli/runner.rb

@@ -37,15 +37,13 @@ module Bosh::Cli
 
       Config.interactive = !@options[:non_interactive]
       Config.cache = Bosh::Cli::Cache.new(@options[:cache_dir])
+      Config.poll_interval = @options[:poll_interval]
 
       load_plugins
       build_parse_tree
       add_shortcuts
 
-      if @args.empty?
-        say(usage)
-        exit(0)
-      end
+      @args = %w(help) if @args.empty?
 
       command = search_parse_tree(@parse_tree)
       if command.nil? && Config.interactive
@@ -61,19 +59,20 @@ module Bosh::Cli
         exit_code = command.run(@args, @options)
         exit(exit_code)
       rescue OptionParser::ParseError => e
-        say(e.message.red)
-        say("Usage: bosh #{command.usage_with_params.columnize(60, 7)}")
+        say_err e.message
+        say_err "Usage: bosh #{command.usage_with_params.columnize(60, 7)}"
         if command.has_options?
           say(command.options_summary.indent(7))
         end
       end
 
     rescue OptionParser::ParseError => e
-      say(e.message.red)
-      say(@option_parser.to_s)
+      say_err e.message
+      say_err @option_parser.to_s
       exit(1)
     rescue Bosh::Cli::CliError => e
-      say(e.message.red)
+      say_err e.message
+      puts ""
       exit(e.exit_code)
     end
 
@@ -106,7 +105,11 @@ module Bosh::Cli
       end
 
       opts = @option_parser
-      opts.on("-c", "--config FILE", "Override configuration file") 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("-C", "--cache-dir DIR", "Override cache directory") do |dir|
@@ -124,11 +127,13 @@ module Bosh::Cli
       end
       opts.on("-n", "--non-interactive", "Don't ask for user input") do
         @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("-P", "--poll INTERVAL", "Director task polling interval") do |interval|
+        @options[:poll_interval] = Integer(interval)
+      end
       opts.on("-t", "--target URL", "Override target") do |target|
         @options[:target] = target
       end
@@ -145,40 +150,54 @@ module Bosh::Cli
       @args = @option_parser.order!(@args)
     end
 
+    def plugins_glob; "bosh/cli/commands/*.rb"; end
+
     # Discover and load CLI plugins from all available gems
     # @return [void]
     def load_plugins
-      plugins_glob = "bosh/cli/commands/*.rb"
+      load_local_plugins
+      load_gem_plugins
+    end
 
-      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
+    def load_local_plugins
+      Dir.glob(File.join("lib", plugins_glob)).each do |file|
+        say("WARNING: loading local plugin: #{file}")
+        require_plugin(file)
       end
+    end
 
-      plugins = Gem::Specification.latest_specs(true).map { |spec|
-        spec.matches_for_glob(plugins_glob)
-      }.flatten
+    def load_gem_plugins
+      get_gem_plugins.each do |plugin_path|
+        original_commands = Config.commands.size
 
-      plugins.each do |plugin|
-        n_commands = Config.commands.size
-        gem_dir = Pathname.new(Gem.dir)
-        plugin_name = Pathname.new(plugin).relative_path_from(gem_dir)
         begin
-          require plugin
+          next unless require_plugin plugin_path
         rescue Exception => e
-          say("Failed to load plugin #{plugin_name}: #{e.message}".red)
+          err("Failed to load plugin #{plugin_path}: #{e.message}".make_red)
         end
-        if Config.commands.size == n_commands
-          say(("File #{plugin_name} has been loaded as plugin but it didn't " +
+
+        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).yellow)
+              "compatible with BOSH CLI 1.0.").columnize(80).make_yellow)
         end
       end
     end
 
+    def get_gem_plugins
+      Gem::Specification.latest_specs(true).map { |spec|
+        spec.matches_for_glob(plugins_glob)
+      }.flatten.uniq
+    rescue
+      err("Cannot load plugins, ".make_yellow +
+              "please run `gem update --system' to ".make_yellow +
+              "update your RubyGems".make_yellow)
+    end
+
+    def require_plugin(file)
+      require File.absolute_path(file)
+    end
+
     def build_parse_tree
       @parse_tree = ParseTreeNode.new
 
@@ -252,5 +271,12 @@ module Bosh::Cli
 
       search_parse_tree(@parse_tree)
     end
+
+    private
+
+    def say_err(message)
+      $stderr << message.make_red
+    end
   end
+
 end

data/lib/cli/stemcell.rb

@@ -28,29 +28,44 @@ module Bosh::Cli
       else
         say("Manifest not found in cache, verifying tarball...")
 
-        step("Extract tarball",
-             "Cannot extract tarball #{@stemcell_file}", :fatal) do
-          `tar -C #{tmp_dir} -xzf #{@stemcell_file} 2>&1`
-          $?.exitstatus == 0
+        stemcell_mf = "stemcell.MF"
+
+        tar = nil
+        step("Read tarball",
+             "Cannot read tarball #{@stemcell_file}", :fatal) do
+          tgz = Zlib::GzipReader.new(File.open(@stemcell_file))
+          tar = Minitar.open(tgz)
+          !!tar
         end
 
-        manifest_file = File.expand_path("stemcell.MF", tmp_dir)
+        manifest = false
+        image = false
+        tar.each do |entry|
+          if entry.full_name == stemcell_mf
+            tar.extract_entry(tmp_dir, entry)
+            manifest = true
+          elsif entry.full_name == "image"
+            image = true
+          end
+        end
 
         step("Manifest exists", "Cannot find stemcell manifest", :fatal) do
-          File.exists?(manifest_file)
+          manifest
         end
 
         step("Stemcell image file",
              "Stemcell image file is missing", :fatal) do
-          File.exists?(File.expand_path("image", tmp_dir))
+          image
         end
 
+        manifest_file = File.expand_path(stemcell_mf, tmp_dir)
+
         say("Writing manifest to cache...")
         manifest_yaml = File.read(manifest_file)
         @cache.write(cache_key, manifest_yaml)
       end
 
-      manifest = YAML.load(manifest_yaml)
+      manifest = Psych.load(manifest_yaml)
 
       step("Stemcell properties",
            "Manifest should contain valid name, " +
@@ -75,8 +90,8 @@ module Bosh::Cli
       say("\nStemcell info")
       say("-------------")
 
-      say("Name:    %s" % [manifest["name"] || "missing".red])
-      say("Version: %s" % [manifest["version"] || "missing".red])
+      say("Name:    %s" % [manifest["name"] || "missing".make_red])
+      say("Version: %s" % [manifest["version"] || "missing".make_red])
     end
   end
 end

data/lib/cli/task_log_renderer.rb

@@ -28,7 +28,7 @@ module Bosh::Cli
     end
 
     def duration_known?
-      false # TODO: make it available for basic renderer
+      false
     end
 
     def add_output(output)

data/lib/cli/task_tracker.rb

@@ -6,13 +6,13 @@ module Bosh
     class TaskTracker
 
       MAX_POLLS = nil # not limited
-      POLL_INTERVAL = 1 # second
+      DEFAULT_POLL_INTERVAL = 1 # second
 
       attr_reader :output
 
       attr_reader :renderer
 
-      # @param [Bosh::Cli::Director] director
+      # @param [Bosh::Cli::Client::Director] director
       # @param [Integer] task_id
       # @param [Hash] options
       def initialize(director, task_id, options = {})
@@ -37,6 +37,8 @@ module Bosh
         else
           @renderer = Bosh::Cli::TaskLogRenderer.create_for_log_type(@log_type)
         end
+
+        @poll_interval = Config.poll_interval || DEFAULT_POLL_INTERVAL
       end
 
       # Tracks director task. Blocks until task is in one of the 'finished'
@@ -46,10 +48,9 @@ module Bosh
       def track
         nl
         @renderer.time_adjustment = @director.get_time_difference
-        say("Director task #{@task_id.to_s.yellow}")
+        say("Director task #{@task_id.to_s.make_yellow}")
 
         cached_output = get_cached_task_output
-
         if cached_output
           task_status = @task.state.to_sym
           output_received(cached_output)
@@ -81,7 +82,7 @@ module Bosh
             return :track_timeout
           end
 
-          sleep(POLL_INTERVAL)
+          sleep(@poll_interval)
         end
 
         :unknown
@@ -98,8 +99,8 @@ module Bosh
           self.class.new(@director, @task_id,
                          @options.merge(:log_type => "debug")).track
         else
-          say("Please use 'bosh task #{@task_id}' command ".red +
-                "to see the debug log".red)
+          say("Please use 'bosh task #{@task_id}' command ".make_red +
+                "to see the debug log".make_red)
         end
       end
 
@@ -125,12 +126,12 @@ module Bosh
         @renderer.finish(task_status)
 
         nl
-        say("Task #{@task_id} #{task_status.to_s.yellow}")
+        say("Task #{@task_id} #{task_status.to_s.make_yellow}")
 
         if task_status == :done && @renderer.duration_known?
           say("Started\t\t#{@renderer.started_at.utc.to_s}")
           say("Finished\t#{@renderer.finished_at.utc.to_s}")
-          say("Duration\t#{format_time(@renderer.duration).yellow}")
+          say("Duration\t#{format_time(@renderer.duration).make_yellow}")
         end
       end