<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3026] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Import plugin files to SVN upon approval.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3026">3026</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3026","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-04-27 18:01:49 +0000 (Wed, 27 Apr 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://meta.trac.wordpress.org/ticket/1570">#1570</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorytoolsclasssvnphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php 2016-04-27 17:33:39 UTC (rev 3025)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php 2016-04-27 18:01:49 UTC (rev 3026)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,20 +82,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_author = get_user_by( 'id', $post->post_author );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create SVN repo.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Read zip and add/commit files to svn.
- SVN::add( Filesystem::unzip( get_attached_file( $attachment->ID ) ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Delete zip.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_attachment( $attachment->ID, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,4 +152,28 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $email, $subject, $content, 'From: plugins@wordpress.org' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * 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;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorytoolsclasssvnphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php 2016-04-27 17:33:39 UTC (rev 3025)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php 2016-04-27 18:01:49 UTC (rev 3026)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class SVN {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function add( $dirs, $args = array() ) {
- return true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * 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' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +67,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = self::parse_svn_errors( $output );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return compact( 'result', 'revision', 'errors' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,10 +110,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function mkdir( $dirs, $args = array() ) {
- return true;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Parse and escape the provided SVN arguements for usage on the CLI.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '-' != substr( $key, 0, 1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = '-' . ( strlen( $key ) > 2 ? '-' : '' ) . $key;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $result[] = escapeshellarg( $key ) . ( $no_parameters ? '' : '=' . escapeshellarg( $value ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>