lib/heirloom/cli/show.rb in heirloom-0.5.0rc4 vs lib/heirloom/cli/show.rb in heirloom-0.6.0rc1

@@ -11,17 +11,19 @@
                               :opts   => @opts
 
         ensure_valid_options :provided => @opts,
                              :required => [:name],
                              :config   => @config
-
+        ensure_valid_region :region => @opts[:metadata_region],
+                            :config => @config
         ensure_domain_exists :name => @opts[:name], :config => @config
-
         id = @opts[:id] ? @opts[:id] : latest_id
         @archive = Archive.new :name   => @opts[:name],
                                :config => @config,
                                :id     => id
+        ensure_archive_exists :archive => @archive,
+                              :config => @config
       end
       
       def show
         jj @archive.show
       end
@@ -47,13 +49,15 @@
 
 If -i is ommited, latest ID is displayed.
 
 EOS
           opt :help, "Display Help"
+          opt :id, "ID of the archive to display.", :type => :string
           opt :level, "Log level [debug|info|warn|error].", :type    => :string,
                                                             :default => 'info'
+          opt :metadata_region, "AWS region to store Heirloom metadata.", :type    => :string,   
+                                                                          :default => 'us-west-1'
           opt :name, "Name of archive.", :type => :string
-          opt :id, "ID of the archive to display.", :type => :string
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
         end