Inform user when latest remote platform image is unavailable

vagrant-smartos · Nov 8, 2014 · 68b0700 · 68b0700
1 parent 32afff4
commit 68b0700
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/lib/vagrant/smartos/zones/cap/platform_image/latest.rb b/lib/vagrant/smartos/zones/cap/platform_image/latest.rb
@@ -7,7 +7,7 @@ module Cap
         module PlatformImage
           class Latest
             def self.platform_image_latest(env)
-              platform_image = Zones::Util::PlatformImages.new(env).show_latest
+              platform_image = Zones::Util::PlatformImages.new(env).latest
               env.ui.info 'Unable to find platform image' unless platform_image
               env.ui.info platform_image
             end

diff --git a/lib/vagrant/smartos/zones/util/platform_images.rb b/lib/vagrant/smartos/zones/util/platform_images.rb
@@ -35,8 +35,11 @@ def list
             ui.info(images.join("\n"), prefix: false)
           end
 
-          def show_latest
-            latest_platform_image
+          def latest
+            latest_html = Downloader.new(platform_image_latest_url).read
+            latest = latest_html.match(/(\d{8}T\d{6}Z)/)
+            return unless latest
+            latest[1]
           end
 
           private
@@ -69,16 +72,10 @@ def checksums_dir
             home_path.join('smartos', 'checksums')
           end
 
-          def latest_platform_image
-            latest_html = Downloader.new(platform_image_latest_url).read
-            latest = latest_html.match(/(\d{8}T\d{6}Z)/)
-            return unless latest
-            latest[1]
-          end
-
           def latest_remote_or_current_image
-            latest_platform_image ||
-              images.last
+            return latest if latest
+            ui.info 'Unable to read remote latest platform image, using local'
+            images.last
           end
 
           def setup_smartos_directories