Merge pull request #483 from wp-cli/copilot/fix-plugin-install-zip-error

Author: swissspidy

features/plugin-install.feature

@@ -273,3 +273,35 @@ Feature: Install WordPress plugins
       """
       Error: No plugins installed.
       """
+
+  Scenario: Install plugin using WordPress.org directory URL
+    Given a WP install
+
+    When I run `wp plugin install https://wordpress.org/plugins/hello-dolly/`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org plugins directory URL, using slug: hello-dolly
+      """
+    And the return code should be 0
+
+    When I run `wp plugin list --name=hello-dolly --field=status`
+    Then STDOUT should be:
+      """
+      inactive
+      """
+
+  Scenario: Install and activate plugin using WordPress.org directory URL
+    Given a WP install
+
+    When I run `wp plugin install https://wordpress.org/plugins/hello-dolly/ --activate`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org plugins directory URL, using slug: hello-dolly
+      """
+    And the return code should be 0
+
+    When I run `wp plugin list --name=hello-dolly --field=status`
+    Then STDOUT should be:
+      """
+      active
+      """

features/theme-install.feature

@@ -158,3 +158,31 @@ Feature: Install WordPress themes
       """
       Error: No themes installed.
       """
+
+  Scenario: Install theme using WordPress.org directory URL
+    When I run `wp theme install https://wordpress.org/themes/twentytwelve/`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org themes directory URL, using slug: twentytwelve
+      """
+    And the return code should be 0
+
+    When I run `wp theme list --name=twentytwelve --field=status`
+    Then STDOUT should be:
+      """
+      inactive
+      """
+
+  Scenario: Install and activate theme using WordPress.org directory URL
+    When I run `wp theme install https://wordpress.org/themes/twentyeleven/ --activate`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org themes directory URL, using slug: twentyeleven
+      """
+    And the return code should be 0
+
+    When I run `wp theme list --name=twentyeleven --field=status`
+    Then STDOUT should be:
+      """
+      active
+      """

src/Plugin_Command.php

@@ -1004,7 +1004,7 @@ protected function filter_item_list( $items, $args ) {
 	 * ## OPTIONS
 	 *
 	 * <plugin|zip|url>...
-	 * : One or more plugins to install. Accepts a plugin slug, the path to a local zip file, or a URL to a remote zip file.
+	 * : One or more plugins to install. Accepts a plugin slug, the path to a local zip file, a URL to a remote zip file, or a URL to a WordPress.org plugin directory.
 	 *
 	 * [--version=<version>]
 	 * : If set, get that particular version from wordpress.org, instead of the
@@ -1083,6 +1083,16 @@ protected function filter_item_list( $items, $args ) {
 	 *     Removing the old version of the plugin...
 	 *     Plugin updated successfully
 	 *     Success: Installed 1 of 1 plugins.
+	 *
+	 *     # Install from a WordPress.org plugin directory URL
+	 *     $ wp plugin install https://wordpress.org/plugins/akismet/
+	 *     Detected WordPress.org plugins directory URL, using slug: akismet
+	 *     Installing Akismet Anti-spam: Spam Protection (3.1.11)
+	 *     Downloading install package from https://downloads.wordpress.org/plugin/akismet.3.1.11.zip...
+	 *     Unpacking the package...
+	 *     Installing the plugin...
+	 *     Plugin installed successfully.
+	 *     Success: Installed 1 of 1 plugins.
 	 */
 	public function install( $args, $assoc_args ) {
 

src/Theme_Command.php

@@ -497,7 +497,7 @@ protected function filter_item_list( $items, $args ) {
 	 * ## OPTIONS
 	 *
 	 * <theme|zip|url>...
-	 * : One or more themes to install. Accepts a theme slug, the path to a local zip file, or a URL to a remote zip file.
+	 * : One or more themes to install. Accepts a theme slug, the path to a local zip file, a URL to a remote zip file, or a URL to a WordPress.org theme directory.
 	 *
 	 * [--version=<version>]
 	 * : If set, get that particular version from wordpress.org, instead of the
@@ -535,6 +535,16 @@ protected function filter_item_list( $items, $args ) {
 	 *
 	 *     # Install from a remote zip file
 	 *     $ wp theme install http://s3.amazonaws.com/bucketname/my-theme.zip?AWSAccessKeyId=123&Expires=456&Signature=abcdef
+	 *
+	 *     # Install from a WordPress.org theme directory URL
+	 *     $ wp theme install https://wordpress.org/themes/twentysixteen/
+	 *     Detected WordPress.org themes directory URL, using slug: twentysixteen
+	 *     Installing Twenty Sixteen (1.2)
+	 *     Downloading install package from http://downloads.wordpress.org/theme/twentysixteen.1.2.zip...
+	 *     Unpacking the package...
+	 *     Installing the theme...
+	 *     Theme installed successfully.
+	 *     Success: Installed 1 of 1 themes.
 	 */
 	public function install( $args, $assoc_args ) {
 		if ( count( $args ) > 1 && Utils\get_flag_value( $assoc_args, 'activate', false ) ) {

src/WP_CLI/CommandWithUpgrade.php

@@ -212,6 +212,17 @@ public function install( $args, $assoc_args ) {
 
 					WP_CLI::log( 'Latest release resolved to ' . $version['name'] );
 				}
+
+				// Check if this is a WordPress.org plugin/theme directory URL.
+				// If so, extract the slug and treat it as a repository installation.
+				// Pattern matches: https://wordpress.org/plugins/plugin-slug/ or https://wordpress.org/themes/theme-slug/
+				// Capture group 1: type (plugins|themes)
+				// Capture group 2: slug (the plugin or theme slug name)
+				if ( preg_match( '~^https?://wordpress\.org/(plugins|themes)/([^/]+)/?$~', $slug, $matches ) ) {
+					$slug      = $matches[2]; // Extract the slug.
+					$is_remote = false;
+					WP_CLI::log( sprintf( 'Detected WordPress.org %s directory URL, using slug: %s', $matches[1], $slug ) );
+				}
 			}
 
 			// Check if a URL to a remote or local zip has been specified.