From 4c9e8afac7579d5f6ba44d4abf9583e473e4c2e1 Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Wed, 3 May 2017 16:08:10 -0400
Subject: [PATCH] Refactoring

---
 src/edu/internet2/jenkins/DockerBuild.groovy | 10 ++++++++--
 vars/imagename.groovy                        |  3 ---
 vars/maintainer.groovy                       |  3 ---
 vars/readCommonBash.groovy                   |  4 ----
 vars/tag.groovy                              |  4 ----
 5 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 vars/imagename.groovy
 delete mode 100644 vars/maintainer.groovy
 delete mode 100644 vars/readCommonBash.groovy
 delete mode 100644 vars/tag.groovy

diff --git a/src/edu/internet2/jenkins/DockerBuild.groovy b/src/edu/internet2/jenkins/DockerBuild.groovy
index d36b4b4..2f1cf14 100644
--- a/src/edu/internet2/jenkins/DockerBuild.groovy
+++ b/src/edu/internet2/jenkins/DockerBuild.groovy
@@ -26,12 +26,18 @@ class DockerBuild implements Serializable {
   }
   
   def maintainer() {
-    readCommonBash('maintainer')
+    def m = readCommonBash('maintainer')
+    if(m == null){
+      throw "Maintainer must be defined in common.bash"
+    }else{
+      m
+    }
+    
   }
   
   def readCommonBash(String key = 'maintainer') {
     def matcher = config =~ (key + '="(.+)"')
-    matcher ? matcher[0][1] : 'null'
+    matcher ? matcher[0][1] : null
   }
   
   def build(args){
diff --git a/vars/imagename.groovy b/vars/imagename.groovy
deleted file mode 100644
index 785dee0..0000000
--- a/vars/imagename.groovy
+++ /dev/null
@@ -1,3 +0,0 @@
-def call() {
-  readCommonBash('imagename')
-}
\ No newline at end of file
diff --git a/vars/maintainer.groovy b/vars/maintainer.groovy
deleted file mode 100644
index 352daa8..0000000
--- a/vars/maintainer.groovy
+++ /dev/null
@@ -1,3 +0,0 @@
-def call() {
-  readCommonBash('maintainer')
-}
\ No newline at end of file
diff --git a/vars/readCommonBash.groovy b/vars/readCommonBash.groovy
deleted file mode 100644
index dff621c..0000000
--- a/vars/readCommonBash.groovy
+++ /dev/null
@@ -1,4 +0,0 @@
-def call(String key = 'maintainer') {
-  def matcher = readFile('common.bash') =~ (key + '="(.+)"')
-  matcher ? matcher[0][1] : 'null'
-}
\ No newline at end of file
diff --git a/vars/tag.groovy b/vars/tag.groovy
deleted file mode 100644
index 73d6b46..0000000
--- a/vars/tag.groovy
+++ /dev/null
@@ -1,4 +0,0 @@
-def call(env){
-  echo env
-  env.BRANCH_NAME
-}
\ No newline at end of file