Changeset 5147

Timestamp:

03/13/2017 05:56:27 AM (7 years ago)

Author:

dd32

Message:

Plugin Directory: ZIPs: Do not build zips on demand, instead store them within a SVN repository.

See #1578

Location:

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

Files:

• api/class-base.php (modified) (1 diff)
• api/routes/class-zip-management.php (deleted)
• bin/rebuild-zip.php (copied) (copied from sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/import-plugin.php) (6 diffs)
• class-plugin-directory.php (modified) (3 diffs)
• cli/class-import.php (modified) (4 diffs)
• jobs/class-plugin-import.php (modified) (1 diff)
• tools/class-svn.php (modified) (2 diffs)
• zip/class-builder.php (modified) (7 diffs)
• zip/class-serve.php (modified) (8 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/class-base.php

@@ -20 +20 @@
         new Routes\Query_Plugins();
         new Routes\SVN_Access();
-        new Routes\Zip_Management();
         new Routes\Plugin_Committers();
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/bin/rebuild-zip.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory;
+use WordPressdotorg\Plugin_Directory\Tools\SVN;
 
 // This script should only be called in a CLI environment.
@@ -7 +8 @@
 }
 
-ob_start();
+//ob_start();
 
-$opts = getopt( '', array( 'url:', 'abspath:', 'plugin:', 'changed-tags:', 'async' ) );
+$opts = getopt( '', array( 'url:', 'abspath:', 'plugin:', 'versions:', 'async' ) );
 
 // Guess the default parameters:
@@ -15 +16 @@
     $opts['plugin'] = $argv[1];
     $argv[1] = '--plugin ' . $argv[1];
+}
+if ( empty( $opts ) && $argc == 3 ) {
+    $opts['plugin'] = $argv[1];
+    $argv[1] = '--plugin ' . $argv[1];
+
+    $opts['versions'] = $argv[2];
+    $argv[2] = '--versions ' . $argv[2];
 }
 if ( empty( $opts['url'] ) ) {
@@ -22 +30 @@
     $opts['abspath'] = substr( __DIR__, 0, strpos( __DIR__, 'wp-content' ) );
 }
-
-if ( empty( $opts['changed-tags'] ) ) {
-    $opts['changed-tags'] = array( 'trunk' );
-} else {
-    $opts['changed-tags'] = explode( ',', $opts['changed-tags'] );
+if ( empty( $opts['versions'] ) ) {
+    $opts['versions'] = '';
 }
-
-$opts['async'] = isset( $opts['async'] );
 
 foreach ( array( 'url', 'abspath', 'plugin' ) as $opt ) {
@@ -36 +39 @@
         fwrite( STDERR, "Usage: php {$argv[0]} --plugin hello-dolly --abspath /home/example/public_html --url https://wordpress.org/plugins/\n" );
         fwrite( STDERR, "--url and --abspath will be guessed if possible.\n" );
-        die();
+        exit(1);
     }
 }
@@ -52 +55 @@
         fwrite( STDERR, "\tphp " . implode( ' ', $argv ) . " --url " . get_site_url( WPORG_PLUGIN_DIRECTORY_BLOGID, '/' ) . "\n" );
     }
-    die();
+    exit(1);
 }
 
-$plugin_slug  = $opts['plugin'];
-$changed_tags = $opts['changed-tags'];
-$start_time   = microtime(1);
+$plugin_slug = $opts['plugin'];
+$versions    = array_filter( array_unique( array_map( 'trim', (array) explode( ',', $opts['versions'] ) ) ), 'strlen' );
+$start_time  = microtime(1);
 
