Changeset 1078

Timestamp:

12/31/2014 04:48:29 PM (10 years ago)

Author:

nacin

Message:

Slack: Add hooks for processing tickets/comments from Trac.

Location:

sites/trunk/svn.wordpress.org

Files:

• bin/slack-commit-hook.php (modified) (1 diff)
• bin/slack-trac-hook.php (added)
• includes/slack-trac-hooks (moved) (moved from sites/trunk/svn.wordpress.org/includes/slack-commit-hook)
• includes/slack-trac-hooks/comments.php (added)
• includes/slack-trac-hooks/commits.php (copied) (copied from sites/trunk/svn.wordpress.org/includes/slack-commit-hook/sender.php) (3 diffs)
• includes/slack-trac-hooks/config.php (modified) (6 diffs)
• includes/slack-trac-hooks/sender.php (deleted)
• includes/slack-trac-hooks/trac.php (copied) (copied from sites/trunk/svn.wordpress.org/includes/slack-commit-hook/trac.php) (4 diffs)

sites/trunk/svn.wordpress.org/bin/slack-commit-hook.php

@@ -7 +7 @@
 }
 
-define( 'INC', dirname( __DIR__ ) . '/includes/slack-commit-hook/' );
-require INC . 'sender.php';
-require INC . 'trac.php';
-require INC . 'config.php';
+define( 'INC', dirname( __DIR__ ) . '/includes/slack-trac-hooks' );
+require INC . '/commits.php';
+require INC . '/trac.php';
+require INC . '/config.php';
 
 list( , $trac, $repo, $rev ) = $argv;
 
 $slack_hook = 'https://hooks.slack.com/services/...';
-$sender = new \SlackCommitHook\Sender( $trac, $repo, $rev, $slack_hook );
+$sender = new Dotorg\SlackTracHooks\Commits( $trac, $repo, $rev, $slack_hook );
 // $sender->use_test_channel( true );
 // $sender->set_svnlook_executable( ... );

sites/trunk/svn.wordpress.org/includes/slack-trac-hooks/commits.php

@@ -1 +1 @@
 <?php
 
-namespace SlackCommitHook;
+namespace Dotorg\SlackTracHooks;
 
