Changeset 3373

Timestamp:

06/15/2016 04:47:04 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Add a SVN watching script to process & import plugins to the plugin directory after each commit.

This doesn't act as a post-commit hook, but instead is designed to be run in an endless loop.

See #1720

Location:

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

Files:

• bin/import-plugin.php (modified) (3 diffs)
• bin/svn-watcher.php (added)
• cli/class-import.php (modified) (4 diffs)
• cli/class-svn-watcher.php (added)

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

@@ -9 +9 @@
 ob_start();
 
-$opts = getopt( '', array( 'url:', 'abspath:', 'plugin:' ) );
+$opts = getopt( '', array( 'url:', 'abspath:', 'plugin:', 'changed-tags:' ) );
 
 // Guess the default parameters:
@@ -21 +21 @@
 if ( empty( $opts['abspath'] ) && false !== strpos( __DIR__, 'wp-content' ) ) {
         $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'] );
 }
 
@@ -47 +53 @@
 }
 
-$plugin_slug = $opts['plugin'];
+$plugin_slug  = $opts['plugin'];
+$changed_tags = $opts['changed-tags'];
+$start_time   = microtime(1);
 
 echo "Processing Import for $plugin_slug... ";
 try {
         $importer = new CLI\Import;
-        $importer->import_from_svn( $plugin_slug );
-        echo "OK\n";
+        $importer->import_from_svn( $plugin_slug, $changed_tags );
+        echo "OK. Took " . round( microtime(1) - $start_time, 2 )  . "s\n";
 } catch( \Exception $e ) {
-        echo "Failed.\n";
+        echo "Failed. Took " . round( microtime(1) - $start_time, 2 )  . "s\n";
+
         fwrite( STDERR, "[{$plugin_slug}] Plugin Import Failed: " . $e->getMessage() . "\n" );
         exit(1);

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

@@ -23 +23 @@
                 'tested',
                 'requires',
-                'stable_tag',
                 'donate_link',
                 'upgrade_notice',
@@ -46 +45 @@
          * @throws \Exception
          *
-         * @param string $plugin_slug The slug of the plugin to import.
-         */
-        public function import_from_svn( $plugin_slug ) {
+         * @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' ) ) {
                 global $wpdb;
 
@@ -152 +152 @@
                         }
 
-                        if ( 'stable_tag' == $readme_field ) {
-                                // The stable_tag needs to come from the trunk readme at all times.
-                                $value = $stable_tag;
-                        } else {
-                                $value = $readme->$readme_field;
-                        }
-
-                        update_post_meta( $plugin->ID, $readme_field, wp_slash( $value ) );
+                        update_post_meta( $plugin->ID, $readme_field, wp_slash( $readme->$readme_field ) );
                 }
 
@@ -190 +183 @@
                         }
                 }
+
+                $current_stable_tag = get_post_meta( $plugin->ID, 'stable_tag', true );
+
+                $this->rebuild_invalidate_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags );
+
+                // Finally, set the new version live.
+                update_post_meta( $plugin->ID, 'stable_tag', $stable_tag );
+        }
+
+        /**
+         * 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' == $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.
         }