bosh_cli 1.2416.0 → 1.2427.0

data/lib/cli/public_stemcell.rb

@@ -5,6 +5,8 @@ module Bosh::Cli
     def initialize(key, size)
       @key = key
       @size = size
+
+      @parsed_version = key.scan(/[\d]*_?[\d]+/).first
     end
 
     def name
@@ -12,12 +14,11 @@ module Bosh::Cli
     end
 
     def version
-      version_digits = @key.gsub(/[^\d]/, '')
-      version_digits.to_i
+      @parsed_version.gsub('_', '.').to_f
     end
 
     def variety
-      name.gsub(version.to_s, '')
+      name.gsub(/(.tgz)|(bosh-stemcell-)|(#{@parsed_version})/, '').split('-').reject { |c| c.empty? }.join('-')
     end
 
     def url
@@ -27,5 +28,6 @@ module Bosh::Cli
     def legacy?
       @key.include?('legacy')
     end
+
   end
 end

data/lib/cli/public_stemcells.rb

@@ -16,10 +16,37 @@ module Bosh::Cli
     end
 
     def all
-      response = HTTPClient.new.get(PUBLIC_STEMCELLS_BASE_URL)
+      response = HTTPClient.new.get(PUBLIC_STEMCELLS_BASE_URL, {'prefix' => 'bosh-stemcell'})
       doc = REXML::Document.new(response.body)
-      stemcell_tags = REXML::XPath.match(doc, "/ListBucketResult/Contents[Key[text()[starts-with(.,'bosh-stemcell/') and not(contains(.,'latest'))]]]")
+      stemcells_tags = parse_document(doc)
+      stemcells = parse_stemcells(stemcells_tags)
+
+      while is_truncated(doc)
+        response = HTTPClient.new.get(PUBLIC_STEMCELLS_BASE_URL, {
+          'prefix' => 'bosh-stemcell',
+          'marker' => stemcells_tags.last.get_text('Key').value
+        })
+
+        doc = REXML::Document.new(response.body)
+        stemcells_tags = parse_document(doc)
+        stemcells += parse_stemcells(stemcells_tags)
+      end
+
+      stemcells
+    end
+
+    def recent
+      stemcell_varietes = all.reject(&:legacy?).group_by(&:variety).values
+      stemcell_varietes.map { |stemcells| stemcells.sort_by(&:version).last }
+    end
+
+    private
+
+    def parse_document(doc)
+      REXML::XPath.match(doc, "/ListBucketResult/Contents[Key[text()[not(contains(.,'latest'))]]]")
+    end
 
+    def parse_stemcells(stemcell_tags)
       stemcell_tags.map do |stemcell_tag|
         stemcell_key = stemcell_tag.get_text('Key').value
         stemcell_size = Integer(stemcell_tag.get_text('Size').value)
@@ -28,9 +55,8 @@ module Bosh::Cli
       end
     end
 
-    def recent
-      stemcell_varietes = all.reject(&:legacy?).group_by(&:variety).values
-      stemcell_varietes.map { |stemcells| stemcells.sort_by(&:version).last }
+    def is_truncated(doc)
+      REXML::XPath.match(doc, "/ListBucketResult/IsTruncated").first.get_text == 'true'
     end
   end
 end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2416.0'
+    VERSION = '1.2427.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2416.0
+  version: 1.2427.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-18 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.2416.0
+        version: 1.2427.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2416.0
+        version: 1.2427.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2416.0
+        version: 1.2427.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2416.0
+        version: 1.2427.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +269,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI
 
-  7ca225'
+  921db9'
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -381,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2981352722135897714
+      hash: 1936487875795083424
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23