bosh_cli 1.5.0.pre.1323 → 1.5.0.pre.1324

data/lib/cli.rb

@@ -1,9 +1,6 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh
   module Cli
     DEFAULT_CONFIG_PATH = File.expand_path('~/.bosh_config')
-    DEFAULT_CACHE_DIR = File.expand_path('~/.bosh_cache')
   end
 end
 
@@ -50,7 +47,6 @@ 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'

data/lib/cli/base_command.rb

@@ -22,11 +22,6 @@ module Bosh::Cli
         @args = []
       end
 
-      # @return [Bosh::Cli::Cache] Current CLI cache
-      def cache
-        Config.cache
-      end
-
       # @return [Bosh::Cli::Config] Current configuration
       def config
         @config ||= begin

data/lib/cli/commands/misc.rb

@@ -137,18 +137,6 @@ module Bosh::Cli::Command
       say("You are no longer logged in to `#{target}'".make_yellow)
     end
 
-    # bosh purge
-    usage "purge"
-    desc  "Purge local manifest cache"
-    def purge_cache
-      if cache.cache_dir != Bosh::Cli::DEFAULT_CACHE_DIR
-        err("Cache directory overriden, please remove manually")
-      else
-        FileUtils.rm_rf(cache.cache_dir)
-        say("Purged cache".make_green)
-      end
-    end
-
     # bosh target
     usage "target"
     desc  "Choose director to talk to (optionally creating an alias). " +

data/lib/cli/commands/stemcell.rb

@@ -17,7 +17,7 @@ module Bosh::Cli::Command
     usage "verify stemcell"
     desc "Verify stemcell"
     def verify(tarball_path)
-      stemcell = Bosh::Cli::Stemcell.new(tarball_path, cache)
+      stemcell = Bosh::Cli::Stemcell.new(tarball_path)
 
       nl
       say("Verifying stemcell...")
@@ -43,28 +43,28 @@ module Bosh::Cli::Command
 
       stemcell_type = stemcell_location =~ /^#{URI::regexp}$/ ? "remote" : "local"
       if stemcell_type == "local"
-        stemcell = Bosh::Cli::Stemcell.new(stemcell_location, cache)
-  
+        stemcell = Bosh::Cli::Stemcell.new(stemcell_location)
+
         nl
         say("Verifying stemcell...")
         stemcell.validate
         nl
-  
+
         unless stemcell.valid?
           err("Stemcell is invalid, please fix, verify and upload again")
         end
-  
+
         say("Checking if stemcell already exists...")
         name = stemcell.manifest["name"]
         version = stemcell.manifest["version"]
-  
+
         if exists?(name, version)
           err("Stemcell `#{name}/#{version}' already exists, " +
                 "increment the version if it has changed")
         else
           say("No")
         end
-        
+
         stemcell_location = stemcell.stemcell_file
 
         nl

data/lib/cli/commands/task.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli::Command
   class Task < Base
 
@@ -8,7 +6,6 @@ module Bosh::Cli::Command
     # bosh task
     usage  "task"
     desc   "Show task status and start tracking its output"
-    option "--no-cache", "Don't cache output locally"
     option "--event", "Track event log"
     option "--cpi", "Track CPI log"
     option "--debug", "Track debug log"
@@ -18,7 +15,6 @@ module Bosh::Cli::Command
     def track(task_id = nil)
       auth_required
       use_filter = !options.key?(:no_filter)
-      use_cache = !options.key?(:no_cache)
       raw_output = options[:raw]
 
       log_type = "event"
@@ -50,7 +46,6 @@ module Bosh::Cli::Command
 
       track_options = {
         :log_type => log_type,
-        :use_cache => use_cache,
         :raw_output => raw_output
       }
 

data/lib/cli/config.rb

@@ -17,9 +17,6 @@ module Bosh::Cli
       # @return [Boolean] Is CLI being used interactively?
       attr_accessor :interactive
 
-      # @return [Bosh::Cli::Cache] CLI cache (to save task logs etc.)
-      attr_accessor :cache
-
       # @return [Integer] CLI polling interval
       attr_accessor :poll_interval
     end
@@ -28,7 +25,6 @@ module Bosh::Cli
     @colorize = true
     @output = nil
     @interactive = false
-    @cache = nil
 
     # Register command with BOSH CLI
     # @param [Bosh::Cli::CommandDefinition] command

data/lib/cli/errors.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli
   class CliError < StandardError
     attr_reader :exit_code
@@ -34,8 +32,6 @@ module Bosh::Cli
   class CliExit              < CliError; error_code(400); end
   class GracefulExit         < CliExit;  error_code(401); end
 
-  class CacheDirectoryError  < CliError; error_code(301); end
-
   class InvalidPackage       < CliError; error_code(500); end
   class InvalidJob           < CliError; error_code(501); end
   class InvalidRelease       < CliError; error_code(503); end

data/lib/cli/runner.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Cli
   class ParseTreeNode < Hash
     attr_accessor :command
@@ -36,7 +34,6 @@ module Bosh::Cli
       parse_global_options
 
       Config.interactive = !@options[:non_interactive]
-      Config.cache = Bosh::Cli::Cache.new(@options[:cache_dir])
       Config.poll_interval = @options[:poll_interval]
 
       load_plugins
@@ -112,9 +109,7 @@ module Bosh::Cli
       opts.on("-c", "--config FILE", config_desc) do |file|
         @options[:config] = file
       end