-// If async, queue it to be parsed instead.
-if ( $opts['async'] ) {
-    Jobs\Plugin_Import::queue( $plugin_slug, array( 'tags_touched' => $changed_tags ) );
-    echo "Queueing Import for $plugin_slug... OK\n";
-    die();
+if ( empty( $versions ) ) {
+    // Rebuild them all!
+    $svn_tags = SVN::ls( "http://plugins.svn.wordpress.org/{$plugin_slug}/tags/" );
+    if ( false === $svn_tags ) {
+        fwrite( STDERR, "Error! Failed to retrieve SVN tag listing." );
+        exit(1);
+    }
+
+    $versions = array_map(
+        function( $dir ) { return trim( $dir, '/' ); },
+        $svn_tags
+    );
+    $versions[] = 'trunk';
 }
 
-echo "Processing Import for $plugin_slug... ";
+if ( ! $versions ) {
+    fwrite( STDERR, "Error! No versions specified (or we couldn't find any)" );
+    exit(1);
+}
+
+echo "Rebuilding ZIPs for $plugin_slug... ";
 try {
-    $importer = new CLI\Import;
-    $importer->import_from_svn( $plugin_slug, $changed_tags );
+    $zip_builder = new ZIP\Builder();
+    $zip_builder->build(
+        $plugin_slug,
+        $versions,
+        "{$plugin_slug}: Rebuild triggered by " . php_uname('n' )
+    );
+
     echo "OK. Took " . round( microtime(1) - $start_time, 2 )  . "s\n";
 } catch( \Exception $e ) {
-    echo "Failed. Took " . round( microtime(1) - $start_time, 2 )  . "s\n";
-
-    fwrite( STDERR, "[{$plugin_slug}] Plugin Import Failed: " . $e->getMessage() . "\n" );
+    fwrite( STDERR, "{$plugin_slug}: Zip Rebuild failed: " . $e->getMessage() . "\n" );
     exit(1);
 }

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

@@ -121 +121 @@
                 'publish_posts'      => 'plugin_approve',
                 'read_private_posts' => 'do_not_allow',
-                'delete_posts'       => 'do_not_allow',
+                'delete_posts'       => is_super_admin() ? 'manage_options' : 'do_not_allow',
                 'create_posts'       => 'do_not_allow',
             ),
