From 6163467536a78639769d673263df23bcb5ac4217 Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <josha.von.gizycki@triology.de>
Date: Tue, 16 Oct 2018 17:49:20 +0200
Subject: [PATCH] renaming things, add kibit to wanijo

---
 src/wanijo_pipeline/core.clj                  |  8 +++---
 src/wanijo_pipeline/pipeline.clj              | 19 --------------
 .../{steps.clj => wanijo_pipeline.clj}        | 25 +++++++++++++++++--
 3 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 src/wanijo_pipeline/pipeline.clj
 rename src/wanijo_pipeline/{steps.clj => wanijo_pipeline.clj} (63%)

diff --git a/src/wanijo_pipeline/core.clj b/src/wanijo_pipeline/core.clj
index d22890f..6c77d23 100644
--- a/src/wanijo_pipeline/core.clj
+++ b/src/wanijo_pipeline/core.clj
@@ -1,12 +1,12 @@
 (ns wanijo-pipeline.core
   (:require
-   [wanijo-pipeline.pipeline :as pipeline]
+   [wanijo-pipeline.wanijo-pipeline :as wp]
+   [wanijo-pipeline.formulare-pipeline :as fp]
    [wanijo-pipeline.ui-selection :as ui-selection]
    [org.httpkit.server :as http-kit]
    [lambdacd.runners :as runners]
    [lambdacd.core :as lambdacd]
-   [clojure.tools.logging :as log]
-   [wanijo-pipeline.formulare-pipeline :as fp])
+   [clojure.tools.logging :as log])
   (:import (java.nio.file.attribute FileAttribute)
            (java.nio.file Files LinkOption))
   (:gen-class))
@@ -17,7 +17,7 @@
     dir))
 
 (defn wanijo-pipeline []
-  (lambdacd/assemble-pipeline pipeline/pipeline-def
+  (lambdacd/assemble-pipeline wp/pipeline-def
                               {:home-dir (home-dir "wanijo")
                                :name "wanijo pipeline"}))
 
diff --git a/src/wanijo_pipeline/pipeline.clj b/src/wanijo_pipeline/pipeline.clj
deleted file mode 100644
index 63d44bb..0000000
--- a/src/wanijo_pipeline/pipeline.clj
+++ /dev/null
@@ -1,19 +0,0 @@
-(ns wanijo-pipeline.pipeline
-  (:use [lambdacd.steps.control-flow]
-        [wanijo-pipeline.steps])
-  (:require
-        [lambdacd.steps.manualtrigger :as manualtrigger]))
-
-(def pipeline-def
-  `((either
-     manualtrigger/wait-for-manual-trigger
-     wait-for-repo)
-    (with-workspace
-      clone
-      compile
-      (in-parallel
-       ancient
-       test
-       eastwood
-       bikeshed
-       cloverage))))
diff --git a/src/wanijo_pipeline/steps.clj b/src/wanijo_pipeline/wanijo_pipeline.clj
similarity index 63%
rename from src/wanijo_pipeline/steps.clj
rename to src/wanijo_pipeline/wanijo_pipeline.clj
index d1e7887..bc2939f 100644
--- a/src/wanijo_pipeline/steps.clj
+++ b/src/wanijo_pipeline/wanijo_pipeline.clj
@@ -1,5 +1,7 @@
-(ns wanijo-pipeline.steps
-  (:require [lambdacd.steps.shell :as lcd-shell]
+(ns wanijo-pipeline.wanijo-pipeline
+  (:require [lambdacd.steps.manualtrigger :as manualtrigger]
+            [lambdacd.steps.control-flow :as cf]
+            [lambdacd.steps.shell :as lcd-shell]
             [lambdacd-git.core :as lcd-git]))
 
 (def repo-uri "https://gitea.heevyis.ninja/josha/wanijo.git")
@@ -33,3 +35,22 @@
 
 (defn cloverage [args ctx]
   (lcd-shell/bash ctx (:cwd args) "lein cloverage --no-html"))
+
+(defn kibit [args ctx]
+  (lcd-shell/bash ctx (:cwd args) "lein kibit"))
+
+
+(def pipeline-def
+  `((cf/either
+     manualtrigger/wait-for-manual-trigger
+     wait-for-repo)
+    (cf/with-workspace
+      clone
+      compile
+      (cf/in-parallel
+       ancient
+       test
+       eastwood
+       bikeshed
+       cloverage
+       kibit))))