Merge pull request #26 from AcalephStorage/release/0.1.3

Release/0.1.3

Author: darkcrux

Caddyfile

@@ -5,6 +5,7 @@
     regexp .*
     ext    /
     to     /index.html
-}
+  }
   log stdout
+  tls /secrets/ssl/cert /secrets/ssl/key
 }

app/adapters/stage.js

@@ -1,19 +1,59 @@
 import ApplicationAdapter from './application';
 import Ember from 'ember';
+import QueryString from 'torii/lib/query-string';
+
 
 export default ApplicationAdapter.extend({
 
-  urlForQueryRecord: function(query, modelName) {
+  updateRecord(store, type, snapshot) {
+    var data = {},
+      url = this.buildURL(type.modelName, null, snapshot, 'updateRecord');
+
+    var serializer = store.serializerFor(type.modelName);
+    serializer.serializeIntoHash(data, type, snapshot);
+
+    if (data.type === 'wait') {
+      let qs = QueryString.create({
+        provider: { continue: 'yes' },
+        requiredParams: ['continue']
+      });
+      url = [url, qs.toString()].join('?');
+    }
+
+    return this.ajax(url, 'POST', { data: {} });
+  },
+
+  urlForQueryRecord(query, modelName) {
     var urlParts = this._buildURL(modelName).split('/');
 
     if (Ember.isPresent(query.owner) && Ember.isPresent(query.repo) && Ember.isPresent(query.buildNumber) && Ember.isPresent(query.stageIndex)) {
-      urlParts.push('pipelines', query.owner, query.repo, 'builds', query.buildNumber, 'stages', query.stageIndex);
+      urlParts.push('pipelines', query.owner, query.repo);
+      urlParts.push('builds', query.buildNumber);
+      urlParts.push('stages', query.stageIndex);
       delete query.owner;
       delete query.repo;
       delete query.buildNumber;
       delete query.stageIndex;
     }
+
     return urlParts.join('/');
   },
 
+  urlForUpdateRecord(id, modelName, snapshot) {
+    var urlParts = this._buildURL(modelName).split('/');
+    urlParts.removeObject(this.pathForType(modelName));
+
+    let pipelineName = snapshot.record.get('build.pipeline.name'),
+      buildNumber = snapshot.record.get('build.number'),
+      index = snapshot.record.get('index');
+
+    if (Ember.isPresent(pipelineName) && Ember.isPresent(buildNumber) && Ember.isPresent(index)) {
+      urlParts.push('pipelines', pipelineName);
+      urlParts.push('builds', buildNumber);
+      urlParts.push('stages', index);
+    }
+
+    return urlParts.join('/');
+  }
+
 });

app/components/build-stage.js

@@ -14,16 +14,28 @@ export default Ember.Component.extend({
     'command': 'terminal',
     'docker_build': 'legal',
     'docker_publish': 'upload',
+    'wait': 'pause',
+    'wait_done': 'right arrow',
   },
   statusIcon: Ember.computed('model.type', function() {
     let type = this.get('model.type');
+    let status = this.get('model.status');
+
+    if (type === 'wait' && status === 'SUCCESS') {
+      type = 'wait_done';
+    }
     return this.iconClassMap[type] || this.defaultStatusIcon;
   }),
   isRunning: Ember.computed.equal('model.status', 'RUNNING'),
 
   click() {
-    this.fetchLogs();
-    this.sendAction('selectStage', this.get('model'));
+    let stage = this.get('model');
+    if (stage.get('type') === 'wait' && stage.get('status') === 'WAITING') {
+      this.sendAction('promptWaitStageMessage', stage);
+    } else {
+      this.fetchLogs();
+      this.sendAction('selectStage', stage);
+    }
   },
 
   willDestroyElement() {
@@ -50,7 +62,7 @@ export default Ember.Component.extend({
   },
 
   logFetcher: task(function*(stage) {
-    if (stage.get('status') !== 'PENDING') {
+    if (stage.get('status') !== 'PENDING' && stage.get('type') != 'wait') {
       let logFiles = yield this.getStageLogs(stage);
       return logFiles;
     }

app/components/pipeline-build.js

@@ -91,6 +91,16 @@ export default Ember.Component.extend({
       });
   }).drop(),
 
+  stageStatusUpdater: task(function * (stage) {
+    let b = this.get('model');
+    Ember.assign(stage, { build: b });
+    stage.save()
+      .finally(() => {
+        this.get('buildFetcher').cancelAll();
+        this.get('buildFetcher').perform();
+      });
+  }).drop(),
+
   buildsPoller: task(function*() {
     while(true) {
       yield this.get('pipeline.builds').reload();
@@ -101,23 +111,25 @@ export default Ember.Component.extend({
   stagesPoller: task(function*() {
     while(true) {
       this.get('buildFetcher').perform();
-      yield timeout(5000); // 5-second interval
+      yield timeout(3000); // 3-second interval
     }
   }).drop(),
 
+  closeInfoBox() {
+    this.send('unselectStage');
+    this.send('closePipelineDetails');
+    this.send('closePipelineEditor');
+  },
+
   actions: {
     historyHide() {
       return Ember.isPresent(this.get('model'));
     },
     selectBuild() {
-      this.send('unselectStage');
-      this.send('closePipelineDetails');
-      this.send('closePipelineEditor');
+      this.closeInfoBox();
     },
     confirmCreateBuild() {
-      this.send('unselectStage');
-      this.send('closePipelineDetails');
-      this.send('closePipelineEditor');
+      this.closeInfoBox();
       this.$('.ui.modal.create-build-confirmation').modal('show');
     },
     createBuild() {
@@ -131,6 +143,15 @@ export default Ember.Component.extend({
     unselectStage() {
       this.set('selectedStage', null);
     },
+    promptWaitStageMessage(stage) {
+      this.closeInfoBox();
+      this.set('selectedWaitStage', stage);
+      this.$('.ui.modal.wait-stage-prompt').modal('show');
+    },
+    startWaitStage() {
+      let stage = this.get('selectedWaitStage');
+      this.get('stageStatusUpdater').perform(stage);
+    },
     viewPipelineDetails() {
       this.send('unselectStage');
       this.send('closePipelineEditor');

app/models/stage.js

@@ -1,5 +1,6 @@
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
+import {belongsTo} from 'ember-data/relationships';
 
 export default Model.extend({
   name: attr('string'),
@@ -12,5 +13,6 @@ export default Model.extend({
   status: attr('string'),
   pod_namespace: attr('string'),
   job_name: attr('string'),
-  pod_name: attr('string')
+  pod_name: attr('string'),
+  build: belongsTo('build')
 });

app/styles/app.less

@@ -13,6 +13,7 @@
 @colorRunning     : #99D6EA;
 @colorRunningDark : #AAE3F7;
 @colorRunningGlow : #D8F5FF;
+@colorWaiting     : #FFB209;
 
 @lrMargin: 2em;
 

app/styles/pipeline.less

@@ -89,6 +89,10 @@
 .pipeline-build ul .stage.FAIL {
   border-color: @colorFail;
 }
+.pipeline-build ul .stage.WAITING::before,
+.pipeline-build ul .stage.WAITING {
+  border-color: @colorWaiting;
+}
 @-webkit-keyframes sk-scaleout {
   0% {
     -webkit-transform: scale(0);
@@ -143,6 +147,10 @@
   background-color: @colorRunning;
   border-color: @colorRunning;
 }
+.ui.WAITING.label {
+  background-color: @colorWaiting;
+  border-color: @colorWaiting;
+}
 
 /*******************
 ** info-box

app/styles/pipelines.less

@@ -29,3 +29,9 @@
 .FAIL.ui.card > .content .status.icon {
   color: @colorFail;
 }
+.WAITING.ui.card > .extra {
+  background: @colorWaiting;
+}
+.WAITING.ui.card > .content .status.icon {
+  color: @colorWaiting;
+}

app/templates/components/pipeline-build.hbs

@@ -37,7 +37,7 @@
         {{#if model.stages}}
           <ul class="stages">
           {{#each model.stages as |stage|}}
-            {{build-stage model=stage build=model pipeline=pipeline selectStage=(action 'selectStage')}}
+            {{build-stage model=stage build=model pipeline=pipeline selectStage=(action 'selectStage') promptWaitStageMessage=(action 'promptWaitStageMessage')}}
           {{/each}}
           </ul>
         {{else}}
@@ -113,3 +113,14 @@
     <div class="ui positive right labeled icon small button">Yes<i class="checkmark icon"></i></div>
   </div>
 {{/ui-modal}}
+
+{{#ui-modal name="wait-stage-prompt" class="small wait-stage-prompt" closable=false onApprove=(action "startWaitStage") }}
+  <div class="header">Wait</div>
+  <div class="content">{{selectedWaitStage.params.message}}</div>
+  <div class="actions">
+    <div class="ui negative small button">No</div>
+    <div class="ui positive right labeled icon small button">Yes<i class="right arrow icon"></i></div>
+  </div>
+{{/ui-modal}}
+
+

kontinuous-ui.yaml

@@ -17,6 +17,16 @@ spec:
     app: kontinuous-ui
     type: dashboard
 
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ssl-secret
+  namespace: acaleph
+data:
+  cert:
+  key:
+
 ---
 apiVersion: v1
 kind: ReplicationController
@@ -38,6 +48,10 @@ spec:
         type: dashboard
       name: kontinuous-ui
       namespace: acaleph
+    volumes:
+    - name: ssl
+      secret:
+          secretName: ssl-secret
     spec:
       containers:
       - env:
@@ -54,3 +68,8 @@ spec:
         - containerPort: 5000
           name: dashboard
           protocol: TCP
+        volumeMounts:
+        - name: ssl
+          readOnly: true
+          mountPath: /secrets/ssl
+