bosh_cli 1.5.0.pre.1332 → 1.5.0.pre.1333

data/lib/cli/commands/stemcell.rb

@@ -1,121 +1,119 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 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"
+    PUBLIC_STEMCELL_INDEX = 'public_stemcells_index.yml'
 
     # The URL of the public stemcell index.
     PUBLIC_STEMCELL_INDEX_URL =
-      "https://s3.amazonaws.com/blob.cfblob.com/stemcells/public_stemcells_index.yml"
+      'https://s3.amazonaws.com/blob.cfblob.com/stemcells/public_stemcells_index.yml'
 
-    DEFAULT_PUB_STEMCELL_TAG = "stable"
-    ALL_STEMCELLS_TAG = "all"
+    DEFAULT_PUB_STEMCELL_TAG = 'stable'
+    ALL_STEMCELLS_TAG = 'all'
 
-    usage "verify stemcell"
-    desc "Verify stemcell"
+    usage 'verify stemcell'
+    desc 'Verify stemcell'
     def verify(tarball_path)
       stemcell = Bosh::Cli::Stemcell.new(tarball_path)
 
       nl
-      say("Verifying stemcell...")
+      say('Verifying stemcell...')
       stemcell.validate
       nl
 
       if stemcell.valid?
         say("`#{tarball_path}' is a valid stemcell".make_green)
       else
-        say("Validation errors:".make_red)
+        say('Validation errors:'.make_red)
         stemcell.errors.each do |error|
-          say("- %s" % [error])
+          say('- %s' % [error])
         end
         err("`#{tarball_path}' is not a valid stemcell")
       end
     end
 
     # bosh upload stemcell
-    usage "upload stemcell"
-    desc "Upload stemcell (stemcell_location can be a local file or a remote URI)"
+    usage 'upload stemcell'
+    desc 'Upload stemcell (stemcell_location can be a local file or a remote URI)'
     def upload(stemcell_location)
       auth_required
 
-      stemcell_type = stemcell_location =~ /^#{URI::regexp}$/ ? "remote" : "local"
-      if stemcell_type == "local"
+      stemcell_type = stemcell_location =~ /^#{URI::regexp}$/ ? 'remote' : 'local'
+      if stemcell_type == 'local'
         stemcell = Bosh::Cli::Stemcell.new(stemcell_location)
 
         nl
-        say("Verifying stemcell...")
+        say('Verifying stemcell...')
         stemcell.validate
         nl
 
         unless stemcell.valid?
-          err("Stemcell is invalid, please fix, verify and upload again")
+          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"]
+  
+        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")
+                'increment the version if it has changed')
         else
-          say("No")
+          say('No')
         end
 
         stemcell_location = stemcell.stemcell_file
 
         nl
-        say("Uploading stemcell...")
+        say('Uploading stemcell...')
         nl
       else
         nl
         say("Using remote stemcell `#{stemcell_location}'")
       end
 
-      if stemcell_type == "local"
+      if stemcell_type == 'local'
         status, task_id = director.upload_stemcell(stemcell_location)
       else
         status, task_id = director.upload_remote_stemcell(stemcell_location)
       end
 
-      task_report(status, task_id, "Stemcell uploaded and created")
+      task_report(status, task_id, 'Stemcell uploaded and created')
     end
 
     # bosh stemcells
-    usage "stemcells"
-    desc "Show the list of available stemcells"
+    usage 'stemcells'
+    desc 'Show the list of available stemcells'
     def list
       auth_required
       stemcells = director.list_stemcells.sort do |sc1, sc2|
-        sc1["name"] == sc2["name"] ?
-            version_cmp(sc1["version"], sc2["version"]) :
-            sc1["name"] <=> sc2["name"]
+        sc1['name'] == sc2['name'] ?
+            version_cmp(sc1['version'], sc2['version']) :
+            sc1['name'] <=> sc2['name']
       end
 
-      err("No stemcells") if stemcells.empty?
+      err('No stemcells') if stemcells.empty?
 
       stemcells_table = table do |t|
-        t.headings = "Name", "Version", "CID"
+        t.headings = 'Name', 'Version', 'CID'
         stemcells.each do |sc|
-          t << [sc["name"], sc["version"], sc["cid"]]
+          t << [sc['name'], sc['version'], sc['cid']]
         end
       end
 
       nl
       say(stemcells_table)
       nl
-      say("Stemcells total: %d" % stemcells.size)
+      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"
+    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]
@@ -123,14 +121,14 @@ module Bosh::Cli::Command
 
       yaml = get_public_stemcell_list
       stemcells_table = table do |t|
