lib/postfix_admin/runner.rb in postfix_admin-0.3.1 vs lib/postfix_admin/runner.rb in postfix_admin-0.3.2

@@ -53,21 +53,25 @@
     desc "forwards", "List all forwards"
     def forwards
       runner { @cli.show_forwards }
     end
 
-    desc "setup example.com password", "Set up a domain (add a domain and an admin user for it)"
+    desc "setup example.com password",
+         "Set up a domain (add a domain and an admin user for it)"
+    method_option :description, type: :string, aliases: "-d", desc: "description"
     method_option :scheme, type: :string, aliases: "-s", desc: "password scheme"
     method_option :rounds, type: :string, aliases: "-r", desc: "encryption rounds for BLF-CRYPT, SHA256-CRYPT and SHA512-CRYPT schemes"
     def setup(domain_name, password)
       runner do
         @cli.setup_domain(domain_name, password,
+                          description: options[:description],
                           scheme: options[:scheme], rounds: options[:rounds])
       end
     end
 
-    desc "teardown example.com", "Tear down a domain (delete a domain and an admin user for it)"
+    desc "teardown example.com",
+         "Tear down a domain (delete a domain and an admin user for it)"
     def teardown(domain_name)
       runner { @cli.teardown_domain(domain_name) }
     end
 
     desc "admin_passwd [e-mail] new_password",
@@ -97,15 +101,15 @@
     def add_domain(domain_name)
       runner { @cli.add_domain(domain_name, description: options[:description]) }
     end
 
     desc "edit_domain example.com", "Edit a domain"
-    method_option :aliases,   type: :numeric, aliases: "-a", desc: "Edit aliases limitation"
-    method_option :mailboxes, type: :numeric, aliases: "-m", desc: "Edit mailboxes limitation"
-    method_option :maxquota,  type: :numeric, aliases: "-q", desc: "Edit max quota limitation"
+    method_option :aliases,   type: :numeric, aliases: "-a", desc: "Update aliase limit"
+    method_option :mailboxes, type: :numeric, aliases: "-m", desc: "Update mailboxe limit"
+    method_option :maxquota,  type: :numeric, aliases: "-q", desc: "Update maximum quota limit (MB)"
     method_option :active, type: :boolean, desc: "Update active status"
-    method_option :description, type: :string, aliases: "-d", desc: "Edit description"
+    method_option :description, type: :string, aliases: "-d", desc: "Update description"
     def edit_domain(domain_name)
       runner do
         if options.size == 0
           warn "Use one or more options."
           help('edit_domain')
@@ -151,14 +155,14 @@
       end
     end
 
     desc "edit_account [e-mail]", "Edit an account"
     method_option :goto,  type: :string,  aliases: "-g",
-                  desc: "mailboxes, addresses e-mails are delivered to"
+                  desc: "Update mailboxes, addresses emails are delivered to"
     method_option :quota, type: :numeric, aliases: "-q",
-                  desc: "quota limitation (MB)"
+                  desc: "Update quota limit (MB)"
     method_option :name,  type: :string,  aliases: "-n",
-                  desc: "full name"
+                  desc: "Update full name"
     method_option :active, type: :boolean,
                   desc: "Update active status"
     def edit_account(address)
       runner do
         if options.size == 0