@@ -1006 +1006 @@
      */
     function custom_redirects() {
-
         // Handle a redirect for /$plugin/$tab_name/ to /$plugin/#$tab_name.
         if ( get_query_var( 'redirect_plugin_tab' ) ) {
@@ -1031 +1030 @@
             // The about page is now over at /developers/.
             if ( 'about' === $path[2] ) {
-                wp_safe_redirect( home_url( '/developers/' . ( ( isset( $path[3] ) && 'add' == $path[3] ) ? 'add/' : '' ) ) );
+                if ( isset( $path[3] ) && 'add' == $path[3] ) {
+                    wp_safe_redirect( home_url( '/developers/add/' ) );
+                } elseif ( isset( $path[3] ) && 'validator' == $path[3] ) {
+                    wp_safe_redirect( home_url( '/developers/readme-validator/' ) );
+                } else {
+                    wp_safe_redirect( home_url( '/developers/' ) );
+                }
                 die();
             }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -8 +8 @@
 use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
 use WordPressdotorg\Plugin_Directory\Tools\SVN;
+use WordPressdotorg\Plugin_Directory\Zip\Builder;
 use Exception;
 
@@ -47 +48 @@
      * @throws \Exception
      *
-     * @param string $plugin_slug      The slug of the plugin to import.
-     * @param array  $svn_changed_tags A list of tags/trunk which the SVN change touched. Optional.
-     */
-    public function import_from_svn( $plugin_slug, $svn_changed_tags = array( 'trunk' ) ) {
+     * @param string $plugin_slug            The slug of the plugin to import.
+     * @param array  $svn_changed_tags       A list of tags/trunk which the SVN change touched. Optional.
+     * @param array  $svn_revision_triggered The SVN revision which this import has been triggered by.
+     */
+    public function import_from_svn( $plugin_slug, $svn_changed_tags = array( 'trunk' ), $svn_revision_triggered = 0 ) {
         global $wpdb;
 
@@ -190 +192 @@
         $current_stable_tag = get_post_meta( $plugin->ID, 'stable_tag', true ) ?: 'trunk';
 
-        $this->rebuild_invalidate_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags );
+        $this->rebuild_affected_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags, $svn_revision_triggered );
 
         // Finally, set the new version live.
@@ -202 +204 @@
 
     /**
-     * Rebuild and Invalidate plugin ZIPs on all web nodes using the REST API Endpoints.
-     *
-     * @param string $plugin_slug        The plugin slug.
-     * @param string $stable_tag         The new stable tag.
-     * @param string $current_stable_tag The new stable tag.
-     * @param array  $svn_changed_tags   The list of SVN tags modified since last import.
-     */
-    protected function rebuild_invalidate_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags ) {
-        global $wporg_webs;
-        $invalidate_zips = $rebuild_zips = array();
-
-        foreach ( $svn_changed_tags as $tag ) {
-            if ( 'trunk' == $tag ) {
-                if ( 'trunk' == $stable_tag ) {
-                    // Trunk is stable, so we'll need to rebuild the zip
-                    $rebuild_zips[] = "{$plugin_slug}.zip";
-                } else {
-                    // Trunk isn't stable, so we'll just remove it so it's rebuilt on demand
-                    $invalidate_zips[] = "{$plugin_slug}.zip";
-                }
-                continue;
-            }
-            if ( $tag == $stable_tag || $tag == $current_stable_tag ) {
-                $rebuild_zips[] = "{$plugin_slug}.{$tag}.zip";
-            } else {
-                $invalidate_zips[] = "{$plugin_slug}.{$tag}.zip";
-            }
-        }
-        if ( $stable_tag != $current_stable_tag ) {
-            // plugin is updated, ensure that everything is rebuilt.
-            if ( ! in_array( $stable_tag, $svn_changed_tags ) ) {
-                $rebuild_zips[] = "{$plugin_slug}" . ( 'trunk' == $stable_tag ? '' : ".{$stable_tag}" ) . '.zip';
-            }
-        }
-
-        if ( empty( $wporg_webs ) || ( empty( $invalidate_zips ) && empty( $rebuild_zips ) ) ) {
-            return;
-        }
-
-        $urls = array();
-        foreach ( $wporg_webs as $node ) {
-            $urls[] = preg_replace( '!^https?://wordpress.org/!', "http://$node/", site_url( '/wp-json/plugins/v1/zip-management' ) );
-        }
-        $headers = array(
-            'User-Agent' => 'WordPress.org Plugin Directory',
-            'Host' => 'WordPress.org',
-            'Authorization' => 'BEARER ' . PLUGIN_API_INTERNAL_BEARER_TOKEN,
-        );
-        $body = array(
-            'plugins' => array(
-                $plugin_slug => array(
-                    'invalidate' => $invalidate_zips,
-                    'rebuild' => $rebuild_zips,
-                )
-            )
-        );
-
-        $results = array();
-        foreach ( $urls as $url ) {
-            $results[ $url ] = wp_remote_post( $url, array(
-                'body' => $body,
-                'headers' => $headers,
-                'sslverify' => false
-            ) );
-        }
-
-        // TODO Do something with $results to verify all servers said the rebuilt zip was correct or something.
+     * (Re)build plugin ZIPs affected by this commit.
+     *
+     * @param string $plugin_slug            The plugin slug.
+     * @param string $stable_tag             The new stable tag.
+     * @param string $current_stable_tag     The new stable tag.
+     * @param array  $svn_changed_tags       The list of SVN tags modified since last import.
+     * @param string $svn_revision_triggered The SVN revision which triggered the rebuild.
+     *
+     * @return bool
+     */
+    protected function rebuild_affected_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags, $svn_revision_triggered = 0 ) {
+        $versions_to_build = $svn_changed_tags;
+
+        // Ensure that the stable zip is built/rebuilt if need be.
+        if ( $stable_tag != $current_stable_tag && ! in_array( $stable_tag, $versions_to_build ) ) {
+            $versions_to_build[] = $stable_tag;
+        }
+
+        // Rebuild/Build $build_zips
+        try {
+            // This will rebuild the ZIP.
+            $zip_builder = new Builder();
+            $zip_builder->build(
+                $plugin_slug,
+                array_unique( $versions_to_build ),
+                $svn_revision_triggered ?
+                    "{$plugin_slug}: ZIP build triggered by https://plugins.trac.wordpress.org/changeset/{$svn_revision_triggered}" :
+                    "{$plugin_slug}: ZIP build triggered by " . php_uname('n')
+            );
+        } catch( Exception $e ) {
+            return false;
+        }
+
+        return true;
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-plugin-import.php

@@ -34 +34 @@
         $changed_tags = isset( $plugin_data['tags_touched'] ) ? $plugin_data['tags_touched'] : array( 'trunk' );
 
+        $revision = isset( $plugin_data['revisions'] ) ? max( (array)$plugin_data['revisions'] ) : false;
+
         try {
             $importer = new CLI\Import;
-            $importer->import_from_svn( $plugin_slug, $changed_tags );
+            $importer->import_from_svn( $plugin_slug, $changed_tags, $revision );
         } catch( Exception $e ) {
             fwrite( STDERR, "[{$plugin_slug}] Plugin Import Failed: " . $e->getMessage() . "\n" );

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

@@ -22 +22 @@
      * }
      */
-    public static function import( $path, $url, $message ) {
-        $options     = array(
-            'non-interactive',
-            'm'    => $message,
-            'user' => PLUGIN_SVN_MANAGEMENT_USER,
-            'pass' => PLUGIN_SVN_MANAGEMENT_PASS,
-        );
+    public static function import( $path, $url, $message, $options = array() ) {
+        $options[] = 'non-interactive';
+        $options['m'] = $message;
+        if ( empty( $options['username'] ) ) {
+            $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
+            $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+        }
+
         $esc_options = self::parse_esc_parameters( $options );
 
@@ -68 +69 @@
         $output = self::shell_exec( "svn export $esc_options $esc_url $esc_destination 2>&1" );
         if ( preg_match( '/Exported 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' );
+    }
+
+    /**
+     * Create an SVN Checkout of a URL to a local directory.
+     *
+     * @static
+     *
+     * @param string $url         The URL to export.
+     * @param string $destination The local folder to checkout into.
+     * @param array  $options     Optional. A list of options to pass to SVN. Default: empty array.
+     * @return array {
+     *     @type bool $result   The result of the operation.
+     *     @type int  $revision The revision exported.
+     * }
+     */
+    public static function checkout( $url, $destination, $options = array() ) {
+        $options[]   = 'non-interactive';
+        $esc_options = self::parse_esc_parameters( $options );
+
+        $esc_url         = escapeshellarg( $url );
+        $esc_destination = escapeshellarg( $destination );
+
+        $output = self::shell_exec( "svn checkout $esc_options $esc_url $esc_destination 2>&1" );
+        if ( preg_match( '/Checked out 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' );
+    }
+
+    /**
+     * Update a SVN checkout.
+     *
+     * @static
+     *
+     * @param string $checkout The path of the SVN checkout to update.
+     * @param array  $options  Optional. A list of options to pass to SVN. Default: empty array.
+     * @return array {
+     *     @type bool $result   The result of the operation.
+     *     @type int  $revision The revision exported.
+     * }
+     */
+    public static function up( $checkout, $options = array() ) {
+        $options[]   = 'non-interactive';
+        $esc_options = self::parse_esc_parameters( $options );
+
+        $esc_checkout = escapeshellarg( $checkout );
+
+        $output = self::shell_exec( "svn up $esc_options $esc_checkout 2>&1" );
+        if ( preg_match( '/Updated to 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' );
+    }
+
+    /**
+     * Add a file in a SVN checkout to be revisioned.
+     *
+     * @static
+     *
+     * @param string $checkout The path of the file to add to SVN.
+     * @return array {
+     *     @type bool $result   The result of the operation.
+     * }
+     */
+    public static function add( $file ) {
+        $options[]   = 'non-interactive';
+        $esc_options = self::parse_esc_parameters( $options );
+
+        $esc_file     = escapeshellarg( $file );
+
+        $output = self::shell_exec( "svn add $esc_options $esc_file 2>&1" );
+        if ( preg_match( "/^A/i", $output ) ) {;
+            $result   = true;
+        } else {
+            $result = false;
+            $errors = self::parse_svn_errors( $output );
+        }
+
+        return compact( 'result', 'errors' );
+    }
+
+    /**
+     * Commit changes in a SVN checkout.
+     *
+     * @static
+     *
+     * @param string $checkout The local folder to import into SVN.
+     * @param string $message  The commit message.
+     * @param array  $options  Any specific options to pass to SVN.
+     * @return array {
+     *     @type bool $result   The result of the operation.
+     *     @type int  $revision The revision imported.
+     * }
+     */
+    public static function commit( $checkout, $message, $options = array() ) {
+        $options[] = 'non-interactive';
+        $options['m'] = $message;
+        if ( empty( $options['username'] ) ) {
+            $options['username'] = PLUGIN_SVN_MANAGEMENT_USER;
+            $options['password'] = PLUGIN_SVN_MANAGEMENT_PASS;
+        }
+
+        $esc_options = self::parse_esc_parameters( $options );
+
+        $esc_checkout = escapeshellarg( $checkout );
+
+        $output = self::shell_exec( "svn commit $esc_options $esc_checkout 2>&1" );
+        if ( preg_match( '/Committed revision (?P<revision>\d+)[.]/i', $output, $m ) ) {
             $revision = (int) $m['revision'];
             $result   = true;

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php

@@ -11 +11 @@
 class Builder {
 
-    /**
-     * The base directory for the ZIP files.
-     * Zip files will be stored in a sub-directory, such as:
-     * /tmp/plugin-zipfiles/hello-dolly/hello-dolly.zip
-     */
-    const ZIP_DIR = '/tmp/plugin-zipfiles';
-    const SVN_URL = 'https://plugins.svn.wordpress.org';
-
-    public $zip_file = '';
-    public $md5_file = '';
-    protected $tmp_build_file = '';
+    const TMP_DIR = '/tmp/plugin-zip-builder';
+    const SVN_URL = 'http://plugins.svn.wordpress.org';
+    const ZIP_SVN_URL = PLUGIN_ZIP_SVN_URL;
+
+    protected $zip_file = '';
     protected $tmp_build_dir  = '';
-
-
-    /**
-     * Generate a ZIP for a provided Plugin Version.
-     *
-     * @param string $plugin_slug The Plugin slug
-     * @param string $version     The version to build (tag, or trunk)
-     */
-    public function __construct( $slug, $version ) {
-        if ( ! is_dir( self::ZIP_DIR ) ) {
-            mkdir( self::ZIP_DIR, 0777, true );
-            chmod( self::ZIP_DIR, 0777 );
-        }
-        if ( ! is_dir( self::ZIP_DIR . '/' . $slug ) ) {
-            mkdir( self::ZIP_DIR . '/' . $slug, 0777, true );
-            chmod( self::ZIP_DIR . '/' . $slug, 0777 );
-        }
-
-        $this->slug = $slug;
-        $this->version = $version;
-
-        if ( 'trunk' == $this->version ) {
-            $this->zip_file = self::ZIP_DIR . "/{$this->slug}/{$this->slug}.zip";
+    protected $tmp_dir = '';
+
+    protected $slug    = '';
+    protected $version = '';
+    protected $context = '';
+
+    /**
+     * Generate a ZIP for a provided Plugin versions.
+     *
+     * @param string $slug     The plugin slug.
+     * @param array  $versions The versions of the plugin to build ZIPs for.
+     * @param string $context  The context of this Builder instance (commit #, etc)
+     */
+    public function build( $slug, $versions, $context = '' ) {
+        // Bail when in an unconfigured environment.
+        if ( ! defined( 'PLUGIN_ZIP_SVN_URL' ) ) {
+            return false;
+        }
+
+        $this->slug     = $slug;
+        $this->versions = $versions;
+        $this->context  = $context;
+
+        // General TMP directory
+        if ( ! is_dir( self::TMP_DIR ) ) {
+            mkdir( self::TMP_DIR, 0777, true );
+            chmod( self::TMP_DIR, 0777 );
+        }
+
+        // Temp Directory for this instance of the Builder class.
+        $this->tmp_dir = $this->generate_temporary_directory( self::TMP_DIR, $slug );
+
+        // Create a checkout of the ZIP SVN
+        $res_checkout = SVN::checkout(
+            self::ZIP_SVN_URL,
+            $this->tmp_dir,
+            array(
+                'depth' => 'empty',
+                'username' => PLUGIN_ZIP_SVN_USER,
+                'password' => PLUGIN_ZIP_SVN_PASS,
+            )
+        );
+
+        if ( $res_checkout['result'] ) {
+
+            // Ensure the plugins folder exists within svn
+            $plugin_folder = "{$this->tmp_dir}/{$this->slug}/";
+            $res = SVN::up(
+                $plugin_folder,
+                array(
+                    'depth' => 'empty'
+                )
+            );
+            if ( ! is_dir( $plugin_folder ) ) {
+                mkdir( $plugin_folder, 0777, true );
+                $res = SVN::add( $plugin_folder );
+            }
+            if ( ! $res['result'] ) {
+                throw new Exception( __METHOD__ . ": Failed to create {$plugin_folder}." );
+            }
         } else {
-            $this->zip_file = self::ZIP_DIR . "/{$this->slug}/{$this->slug}.{$this->version}.zip";
-        }
-        $this->md5_file = $this->zip_file . '.md5';
-
-    }
-
-    /**
-     * Generate a ZIP for the plugin + version 
-     */
-    public function build() {
-        try {
-            $this->tmp_build_file = $this->generate_temporary_filename( dirname( $this->zip_file ), "tmp-{$this->slug}.{$this->version}", '.zip' );
-            $this->tmp_build_dir  = $this->tmp_build_file . '-files';
-            mkdir( $this->tmp_build_dir, 0777, true );
-
-            $this->export_plugin();
-            $this->fix_directory_dates();           
-            $this->generate_zip();
-            $this->move_into_place();
-            $this->generate_md5();
-
-            $this->cleanup();
-
-            return true;
-        } catch( Exception $e ) {
-            $this->cleanup();
-            throw $e;
-        }/* finally { // PHP 5.5+, meta.svn is limited to PHP 5.4 code still.
-            $this->cleanup();
-        }*/
-    }
-
-    /**
-     * Generates a temporary unique file in a given directory
+            throw new Exception( __METHOD__ . ": Failed to create checkout of {$svn_url}." );
+        }
+
+        // Build the requested ZIPs
+        foreach ( $versions as $version ) {
+            $this->version = $version;
+
+            if ( 'trunk' == $version ) {
+                $this->zip_file = "{$this->tmp_dir}/{$this->slug}/{$this->slug}.zip";
+            } else {
+                $this->zip_file = "{$this->tmp_dir}/{$this->slug}/{$this->slug}.{$version}.zip";
+            }
+
+            // Pull the ZIP file down we're going to modify, which may not already exist.
+            SVN::up( $this->zip_file );
+
+            try {
+
+                $this->tmp_build_dir  = $this->zip_file . '-files';
+                mkdir( $this->tmp_build_dir, 0777, true );
+
+                $this->export_plugin();
+                $this->fix_directory_dates();           
+                $this->generate_zip();
+                $this->cleanup_plugin_tmp();
+
+            } catch( Exception $e ) {
+                // In event of error, skip this file this time.
+                $this->cleanup_plugin_tmp();
+
+                // Perform an SVN up to revert any changes made.
+                SVN::up( $this->zip_file );
+                continue;
+            }
+
+            // Add the ZIP file to SVN - This is only really needed for new files which don't exist in SVN.
+            SVN::add( $this->zip_file );            
+        }
+
+        $res = SVN::commit(
+            $this->tmp_dir,
+            $this->context ? $this->context : "Updated ZIPs for {$this->slug}.",
+            array(
+                'username' => PLUGIN_ZIP_SVN_USER,
+                'password' => PLUGIN_ZIP_SVN_PASS,
+            )
+        );
+
+        $this->invalidate_zip_caches( $versions );
+
+        $this->cleanup();
+
+        if ( ! $res['result'] ) {
+            if ( $res['errors'] ) {
+                throw new Exception( __METHOD__ . ': Failed to commit the new ZIPs: ' . $res['errors'][0]['error_message'] );
+            } else {
+                throw new Exception( __METHOD__ . ': Commit failed without error, maybe there were no modified files?' );
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Generates a temporary unique directory in a given directory
      *
      * Performs a similar job to `tempnam()` with an added suffix and doesn't
@@ -92 +154 @@
      * @param string $suffix The file suffix, optional.
      *
-     * @return string Filename of unique temporary file.
-     */
-    protected function generate_temporary_filename( $dir, $prefix, $suffix = '' ) {
+     * @return string Path of unique temporary directory.
+     */
+    protected function generate_temporary_directory( $dir, $prefix, $suffix = '' ) {
         $i = 0;
         do {
@@ -106 +168 @@
 
         fclose( $fp );
+
+        // Convert file to directory.
+        unlink( $filename );
+        if ( ! mkdir( $filename, 0777, true ) ) {
+            throw new Exception( __METHOD__ . ': Could not convert temporary filename to directory.' );
+        }
+        chmod( $filename, 0777 );
 
         return $filename;
@@ -168 +237 @@
         ) );
         if ( ! $latest_file_modified_timestamp ) {
-            throw new Exception( _METHOD__ . ': Unable to locate the latest modified files timestamp.', 503 );
+            throw new Exception( __METHOD__ . ': Unable to locate the latest modified files timestamp.', 503 );
         }
 
@@ -182 +251 @@
      */
     protected function generate_zip() {
-        // We have to remove the temporary 0-byte file first as zip will complain about not being able to find the zip structures.
-        unlink( $this->tmp_build_file );
+        // If we're building an existing zip, remove the existing file first.
+        if ( file_exists( $this->zip_file ) ) {
+            unlink( $this->zip_file );
+        }
         $this->exec( sprintf(
             'cd %s && find %s -print0 | sort -z | xargs -0 zip -Xu %s 2>&1',
             escapeshellarg( $this->tmp_build_dir ),
             escapeshellarg( $this->slug ),
-            escapeshellarg( $this->tmp_build_file )
+            escapeshellarg( $this->zip_file )
         ), $zip_build_output, $return_value );
 
@@ -196 +267 @@
     }
 
-    /**
-     * Moves the completed ZIP into it's real-life location.
-     */
-    protected function move_into_place() {
-        $this->exec( sprintf(
-            'mv -f %s %s',
-            escapeshellarg( $this->tmp_build_file ),
-            escapeshellarg( $this->zip_file )
-        ), $output, $return_value );
-
-        if ( $return_value ) {
-            throw new Exception( __METHOD__ . ': Could not move ZIP into place.', 503 );
-        }
-    }
-
-    /**
-     * Generates the MD5 for the ZIP file used for serving.
-     *
-     * This can also be used for generating a package signature in the future.
-     */
-    protected function generate_md5() {
-        $this->exec( sprintf(
-            "md5sum %s | head -c 32 > %s",
-            escapeshellarg( $this->zip_file ),
-            escapeshellarg( $this->md5_file )
-        ), $output, $return_code );
-
-        if ( $return_code ) {
-            throw new Exception( __METHOD__ . ': Failed to create file checksum.', 503 );
+
+    /**
+     * Purge ZIP caches after ZIP building.
+     *
+     * @param array $versions The list of plugin versions of modified zips.
+     * @return bool
+     */
+    public function invalidate_zip_caches( $versions ) {
+        // TODO: Implement PURGE 
+        return true;
+        if ( ! defined( 'PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION' ) ) {
+            return true;
+        }
+
+        foreach ( $versions as $version ) {
+            if ( 'trunk' == $version ) {
+                $zip = "{$this->slug}/{$this->slug}.zip";
+            } else {
+                $zip = "{$this->slug}/{$this->slug}.{$version}.zip";
+            }
+
+            foreach ( $plugins_downloads_load_balancer /* TODO */ as $lb ) {
+                $url = 'http://' . $lb . PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION . $zip;
+                wp_remote_request(
+                    $url,
+                    array(
+                        'method' => 'PURGE',
+                    )
+                );
+            }
         }
     }
@@ -232 +304 @@
      */
     protected function cleanup() {
-        if ( $this->tmp_build_file && file_exists( $this->tmp_build_file ) ) {
-            unlink( $this->tmp_build_file );
-        }
+        if ( $this->tmp_dir ) {
+            $this->exec( sprintf( 'rm -rf %s', escapeshellarg( $this->tmp_dir ) ) );
+        }
+    }
+
+    /**
+     * Cleans up any temporary directories created by the ZIP builder for a specific build.
+     */
+    protected function cleanup_plugin_tmp() {
         if ( $this->tmp_build_dir ) {
             $this->exec( sprintf( 'rm -rf %s', escapeshellarg( $this->tmp_build_dir ) ) );

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-serve.php

@@ -13 +13 @@
 class Serve {
 
-    const ZIP_DIR = '/tmp/plugin-zipfiles';
-
     public function __construct() {
         try {
             $request = $this->determine_request();
 
-            // Serve & perhaps build if need be
-            $files = $this->get_files( $request );
-            if ( ! file_exists( $files['zip'] ) ) {
-                $builder = new Builder( $request['slug'], $request['version'] );
-                $builder->build();
-                clearstatcache();
-            }
-
-            $this->serve_zip( $files, $request );
+            $this->serve_zip( $request );
 
             if ( $request['args']['stats'] ) {
@@ -34 +24 @@
 
         } catch ( Exception $e )  {
-            $this->error( $e->getCode() );
+            $this->error();
         }
 
@@ -51 +41 @@
 
         if ( ! preg_match( "!^(?P<slug>[a-z0-9-]+)(.(?P<version>.+))?.zip$!i", $zip, $m ) ) {
-            throw new Exception( __METHOD__ . ": Invalid URL" );
+            throw new Exception( __METHOD__ . ": Invalid URL." );
         }
 
@@ -96 +86 @@
         }
         if ( ! $version ) {
-            throw new Exception( __METHOD__ . ": A version for $plugin_slug cannot be determined.", 404 );
+            throw new Exception( __METHOD__ . ": A version for $plugin_slug cannot be determined." );
         }
 
@@ -121 +111 @@
 
         if ( ! $post_id ) {
-            throw new Exception( __METHOD__ . ": A post_id for $plugin_slug cannot be determined.", 404 );
+            throw new Exception( __METHOD__ . ": A post_id for $plugin_slug cannot be determined." );
         }
 
@@ -133 +123 @@
      * @return array An array containing the files to use for the request, 'zip' and 'md5'.
      */
-    protected function get_files( $request ) {
+    protected function get_file( $request ) {
         if ( empty( $request['version'] ) || 'trunk' == $request['version'] ) {
-            $zip = self::ZIP_DIR . "/{$request['slug']}/{$request['slug']}.zip";
+            return "{$request['slug']}/{$request['slug']}.zip";
         } else {
-            $zip = self::ZIP_DIR . "/{$request['slug']}/{$request['slug']}.{$request['version']}.zip";
-        }
-        $md5 = $zip . '.md5';
-
-        return compact( 'zip', 'md5' );
+            return "{$request['slug']}/{$request['slug']}.{$request['version']}.zip";
+        }
     }
 
@@ -147 +134 @@
      * Output a ZIP file with all headers.
      *
-     * @param array $files {
-     *   Array of files for the request.
-     *
-     *   @type string $zip The Zip file to serve.
-     *   @type string $md5 The MD5 file to use for the Content-MD5 header. Optional.
-     * }
      * @param array $request The request array for the request.
      */
-    protected function serve_zip( $files, $request ) {
-        header( 'Content-Type: application/zip' );
-        header( 'Content-Disposition: attachment; filename=' . basename( $files['zip'] ) );
-        if ( !empty( $files['md5'] ) && ( $md5 = file_get_contents( $files['md5'] ) )  ) {
-            header( 'Content-MD5: ' . $md5 );
-        }
-
-        // TODO: Accel Redirect allows for ZIP files to be cached on the LB's
-        // header('X-Accel-Redirect: ' . $accel_redirect );
-
-        header( 'Content-Length: ' . filesize( $files['zip'] ) );
-        readfile( $files['zip'] );
+    protected function serve_zip( $request ) {
+        $zip = $this->get_file( $request );
+
+        if ( defined( 'PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION' ) ) {
+            $zip_url = PLUGIN_ZIP_X_ACCEL_REDIRECT_LOCATION . $zip;
+
+            header( 'Content-Type: application/zip' );
+            header( 'Content-Disposition: attachment; filename=' . basename( $zip ) );
+            header( "X-Accel-Redirect: $zip_url" );
+        } else {
+            header( 'Content-Type: text/plain' );
+            echo "This is a request for $zip, this server isn't currently configured to serve zip files.\n";
+        }
+
+        if ( function_exists( 'fastcgi_finish_request' ) ) {
+            fastcgi_finish_request();
+        }
+
     }
 
@@ -225 +212 @@
 
     /**
-     * Quit with an Error code.
-     *
-     * @param int $code The HTTP Error code, 404 or 503.
-     */
-    protected function error( $code = 404 ) {
+     * Bail with a 404.
+     */
+    protected function error() {
         $protocol = isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
         $protocol .= ' ';
-        switch ( $code ) {
-            case 503:
-                header( $protocol . '503 Service Unavailable' );
-                die( '503 Service Unavailable' );
-
-            default:
-            case 404:
-                header( $protocol . '404 File not found' );
-                die( '404 File not found' );
-        }
+
+        header( $protocol . '404 File not found' );
+        die( '404 file not found' );
     }