Skip to content

Update JS to use more recent ECMAScript patterns #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2020
Merged

Update JS to use more recent ECMAScript patterns #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
ecmaVersion: 10,
sourceType: 'module'
},
extends: 'eslint:recommended',
Expand Down
22 changes: 11 additions & 11 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
'use strict';

var DeployPluginBase = require('ember-cli-deploy-plugin');
var ScmTable = require('./lib/scm-table');
var LegacyTable = require('./lib/legacy-table');
const DeployPluginBase = require('ember-cli-deploy-plugin');
const ScmTable = require('./lib/scm-table');
const LegacyTable = require('./lib/legacy-table');

module.exports = {
name: 'ember-cli-deploy-display-revisions',

createDeployPlugin: function(options) {
var DeployPlugin = DeployPluginBase.extend({
createDeployPlugin(options) {
let DeployPlugin = DeployPluginBase.extend({
name: options.name,

defaultConfig: {
amount: function(context) {
amount(context) {
return context.commandOptions.amount || 10;
},

revisions: function(context) {
revisions(context) {
return context.revisions;
}
},

displayRevisions: function(/* context */) {
var table;
var revisions = this.readConfig('revisions');
displayRevisions(/* context */) {
let table;
let revisions = this.readConfig('revisions');
if(!revisions || revisions.length === 0) {
this.log("Could not display latest revisions because no revisions were found in context.", {color: 'yellow'});
return;
}

revisions = revisions.slice(0, this.readConfig("amount"));

var hasRevisionData = revisions.reduce(function(prev, current) {
let hasRevisionData = revisions.reduce(function(prev, current) {
return !prev ? false : !!current.revisionData;
}, true);

Expand Down
50 changes: 25 additions & 25 deletions lib/legacy-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
var moment = require('moment');
var CoreObject = require('core-object');
let moment = require('moment');
let CoreObject = require('core-object');

module.exports = CoreObject.extend({
init: function(plugin, revisions) {
init(plugin, revisions) {
this._super(plugin, revisions);

this._plugin = plugin;
this.revisions = revisions;
},

log: function() {
log() {
this._plugin.log.apply(this._plugin, arguments);
},

display: function() {
var revisions = this.revisions;
var keys = this._getKeys(revisions);
display() {
let revisions = this.revisions;
let keys = this._getKeys(revisions);

this._displayHeader(keys, revisions);

Expand All @@ -24,18 +24,18 @@ module.exports = CoreObject.extend({
}.bind(this));
},

_displayRow: function(keys, revision) {
var row = "";
_displayRow(keys, revision) {
let row = "";
if(revision.active) {
row += ">";
} else {
row += " ";
}

var lastKey = keys[keys.length - 1];
let lastKey = keys[keys.length - 1];

keys.forEach(function(key) {
var value = revision[key.name] ? revision[key.name] : "";
let value = revision[key.name] ? revision[key.name] : "";

if(key.name === 'timestamp') {
value = moment(value).format("YYYY/MM/DD HH:mm:ss");
Expand All @@ -47,8 +47,8 @@ module.exports = CoreObject.extend({

row += " " + value + " ";

var fillerLength = key.maxLength - value.length;
for(var i = 0; i < fillerLength; i++) {
let fillerLength = key.maxLength - value.length;
for(let i = 0; i < fillerLength; i++) {
row += " ";
}
if(key !== lastKey) {
Expand All @@ -59,14 +59,14 @@ module.exports = CoreObject.extend({
this.log(row);
},

_getKeys: function(revisions) {
var keys = [
_getKeys(revisions) {
let keys = [
{name: 'version', maxLength: 7},
{name: 'timestamp', maxLength: 19},
{name: 'deployer', maxLength: 10},
{name: 'revision', maxLength: -1}
];
var presentKeys = [];
let presentKeys = [];
keys.forEach(function(key) {
if(this._hasKey(key.name, revisions)) {
presentKeys.push(key);
Expand All @@ -75,16 +75,16 @@ module.exports = CoreObject.extend({
return presentKeys;
},

_displayHeader: function(keys) {
var keyHeader = " ";
var lastKey = keys[keys.length - 1];
_displayHeader(keys) {
let keyHeader = " ";
let lastKey = keys[keys.length - 1];

keys.forEach(function(key) {
var shortKey = key.maxLength === -1 ? key.name : key.name.substr(0, key.maxLength);
let shortKey = key.maxLength === -1 ? key.name : key.name.substr(0, key.maxLength);
keyHeader += " " + shortKey + " ";

var fillerLength = key.maxLength === -1 ? 0 : key.maxLength - shortKey.length;
for(var i = 0; i < fillerLength; i++) {
let fillerLength = key.maxLength === -1 ? 0 : key.maxLength - shortKey.length;
for(let i = 0; i < fillerLength; i++) {
keyHeader += " ";
}

Expand All @@ -95,13 +95,13 @@ module.exports = CoreObject.extend({
});
this.log(keyHeader);

var underline = "";
for(var i = 0; i < keyHeader.length; i++) {
let underline = "";
for(let i = 0; i < keyHeader.length; i++) {
underline += "=";
}
this.log(underline);
},
_hasKey: function(key, revisions) {
_hasKey(key, revisions) {
return revisions.some(function(revision) {
return Object.keys(revision).indexOf(key) !== -1;
});
Expand Down
32 changes: 16 additions & 16 deletions lib/scm-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
var Table = require('cli-table3');
var moment = require('moment');
var CoreObject = require('core-object');
var RSVP = require('rsvp');
const Table = require('cli-table3');
const moment = require('moment');
const CoreObject = require('core-object');
const RSVP = require('rsvp');

module.exports = CoreObject.extend({
init: function(plugin, revisions) {
init(plugin, revisions) {
this._super(plugin, revisions);

this._plugin = plugin;
this.revisions = revisions;
},

display: function(/* revisions */) {
var table = this._createTable();
display(/* revisions */) {
let table = this._createTable();
this._tableRows(table);

this._plugin.logRaw(table.toString());
return RSVP.resolve();
},

_isWide: function() {
_isWide() {
return process.stdout.columns >= 98;
},

_tableHeader: function() {
var head = ['RevisionKey', 'Commit', 'User', 'Branch'];
_tableHeader() {
let head = ['RevisionKey', 'Commit', 'User', 'Branch'];

if (this._isWide()) {
head.push('Deploy time');
}
return head;
},

_createTable: function() {
var head = this._tableHeader();
_createTable() {
let head = this._tableHeader();

return new Table({
head: head,
Expand All @@ -58,19 +58,19 @@ module.exports = CoreObject.extend({
});
},

_tableRows: function(table) {
_tableRows(table) {
this.revisions.forEach(function(revision) {
var data = revision.revisionData;
let data = revision.revisionData;

var row = [
let row = [
((revision.active) ? '> ' : ' ') + data.revisionKey,
data.scm.sha.substr(0,8),
data.scm.email,
data.scm.branch,
];

if (this._isWide()) {
var value = moment(data.timestamp).format("YYYY/MM/DD HH:mm:ss");
let value = moment(data.timestamp).format("YYYY/MM/DD HH:mm:ss");
row.push(value);
}

Expand Down
Loading