-      opts.on("-C", "--cache-dir DIR", "Override cache directory") do |dir|
-        @options[:cache_dir] = dir
-      end
+
       opts.on("--[no-]color", "Toggle colorized output") do |v|
         Config.colorize = v
       end

data/lib/cli/stemcell.rb

@@ -4,9 +4,8 @@ module Bosh::Cli
 
     attr_reader :stemcell_file, :manifest
 
-    def initialize(tarball_path, cache)
+    def initialize(tarball_path)
       @stemcell_file = File.expand_path(tarball_path, Dir.pwd)
-      @cache = cache
     end
 
     def perform_validation(options = {})
@@ -17,52 +16,42 @@ module Bosh::Cli
         File.exists?(@stemcell_file) && File.readable?(@stemcell_file)
       end
 
-      cache_key = "%s_%s" % [@stemcell_file, File.mtime(@stemcell_file)]
+      say("Verifying tarball...")
 
-      manifest_yaml = @cache.read(cache_key)
+      stemcell_mf = "stemcell.MF"
 
-      if manifest_yaml
-        say("Using cached manifest...")
-      else
-        say("Manifest not found in cache, verifying tarball...")
-
-        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 = 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
+      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
 
-        step("Manifest exists", "Cannot find stemcell manifest", :fatal) do
-          manifest
-        end
+      manifest = false # assign false because we return something truthy
 
-        step("Stemcell image file",
-             "Stemcell image file is missing", :fatal) do
-          image
+      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
 
-        manifest_file = File.expand_path(stemcell_mf, tmp_dir)
+      step("Manifest exists", "Cannot find stemcell manifest", :fatal) do
+        manifest
+      end
 
-        say("Writing manifest to cache...")
-        manifest_yaml = File.read(manifest_file)
-        @cache.write(cache_key, manifest_yaml)
+      step("Stemcell image file",
+           "Stemcell image file is missing", :fatal) do
+        image
       end
 
+      manifest_file = File.expand_path(stemcell_mf, tmp_dir)
+      manifest_yaml = File.read(manifest_file)
+
       manifest = Psych.load(manifest_yaml)
 
       step("Stemcell properties",

data/lib/cli/task_tracker.rb

@@ -24,10 +24,8 @@ module Bosh
         default_log_type = @quiet ? "none" : "event"
 
         @log_type = options[:log_type] || default_log_type
-        @use_cache = options.key?(:use_cache) ? @options[:use_cache] : true
 
         @output = nil
-        @cache = Config.cache
         @task = Bosh::Cli::DirectorTask.new(@director, @task_id, @log_type)
 
         if options[:renderer]
@@ -49,19 +47,10 @@ module Bosh
         nl
         @renderer.time_adjustment = @director.get_time_difference
         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)
-          @renderer.refresh
-        else
-          task_status = poll
-        end
+        task_status = poll
 
         print_task_summary(task_status)
 
-        save_task_output unless cached_output
         task_status
       end
 
@@ -160,21 +149,6 @@ module Bosh
       def interactive?
         Bosh::Cli::Config.interactive
       end
-
-      def get_cached_task_output
-        return nil unless @use_cache
-        @cache.read(task_cache_key)
-      end
-
-      def save_task_output
-        return nil unless @output && @use_cache
-        @cache.write(task_cache_key, @output)
-      end
-
-      def task_cache_key
-        "task/#{@director.uuid}/#{@task_id}/#{@log_type}"
-      end
-
     end
   end
 end

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = '1.5.0.pre.1323'
+    VERSION = '1.5.0.pre.1324'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1323
+  version: 1.5.0.pre.1324
   prerelease: 6
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1323
+        version: 1.5.0.pre.1324
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1323
+        version: 1.5.0.pre.1324
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1323
+        version: 1.5.0.pre.1324
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1323
+        version: 1.5.0.pre.1324
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  a23a10'
+  f83ef2'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -233,7 +233,6 @@ files:
 - lib/cli/backup_destination_path.rb
 - lib/cli/base_command.rb
 - lib/cli/blob_manager.rb
-- lib/cli/cache.rb
 - lib/cli/changeset_helper.rb
 - lib/cli/client/compiled_packages_client.rb
 - lib/cli/client/director.rb

data/lib/cli/cache.rb

@@ -1,44 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Cli
-  class Cache
-
-    attr_reader :cache_dir
-
-    def initialize(cache_dir = nil)
-      @cache_dir = cache_dir || Bosh::Cli::DEFAULT_CACHE_DIR
-
-        if File.exists?(@cache_dir) && !File.directory?(@cache_dir)
-          raise CacheDirectoryError, "BOSH cache directory error: " +
-                                    "`#{@cache_dir}' is a file, not directory"
-        end
-
-        unless File.exists?(@cache_dir)
-          FileUtils.mkdir_p(@cache_dir)
-          File.chmod(0700, @cache_dir)
-        end
-      end
-
-    def read(key)
-      cached_file = path(key)
-      return nil unless File.exists?(cached_file)
-      File.read(cached_file)
-    end
-
-    def write(key, value)
-      File.open(path(key), "w") do |f|
-        f.write(value)
-      end
-    end
-
-    private
-
-    def path(key)
-      File.expand_path(hash_for(key), @cache_dir)
-    end
-
-    def hash_for(key)
-      Digest::SHA1.hexdigest(key)
-    end
-  end
-end