Merge branch 'master' of https://github.com/jayrhynas/SwiftyTimer into jayrhynas-master

Author: radex

Src/SwiftyTimer.swift

@@ -63,17 +63,29 @@ extension NSTimer {
 
     public class func after(interval: NSTimeInterval, _ block: () -> ()) -> NSTimer {
         let timer = NSTimer.new(after: interval, block)
-        NSRunLoop.currentRunLoop().addTimer(timer, forMode: NSDefaultRunLoopMode)
+        timer.start()
         return timer
     }
 
     /// Create and schedule a timer that will call `block` repeatedly in specified time intervals.
 
     public class func every(interval: NSTimeInterval, _ block: () -> ()) -> NSTimer {
         let timer = NSTimer.new(every: interval, block)
-        NSRunLoop.currentRunLoop().addTimer(timer, forMode: NSDefaultRunLoopMode)
+        timer.start()
         return timer
     }
+    
+    /// Schedule this timer on the specified run loop (defaults to the current run loop)
+    
+    public func start(onRunLoop runLoop: NSRunLoop = NSRunLoop.currentRunLoop(), forMode mode: String = NSDefaultRunLoopMode) {
+        runLoop.addTimer(self, forMode: mode)
+    }
+    
+    /// Invalidate this timer (provided to match `start`)
+    
+    public func stop() {
+        self.invalidate()
+    }
 }
 
 extension Double {

Tests/SwiftyTimerTests/main.swift

@@ -50,7 +50,22 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         NSRunLoop.currentRunLoop().addTimer(timer, forMode: NSDefaultRunLoopMode)
     }
 
+    var timer4: NSTimer!
+    
     func test5() {
+        var fired = false
+        timer4 = NSTimer.new(every: 0.1.seconds) {
+            if fired {
+                self.timer4.stop()
+                self.test6()
+            } else {
+                fired = true
+            }
+        }
+        timer4.start()
+    }
+
+    func test6() {
         NSTimer.after(0.1.seconds, done)
     }