Skip to content

Eliminate usage triggering ember-cli deprecation #72

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
Mar 25, 2017
Merged

Eliminate usage triggering ember-cli deprecation #72

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
4 changes: 2 additions & 2 deletions bin/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* bin/changelog
*/

var EOL = require('os').EOL;
var EOL = require('os').EOL;
var multiline = require('multiline');
var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');
var GitHubApi = require('github');

var github = new GitHubApi({version: '3.0.0'});
Expand Down
18 changes: 9 additions & 9 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* jshint node: true */
'use strict';

var Promise = require('ember-cli/lib/ext/promise');
var path = require('path');
var fs = require('fs');
var RSVP = require('rsvp');
var path = require('path');
var fs = require('fs');

var denodeify = require('rsvp').denodeify;
var readFile = denodeify(fs.readFile);
Expand Down Expand Up @@ -105,7 +105,7 @@ module.exports = {

var revisionKey = redisDeployClient.activeRevision(keyPrefix);

return Promise.resolve(revisionKey).then(function(previousRevisionKey) {
return RSVP.resolve(revisionKey).then(function(previousRevisionKey) {
return {
revisionData: {
previousRevisionKey: previousRevisionKey
Expand All @@ -122,7 +122,7 @@ module.exports = {
var activeContentSuffix = this.readConfig('activeContentSuffix');

this.log('Activating revision `' + revisionKey + '`', { verbose: true });
return Promise.resolve(redisDeployClient.activate(keyPrefix, revisionKey, activationSuffix, activeContentSuffix))
return RSVP.resolve(redisDeployClient.activate(keyPrefix, revisionKey, activationSuffix, activeContentSuffix))
.then(this.log.bind(this, '✔ Activated revision `' + revisionKey + '`', {}))
.then(function(){
return {
Expand All @@ -146,7 +146,7 @@ module.exports = {
var keyPrefix = this.readConfig('keyPrefix');

this.log('Listing initial revisions for key: `' + keyPrefix + '`', { verbose: true });
return Promise.resolve(redisDeployClient.fetchRevisions(keyPrefix))
return RSVP.resolve(redisDeployClient.fetchRevisions(keyPrefix))
.then(function(revisions) {
return {
initialRevisions: revisions
Expand All @@ -160,7 +160,7 @@ module.exports = {
var keyPrefix = this.readConfig('keyPrefix');

this.log('Listing revisions for key: `' + keyPrefix + '`');
return Promise.resolve(redisDeployClient.fetchRevisions(keyPrefix))
return RSVP.resolve(redisDeployClient.fetchRevisions(keyPrefix))
.then(function(revisions) {
return {
revisions: revisions
Expand All @@ -178,12 +178,12 @@ module.exports = {

_uploadSuccessMessage: function(key) {
this.log('Uploaded with key `' + key + '`', { verbose: true });
return Promise.resolve(key);
return RSVP.resolve(key);
},

_errorMessage: function(error) {
this.log(error, { color: 'red' });
return Promise.reject(error);
return RSVP.reject(error);
}
});

Expand Down
28 changes: 14 additions & 14 deletions lib/redis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var CoreObject = require('core-object');
var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');

module.exports = CoreObject.extend({

Expand Down Expand Up @@ -47,13 +47,13 @@ module.exports = CoreObject.extend({
var maxEntries = this._maxRecentUploads;
var _this = this;

return Promise.resolve()
return RSVP.resolve()
.then(this._uploadIfKeyDoesNotExist.bind(this, redisKey, value))
.then(function() {
if (revisionData) {
return _this._uploadRevisionData(keyPrefix, revisionKey, revisionData);
} else {
return Promise.resolve();
return RSVP.resolve();
}
})
.then(this._updateRecentUploadsList.bind(this, keyPrefix, revisionKey))
Expand All @@ -64,7 +64,7 @@ module.exports = CoreObject.extend({
},

activate: function(keyPrefix, revisionKey, activationSuffix, activeContentSuffix) {
return Promise.resolve()
return RSVP.resolve()
.then(this._listRevisions.bind(this, keyPrefix))
.then(this._validateRevisionKey.bind(this, revisionKey))
.then(this._activateRevision.bind(this, keyPrefix, revisionKey, activationSuffix, activeContentSuffix));
Expand All @@ -73,8 +73,8 @@ module.exports = CoreObject.extend({
fetchRevisions: function(keyPrefix) {
var _this = this;
return this._listRevisions(keyPrefix).then(function(revisions) {
return Promise.hash({
revisions: Promise.resolve(revisions),
return RSVP.hash({
revisions: RSVP.resolve(revisions),
current: _this.activeRevision(keyPrefix),
revisionData: _this._revisionData(keyPrefix, revisions)
});
Expand All @@ -99,15 +99,15 @@ module.exports = CoreObject.extend({

_revisionData: function(keyPrefix, revisions) {
if (revisions.length === 0) {
return Promise.resolve();
return RSVP.resolve();
}
var dataKeys = revisions.map(function(revision) {
return keyPrefix + ':revision-data:' + revision;
});

return this._client.mget(dataKeys).then(function(data) {
if (!data) {
return Promise.resolve();
return RSVP.resolve();
}
return data.map(function(d) {
return JSON.parse(d);
Expand All @@ -122,7 +122,7 @@ module.exports = CoreObject.extend({
},

_validateRevisionKey: function(revisionKey, revisions) {
return revisions.indexOf(revisionKey) > -1 ? Promise.resolve() : Promise.reject('`' + revisionKey + '` is not a valid revision key');
return revisions.indexOf(revisionKey) > -1 ? RSVP.resolve() : RSVP.reject('`' + revisionKey + '` is not a valid revision key');
},

_activateRevisionKey: function(keyPrefix, revisionKey, activationSuffix) {
Expand All @@ -145,7 +145,7 @@ module.exports = CoreObject.extend({
var activeContentKey = keyPrefix + ':' + activeContentSuffix;
var revisionContentKey = keyPrefix + ':' + revisionKey;

return new Promise(function(resolve, reject) {
return new RSVP.Promise(function(resolve, reject) {
client.get(revisionContentKey).then(
function(value) {
client.set(activeContentKey, value).then(function() {
Expand All @@ -161,13 +161,13 @@ module.exports = CoreObject.extend({
var client = this._client;
var allowOverwrite = !!this._allowOverwrite;

return Promise.resolve()
return RSVP.resolve()
.then(function() {
return client.get(redisKey);
})
.then(function(value) {
if (value && !allowOverwrite) {
return Promise.reject('Value already exists for key: ' + redisKey);
return RSVP.reject('Value already exists for key: ' + redisKey);
}
})
.then(function() {
Expand All @@ -178,7 +178,7 @@ module.exports = CoreObject.extend({
_uploadRevisionData: function(keyPrefix, revisionKey, revisionData) {
var client = this._client;
var redisKey = keyPrefix + ':revision-data:' + revisionKey;
return Promise.resolve()
return RSVP.resolve()
.then(function() {
return client.set(redisKey, JSON.stringify(revisionData));
});
Expand All @@ -195,7 +195,7 @@ module.exports = CoreObject.extend({
var client = this._client;
var listKey = keyPrefix + ':revisions';

return Promise.hash({
return RSVP.hash({
revisionsToBeRemoved: client.zrange(listKey, 0, -(maxEntries + 1)),
current: this.activeRevision(keyPrefix)
}).then(function(results) {
Expand Down
8 changes: 4 additions & 4 deletions tests/helpers/fake-redis-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');
var CoreObject = require('core-object');

module.exports = CoreObject.extend({
Expand All @@ -8,7 +8,7 @@ module.exports = CoreObject.extend({
this.options = options;
},
get: function(/* key */) {
return Promise.resolve('some-other-value');
return RSVP.resolve('some-other-value');
},
set: function() { },
del: function() { },
Expand All @@ -23,9 +23,9 @@ module.exports = CoreObject.extend({
zrange: function() {
},
zrevrange: function() {
return Promise.resolve(this.recentRevisions);
return RSVP.resolve(this.recentRevisions);
},
mget: function() {
return Promise.resolve();
return RSVP.resolve();
}
});
12 changes: 5 additions & 7 deletions tests/unit/index-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* jshint node: true */
/* jshint jasmine: true */
'use strict';

var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');
var assert = require('../helpers/assert');
var FakeRedis = require('../helpers/fake-redis-lib');

Expand Down Expand Up @@ -506,7 +504,7 @@ describe('redis plugin', function() {
redisDeployClient: function(/* context */) {
return {
upload: function(keyPrefix, revisionKey) {
return Promise.resolve(keyPrefix + ':' + revisionKey);
return RSVP.resolve(keyPrefix + ':' + revisionKey);
}
};
}
Expand Down Expand Up @@ -576,7 +574,7 @@ describe('redis plugin', function() {
redisDeployClient: function(/* context */) {
return {
activate: function() {
return Promise.reject('some-error');
return RSVP.reject('some-error');
}
};
}
Expand Down Expand Up @@ -650,7 +648,7 @@ describe('redis plugin', function() {
redisDeployClient: function(/* context */) {
return {
fetchRevisions: function(/* keyPrefix, revisionKey */) {
return Promise.resolve([{
return RSVP.resolve([{
revision: 'a',
active: false
}]);
Expand Down Expand Up @@ -696,7 +694,7 @@ describe('redis plugin', function() {
redisDeployClient: function(/* context */) {
return {
fetchRevisions: function(/* keyPrefix, revisionKey */) {
return Promise.resolve([{
return RSVP.resolve([{
revision: 'a',
active: false
}]);
Expand Down
26 changes: 13 additions & 13 deletions tests/unit/lib/redis-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var FakeRedis = require('../../helpers/fake-redis-lib');
var FakeClient = require('../../helpers/fake-redis-client');


var Promise = require('ember-cli/lib/ext/promise');
var RSVP = require('rsvp');
var assert = require('../../helpers/assert');
var CoreObject = require('core-object');

Expand All @@ -28,7 +28,7 @@ describe('redis', function() {

var redis = new Redis({}, new FakeRedis(FakeClient.extend({
get: function(key) {
return Promise.resolve(null);
return RSVP.resolve(null);
},
set: function(key, value) {
fileUploaded = true;
Expand Down Expand Up @@ -69,7 +69,7 @@ describe('redis', function() {
it('updates the list of recent uploads once upload is successful', function() {
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
get: function(key) {
return Promise.resolve(null);
return RSVP.resolve(null);
}
})));

Expand All @@ -86,7 +86,7 @@ describe('redis', function() {

var redis = new Redis({}, new FakeRedis(FakeClient.extend({
get: function(key) {
return Promise.resolve(null);
return RSVP.resolve(null);
},
del: function(key) {
assert(key === 'key:1' || key === 'key:2' || key === 'key:revision-data:1' || key === 'key:revision-data:2');
Expand Down Expand Up @@ -116,9 +116,9 @@ describe('redis', function() {
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
get: function(key) {
if (key == 'key:current') {
return Promise.resolve('1');
return RSVP.resolve('1');
}
return Promise.resolve(null);
return RSVP.resolve(null);
},
zrange: function() {
return this.recentRevisions.slice(0,2);
Expand All @@ -140,7 +140,7 @@ describe('redis', function() {

var redis = new Redis({ maxRecentUploads: 5 }, new FakeRedis(FakeClient.extend({
get: function(/* key */) {
return Promise.resolve(null);
return RSVP.resolve(null);
},
zrange: function(listKey, startIndex, stopIndex) {
var end = this.recentRevisions.length - (Math.abs(stopIndex) - 1);
Expand All @@ -165,7 +165,7 @@ describe('redis', function() {
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
get: function(key) {
redisKey = key;
return Promise.resolve('some-other-value');
return RSVP.resolve('some-other-value');
}
})));

Expand All @@ -181,7 +181,7 @@ describe('redis', function() {
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
get: function(key) {
redisKey = key;
return Promise.resolve('some-other-value');
return RSVP.resolve('some-other-value');
}
})));

Expand Down Expand Up @@ -257,11 +257,11 @@ describe('redis', function() {
},

get: function(key) {
return Promise.resolve(this._db[key]);
return RSVP.resolve(this._db[key]);
},
set: function(key, value) {
this._db[key] = value;
return Promise.resolve(value);
return RSVP.resolve(value);
},
}));

Expand Down Expand Up @@ -345,7 +345,7 @@ describe('redis', function() {
get: function() {
},
mget: function(keys) {
return Promise.resolve(['{"revisionKey":"a","timestamp":"2016-03-13T14:25:40.563Z","scm":{"sha":"9101968710f18a6720c48bf032fd82efd5743b7d","email":"mattia@mail.com","name":"Mattia Gheda","timestamp":"2015-12-22T12:44:48.000Z","branch":"master"}}']);
return RSVP.resolve(['{"revisionKey":"a","timestamp":"2016-03-13T14:25:40.563Z","scm":{"sha":"9101968710f18a6720c48bf032fd82efd5743b7d","email":"mattia@mail.com","name":"Mattia Gheda","timestamp":"2015-12-22T12:44:48.000Z","branch":"master"}}']);
}
})));

Expand Down Expand Up @@ -378,7 +378,7 @@ describe('redis', function() {
activationSuffix: 'active-key'
}, new FakeRedis(FakeClient.extend({
get: function(key) {
return Promise.resolve(key);
return RSVP.resolve(key);
}
})));

Expand Down