Merge pull request #32 from linkedin/small-bug-fixes

Small bug fixes

Author: ob

Bluepill-cli/Bluepill-cli/Bluepill/Bluepill.m

@@ -202,7 +202,8 @@ - (void)createSimulatorWithContext:(BPExecutionContext *)context {
 
     handler.beginWith = ^{
         [[BPStats sharedStats] endTimer:stepName];
-        [BPUtils printInfo:(__handler.error ? FAILED : INFO) withString:[@"Completed: " stringByAppendingString:stepName]];
+        [BPUtils printInfo:(__handler.error ? FAILED : INFO)
+                withString:[NSString stringWithFormat:@"Completed: %@ %@", stepName, context.runner.UDID]];
     };
 
     handler.onSuccess = ^{

Bluepill-cli/Bluepill-cli/Simulator/SimulatorRunner.h

@@ -17,6 +17,7 @@
 @interface SimulatorRunner : NSObject
 
 @property (nonatomic, assign, readonly) BOOL needsRetry;
+@property (nonatomic, readonly) NSString *UDID;
 
 + (instancetype)simulatorRunnerWithConfiguration:(BPConfiguration *)config;
 

Bluepill-cli/Bluepill-cli/Simulator/SimulatorRunner.m

@@ -324,4 +324,8 @@ - (BPExitStatus)exitStatus {
     return ([self.monitor exitStatus]);
 }
 
+- (NSString *)UDID {
+    return [self.device.UDID UUIDString];
+}
+
 @end

Bluepill-runner/Bluepill-runner/BPRunner.m

@@ -21,11 +21,6 @@
 
 void onInterrupt(int ignore) {
     interrupted ++;
-    if (interrupted >=5) {
-        fprintf(stderr, "You really want to terminate, OK!\n");
-        exit(0);
-    }
-    fprintf(stderr, "Received interrupt (Ctrl-C) %d times, waiting for child processes to finish.\n", interrupted);
 }
 
 int
@@ -163,8 +158,17 @@ - (int)run {
     int seconds = 0;
     __block NSMutableArray *taskList = [[NSMutableArray alloc] init];
     self.nsTaskList = [[NSMutableArray alloc] init];
+    int old_interrupted = interrupted;
     while (1) {
         if (interrupted) {
+            if (interrupted >=5) {
+                [BPUtils printInfo:ERROR withString:@"You really want to terminate, OK!"];
+                exit(0);
+            }
+            if (interrupted != old_interrupted) {
+                [BPUtils printInfo:WARNING withString:[NSString stringWithFormat:@"Received interrupt (Ctrl-C) %d times, waiting for child processes to finish.", interrupted]];
+                old_interrupted = interrupted;
+            }
             [self interrupt];
         }
         if (([bundles count] == 0 && launchedTasks == 0) || (interrupted && launchedTasks == 0)) break;