Merge pull request #45 from ryotsun/patch-35

Don't attempt to rename ZIPs coming from a GitHub archive release/tag

Author: danielbachhuber

features/plugin-install.feature

@@ -145,3 +145,28 @@ Feature: Install WordPress plugins
       """
       Warning: Destination folder already exists. "{WORKING_DIR}/wp-content/plugins/akismet/"
       """
+
+  Scenario: Don't attempt to rename ZIPs coming from a GitHub archive release/tag
+    Given a WP install
+
+    When I run `wp plugin install https://github.com/wp-cli-test/generic-example-plugin/archive/v0.1.0.zip`
+    Then STDOUT should contain:
+      """
+      Plugin installed successfully.
+      """
+    And STDOUT should contain:
+      """
+      package from https://github.com/wp-cli-test/generic-example-plugin/archive/v0.1.0.zip
+      """
+    And STDOUT should contain:
+      """
+      Renamed Github-based project from 'generic-example-plugin-0.1.0' to 'generic-example-plugin'.
+      """
+    And STDOUT should contain:
+      """
+      Plugin installed successfully.
+      """
+    And STDERR should be empty
+    And the wp-content/plugins/generic-example-plugin directory should exist
+    And the wp-content/plugins/generic-example-plugi directory should not exist
+    And the wp-content/plugins/generic-example-plugin-0.1.0 directory should not exist

src/WP_CLI/CommandWithUpgrade.php

@@ -152,15 +152,22 @@ public function install( $args, $assoc_args ) {
 						if ( preg_match( '#github\.com/([^/]+)/([^/]+)/releases/download/#', $local_or_remote_zip_file ) || preg_match( '#github\.com/([^/]+)/([^/]+)/raw/#', $local_or_remote_zip_file ) ) {
 							return $source;
 						}
-						$branch_length = strlen( pathinfo( $local_or_remote_zip_file, PATHINFO_FILENAME ) );
-						if ( $branch_length ) {
-							$new_path = substr( rtrim( $source, '/' ), 0, - ( $branch_length + 1 ) ) . '/';
-							if ( $GLOBALS['wp_filesystem']->move( $source, $new_path ) ) {
-								WP_CLI::log( "Renamed Github-based project from '" . Utils\basename( $source ) . "' to '" . Utils\basename( $new_path ) . "'." );
-								return $new_path;
-							} else {
-								return new \WP_Error( 'wpcli_install_gitub', "Couldn't move Github-based project to appropriate directory." );
-							}
+
+						$branch_name = pathinfo( $local_or_remote_zip_file, PATHINFO_FILENAME );
+
+						// Always be attached "archive" into release tag and tag on github.
+						if ( preg_match( '#github\.com/([^/]+)/([^/]+)/archive/#', $local_or_remote_zip_file ) ) {
+							$path_array = explode( "/", pathinfo( $local_or_remote_zip_file, PATHINFO_DIRNAME) );
+							array_pop( $path_array );
+							$branch_name = end( $path_array );
+						}
+
+						$new_path = str_replace( pathinfo( $source, PATHINFO_BASENAME ), $branch_name, $source );
+						if ( $GLOBALS['wp_filesystem']->move( $source, $new_path ) ) {
+							WP_CLI::log( "Renamed Github-based project from '" . Utils\basename( $source ) . "' to '" . Utils\basename( $new_path ) . "'." );
+							return $new_path;
+						} else {
+							return new \WP_Error( 'wpcli_install_github', "Couldn't move Github-based project to appropriate directory." );
 						}
 						return $source;
 					};