Upgrade to new Chameleon

.travis.yml

@@ -6,4 +6,4 @@ sudo: required
 dist: trusty
 osx_image: xcode8
 script:
-  - eval "$(curl -sL https://raw.githubusercontent.com/ChameleonBot/Scripts/master/ci_3.0.1)"
+  - eval "$(curl -sL https://raw.githubusercontent.com/ChameleonBot/Scripts/master/ci)"

Package.swift

@@ -1,16 +1,11 @@
+// swift-tools-version:3.1
+
 import PackageDescription
 
 let package = Package(
     name: "Camille",
-    targets: [
-        Target(
-            name: "Camille",
-            dependencies: []
-        )
-    ],
     dependencies: [
-        .Package(url: "https://github.com/ChameleonBot/Bot.git", majorVersion: 0, minor: 2),
-        .Package(url: "https://github.com/ChameleonBot/Sugar.git", majorVersion: 0, minor: 2)
+        .Package(url: "https://github.com/ChameleonBot/Chameleon.git", majorVersion: 1),
     ],
     exclude: [
         "XcodeProject"

Sources/Camille/Configs/Configs+CrossPostService.swift

@@ -1,21 +1,21 @@
-import Sugar
-
-extension Configs {
-    static let CrossPost = CrossPostServiceConfig(
-        timeSpan: 60 * 2,
-        includeMessage: { message in
-            return message.text.components(separatedBy: " ").count > 5
-        },
-        reportingTarget: "admins",
-        publicWarning: { channel, user in
-            return try SlackMessage()
-                .line(user, " cross posting is discouraged.")
-                .makeChatPostMessage(target: channel)
-        },
-        privateWarning: { im in
-            return try SlackMessage()
-                .line("Please refrain from cross posting, it is discouraged here.")
-                .makeChatPostMessage(target: im)
-        }
-    )
-}
+//import Sugar
+//
+//extension Configs {
+//    static let CrossPost = CrossPostServiceConfig(
+//        timeSpan: 60 * 2,
+//        includeMessage: { message in
+//            return message.text.components(separatedBy: " ").count > 5
+//        },
+//        reportingTarget: "admins",
+//        publicWarning: { channel, user in
+//            return try SlackMessage()
+//                .line(user, " cross posting is discouraged.")
+//                .makeChatPostMessage(target: channel)
+//        },
+//        privateWarning: { im in
+//            return try SlackMessage()
+//                .line("Please refrain from cross posting, it is discouraged here.")
+//                .makeChatPostMessage(target: im)
+//        }
+//    )
+//}

Sources/Camille/Configs/Configs+KarmaService.swift

@@ -1,16 +1,16 @@
-import Sugar
-
-extension Configs {
-    static let Karma = KarmaService.Config(
-        topUsersLimit: 20,
-        karmaAdjusters: [("++", 1), ("--", -1)],
-        textDistanceThreshold: 4,
-        allowedBufferCharacters: [" ", ":"],
-        positiveMessage: { user, total in
-            return ["\(user.name) you rock!: \(total)"]
-        },
-        negativeMessage: { user, total in
-            return ["Boooo \(user.name)!: \(total)"]
-        }
-    )
-}
+//import Sugar
+//
+//extension Configs {
+//    static let Karma = KarmaService.Config(
+//        topUsersLimit: 20,
+//        karmaAdjusters: [("++", 1), ("--", -1)],
+//        textDistanceThreshold: 4,
+//        allowedBufferCharacters: [" ", ":"],
+//        positiveMessage: { user, total in
+//            return ["\(user.name) you rock!: \(total)"]
+//        },
+//        negativeMessage: { user, total in
+//            return ["Boooo \(user.name)!: \(total)"]
+//        }
+//    )
+//}

Sources/Camille/Configs/Configs+TopicService.swift

@@ -1,14 +1,14 @@
-import Sugar
-
-extension Configs {
-    static let Topic = TopicServiceConfig(
-        userAllowed: { user in
-            return user.is_admin
-        },
-        warning: { channel, user in
-            return try SlackMessage()
-                .line("I can't let you do that, ", user, ". Only admins are allowed to change the topic.")
-                .makeChatPostMessage(target: channel)
-        }
-    )
-}
+//import Sugar
+//
+//extension Configs {
+//    static let Topic = TopicServiceConfig(
+//        userAllowed: { user in
+//            return user.is_admin
+//        },
+//        warning: { channel, user in
+//            return try SlackMessage()
+//                .line("I can't let you do that, ", user, ". Only admins are allowed to change the topic.")
+//                .makeChatPostMessage(target: channel)
+//        }
+//    )
+//}

Sources/Camille/Configs/Configs+UserJoinService.swift

@@ -1,9 +1,9 @@
-import Sugar
-
-extension Configs {
-    static let UserJoin = UserJoinConfig(newUserAnnouncement: { im in
-        return try SlackMessage()
-            .line("Hi, ", im.user, ", welcome to the ios-developer slack team!")
-            .makeChatPostMessage(target: im)
-    })
-}
+//import Sugar
+//
+//extension Configs {
+//    static let UserJoin = UserJoinConfig(newUserAnnouncement: { im in
+//        return try SlackMessage()
+//            .line("Hi, ", im.user, ", welcome to the ios-developer slack team!")
+//            .makeChatPostMessage(target: im)
+//    })
+//}

Sources/Camille/Configs/Configs.swift

@@ -1,2 +1,2 @@
-
-enum Configs { }
+//
+//enum Configs { }

Sources/Camille/CrossPost/CrossPostButton.swift

@@ -1,24 +1,24 @@
-
-enum CrossPostButton: String {
-    case privateWarning
-    case publicWarning
-    case removeAll
-
-    var text: String {
-        switch self {
-        case .privateWarning: return "Private Warning"
-        case .publicWarning: return "Public Warning"
-        case .removeAll: return "Remove all posts"
-        }
-    }
-
-    var afterExecuted: [CrossPostButton] {
-        switch self {
-        case .privateWarning: return [.removeAll]
-        case .publicWarning: return [.removeAll]
-        case .removeAll: return [.privateWarning, .publicWarning]
-        }
-    }
-
-    static var all: [CrossPostButton] { return [.privateWarning, .publicWarning, .removeAll] }
-}
+//
+//enum CrossPostButton: String {
+//    case privateWarning
+//    case publicWarning
+//    case removeAll
+//    
+//    var text: String {
+//        switch self {
+//        case .privateWarning: return "Private Warning"
+//        case .publicWarning: return "Public Warning"
+//        case .removeAll: return "Remove all posts"
+//        }
+//    }
+//    
+//    var afterExecuted: [CrossPostButton] {
+//        switch self {
+//        case .privateWarning: return [.removeAll]
+//        case .publicWarning: return [.removeAll]
+//        case .removeAll: return [.privateWarning, .publicWarning]
+//        }
+//    }
+//    
+//    static var all: [CrossPostButton] { return [.privateWarning, .publicWarning, .removeAll] }
+//}