wordpress_tools 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c26c72c71bd8bb74b3fcdb3a2ae4302a8b22170
-  data.tar.gz: be929e12b15a9acbabf077e61e64095042844869
+  metadata.gz: 2aab5b9ce9b86829003f51b82bbc192c4c573e2e
+  data.tar.gz: c0074b0ac07c8f4544758df01b1ce8cd73d2e305
 SHA512:
-  metadata.gz: bd84358d1962f3dd601947996aeee5d11734fa67e74e8cc7c64ff3bd9d1b76bf0f13a36477cd81d382a504982cd159aa4af51ddb792c7dbb016895e8fc54001d
-  data.tar.gz: 95711a166ecd825eb9f74d8399d8e580168ffa28c50c0779bcfdf4f08ec4eac10bea524daef455c6bc7068e8c9cf7ebb2d5388cc058caba470a8f069f3150805
+  metadata.gz: b3ce822c5a57b292d6d031846bdc703c648c2509dc55d8f91c8dbe4c631ec8cf18bf34c6aa4590271b87ae5298a52335bee58e1beeab73538da258bfefa7b03e
+  data.tar.gz: 5d63e473f3a5edef32a82e67d863b9d4fef6eed2bb390288573e6b88856cb2436298055d680f2762dab784b46523efecafed3022b6cf9f0c31028b3b7cd81833

data/README.md

@@ -20,6 +20,7 @@ Get some help:
 
 ```bash
 Options:
+      [--force]                          # Overwrite existing WP-CLI / WP-CLI Server installation
   -l, [--locale=LOCALE]                  # WordPress locale
                                          # Default: en_US
   -b, [--bare=BARE]                      # Remove default themes and plugins

data/lib/wordpress_tools/cli.rb

@@ -1,6 +1,7 @@
 module WordPressTools
   class CLI < Thor
     include CLIHelper
+    include SharedOptions
 
     desc "new [DIR_NAME]", "download the latest stable version of WordPress in a new directory with specified name (default is wordpress)"
     add_method_options(shared_options)
@@ -12,8 +13,8 @@ module WordPressTools
 
       info("Starting...")
 
-      WPCLICore.new.invoke :install
-      WPCLIServer.new.invoke :install
+      WPCLICore.new.invoke :install, [], options
+      WPCLIServer.new.invoke :install, [], options
       Database.new.invoke :create, [dir_name], options
       WordPress.new.invoke :download, [dir_name], options
       WordPress.new.invoke :setup, [dir_name], options

data/lib/wordpress_tools/cli_helper.rb

@@ -1,29 +1,7 @@
 module WordPressTools
   module CLIHelper
-    extend ActiveSupport::Concern
     include Thor::Actions
 
-    class_methods do
-      def shared_options
-        [
-          [:locale, { aliases: "-l", desc: "WordPress locale", default: Configuration.for(:locale)}],
-          [:bare, {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
-
-      def add_method_options(options)
-        options.each do |option|
-          method_option(*option)
-        end
-      end
-    end
-
     def info(message)
       say message
     end

data/lib/wordpress_tools/database.rb

@@ -1,6 +1,7 @@
 module WordPressTools
   class Database < Thor
     include CLIHelper
+    include SharedOptions
 
     attr_reader :db_name
 

data/lib/wordpress_tools/shared_options.rb

@@ -0,0 +1,27 @@
+module WordPressTools
+  module SharedOptions
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def shared_options
+        [
+          [:force, {type: :boolean, desc: "Overwrite existing WP-CLI / WP-CLI Server installation"}],
+          [:locale, { aliases: "-l", desc: "WordPress locale", default: Configuration.for(:locale)}],
+          [:bare, {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
+
+      def add_method_options(options)
+        options.each do |option|
+          method_option(*option)
+        end
+      end
+    end
+  end
+end

data/lib/wordpress_tools/version.rb

@@ -1,3 +1,3 @@
 module WordPressTools
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/wordpress_tools/wordpress.rb

@@ -1,6 +1,7 @@
 module WordPressTools
   class WordPress < Thor
     include CLIHelper
+    include SharedOptions
 
     attr_reader :dir_name
 

data/lib/wordpress_tools/wp_cli_core.rb

@@ -1,8 +1,10 @@
 module WordPressTools
   class WPCLICore < Thor
     include CLIHelper
+    include SharedOptions
 
     desc "install", ""
+    add_method_options(shared_options)
     def install
       return unless overwrite?
 
@@ -20,7 +22,7 @@ module WordPressTools
 
     no_tasks do
       def overwrite?
-        if installed?
+        if installed? && options[:force] != true
           yes? "WP-CLI already installed [#{install_path}]. Do you want to overwite it? [y]es, [N]o"
         else
           true

data/lib/wordpress_tools/wp_cli_server.rb

@@ -1,8 +1,10 @@
 module WordPressTools
   class WPCLIServer < Thor
     include CLIHelper
+    include SharedOptions
 
     desc "install", ""
+    add_method_options(shared_options)
     def install
       return unless overwrite?
 
@@ -13,7 +15,7 @@ module WordPressTools
 
     no_tasks do
       def overwrite?
-        if installed?
+        if installed? && options[:force] != true
           yes? "WP-CLI server command already installed [#{install_dir}]. Do you want to overwite it? [y]es, [N]o"
         else
           true

data/lib/wordpress_tools.rb

@@ -4,11 +4,12 @@ require "thor"
 require "active_support"
 require "active_support/all"
 
-require "wordpress_tools/version"
-require "wordpress_tools/config"
 require "wordpress_tools/cli_helper"
+require "wordpress_tools/shared_options"
+require "wordpress_tools/config"
 require "wordpress_tools/cli"
+require "wordpress_tools/database"
+require "wordpress_tools/version"
 require "wordpress_tools/wordpress"
 require "wordpress_tools/wp_cli_core"
 require "wordpress_tools/wp_cli_server"
-require "wordpress_tools/database"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordpress_tools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - "Étienne Després"
@@ -156,6 +156,7 @@ files:
 - lib/wordpress_tools/cli_helper.rb
 - lib/wordpress_tools/config.rb
 - lib/wordpress_tools/database.rb
+- lib/wordpress_tools/shared_options.rb
 - lib/wordpress_tools/version.rb
 - lib/wordpress_tools/wordpress.rb
 - lib/wordpress_tools/wp_cli_core.rb