-        t.headings = full ? ["Name", "Url", "Tags"] : ["Name", "Tags"]
+        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"]
+            url = yaml[key]['url']
+            yaml_tags = yaml[key]['tags']
             next if skip_this_tag?(yaml_tags, tags)
 
-            yaml_tags = yaml_tags ? yaml_tags.join(", ") : ""
+            yaml_tags = yaml_tags ? yaml_tags.join(', ') : ''
             t << (full ? [key, url, yaml_tags] : [key, yaml_tags])
           end
         end
@@ -139,12 +137,12 @@ module Bosh::Cli::Command
       say(stemcells_table)
 
       say("To download use `bosh download public stemcell <stemcell_name>'. " +
-          "For full url use --full.")
+            'For full url use --full.')
     end
 
     # Downloads one of the publicly available stemcells.
-    usage "download public stemcell"
-    desc "Downloads a stemcell from the public blobstore"
+    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)
@@ -152,7 +150,7 @@ module Bosh::Cli::Command
       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(", ")
+        available_stemcells = yaml.map { |k| k }.join(', ')
         err("'#{stemcell_name}' not found in '#{available_stemcells}'.")
       end
 
@@ -161,13 +159,13 @@ module Bosh::Cli::Command
         err("File `#{stemcell_name}' already exists")
       end
 
-      url = yaml[stemcell_name]["url"]
-      size = yaml[stemcell_name]["size"]
-      sha1 = yaml[stemcell_name]["sha"]
+      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|
+      File.open("#{stemcell_name}", 'w') do |file|
         @http_client.get(url) do |chunk|
           file.write(chunk)
           progress_bar.inc(chunk.size)
@@ -180,19 +178,19 @@ module Bosh::Cli::Command
         err("The downloaded file sha1 `#{file_sha1}' does not match the " +
             "expected sha1 `#{sha1}'")
       else
-        say("Download complete".make_green)
+        say('Download complete'.make_green)
       end
     end
 
     # bosh delete stemcell
-    usage "delete stemcell"
-    desc  "Delete stemcell"
-    option "--force", "ignore errors while deleting the stemcell"
+    usage 'delete stemcell'
+    desc 'Delete stemcell'
+    option '--force', 'ignore errors while deleting the stemcell'
     def delete(name, version)
       auth_required
       force = !!options[:force]
 
-      say("Checking if stemcell exists...")
+      say('Checking if stemcell exists...')
 
       unless exists?(name, version)
         err("Stemcell `#{name}/#{version}' does not exist")
@@ -201,7 +199,7 @@ module Bosh::Cli::Command
       say("You are going to delete stemcell `#{name}/#{version}'".make_red)
 
       unless confirmed?
-        say("Canceled deleting stemcell".make_green)
+        say('Canceled deleting stemcell'.make_green)
         return
       end
 
@@ -229,7 +227,7 @@ module Bosh::Cli::Command
 
     def exists?(name, version)
       existing = director.list_stemcells.select do |sc|
-        sc["name"] == name && sc["version"] == version
+        sc['name'] == name && sc['version'] == version
       end
 
       !existing.empty?

data/lib/cli/download_with_progress.rb

@@ -0,0 +1,36 @@
+module Bosh::Cli
+  class DownloadWithProgress
+    def initialize(url, size)
+      @url = url
+      @size = size
+      @filename = File.basename(@url)
+    end
+
+    def perform
+      progress_bar = ProgressBar.new(@filename, @size)
+      progress_bar.file_transfer_mode
+      download_in_chunks { |chunk| progress_bar.inc(chunk.size) }
+      progress_bar.finish
+    end
+
+    def sha1?(sha1)
+      self.sha1 == sha1
+    end
+
+    def sha1
+      Digest::SHA1.file(@filename).hexdigest
+    end
+
+    private
+
+    def download_in_chunks
+      File.open(@filename, 'w') do |file|
+        http_client = HTTPClient.new
+        http_client.get(@url) do |chunk|
+          file.write(chunk)
+          yield chunk
+        end
+      end
+    end
+  end
+end

data/lib/cli/public_stemcell.rb

@@ -0,0 +1,34 @@
+module Bosh::Cli
+  class PublicStemcell
+    attr_reader :name
+
+    def initialize(name, properties)
+      @name = name
+      @properties = properties
+    end
+
+    def url
+      @properties['url']
+    end
+
+    def size
+      @properties['size']
+    end
+
+    def sha1
+      @properties['sha1']
+    end
+
+    def tags
+      @properties['tags']
+    end
+
+    def tag_names
+      tags ? tags.join(', ') : ''
+    end
+
+    def tagged?(requested_tags)
+      tags.nil? || (requested_tags - tags).empty?
+    end
+  end
+end

