lib/heirloom/cli/shared.rb in heirloom-0.6.1 vs lib/heirloom/cli/shared.rb in heirloom-0.7.0rc1

@@ -103,11 +103,10 @@
                               :config => config
 
         unless archive.buckets_exist? :regions       => regions,
                                       :bucket_prefix => base
           logger.error "Required buckets for '#{base}' do not exist."
-          logger.error "Run 'heirloom setup -h' for help setting up new region."
           exit 1
         end
       end
 
       def ensure_domain_exists(args)
@@ -117,12 +116,11 @@
 
         archive = Archive.new :name   => name,
                               :config => config
 
         unless archive.domain_exists?
-          logger.error "Metadata domain '#{name}' does not exist in '#{config.metadata_region}'."
-          logger.error "Run 'heirloom setup -h' for help setting up new region."
+          logger.error "'#{name}' does not exist in '#{config.metadata_region}' catalog."
           exit 1
         end
       end
 
       def ensure_archive_exists(args)
@@ -130,9 +128,20 @@
         archive = args[:archive]
         logger  = config.logger
 
         unless archive.exists?
           logger.error "Archive does not exist."
+          exit 1
+        end
+      end
+
+      def ensure_archive_domain_empty(args)
+        config  = args[:config]
+        archive = args[:archive]
+        logger  = config.logger
+
+        unless archive.count.zero?
+          logger.error "Not empty."
           exit 1
         end
       end
 
     end