File tree Expand file tree Collapse file tree 7 files changed +22
-22
lines changed Expand file tree Collapse file tree 7 files changed +22
-22
lines changed Original file line number Diff line number Diff line change 13
13
14
14
var EOL = require ( 'os' ) . EOL ;
15
15
var multiline = require ( 'multiline' ) ;
16
- var Promise = require ( 'ember-cli/lib/ext/promise ' ) ;
16
+ var RSVP = require ( 'rsvp ' ) ;
17
17
var GitHubApi = require ( 'github' ) ;
18
18
19
19
var github = new GitHubApi ( { version : '3.0.0' } ) ;
20
- var compareCommits = Promise . denodeify ( github . repos . compareCommits ) ;
20
+ var compareCommits = RSVP . denodeify ( github . repos . compareCommits ) ;
21
21
var currentVersion = 'v' + require ( '../package' ) . version ;
22
22
23
23
var user = 'ember-cli-deploy' ;
Original file line number Diff line number Diff line change 1
1
/* jshint node: true */
2
2
'use strict' ;
3
3
4
- var Promise = require ( 'ember-cli/lib/ext/promise ' ) ;
4
+ var RSVP = require ( 'rsvp ' ) ;
5
5
6
6
var DeployPluginBase = require ( 'ember-cli-deploy-plugin' ) ;
7
7
@@ -38,7 +38,7 @@ module.exports = {
38
38
scm : this . _getScmData ( )
39
39
} ;
40
40
41
- return Promise . hash ( promises )
41
+ return RSVP . hash ( promises )
42
42
. then ( function ( results ) {
43
43
var data = results . data ;
44
44
data . scm = results . scm ;
@@ -66,13 +66,13 @@ module.exports = {
66
66
var path = this . readConfig ( 'distDir' ) ;
67
67
return new ScmDataGenerator ( path ) . generate ( ) ;
68
68
} else {
69
- return Promise . resolve ( ) ;
69
+ return RSVP . resolve ( ) ;
70
70
}
71
71
} ,
72
72
73
73
_errorMessage : function ( error ) {
74
74
this . log ( error , { color : 'red' } ) ;
75
- return Promise . reject ( error ) ;
75
+ return RSVP . reject ( error ) ;
76
76
}
77
77
} ) ;
78
78
return new DeployPlugin ( ) ;
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ var fs = require('fs');
3
3
var path = require ( 'path' ) ;
4
4
var minimatch = require ( 'minimatch' ) ;
5
5
var crypto = require ( 'crypto' ) ;
6
- var Promise = require ( 'ember-cli/lib/ext/promise ' ) ;
6
+ var RSVP = require ( 'rsvp ' ) ;
7
7
8
8
var denodeify = require ( 'rsvp' ) . denodeify ;
9
9
var readFile = denodeify ( fs . readFile ) ;
@@ -23,7 +23,7 @@ module.exports = CoreObject.extend({
23
23
var filePaths = distFiles . filter ( minimatch . filter ( filePattern , { matchBase : true } ) ) ;
24
24
25
25
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 + '`' ) ;
27
27
}
28
28
29
29
var filePath = path . join ( distDir , filePaths [ 0 ] ) ;
Original file line number Diff line number Diff line change 1
1
var CoreObject = require ( 'core-object' ) ;
2
2
var gitRepoInfo = require ( 'git-repo-info' ) ;
3
- var Promise = require ( 'ember-cli/lib/ext/promise ' ) ;
3
+ var RSVP = require ( 'rsvp ' ) ;
4
4
5
5
module . exports = CoreObject . extend ( {
6
6
generate : function ( ) {
7
7
var info = gitRepoInfo ( ) ;
8
8
9
9
if ( info === null || info . root === null ) {
10
- return Promise . reject ( 'Could not find git repository' ) ;
10
+ return RSVP . reject ( 'Could not find git repository' ) ;
11
11
}
12
12
13
13
var sha = info . sha . slice ( 0 , 7 ) ;
14
14
15
15
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 + '`' ) ;
17
17
}
18
18
19
- return Promise . resolve ( {
19
+ return RSVP . resolve ( {
20
20
revisionKey : sha ,
21
21
timestamp : new Date ( ) . toISOString ( )
22
22
} ) ;
Original file line number Diff line number Diff line change 1
1
var CoreObject = require ( 'core-object' ) ;
2
2
var gitRepoInfo = require ( 'git-repo-info' ) ;
3
- var Promise = require ( 'ember-cli/lib/ext/promise ' ) ;
3
+ var RSVP = require ( 'rsvp ' ) ;
4
4
5
5
module . exports = CoreObject . extend ( {
6
6
init : function ( options ) {
@@ -13,17 +13,17 @@ module.exports = CoreObject.extend({
13
13
var info = gitRepoInfo ( ) ;
14
14
15
15
if ( info === null || info . root === null ) {
16
- return Promise . reject ( 'Could not find git repository' ) ;
16
+ return RSVP . reject ( 'Could not find git repository' ) ;
17
17
}
18
18
19
19
var tag = info . tag ;
20
20
var sha = info . sha . slice ( 0 , 8 ) ;
21
21
22
22
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 + '`' ) ;
24
24
}
25
25
26
- return Promise . resolve ( {
26
+ return RSVP . resolve ( {
27
27
revisionKey : info . tag + separator + sha ,
28
28
timestamp : new Date ( ) . toISOString ( )
29
29
} ) ;
Original file line number Diff line number Diff line change 1
1
var CoreObject = require ( 'core-object' ) ;
2
2
var gitRepoInfo = require ( 'git-repo-info' ) ;
3
3
var fs = require ( 'fs' ) ;
4
- var Promise = require ( 'ember-cli/lib/ext/promise ' ) ;
4
+ var RSVP = require ( 'rsvp ' ) ;
5
5
6
6
var denodeify = require ( 'rsvp' ) . denodeify ;
7
7
var readFile = denodeify ( fs . readFile ) ;
@@ -19,7 +19,7 @@ module.exports = CoreObject.extend({
19
19
var info = gitRepoInfo ( ) ;
20
20
21
21
if ( info === null || info . root === null ) {
22
- return Promise . reject ( 'Could not find git repository' ) ;
22
+ return RSVP . reject ( 'Could not find git repository' ) ;
23
23
}
24
24
25
25
var sha = ( info . sha || '' ) . slice ( 0 , 8 ) ;
@@ -30,7 +30,7 @@ module.exports = CoreObject.extend({
30
30
var json = JSON . parse ( contents ) ;
31
31
32
32
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 + '`' ) ;
34
34
}
35
35
36
36
var versionString = json . version ;
Original file line number Diff line number Diff line change 1
1
var CoreObject = require ( 'core-object' ) ;
2
- var Promise = require ( 'ember-cli/lib/ext/promise ' ) ;
2
+ var RSVP = require ( 'rsvp ' ) ;
3
3
var gitRepoInfo = require ( 'git-repo-info' ) ;
4
- var simpleGit = require ( 'simple-git' ) ;
4
+ var simpleGit = require ( 'simple-git' ) ;
5
5
6
6
module . exports = CoreObject . extend ( {
7
7
init : function ( path ) {
@@ -11,7 +11,7 @@ module.exports = CoreObject.extend({
11
11
12
12
generate : function ( ) {
13
13
var _this = this ;
14
- return new Promise ( function ( resolve , reject ) {
14
+ return new RSVP . Promise ( function ( resolve , reject ) {
15
15
simpleGit ( _this . path ) . log ( function ( err , log ) {
16
16
var info = log . latest ;
17
17
resolve ( {
You can’t perform that action at this time.
0 commit comments