bosh_cli 1.5.0.pre.1365 → 1.5.0.pre.1374

data/lib/cli/commands/stemcell.rb

@@ -1,5 +1,5 @@
 require 'cli/public_stemcell_presenter'
-require 'cli/public_stemcell_index'
+require 'cli/public_stemcells'
 
 module Bosh::Cli
   class Command::Stemcell < Command::Base
@@ -102,19 +102,18 @@ module Bosh::Cli
     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
-      public_stemcell_index = PublicStemcellIndex.download(self)
-      public_stemcells_presenter = PublicStemcellPresenter.new(self, public_stemcell_index)
+      public_stemcells = PublicStemcells.new
+      public_stemcells_presenter = PublicStemcellPresenter.new(self, public_stemcells)
       public_stemcells_presenter.list(options)
     end
 
     usage 'download public stemcell'
     desc 'Downloads a stemcell from the public blobstore'
     def download_public(stemcell_filename)
-      public_stemcell_index = PublicStemcellIndex.download(self)
-      public_stemcells_presenter = PublicStemcellPresenter.new(self, public_stemcell_index)
+      public_stemcells = PublicStemcells.new
+      public_stemcells_presenter = PublicStemcellPresenter.new(self, public_stemcells)
       public_stemcells_presenter.download(stemcell_filename)
     end
 

data/lib/cli/public_stemcell.rb

@@ -1,34 +1,31 @@
 module Bosh::Cli
   class PublicStemcell
-    attr_reader :name
+    attr_reader :size
 
-    def initialize(name, properties)
-      @name = name
-      @properties = properties
+    def initialize(key, size)
+      @key = key
+      @size = size
     end
 
-    def url
-      @properties['url']
-    end
-
-    def size
-      @properties['size']
+    def name
+      File.basename(@key)
     end
 
-    def sha1
-      @properties['sha1']
+    def version
+      version_digits = @key.gsub(/[^\d]/, '')
+      version_digits.to_i
     end
 
-    def tags
-      @properties['tags']
+    def variety
+      name.gsub(version.to_s, '')
     end
 
-    def tag_names
-      tags ? tags.join(', ') : ''
+    def url
+      "#{PublicStemcells::PUBLIC_STEMCELLS_BASE_URL}/#{@key}"
     end
 
-    def tagged?(requested_tags)
-      tags.nil? || (requested_tags - tags).empty?
+    def legacy?
+      @key.include?('legacy')
     end
   end
 end

data/lib/cli/public_stemcell_presenter.rb

@@ -1,24 +1,19 @@
-require 'cli/public_stemcell_index'
 require 'cli/download_with_progress'
 
 module Bosh::Cli
   class PublicStemcellPresenter
-    def initialize(ui, public_stemcell_index)
+    def initialize(ui, public_stemcells)
       @ui = ui
-      @public_stemcell_index = public_stemcell_index
+      @public_stemcells = public_stemcells
     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)
+        t.headings = full ? %w(Name Url) : %w(Name)
 
-        @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
+        stemcell_for(options).each do |stemcell|
+          t << (full ? [stemcell.name, stemcell.url] : [stemcell.name])
         end
       end
 
@@ -27,23 +22,25 @@ module Bosh::Cli
     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(',')}'.")
+      unless @public_stemcells.has_stemcell?(stemcell_name)
+        @ui.err("'#{stemcell_name}' not found.")
       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)
+      stemcell = @public_stemcells.find(stemcell_name)
+      download_with_progress = DownloadWithProgress.new(stemcell.url, stemcell.size)
       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
+      @ui.say('Download complete'.make_green)
+    end
+
+    private
+
+    def stemcell_for(options)
+      options[:all] ? @public_stemcells.all : @public_stemcells.recent
     end
   end
 end

data/lib/cli/public_stemcells.rb

@@ -0,0 +1,36 @@
+require 'httpclient'
+require 'rexml/document'
+
+require 'cli/public_stemcell'
+
+module Bosh::Cli
+  class PublicStemcells
+    PUBLIC_STEMCELLS_BASE_URL = 'https://bosh-jenkins-artifacts.s3.amazonaws.com'
+
+    def has_stemcell?(stemcell_filename)
+      all.any? { |stemcell| stemcell.name == stemcell_filename }
+    end
+
+    def find(stemcell_filename)
+      all.detect { |stemcell| stemcell.name == stemcell_filename }
+    end
+
+    def all
+      response = HTTPClient.new.get(PUBLIC_STEMCELLS_BASE_URL)
+      doc = REXML::Document.new(response.body)
+      stemcell_tags = REXML::XPath.match(doc, "/ListBucketResult/Contents[Key[text()[starts-with(.,'bosh-stemcell/') and not(contains(.,'latest'))]]]")
+
+      stemcell_tags.map do |stemcell_tag|
+        stemcell_key = stemcell_tag.get_text('Key').value
+        stemcell_size = Integer(stemcell_tag.get_text('Size').value)
+
+        PublicStemcell.new(stemcell_key, stemcell_size)
+      end
+    end
+
+    def recent
+      stemcell_varietes = all.reject(&:legacy?).group_by(&:variety).values
+      stemcell_varietes.map { |stemcells| stemcells.sort_by(&:version).last }
+    end
+  end
+end

data/lib/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1365
+  version: 1.5.0.pre.1374
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
   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.1365
+        version: 1.5.0.pre.1374
 - !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.1365
+        version: 1.5.0.pre.1374
   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.1365
+        version: 1.5.0.pre.1374
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
@@ -219,9 +235,41 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'BOSH CLI
 
-  a77e8c'
+  d50b1a'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -285,8 +333,8 @@ files:
 - 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/public_stemcells.rb
 - lib/cli/release.rb
 - lib/cli/release_builder.rb
 - lib/cli/release_compiler.rb

data/lib/cli/public_stemcell_index.rb

@@ -1,41 +0,0 @@
-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