bosh_cli 1.5.0.pre.1336 → 1.5.0.pre.1337

data/lib/cli/commands/stemcell.rb

@@ -1,16 +1,9 @@
-module Bosh::Cli::Command
-  class Stemcell < Base
-    include Bosh::Cli::VersionCalc
-
-    # The filename of the public stemcell index.
-    PUBLIC_STEMCELL_INDEX = 'public_stemcells_index.yml'
+require 'cli/public_stemcell_presenter'
+require 'cli/public_stemcell_index'
 
-    # The URL of the public stemcell index.
-    PUBLIC_STEMCELL_INDEX_URL =
-      'https://s3.amazonaws.com/blob.cfblob.com/stemcells/public_stemcells_index.yml'
-
-    DEFAULT_PUB_STEMCELL_TAG = 'stable'
-    ALL_STEMCELLS_TAG = 'all'
+module Bosh::Cli
+  class Command::Stemcell < Command::Base
+    include Bosh::Cli::VersionCalc
 
     usage 'verify stemcell'
     desc 'Verify stemcell'
@@ -33,7 +26,6 @@ module Bosh::Cli::Command
       end
     end
 
-    # bosh upload stemcell
     usage 'upload stemcell'
     desc 'Upload stemcell (stemcell_location can be a local file or a remote URI)'
     def upload(stemcell_location)
@@ -51,7 +43,7 @@ module Bosh::Cli::Command
         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']
@@ -82,7 +74,6 @@ module Bosh::Cli::Command
       task_report(status, task_id, 'Stemcell uploaded and created')
     end
 
-    # bosh stemcells
     usage 'stemcells'
     desc 'Show the list of available stemcells'
     def list
@@ -108,81 +99,25 @@ module Bosh::Cli::Command
       say('Stemcells total: %d' % stemcells.size)
     end
 
-    # Prints out the publicly available stemcells.
     usage 'public stemcells'
     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|
-        t.headings = full ? ['Name', 'Url', 'Tags'] : ['Name', 'Tags']
-        yaml.keys.sort.each do |key|
-          if key != PUBLIC_STEMCELL_INDEX
-            url = yaml[key]['url']
-            yaml_tags = yaml[key]['tags']
-            next if skip_this_tag?(yaml_tags, tags)
-
-            yaml_tags = yaml_tags ? yaml_tags.join(', ') : ''
-            t << (full ? [key, url, yaml_tags] : [key, yaml_tags])
-          end
-        end
-      end
-
-      say(stemcells_table)
-
-      say("To download use `bosh download public stemcell <stemcell_name>'. " +
-            'For full url use --full.')
+      public_stemcell_index = PublicStemcellIndex.download(self)
+      public_stemcells_presenter = PublicStemcellPresenter.new(self, public_stemcell_index)
+      public_stemcells_presenter.list(options)
     end
 
-    # Downloads one of the publicly available stemcells.
     usage 'download public stemcell'
     desc 'Downloads a stemcell from the public blobstore'
-    # @param [String] stemcell_name The name of the stemcell, as seen in the
-    #   public stemcell index file.
-    def download_public(stemcell_name)
-      yaml = get_public_stemcell_list
-      yaml.delete(PUBLIC_STEMCELL_INDEX) if yaml.has_key?(PUBLIC_STEMCELL_INDEX)
-
-      unless yaml.has_key?(stemcell_name)
-        available_stemcells = yaml.map { |k| k }.join(', ')
-        err("'#{stemcell_name}' not found in '#{available_stemcells}'.")
-      end
-
-      if File.exists?(stemcell_name) &&
-         !confirmed?("Overwrite existing file `#{stemcell_name}'?")
-        err("File `#{stemcell_name}' already exists")
-      end
-
-      url = yaml[stemcell_name]['url']
-      size = yaml[stemcell_name]['size']
-      sha1 = yaml[stemcell_name]['sha']
-      progress_bar = ProgressBar.new(stemcell_name, size)
-      progress_bar.file_transfer_mode
-
-      File.open("#{stemcell_name}", 'w') do |file|
-        @http_client.get(url) do |chunk|
-          file.write(chunk)
-          progress_bar.inc(chunk.size)
-        end
-      end
-      progress_bar.finish
-
-      file_sha1 = Digest::SHA1.file(stemcell_name).hexdigest
-      if file_sha1 != sha1
-        err("The downloaded file sha1 `#{file_sha1}' does not match the " +
-            "expected sha1 `#{sha1}'")
-      else
-        say('Download complete'.make_green)
-      end
+    def download_public(stemcell_filename)
+      public_stemcell_index = PublicStemcellIndex.download(self)
+      public_stemcells_presenter = PublicStemcellPresenter.new(self, public_stemcell_index)
+      public_stemcells_presenter.download(stemcell_filename)
     end
 
-    # bosh delete stemcell
     usage 'delete stemcell'
     desc 'Delete stemcell'
     option '--force', 'ignore errors while deleting the stemcell'
@@ -210,21 +145,6 @@ module Bosh::Cli::Command
 
     private
 
-    def skip_this_tag?(yaml_tags, requested_tags)
-      if requested_tags == [ALL_STEMCELLS_TAG]
-        return false
-      end
-      unless yaml_tags
-        return true
-      end
-      requested_tags.each do |tag|
-        unless yaml_tags.include?(tag)
-          return true
-        end
-      end
-      return false
-    end
-
     def exists?(name, version)
       existing = director.list_stemcells.select do |sc|
         sc['name'] == name && sc['version'] == version
@@ -232,18 +152,5 @@ module Bosh::Cli::Command
 
       !existing.empty?
     end
-
-    # Grabs the index file for the publicly available stemcells.
-    # @return [Hash] The index file YAML as a hash.
-    def get_public_stemcell_list
-      @http_client = HTTPClient.new
-      response = @http_client.get(PUBLIC_STEMCELL_INDEX_URL)
-      status_code = response.http_header.status_code
-      if status_code != HTTP::Status::OK
-        err("Received HTTP #{status_code} from #{PUBLIC_STEMCELL_INDEX_URL}.")
-      end
-      Psych.load(response.body)
-    end
-
   end
 end

data/lib/cli/public_stemcell_presenter.rb

@@ -3,9 +3,9 @@ require 'cli/download_with_progress'
 
 module Bosh::Cli
   class PublicStemcellPresenter
-    def initialize(ui)
+    def initialize(ui, public_stemcell_index)
       @ui = ui
-      @public_stemcell_index = PublicStemcellIndex.download(@ui)
+      @public_stemcell_index = public_stemcell_index
     end
 
     def list(options)

data/lib/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1336
+  version: 1.5.0.pre.1337
   prerelease: 6
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1336
+        version: 1.5.0.pre.1337
   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.1336
+        version: 1.5.0.pre.1337
 - !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.1336
+        version: 1.5.0.pre.1337
   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.1336
+        version: 1.5.0.pre.1337
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  c42ba6'
+  9923ad'
 email: support@cloudfoundry.com
 executables:
 - bosh