Skip to content

Commit 528db0d

Browse files
lukemelialukemelia
authored
Merge pull request #72 from ember-cli-deploy/chore/eliminate-deprecation
Eliminate usage triggering ember-cli deprecation
2 parents bbeee2a + 405bd2e commit 528db0d

File tree

6 files changed

+47
-49
lines changed

6 files changed

+47
-49
lines changed

‎bin/changelog

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* bin/changelog
1212
*/
1313

14-
var EOL = require('os').EOL;
14+
var EOL = require('os').EOL;
1515
var multiline = require('multiline');
16-
var Promise = require('ember-cli/lib/ext/promise');
16+
var RSVP = require('rsvp');
1717
var GitHubApi = require('github');
1818

1919
var github = new GitHubApi({version: '3.0.0'});

‎index.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* jshint node: true */
22
'use strict';
33

4-
var Promise = require('ember-cli/lib/ext/promise');
5-
var path = require('path');
6-
var fs = require('fs');
4+
var RSVP = require('rsvp');
5+
var path = require('path');
6+
var fs = require('fs');
77

88
var denodeify = require('rsvp').denodeify;
99
var readFile = denodeify(fs.readFile);
@@ -105,7 +105,7 @@ module.exports = {
105105

106106
var revisionKey = redisDeployClient.activeRevision(keyPrefix);
107107

108-
return Promise.resolve(revisionKey).then(function(previousRevisionKey) {
108+
return RSVP.resolve(revisionKey).then(function(previousRevisionKey) {
109109
return {
110110
revisionData: {
111111
previousRevisionKey: previousRevisionKey
@@ -122,7 +122,7 @@ module.exports = {
122122
var activeContentSuffix = this.readConfig('activeContentSuffix');
123123

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

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

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

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

184184
_errorMessage: function(error) {
185185
this.log(error, { color: 'red' });
186-
return Promise.reject(error);
186+
return RSVP.reject(error);
187187
}
188188
});
189189

‎lib/redis.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var CoreObject = require('core-object');
2-
var Promise = require('ember-cli/lib/ext/promise');
2+
var RSVP = require('rsvp');
33

44
module.exports = CoreObject.extend({
55

@@ -47,13 +47,13 @@ module.exports = CoreObject.extend({
4747
var maxEntries = this._maxRecentUploads;
4848
var _this = this;
4949

50-
return Promise.resolve()
50+
return RSVP.resolve()
5151
.then(this._uploadIfKeyDoesNotExist.bind(this, redisKey, value))
5252
.then(function() {
5353
if (revisionData) {
5454
return _this._uploadRevisionData(keyPrefix, revisionKey, revisionData);
5555
} else {
56-
return Promise.resolve();
56+
return RSVP.resolve();
5757
}
5858
})
5959
.then(this._updateRecentUploadsList.bind(this, keyPrefix, revisionKey))
@@ -64,7 +64,7 @@ module.exports = CoreObject.extend({
6464
},
6565

6666
activate: function(keyPrefix, revisionKey, activationSuffix, activeContentSuffix) {
67-
return Promise.resolve()
67+
return RSVP.resolve()
6868
.then(this._listRevisions.bind(this, keyPrefix))
6969
.then(this._validateRevisionKey.bind(this, revisionKey))
7070
.then(this._activateRevision.bind(this, keyPrefix, revisionKey, activationSuffix, activeContentSuffix));
@@ -73,8 +73,8 @@ module.exports = CoreObject.extend({
7373
fetchRevisions: function(keyPrefix) {
7474
var _this = this;
7575
return this._listRevisions(keyPrefix).then(function(revisions) {
76-
return Promise.hash({
77-
revisions: Promise.resolve(revisions),
76+
return RSVP.hash({
77+
revisions: RSVP.resolve(revisions),
7878
current: _this.activeRevision(keyPrefix),
7979
revisionData: _this._revisionData(keyPrefix, revisions)
8080
});
@@ -99,15 +99,15 @@ module.exports = CoreObject.extend({
9999

100100
_revisionData: function(keyPrefix, revisions) {
101101
if (revisions.length === 0) {
102-
return Promise.resolve();
102+
return RSVP.resolve();
103103
}
104104
var dataKeys = revisions.map(function(revision) {
105105
return keyPrefix + ':revision-data:' + revision;
106106
});
107107

108108
return this._client.mget(dataKeys).then(function(data) {
109109
if (!data) {
110-
return Promise.resolve();
110+
return RSVP.resolve();
111111
}
112112
return data.map(function(d) {
113113
return JSON.parse(d);
@@ -122,7 +122,7 @@ module.exports = CoreObject.extend({
122122
},
123123

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

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

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

164-
return Promise.resolve()
164+
return RSVP.resolve()
165165
.then(function() {
166166
return client.get(redisKey);
167167
})
168168
.then(function(value) {
169169
if (value && !allowOverwrite) {
170-
return Promise.reject('Value already exists for key: ' + redisKey);
170+
return RSVP.reject('Value already exists for key: ' + redisKey);
171171
}
172172
})
173173
.then(function() {
@@ -178,7 +178,7 @@ module.exports = CoreObject.extend({
178178
_uploadRevisionData: function(keyPrefix, revisionKey, revisionData) {
179179
var client = this._client;
180180
var redisKey = keyPrefix + ':revision-data:' + revisionKey;
181-
return Promise.resolve()
181+
return RSVP.resolve()
182182
.then(function() {
183183
return client.set(redisKey, JSON.stringify(revisionData));
184184
});
@@ -195,7 +195,7 @@ module.exports = CoreObject.extend({
195195
var client = this._client;
196196
var listKey = keyPrefix + ':revisions';
197197

198-
return Promise.hash({
198+
return RSVP.hash({
199199
revisionsToBeRemoved: client.zrange(listKey, 0, -(maxEntries + 1)),
200200
current: this.activeRevision(keyPrefix)
201201
}).then(function(results) {

‎tests/helpers/fake-redis-client.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var Promise = require('ember-cli/lib/ext/promise');
1+
var RSVP = require('rsvp');
22
var CoreObject = require('core-object');
33

44
module.exports = CoreObject.extend({
@@ -8,7 +8,7 @@ module.exports = CoreObject.extend({
88
this.options = options;
99
},
1010
get: function(/* key */) {
11-
return Promise.resolve('some-other-value');
11+
return RSVP.resolve('some-other-value');
1212
},
1313
set: function() { },
1414
del: function() { },
@@ -23,9 +23,9 @@ module.exports = CoreObject.extend({
2323
zrange: function() {
2424
},
2525
zrevrange: function() {
26-
return Promise.resolve(this.recentRevisions);
26+
return RSVP.resolve(this.recentRevisions);
2727
},
2828
mget: function() {
29-
return Promise.resolve();
29+
return RSVP.resolve();
3030
}
3131
});

‎tests/unit/index-test.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/* jshint node: true */
2-
/* jshint jasmine: true */
31
'use strict';
42

5-
var Promise = require('ember-cli/lib/ext/promise');
3+
var RSVP = require('rsvp');
64
var assert = require('../helpers/assert');
75
var FakeRedis = require('../helpers/fake-redis-lib');
86

@@ -506,7 +504,7 @@ describe('redis plugin', function() {
506504
redisDeployClient: function(/* context */) {
507505
return {
508506
upload: function(keyPrefix, revisionKey) {
509-
return Promise.resolve(keyPrefix + ':' + revisionKey);
507+
return RSVP.resolve(keyPrefix + ':' + revisionKey);
510508
}
511509
};
512510
}
@@ -576,7 +574,7 @@ describe('redis plugin', function() {
576574
redisDeployClient: function(/* context */) {
577575
return {
578576
activate: function() {
579-
return Promise.reject('some-error');
577+
return RSVP.reject('some-error');
580578
}
581579
};
582580
}
@@ -650,7 +648,7 @@ describe('redis plugin', function() {
650648
redisDeployClient: function(/* context */) {
651649
return {
652650
fetchRevisions: function(/* keyPrefix, revisionKey */) {
653-
return Promise.resolve([{
651+
return RSVP.resolve([{
654652
revision: 'a',
655653
active: false
656654
}]);
@@ -696,7 +694,7 @@ describe('redis plugin', function() {
696694
redisDeployClient: function(/* context */) {
697695
return {
698696
fetchRevisions: function(/* keyPrefix, revisionKey */) {
699-
return Promise.resolve([{
697+
return RSVP.resolve([{
700698
revision: 'a',
701699
active: false
702700
}]);

‎tests/unit/lib/redis-test.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var FakeRedis = require('../../helpers/fake-redis-lib');
44
var FakeClient = require('../../helpers/fake-redis-client');
55

66

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

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

2929
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
3030
get: function(key) {
31-
return Promise.resolve(null);
31+
return RSVP.resolve(null);
3232
},
3333
set: function(key, value) {
3434
fileUploaded = true;
@@ -69,7 +69,7 @@ describe('redis', function() {
6969
it('updates the list of recent uploads once upload is successful', function() {
7070
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
7171
get: function(key) {
72-
return Promise.resolve(null);
72+
return RSVP.resolve(null);
7373
}
7474
})));
7575

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

8787
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
8888
get: function(key) {
89-
return Promise.resolve(null);
89+
return RSVP.resolve(null);
9090
},
9191
del: function(key) {
9292
assert(key === 'key:1' || key === 'key:2' || key === 'key:revision-data:1' || key === 'key:revision-data:2');
@@ -116,9 +116,9 @@ describe('redis', function() {
116116
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
117117
get: function(key) {
118118
if (key == 'key:current') {
119-
return Promise.resolve('1');
119+
return RSVP.resolve('1');
120120
}
121-
return Promise.resolve(null);
121+
return RSVP.resolve(null);
122122
},
123123
zrange: function() {
124124
return this.recentRevisions.slice(0,2);
@@ -140,7 +140,7 @@ describe('redis', function() {
140140

141141
var redis = new Redis({ maxRecentUploads: 5 }, new FakeRedis(FakeClient.extend({
142142
get: function(/* key */) {
143-
return Promise.resolve(null);
143+
return RSVP.resolve(null);
144144
},
145145
zrange: function(listKey, startIndex, stopIndex) {
146146
var end = this.recentRevisions.length - (Math.abs(stopIndex) - 1);
@@ -165,7 +165,7 @@ describe('redis', function() {
165165
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
166166
get: function(key) {
167167
redisKey = key;
168-
return Promise.resolve('some-other-value');
168+
return RSVP.resolve('some-other-value');
169169
}
170170
})));
171171

@@ -181,7 +181,7 @@ describe('redis', function() {
181181
var redis = new Redis({}, new FakeRedis(FakeClient.extend({
182182
get: function(key) {
183183
redisKey = key;
184-
return Promise.resolve('some-other-value');
184+
return RSVP.resolve('some-other-value');
185185
}
186186
})));
187187

@@ -257,11 +257,11 @@ describe('redis', function() {
257257
},
258258

259259
get: function(key) {
260-
return Promise.resolve(this._db[key]);
260+
return RSVP.resolve(this._db[key]);
261261
},
262262
set: function(key, value) {
263263
this._db[key] = value;
264-
return Promise.resolve(value);
264+
return RSVP.resolve(value);
265265
},
266266
}));
267267

@@ -345,7 +345,7 @@ describe('redis', function() {
345345
get: function() {
346346
},
347347
mget: function(keys) {
348-
return Promise.resolve(['{"revisionKey":"a","timestamp":"2016-03-13T14:25:40.563Z","scm":{"sha":"9101968710f18a6720c48bf032fd82efd5743b7d","email":"[email protected]","name":"Mattia Gheda","timestamp":"2015-12-22T12:44:48.000Z","branch":"master"}}']);
348+
return RSVP.resolve(['{"revisionKey":"a","timestamp":"2016-03-13T14:25:40.563Z","scm":{"sha":"9101968710f18a6720c48bf032fd82efd5743b7d","email":"[email protected]","name":"Mattia Gheda","timestamp":"2015-12-22T12:44:48.000Z","branch":"master"}}']);
349349
}
350350
})));
351351

@@ -378,7 +378,7 @@ describe('redis', function() {
378378
activationSuffix: 'active-key'
379379
}, new FakeRedis(FakeClient.extend({
380380
get: function(key) {
381-
return Promise.resolve(key);
381+
return RSVP.resolve(key);
382382
}
383383
})));
384384

0 commit comments

Comments
 (0)