data/lib/cli/public_stemcell_index.rb

@@ -0,0 +1,41 @@
+require 'cli/public_stemcell'
+
+module Bosh::Cli
+  class PublicStemcellIndex
+    def self.download(ui)
+      index_url = 'https://s3.amazonaws.com/blob.cfblob.com/stemcells/public_stemcells_index.yml'
+
+      http_client = HTTPClient.new
+      response = http_client.get(index_url)
+      status_code = response.http_header.status_code
+
+      if status_code == HTTP::Status::OK
+        index = Psych.load(response.body)
+        index.delete('public_stemcells_index.yml') if index.has_key?('public_stemcells_index.yml')
+        new(index)
+      else
+        ui.err("Received HTTP #{status_code} from #{index_url}.")
+      end
+    end
+
+    def initialize(index)
+      @index = index
+    end
+
+    def has_stemcell?(stemcell_name)
+      @index.has_key?(stemcell_name)
+    end
+
+    def names
+      @index.keys.sort
+    end
+
+    def find(stemcell_name)
+      PublicStemcell.new(stemcell_name, @index[stemcell_name])
+    end
+
+    def each
+      names.map { |stemcell_name| yield find(stemcell_name) }
+    end
+  end
+end

data/lib/cli/public_stemcell_presenter.rb

@@ -0,0 +1,49 @@
+require 'cli/public_stemcell_index'
+require 'cli/download_with_progress'
+
+module Bosh::Cli
+  class PublicStemcellPresenter
+    def initialize(ui)
+      @ui = ui
+      @public_stemcell_index = PublicStemcellIndex.download(@ui)
+    end
+
+    def list(options)
+      full = !!options[:full]
+      requested_tags = options[:tags] || %w(stable)
+
+      stemcells_table = @ui.table do |t|
+        t.headings = full ? %w(Name Url Tags) : %w(Name Tags)
+
+        @public_stemcell_index.each do |stemcell|
+          if options[:all] || stemcell.tagged?(requested_tags)
+            t << (full ? [stemcell.name, stemcell.url, stemcell.tag_names] : [stemcell.name, stemcell.tag_names])
+          end
+        end
+      end
+
+      @ui.say(stemcells_table.render)
+      @ui.say("To download use `bosh download public stemcell <stemcell_name>'. For full url use --full.")
+    end
+
+    def download(stemcell_name)
+      unless @public_stemcell_index.has_stemcell?(stemcell_name)
+        @ui.err("'#{stemcell_name}' not found in '#{@public_stemcell_index.names.join(',')}'.")
+      end
+
+      if File.exists?(stemcell_name) && !@ui.confirmed?("Overwrite existing file `#{stemcell_name}'?")
+        @ui.err("File `#{stemcell_name}' already exists")
+      end
+
+      stemcell = @public_stemcell_index.find(stemcell_name)
+      download_with_progress = DownloadWithProgress.new(stemcell.size, stemcell.url)
+      download_with_progress.perform
+
+      if download_with_progress.sha1?(stemcell.sha1)
+        @ui.say('Download complete'.make_green)
+      else
+        @ui.err("The downloaded file sha1 `#{download_with_progress.sha1}' does not match the expected sha1 `#{stemcell.sha1}'")
+      end
+    end
+  end
+end

data/lib/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1332
+  version: 1.5.0.pre.1333
   prerelease: 6
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1332
+        version: 1.5.0.pre.1333
   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.1332
+        version: 1.5.0.pre.1333
 - !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.1332
+        version: 1.5.0.pre.1333
   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.1332
+        version: 1.5.0.pre.1333
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  647717'
+  063aca'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -270,6 +270,7 @@ files:
 - lib/cli/deployment_manifest.rb
 - lib/cli/deployment_manifest_compiler.rb
 - lib/cli/director_task.rb
+- lib/cli/download_with_progress.rb
 - lib/cli/errors.rb
 - lib/cli/event_log_renderer.rb
 - lib/cli/file_with_progress_bar.rb
@@ -283,6 +284,9 @@ files:
 - lib/cli/null_renderer.rb
 - lib/cli/package_builder.rb
 - lib/cli/packaging_helper.rb
+- lib/cli/public_stemcell.rb
+- lib/cli/public_stemcell_index.rb
+- lib/cli/public_stemcell_presenter.rb
 - lib/cli/release.rb
 - lib/cli/release_builder.rb
 - lib/cli/release_compiler.rb