Merge pull request #204 from Centril/various-improvements

Fix #201 (Controllable auto-close/postpone behavior)

Author: Centril

.gitignore

@@ -6,3 +6,4 @@ target
 *.log
 .envrc
 *~
+rls/

teams.toml renamed to rfcbot.toml

@@ -1,4 +1,16 @@
-[T-core]
+[fcp_behaviors]
+
+[fcp_behaviors."rust-lang/rfcs"]
+close = true
+postpone = true
+
+[fcp_behaviors."rust-lang/rust"]
+close = false
+postpone = false
+
+[teams]
+
+[teams.T-core]
 name = "Core"
 ping = "rust-lang/core"
 members = [
@@ -14,7 +26,7 @@ members = [
   "Mark-Simulacrum",
 ]
 
-[T-lang]
+[teams.T-lang]
 name = "Language"
 ping = "rust-lang/lang"
 members = [
@@ -29,7 +41,7 @@ members = [
   "scottmcm",
 ]
 
-[T-libs]
+[teams.T-libs]
 name = "Libraries"
 ping = "rust-lang/libs"
 members = [
@@ -42,7 +54,7 @@ members = [
   "SimonSapin",
 ]
 
-[T-compiler]
+[teams.T-compiler]
 name = "Compiler"
 ping = "rust-lang/compiler"
 members = [
@@ -59,7 +71,7 @@ members = [
   "oli-obk",
 ]
 
-[T-doc]
+[teams.T-doc]
 name = "Documentation"
 ping = "rust-lang/docs"
 members = [
@@ -69,7 +81,7 @@ members = [
   "steveklabnik",
 ]
 
-[T-infra]
+[teams.T-infra]
 name = "Infrastructure"
 ping = "rust-lang/infra"
 members = [
@@ -84,7 +96,7 @@ members = [
   "TimNN",
 ]
 
-[T-cargo]
+[teams.T-cargo]
 name = "Cargo"
 ping = "rust-lang/cargo"
 members = [
@@ -97,7 +109,7 @@ members = [
   "wycats",
 ]
 
-[T-dev-tools]
+[teams.T-dev-tools]
 name = "Dev tools"
 ping = "rust-lang/dev-tools"
 members = [
@@ -110,7 +122,7 @@ members = [
   "steveklabnik",
 ]
 
-[T-dev-tools-rustdoc]
+[teams.T-dev-tools-rustdoc]
 name = "Rustdoc"
 ping = "rust-lang/rustdoc"
 members = [
@@ -121,7 +133,7 @@ members = [
   "steveklabnik",
 ]
 
-[T-IDEs]
+[teams.T-IDEs]
 name = "IDEs and editors"
 ping = "rust-lang/IDEs"
 members = [

src/github/nag.rs

@@ -14,7 +14,7 @@ use domain::rfcbot::{FcpConcern, FcpProposal, FcpReviewRequest, FeedbackRequest,
 use domain::schema::*;
 use error::*;
 use github::models::CommentFromJson;
-use teams::TEAMS;
+use teams::SETUP;
 use super::GH;
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash)]
@@ -464,24 +464,31 @@ fn evaluate_nags() -> DashResult<()> {
     Ok(())
 }
 
-fn execute_ffcp_actions(issue: &Issue, disposition: FcpDisposition) {
-    if !is_rfc_repo(&issue) { return; }
+fn can_ffcp_close(issue: &Issue) -> bool {
+    SETUP.should_ffcp_auto_close(&issue.repository)
+}
+
+fn can_ffcp_postpone(issue: &Issue) -> bool {
+    SETUP.should_ffcp_auto_postpone(&issue.repository)
+}
 
+fn execute_ffcp_actions(issue: &Issue, disposition: FcpDisposition) {
     match disposition {
         FcpDisposition::Merge => {
             // TODO: This one will require a lot of work to
             // auto-merge RFCs and create the tracking issue.
         },
-        FcpDisposition::Close => {
+        FcpDisposition::Close if can_ffcp_close(issue) => {
             let _ = issue.add_label(Label::Closed);
             issue.remove_label(Label::DispositionClose);
             issue.close();
         },
-        FcpDisposition::Postpone => {
+        FcpDisposition::Postpone if can_ffcp_postpone(issue) => {
             let _ = issue.add_label(Label::Postponed);
             issue.remove_label(Label::DispositionPostpone);
             issue.close();
         },
+        _ => {},
     }
 }
 
@@ -566,9 +573,9 @@ fn subteam_members(issue: &Issue) -> DashResult<Vec<GitHubUser>> {
 
     // retrieve all of the teams tagged on this issue
     // cannot WAIT for by-ref/by-val inference
-    let member_logins = TEAMS.iter()
+    let member_logins = SETUP.teams()
         .filter(|&(ref label, _)| issue.labels.contains(&label.0))
-        .flat_map(|(_, team)| &team.member_logins)
+        .flat_map(|(_, team)| team.member_logins())
         .collect::<BTreeSet<_>>()
         .into_iter() // diesel won't work with btreeset, and dedup has weird lifetime errors
         .collect::<Vec<_>>();
@@ -1028,10 +1035,6 @@ enum CommentType<'a> {
     },
 }
 
-fn is_rfc_repo(issue: &Issue) -> bool {
-    issue.repository == "rust-lang/rfcs"
-}
-
 impl<'a> RfcBotComment<'a> {
     fn new(issue: &'a Issue, comment_type: CommentType<'a>) -> RfcBotComment<'a> {
 
@@ -1146,16 +1149,15 @@ impl<'a> RfcBotComment<'a> {
                 Self::add_comment_url(issue, &mut msg, status_comment_id);
                 msg.push_str("), is now **complete**.");
 
-                if is_rfc_repo(issue) {
-                    match disposition {
-                        FcpDisposition::Merge => {}
-                        FcpDisposition::Close => {
-                            msg.push_str("\n\nBy the power vested in me by Rust, I hereby close this RFC.");
-                        },
-                        FcpDisposition::Postpone => {
-                            msg.push_str("\n\nBy the power vested in me by Rust, I hereby postpone this RFC.");
-                        },
-                    }
+                match disposition {
+                    FcpDisposition::Merge => {}
+                    FcpDisposition::Close if can_ffcp_close(issue) => {
+                        msg.push_str("\n\nBy the power vested in me by Rust, I hereby close this RFC.");
+                    },
+                    FcpDisposition::Postpone if can_ffcp_postpone(issue) => {
+                        msg.push_str("\n\nBy the power vested in me by Rust, I hereby postpone this RFC.");
+                    },
+                    _ => {},
                 }
 
                 if !added_label {

src/main.rs

@@ -72,7 +72,7 @@ fn main() {
     let _ = DB_POOL.get().expect("Unable to test connection pool.");
 
     // we want to panic if we're unable to find any of the usernames
-    let parsed_teams = teams::TEAMS.keys().collect::<Vec<_>>();
+    let parsed_teams = teams::SETUP.team_labels().collect::<Vec<_>>();
     info!("parsed teams: {:?}", parsed_teams);
 
     // FIXME(anp) need to handle panics in both the listeners and crash the server