Integrated into run command.

ajoberstar · ajoberstar · commit 41ce855882e2 · 2013-09-12T20:33:17.000-05:00
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/cli/dsl/script/PipelineScript.groovy b/src/main/groovy/org/pipelinelabs/pipeline/cli/dsl/script/PipelineScript.groovy
@@ -3,7 +3,6 @@ package org.pipelinelabs.pipeline.cli.dsl.script
 import org.pipelinelabs.pipeline.dsl.PipelineDsl
 
 public abstract class PipelineScript extends Script {
-
     @Delegate
     private PipelineDsl pipeline;
 
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/AnnounceDsl.java b/src/main/groovy/org/pipelinelabs/pipeline/dsl/AnnounceDsl.java
@@ -1,7 +1,12 @@
 package org.pipelinelabs.pipeline.dsl;
 
+import java.util.List;
+
 import groovy.lang.Closure;
 
+import org.pipelinelabs.pipeline.messenger.MessageContext;
+
 public interface AnnounceDsl {
     void email(Closure config);
+    List<MessageContext> toContexts();
 }
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/EmailDsl.java b/src/main/groovy/org/pipelinelabs/pipeline/dsl/EmailDsl.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.pipelinelabs.pipeline.messenger.internal.EmailContext;
 
-public interface EmailDsl {
+public interface EmailDsl extends MessageContextDsl<EmailContext> {
     List<String> getTo();
     void to(String... to);
     void setTo(List<String> to);
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/EmailMessengerDsl.java b/src/main/groovy/org/pipelinelabs/pipeline/dsl/EmailMessengerDsl.java
@@ -7,6 +7,8 @@ public interface EmailMessengerDsl {
     void setHost(String host);
     int getPort();
     void setPort(int port);
+    boolean getTls();
+    void setTls(boolean tls);
     String getUsername();
     void setUsername(String username);
     String getPassword();
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/MessageContextDsl.java b/src/main/groovy/org/pipelinelabs/pipeline/dsl/MessageContextDsl.java
@@ -0,0 +1,7 @@
+package org.pipelinelabs.pipeline.dsl;
+
+import org.pipelinelabs.pipeline.messenger.MessageContext;
+
+public interface MessageContextDsl<T extends MessageContext> {
+    T toContext();
+}
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/MessengerDsl.java b/src/main/groovy/org/pipelinelabs/pipeline/dsl/MessengerDsl.java
@@ -2,6 +2,9 @@
 
 import groovy.lang.Closure;
 
+import org.pipelinelabs.pipeline.messenger.Messenger;
+
 public interface MessengerDsl {
     void email(Closure config);
+    Messenger toMessenger();
 }
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/PipelineDsl.java b/src/main/groovy/org/pipelinelabs/pipeline/dsl/PipelineDsl.java
@@ -9,7 +9,11 @@ public interface PipelineDsl {
 
     void echo(String format, Object... values);
 
+    // MessengerDsl getMessenger();
+
     MessengerDsl messenger(Closure closure);
 
+    // AnnounceDsl getAnnounce();
+
     AnnounceDsl announce(Closure closure);
 }
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultAnnounceDsl.groovy b/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultAnnounceDsl.groovy
@@ -1,17 +1,20 @@
 package org.pipelinelabs.pipeline.dsl.internal
 
 import org.pipelinelabs.pipeline.dsl.AnnounceDsl
+import org.pipelinelabs.pipeline.dsl.EmailDsl
 import org.pipelinelabs.pipeline.dsl.internal.DefaultEmailDsl
 import org.pipelinelabs.pipeline.messenger.MessageContext
+import org.pipelinelabs.pipeline.util.ConfigureUtil
 
 class DefaultAnnounceDsl implements AnnounceDsl {
-    private final List<MessageContext> contexts = []
+    final EmailDsl email = new DefaultEmailDsl()
 
     @Override
     void email(Closure config) {
-        new DefaultEmailDsl().with {
-            ConfigureUtil.configure(dsl, config)
-            contexts << dsl.toContext()
-        }
+        ConfigureUtil.configure(email, config)
+    }
+
+    List<MessageContext> toContexts() {
+        return [email].collect { it.toContext() }
     }
 }
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultEmailMessengerDsl.groovy b/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultEmailMessengerDsl.groovy
@@ -8,6 +8,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl
 class DefaultEmailMessengerDsl implements EmailMessengerDsl {
     String host
     int port
+    boolean tls = false
     String username
     String password
     String from
@@ -18,6 +19,10 @@ class DefaultEmailMessengerDsl implements EmailMessengerDsl {
             port = this.port
             username = this.username
             password = this.password
+            if (tls) {
+                javaMailProperties = new Properties()
+                javaMailProperties['mail.smtp.starttls.enable'] = 'true'
+            }
             it
         }
         return new EmailMessenger(sender, from)
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultMessengerDsl.groovy b/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultMessengerDsl.groovy
@@ -1,16 +1,22 @@
 package org.pipelinelabs.pipeline.dsl.internal
 
 import org.pipelinelabs.pipeline.messenger.Messenger
+import org.pipelinelabs.pipeline.messenger.internal.AggregateMessenger
 import org.pipelinelabs.pipeline.dsl.MessengerDsl
+import org.pipelinelabs.pipeline.dsl.EmailMessengerDsl
+import org.pipelinelabs.pipeline.dsl.internal.DefaultEmailMessengerDsl
+import org.pipelinelabs.pipeline.util.ConfigureUtil
 
 class DefaultMessengerDsl implements MessengerDsl {
-    private final List<Messenger> messengers = []
+    final EmailMessengerDsl email = new DefaultEmailMessengerDsl()
 
     @Override
     void email(Closure config) {
-        new DefaultEmailMessengerDsl().with {
-            ConfigureUtil.configure(dsl, config)
-            messengers << dsl.toMessenger()
-        }
+        ConfigureUtil.configure(email, config)
+    }
+
+    @Override
+    Messenger toMessenger() {
+        return new AggregateMessenger([email].collect { it.toMessenger() });
     }
 }
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultPipelineDsl.java b/src/main/groovy/org/pipelinelabs/pipeline/dsl/internal/DefaultPipelineDsl.java
@@ -5,21 +5,34 @@
 import org.pipelinelabs.pipeline.dsl.AnnounceDsl;
 import org.pipelinelabs.pipeline.dsl.MessengerDsl;
 import org.pipelinelabs.pipeline.dsl.StageDsl;
+import org.pipelinelabs.pipeline.event.PipeEvent;
+import org.pipelinelabs.pipeline.messenger.MessageContext;
 import org.pipelinelabs.pipeline.runner.DefaultPipeline;
 import org.pipelinelabs.pipeline.util.ConfigureUtil;
 
 import java.util.LinkedHashSet;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 public class DefaultPipelineDsl implements InternalPipelineDsl {
+    private final AnnounceDsl announce = new DefaultAnnounceDsl();
+    private final MessengerDsl messenger = new DefaultMessengerDsl();
     private Set<InternalStageDsl> stages = new LinkedHashSet<>();
+    private List<PipeEvent> events = new ArrayList<PipeEvent>();
 
     @Override
     public StageDsl stage(final String name, final Closure closure) {
         final InternalStageDsl stage = new DefaultStageDsl(name);
-        ConfigureUtil.configure(stage, closure);
-        stages.add(stage);
-        return stage;
+        try {
+            ConfigureUtil.configure(stage, closure);
+            events.add(new PipeEvent("ProjectName", "Success", stage.getDescription(), ""));
+            stages.add(stage);
+            return stage;
+        } catch (Exception e) {
+            events.add(new PipeEvent("ProjectName", "Failure", stage.getDescription(), e.getMessage()));
+            return stage;
+        }
     }
 
     @Override
@@ -41,16 +54,29 @@ public Pipeline export() {
         return pipeline;
     }
 
+    // @Override
+    // public AnnounceDsl getAnnounce() {
+    //     return announce;
+    // }
+
     @Override
     public AnnounceDsl announce(Closure closure) {
-        AnnounceDsl announce = new DefaultAnnounceDsl();
         ConfigureUtil.configure(announce, closure);
+        System.out.println("In announce");
+        for (MessageContext context : announce.toContexts()) {
+            System.out.println("In context");
+            messenger.toMessenger().process(context, events.get(events.size() - 1));
+        }
         return announce;
     }
 
+    // @Override
+    // public MessengerDsl getMessenger() {
+    //     return messenger;
+    // }
+
     @Override
     public MessengerDsl messenger(Closure closure) {
-        MessengerDsl messenger = new DefaultMessengerDsl();
         ConfigureUtil.configure(messenger, closure);
         return messenger;
     }
diff --git a/src/main/groovy/org/pipelinelabs/pipeline/event/PipeEvent.java b/src/main/groovy/org/pipelinelabs/pipeline/event/PipeEvent.java
@@ -1,8 +1,31 @@
 package org.pipelinelabs.pipeline.event;
 
-public interface PipeEvent {
-    String getName();
-    String getStatus();
-    String getDescription();
-    String getDetails();
+public class PipeEvent {
+    private final String name;
+    private final String status;
+    private final String description;
+    private final String details;
+
+    public PipeEvent(String name, String status, String description, String details) {
+        this.name = name;
+        this.status = status;
+        this.description = description;
+        this.details = details;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getDetails() {
+        return details;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@`
`2`	`2`
`3`	`3`	`import groovy.lang.Closure;`
`4`	`4`
	`5`	`+import org.pipelinelabs.pipeline.messenger.Messenger;`
	`6`	`+`
`5`	`7`	`public interface MessengerDsl {`
`6`	`8`	`void email(Closure config);`
	`9`	`+ Messenger toMessenger();`
`7`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,11 @@ public interface PipelineDsl {`
`9`	`9`
`10`	`10`	`void echo(String format, Object... values);`
`11`	`11`
	`12`	`+ // MessengerDsl getMessenger();`
	`13`	`+`
`12`	`14`	`MessengerDsl messenger(Closure closure);`
`13`	`15`
	`16`	`+ // AnnounceDsl getAnnounce();`
	`17`	`+`
`14`	`18`	`AnnounceDsl announce(Closure closure);`
`15`	`19`	`}`