Skip to content

Commit f460693

Browse files
committed
Replace deprecated ember-cli/ext/promise with rsvp
1 parent dfa9a10 commit f460693

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

bin/changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
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'});
20-
var compareCommits = Promise.denodeify(github.repos.compareCommits);
20+
var compareCommits = RSVP.denodeify(github.repos.compareCommits);
2121
var currentVersion = 'v' + require('../package').version;
2222

2323
var user = 'ember-cli-deploy';

index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* jshint node: true */
22
'use strict';
33

4-
var Promise = require('ember-cli/lib/ext/promise');
4+
var RSVP = require('rsvp');
55

66
var DeployPluginBase = require('ember-cli-deploy-plugin');
77

@@ -38,7 +38,7 @@ module.exports = {
3838
scm: this._getScmData()
3939
};
4040

41-
return Promise.hash(promises)
41+
return RSVP.hash(promises)
4242
.then(function(results) {
4343
var data = results.data;
4444
data.scm = results.scm;
@@ -66,13 +66,13 @@ module.exports = {
6666
var path = this.readConfig('distDir');
6767
return new ScmDataGenerator(path).generate();
6868
} else {
69-
return Promise.resolve();
69+
return RSVP.resolve();
7070
}
7171
},
7272

7373
_errorMessage: function(error) {
7474
this.log(error, { color: 'red' });
75-
return Promise.reject(error);
75+
return RSVP.reject(error);
7676
}
7777
});
7878
return new DeployPlugin();

lib/data-generators/file-hash.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var fs = require('fs');
33
var path = require('path');
44
var minimatch = require('minimatch');
55
var crypto = require('crypto');
6-
var Promise = require('ember-cli/lib/ext/promise');
6+
var RSVP = require('rsvp');
77

88
var denodeify = require('rsvp').denodeify;
99
var readFile = denodeify(fs.readFile);
@@ -23,7 +23,7 @@ module.exports = CoreObject.extend({
2323
var filePaths = distFiles.filter(minimatch.filter(filePattern, { matchBase: true }));
2424

2525
if (!filePaths.length) {
26-
return Promise.reject('`' + filePattern + '` does not exist in distDir `' + distDir + '`');
26+
return RSVP.reject('`' + filePattern + '` does not exist in distDir `' + distDir + '`');
2727
}
2828

2929
var filePath = path.join(distDir, filePaths[0]);

lib/data-generators/git-commit.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
var CoreObject = require('core-object');
22
var gitRepoInfo = require('git-repo-info');
3-
var Promise = require('ember-cli/lib/ext/promise');
3+
var RSVP = require('rsvp');
44

55
module.exports = CoreObject.extend({
66
generate: function() {
77
var info = gitRepoInfo();
88

99
if (info === null || info.root === null) {
10-
return Promise.reject('Could not find git repository');
10+
return RSVP.reject('Could not find git repository');
1111
}
1212

1313
var sha = info.sha.slice(0, 7);
1414

1515
if (!sha) {
16-
return Promise.reject('Could not build revision with commit hash `' + sha + '`');
16+
return RSVP.reject('Could not build revision with commit hash `' + sha + '`');
1717
}
1818

19-
return Promise.resolve({
19+
return RSVP.resolve({
2020
revisionKey: sha,
2121
timestamp: new Date().toISOString()
2222
});

lib/data-generators/git-tag-commit.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var CoreObject = require('core-object');
22
var gitRepoInfo = require('git-repo-info');
3-
var Promise = require('ember-cli/lib/ext/promise');
3+
var RSVP = require('rsvp');
44

55
module.exports = CoreObject.extend({
66
init: function(options) {
@@ -13,17 +13,17 @@ module.exports = CoreObject.extend({
1313
var info = gitRepoInfo();
1414

1515
if (info === null || info.root === null) {
16-
return Promise.reject('Could not find git repository');
16+
return RSVP.reject('Could not find git repository');
1717
}
1818

1919
var tag = info.tag;
2020
var sha = info.sha.slice(0, 8);
2121

2222
if (!info.tag || !sha) {
23-
return Promise.reject('Could not build revision with tag `' + tag + '` and commit hash `' + sha + '`');
23+
return RSVP.reject('Could not build revision with tag `' + tag + '` and commit hash `' + sha + '`');
2424
}
2525

26-
return Promise.resolve({
26+
return RSVP.resolve({
2727
revisionKey: info.tag + separator + sha,
2828
timestamp: new Date().toISOString()
2929
});

lib/data-generators/version-commit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var CoreObject = require('core-object');
22
var gitRepoInfo = require('git-repo-info');
33
var fs = require('fs');
4-
var Promise = require('ember-cli/lib/ext/promise');
4+
var RSVP = require('rsvp');
55

66
var denodeify = require('rsvp').denodeify;
77
var readFile = denodeify(fs.readFile);
@@ -19,7 +19,7 @@ module.exports = CoreObject.extend({
1919
var info = gitRepoInfo();
2020

2121
if (info === null || info.root === null) {
22-
return Promise.reject('Could not find git repository');
22+
return RSVP.reject('Could not find git repository');
2323
}
2424

2525
var sha = (info.sha || '').slice(0, 8);
@@ -30,7 +30,7 @@ module.exports = CoreObject.extend({
3030
var json = JSON.parse(contents);
3131

3232
if (!json.version) {
33-
return Promise.reject('Could not build revision with version `' + json.version + '` and commit hash `' + sha + '`');
33+
return RSVP.reject('Could not build revision with version `' + json.version + '` and commit hash `' + sha + '`');
3434
}
3535

3636
var versionString = json.version;

lib/scm-data-generators/git.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var CoreObject = require('core-object');
2-
var Promise = require('ember-cli/lib/ext/promise');
2+
var RSVP = require('rsvp');
33
var gitRepoInfo = require('git-repo-info');
4-
var simpleGit = require('simple-git');
4+
var simpleGit = require('simple-git');
55

66
module.exports = CoreObject.extend({
77
init: function(path) {
@@ -11,7 +11,7 @@ module.exports = CoreObject.extend({
1111

1212
generate: function() {
1313
var _this = this;
14-
return new Promise(function(resolve, reject) {
14+
return new RSVP.Promise(function(resolve, reject) {
1515
simpleGit(_this.path).log(function(err, log) {
1616
var info = log.latest;
1717
resolve({

0 commit comments

Comments
 (0)