lib/heirloom/cli/destroy.rb in heirloom-0.12.3 vs lib/heirloom/cli/destroy.rb in heirloom-0.12.4

@@ -15,12 +15,11 @@
                               :opts   => @opts
 
         ensure_valid_options :provided => @opts,
                              :required => [:name, :id],
                              :config   => @config
-        ensure_valid_region :region => @opts[:metadata_region],
-                            :config => @config
+        ensure_valid_metadata_region @config
         ensure_domain_exists :name => @opts[:name], :config => @config
 
         @name = @opts[:name]
         @id = @opts[:id]
         @archive = Archive.new :name   => @name,
@@ -57,10 +56,10 @@
           opt :aws_access_key, "AWS Access Key ID", :type => :string, 
                                                     :short => :none
           opt :aws_secret_key, "AWS Secret Access Key", :type => :string, 
                                                         :short => :none
           opt :use_iam_profile, "Use IAM EC2 Profile", :short => :none
-          opt :environment, "Environment (defined in ~/.heirloom.yml)", :type => :string
+          opt :environment, "Environment (defined in heirloom config file)", :type => :string
         end
       end
     end
   end
 end