a bit of style refactor

Author: alessandro-fazzi

lib/wordpress_tools/database.rb

@@ -18,15 +18,22 @@ def create(db_name = "wordpress")
 
     no_tasks do
       def create_database
-        run_command(mysql_create_command) || error("Cannot create database '#{db_name}'. Already exists?")
+        run_command(mysql_create_command) ||
+          error("Cannot create database '#{db_name}'. Already exists?")
       end
 
       def test_login
-        run_command("#{mysql_command} --execute='QUIT'") || error("Cannot login to MySQL. Wrong credentials?")
+        run_command("#{mysql_command} --execute='QUIT'") ||
+          error("Cannot login to MySQL. Wrong credentials?")
       end
 
       def mysql_create_command
-        "#{mysql_command} --execute='CREATE DATABASE #{db_name} DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;'"
+        [
+          mysql_command,
+          "--execute='CREATE DATABASE ",
+          db_name,
+          "DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;'"
+        ].join
       end
 
       def mysql_command

lib/wordpress_tools/shared_options.rb

@@ -5,15 +5,37 @@ module SharedOptions
     class_methods do
       def shared_options
         [
-          [:force, { type: :boolean, desc: "Overwrite existing WP-CLI installation" }],
-          [:locale, { aliases: "-l", desc: "WordPress locale", default: Configuration.for(:locale) }],
-          [:bare, { type: :boolean, aliases: "-b", desc: "Remove default themes and plugins" }],
-          [:admin_user, { desc: "WordPress admin user", default: Configuration.for(:admin_user) }],
-          [:admin_email, { desc: "WordPress admin email", default: Configuration.for(:admin_email) }],
-          [:admin_password, { desc: "WordPress admin password", default: Configuration.for(:admin_password) }],
-          [:db_user, { desc: "MySQL database user", default: Configuration.for(:db_user) }],
-          [:db_password, { desc: "MySQL database pasword", default: Configuration.for(:db_password) }],
-          [:site_url, { desc: "Wordpress site URL", default: Configuration.for(:site_url) }]
+          [:force, {
+            type: :boolean, desc: "Overwrite existing WP-CLI installation"
+          }],
+          [:locale, {
+            aliases: "-l",
+            desc: "WordPress locale",
+            default: Configuration.for(:locale)
+          }],
+          [:bare, {
+            type: :boolean,
+            aliases: "-b",
+            desc: "Remove default themes and plugins"
+          }],
+          [:admin_user, {
+            desc: "WordPress admin user", default: Configuration.for(:admin_user)
+          }],
+          [:admin_email, {
+            desc: "WordPress admin email", default: Configuration.for(:admin_email)
+          }],
+          [:admin_password, {
+            desc: "WordPress admin password", default: Configuration.for(:admin_password)
+          }],
+          [:db_user, {
+            desc: "MySQL database user", default: Configuration.for(:db_user)
+          }],
+          [:db_password, {
+            desc: "MySQL database pasword", default: Configuration.for(:db_password)
+          }],
+          [:site_url, {
+            desc: "Wordpress site URL", default: Configuration.for(:site_url)
+          }]
         ]
       end
 

lib/wordpress_tools/wp_cli_core.rb

@@ -35,21 +35,27 @@ def installed?
 
       def download
         info("Downloading WP-CLI...")
-        get(download_url, download_path, verbose: false, force: true) || error("Cannot download WP-CLI")
+        get(download_url, download_path, verbose: false, force: true) ||
+          error("Cannot download WP-CLI")
+
         success("Downloaded WP-CLI")
       end
 
       def move
         info("Installing WP-CLI...")
         need_sudo = !File.writable?(install_dir)
-        run_command(move_command(download_path, install_path, need_sudo)) || error("Cannot install WP-CLI in '#{install_path}'")
+        run_command(move_command(download_path, install_path, need_sudo)) ||
+          error("Cannot install WP-CLI in '#{install_path}'")
+
         success("Installed WP-CLI in '#{install_path}'")
       end
 
       def make_executable
         info("Making WP-CLI executable...")
         need_sudo = !File.writable?(install_dir)
-        run_command(executable_bit_command(install_path, need_sudo)) || error("Cannot make WP-CLI executable")
+        run_command(executable_bit_command(install_path, need_sudo)) ||
+          error("Cannot make WP-CLI executable")
+
         success("WP-CLI is now executable")
       end