Merge pull request 'simplify-secret' (#27) from simplify-secret into master

Reviewed-on: #27

Jenkinsfile

@@ -2,19 +2,16 @@ pipeline {
   agent any
   
   environment {
-    APP_SESSION_SECRET = ''
     DB_NAME = 'url_shortener.db'
   }
   stages {
     stage('Init') {
       steps {
-        sh 'rbenv local 3.2.2'
-        script {
-	  env.APP_SESSION_SECRET = sh(script: 'ruby secret.rb', returnStdout: true)
-        }
-        sh 'echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby secret.rb)" > .env.rb'
-        sh 'echo "ENV[\\\"DB_NAME\\\"] ||= \\\"${DB_NAME}\\\"" >> .env.rb'
-        sh 'cat .env.rb'
+        sh ''' #!/usr/local/bin/bash
+          rbenv local 3.2.2
+          echo "ENV[\\\"APP_SESSION_SECRET\\\"] ||= $(ruby -rsecurerandom -e 'puts SecureRandom.base64(64).inspect()')" > .env.rb
+          echo "ENV[\\\"DB_NAME\\\"] ||= \\\"${DB_NAME}\\\"" >> .env.rb
+        '''
       }
     }
     stage('Build dependencies') {
@@ -35,7 +32,6 @@ pipeline {
     }
     stage('Report results') {
       steps {
-        archive(includes: 'pkg/*.gem')
         publishHTML (target: [
           allowMissing: false,
           alwaysLinkToLastBuild: false,
@@ -46,6 +42,32 @@ pipeline {
           reportTitles: 'Cucumber Results, RSpec Results, Test Coverage'])
       }
     }
+    stage('Build production deliverable') {
+      steps {
+        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+          sh ''' #!/usr/local/bin/bash
+            ZIP_FILE="url-shortener_$(date "+%Y-%m-%d_%H-%M-%S").tgz"
+            CUR_DIR=$(pwd)
+            mkdir -p /tmp/url-shortener
+            cp -R * /tmp/url-shortener
+            cp .env.rb /tmp/url-shortener/
+            cp .ruby-version /tmp/url-shortener/
+            cd /tmp/url-shortener
+            rm -rf features spec coverage db/*.db .git* Jenkinsfile *.html
+            cd /tmp
+            tar -czvf $ZIP_FILE url-shortener/
+            mv /tmp/$ZIP_FILE $CUR_DIR/
+            '''
+        }
+        archiveArtifacts artifacts: '*.tgz'
+      }
+    }
+    stage('Clean up deliverable') {
+      steps {
+        sh 'rm -rf /tmp/url-shortener'
+        sh 'rm -rf *.tgz'
+      }
+    }
   }
   post {
     success {
@@ -57,5 +79,8 @@ pipeline {
     failure {
       mattermostSend channel: 'git-messages', color: 'danger', message: "[${JOB_NAME}](${JOB_URL}) [#${BUILD_NUMBER}](${BUILD_URL}) ([Gitea](${GIT_URL}))", text: "Build Failed"
     }
+    always {
+      cleanWs deleteDirs: true, patterns: [[pattern: '*', type: 'INCLUDE']]
+    }
   }
 }

secret.rb

@@ -1,2 +0,0 @@
-require 'securerandom'
-puts SecureRandom.base64(64).inspect()