-class Sender {
+class Commits {
     protected $trac;
     protected $repo;
@@ -29 +29 @@
     public function run() {
         $payload = $this->generate_payload();
-        foreach ( $this->trac->get_channels( $this->svnlook( 'changed' ) ) as $channel ) {
+        foreach ( $this->trac->get_commit_channels( $this->svnlook( 'changed' ) ) as $channel ) {
             $this->send( $channel, $payload );
         }
@@ -46 +46 @@
         $revision = 'r' . $this->rev;
 
-        $username = $this->trac->get_username();
+        $username = $this->trac->get_commit_username();
         $emoji    = $this->trac->get_emoji();
         $color    = $this->trac->get_color();

sites/trunk/svn.wordpress.org/includes/slack-trac-hooks/config.php

@@ -1 +1 @@
 <?php
 
-namespace SlackCommitHook;
+namespace Dotorg\SlackTracHooks;
 
 class Core_Trac extends Trac {
-    protected $channels = array( '#core', '#core-commits' );
-    protected $username = 'WordPress commit';
+    protected $commit_channels = array( '#core', '#core-commits' );
+    protected $commit_username = 'WordPress commit';
+    protected $commit_range = array( 3, 5 );
     protected $ticket_range = array( 3, 5 );
-    protected $commit_range = array( 3, 5 );
+
+    protected $ticket_channels  = array( '#core', '#core-newtickets' );
+    protected $ticket_username  = 'WordPress Trac';
+    protected $firehose_channel = '#core-firehose';
 
     /**
@@ -13 +17 @@
      * Start regex matches with # as your delimiter.
      */
-    protected $channel_matcher = array(
+    protected $commit_path_filters = array(
         'wp-content/themes'       => '#core-themes',
         'customize'               => '#core-customize',
@@ -21 +25 @@
         'press-this.php'          => '#feature-pressthis',
     );
+
+    /**
+     * Components or focuses that cause new tickets to be piped to particular channels.
+     */
+    protected $ticket_component_filters = array(
+        'Customize'     => '#core-customize',
+        'Bundled Theme' => '#core-themes',
+        'Press This'    => '#feature-pressthis',
+    );
 }
 
 class Meta_Trac extends Trac {
-    protected $channels = array( '#meta', '#meta-commits' );
-    protected $username = 'WordPress.org Meta commit';
+    protected $commit_channels = array( '#meta', '#meta-commits' );
+    protected $commit_username = 'WordPress.org Meta commit';
 
-    protected $channel_matcher = array(
+    protected $ticket_channels = array( '#meta-newtickets' );
+
+    protected $commit_path_filters = array(
         'translate.wordpress.org/' => '#meta-i18n',
         'global.wordpress.org/'    => '#meta-i18n',
@@ -34 +49 @@
         'wporg-developer/'         => '#meta-devhub',
     );
+
+    protected $ticket_component_filters = array(
+        'International Forums'          => '#meta-i18n',
+        'International Sites (Rosetta)' => '#meta-i18n',
+        'translate.wordpress.org'       => '#meta-i18n',
+        'developer.wordpress.org'       => '#meta-devhub',
+    );
 }
 
 class bbPress_Trac extends Trac {
-    protected $channels = array( '#bbpress', '#bbpress-commits' );
-    protected $username = 'bbPress commit';
+    protected $commit_channels = array( '#bbpress', '#bbpress-commits' );
+    protected $commit_username = 'bbPress commit';
+    protected $ticket_channels = array( '#bbpress', '#bbpress-newtickets' );
     protected $color    = '#080';
     protected $emoji    = ':bbpress:';
@@ -44 +67 @@
 
 class BuddyPress_Trac extends Trac {
-    protected $channels = array( '#buddypress', '#buddypress-commits' );
-    protected $username = 'BuddyPress commit';
+    protected $commit_channels = array( '#buddypress', '#buddypress-commits' );
+    protected $commit_username = 'BuddyPress commit';
+    protected $ticket_channels = array( '#buddypress', '#buddypress-newtickets' );
     protected $color    = '#d84800';
     protected $emoji    = ':buddypress:';
@@ -51 +75 @@
 
 class Dotorg_Trac extends Trac {
-    protected $channels = 'dotorg';
-    protected $username = 'Private dotorg commit';
+    protected $commit_channels = 'dotorg';
+    protected $commit_username = 'Private dotorg commit';
+    protected $ticket_channels = 'dotorg';
 }
 
 class Deploy_Trac extends Trac {
-    protected $channels = 'dotorg';
-    protected $username = 'Deploy commit';
+    protected $commit_channels = 'dotorg';
+    protected $commit_username = 'Deploy commit';
+    protected $ticket_channels = 'dotorg';
 }
 
 class GlotPress_Trac extends Trac {
-    protected $channels = '#glotpress';
-    protected $username = 'GlotPress commit';
+    protected $commit_channels = '#glotpress';
+    protected $commit_username = 'GlotPress commit';
+    protected $ticket_channels = '#glotpress';
 }

sites/trunk/svn.wordpress.org/includes/slack-trac-hooks/trac.php

@@ -1 +1 @@
 <?php
 
-namespace SlackCommitHook;
+namespace Dotorg\SlackTracHooks;
 
 abstract class Trac {
-    protected $channels = '#test';
-    protected $username = 'Commit';
+    protected $commit_channels = '#test';
+    protected $commit_username = 'Commit';
+    protected $ticket_channels = '#test';
+    protected $ticket_username;
+
+    protected $firehose_channel = false;
+
     protected $color    = '#21759b';
     protected $emoji    = ':wordpress:';
@@ -15 +20 @@
 
     function __construct() {
-        // 'SlackCommitHook\Core_Trac' => 'core'
-        $this->trac = strtolower( str_replace( array( __NAMESPACE__, '\\', '_Trac' ), '', get_class( $this ) ) );
+        // 'Dotorg\SlackTracHooks\Core_Trac' => 'Core_Trac'
+        $class = str_replace( __NAMESPACE__ . '\\', '', get_class( $this ) );
+
+        // 'Core_Trac' => 'core'
+        $this->trac = strtolower( str_replace( '_Trac', '', $class ) );
+
+        if ( ! isset( $this->ticket_username ) ) {
+            // 'Core_Trac' => 'Core Trac'
+            $this->ticket_username = str_replace( '_', ' ', $class );
+        }
     }
 
-    function get_username() {
-        return $this->username;
+    function get_commit_username() {
+        return $this->commit_username;
+    }
+
+    function get_ticket_username() {
+        return $this->ticket_username;
     }
 
@@ -57 +74 @@
     }
 
-    function get_channels( $changed_files = null ) {
-        $channels = (array) $this->channels;
+    function get_commit_channels( $changed_files = null ) {
+        $channels = (array) $this->commit_channels;
 
-        if ( empty( $this->channel_matcher ) || empty( $changed_files ) ) {
+        if ( isset( $this->firehose_channel ) ) {
+            $channels[] = $this->firehose_channel;
+        }
+
+        if ( empty( $this->commit_path_filters ) || empty( $changed_files ) ) {
             return $channels;
         }
 
-        foreach ( $this->channel_matcher as $needle => $channels_to_add ) {
+        foreach ( $this->commit_path_filters as $needle => $channels_to_add ) {
             if ( $needle[0] === '#' ) {
                 // Append PCRE_MULTILINE so ^ and $ refer to individual lines.
@@ -74 +95 @@
             }
         }
+    
         return $channels;
     }
+
+    function get_ticket_channels( $ticket = null ) {
+        $channels = (array) $this->ticket_channels;
+
+        if ( isset( $this->firehose_channel ) ) {
+            $channels[] = $this->firehose_channel;
+        }
+
+        if ( empty( $this->ticket_component_filters ) || empty( $ticket ) ) {
+            return $channels;
+        }
+
+        if ( isset( $ticket->component ) && isset( $this->ticket_component_filters[ $ticket->component ] ) ) {
+            $channels = array_merge( $channels, (array) $this->ticket_component_filters[ $ticket->component ] );
+        }
+
+        if ( isset( $ticket->focuses ) ) {
+            foreach ( explode( ', ', $ticket->focuses ) as $focus ) {
+                if ( isset( $this->ticket_component_filters[ $focus ] ) ) {
+                    $channels = array_merge( $channels, (array) $this->ticket_component_filters[ $focus ] );
+                }
+            }
+        }
+        return $channels;
+    }
+
+    function get_firehose_channel() {
+        return $this->firehose_channel;
+    }
 }
+