Changeset 3026

Timestamp:

04/27/2016 06:01:49 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Import plugin files to SVN upon approval.

We need to create an SVN repo anyway, adding the approved files also gives us
a nice baseline to compare commits to. And it saves plugin authors one more
step in the process of initially publishing the plugin.

See #1570.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• admin/class-status-transitions.php (modified) (2 diffs)
• tools/class-svn.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php

@@ -83 +83 @@
 
         // Create SVN repo.
-        $svn_dirs = array(
-            "{$post->post_name}/",
-            "{$post->post_name}/trunk",
-            "{$post->post_name}/branches",
-            "{$post->post_name}/tags",
-            "{$post->post_name}/assets",
-        );
-        SVN::mkdir( $svn_dirs, array(
-            'message' => sprintf( 'Adding %1$s by %2$s.', $post->post_title, $plugin_author->user_login ),
+        $dir = Filesystem::temp_directory( $post->post_name );
+        $dir = Filesystem::unzip( get_attached_file( $attachment->ID ), $dir );
+        foreach ( array( 'assets', 'branches', 'tags', 'trunk' ) as $folder ) {
+            mkdir( "$dir/$folder", 0777 );
+        }
+
+        $plugin_root = $this->get_plugin_root( $dir );
+        // If there is no plugin file we have nothing to commit. Bail.
+        if ( empty( $plugin_root ) ) {
+            return;
+        }
+        rename( $plugin_root, "$dir/trunk" );
+
+        SVN::import( $dir, 'http://plugins.svn.wordpress.org/' . $post->post_name, array(
+            'm'        => sprintf( 'Adding %1$s by %2$s.', $post->post_title, $plugin_author->user_login ),
+            'username' => AUTOMATTIC_SVN_TRACKER__SVN_USER,
+            'password' => AUTOMATTIC_SVN_TRACKER__SVN_PASSWORD,
         ) );
-
-        // Read zip and add/commit files to svn.
-        SVN::add( Filesystem::unzip( get_attached_file( $attachment->ID ) ) );
 
         // Delete zip.
@@ -148 +153 @@
         wp_mail( $email, $subject, $content, 'From: plugins@wordpress.org' );
     }
+
+    /**
+     * Returns the path to a plugins root directory.
+     *
+     * @param string $dir Directory to search in.
+     * @return string
+     */
+    private function get_plugin_root( $dir ) {
+        $plugin_root  = '';
+        $plugin_files = Filesystem::list_files( $dir, true /* Recursive */, '!\.php$!i' );
+
+        foreach ( $plugin_files as $plugin_file ) {
+
+            // No markup/translation needed.
+            $plugin_data = get_plugin_data( $plugin_file, false, false );
+
+            if ( ! empty( $plugin_data['Name'] ) ) {
+                $plugin_root = dirname( $plugin_file );
+                break;
+            }
+        }
+
+        return $plugin_root;
+    }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php

@@ -9 +9 @@
 class SVN {
 
-    public static function add( $dirs, $args = array() ) {
-        return true;
+    /**
+     * Create an SVN Export of a local directory to a URL.
+     *
+     * Note: An exception will be thrown upon SVN error.
+     *
+     * @param string $path    The local folder to import into SVN.
+     * @param string $url     The URL to import to.
+     * @param array  $options A list of options to pass to SVN. Optional.
+     *
+     * @return array {
+     *   @type bool $result   The result of the operation.
+     *   @type int  $revision The revision imported.
+     * }
+     */
+    public static function import( $path, $url, $options = array() ) {
+        $esc_options = self::parse_esc_parameters( $options );
+
+        $esc_path = escapeshellarg( $path );
+        $esc_url  = escapeshellarg( $url );
+
+        $output = shell_exec( "svn import $esc_options $esc_path $esc_url 2>&1" );
+        if ( preg_match( '/Committed revision (?P<revision>\d+)[.]/i', $output, $m ) ) {
+            $revision = (int) $m['revision'];
+            $result   = true;
+        } else {
+            $result = false;
+            $errors = self::parse_svn_errors( $output );
+        }
+
+        return compact( 'result', 'revision', 'errors' );
     }
 
@@ -40 +68 @@
             $result = false;
             $errors = self::parse_svn_errors( $output );
-            
         }
 
@@ -84 +111 @@
     }
 
-    public static function mkdir( $dirs, $args = array() ) {
-        return true;
-    }
-
     /**
      * Parse and escape the provided SVN arguements for usage on the CLI.
@@ -109 +132 @@
                 $key = '-' . ( strlen( $key ) > 2 ? '-' : '' ) . $key;
             }
-            
+
             $result[] = escapeshellarg( $key ) . ( $no_parameters ? '' : '=' . escapeshellarg( $value ) );
         }