ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-27 01:11:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #94 from resin-io/upgrade_vcs_dependencies

Browse Source 
Upgrade Resin VCS dependencies
This commit is contained in:
Juan Cruz Viotti 2015-07-13 07:37:02 -04:00
commit 10478e389a
10 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/actions/app.js
View File

@ -129,11 +129,11 @@
if (!confirmed) { if (!confirmed) {
return done(); return done();
} }
return vcs.initialize(currentDirectory, callback); return vcs.initialize(currentDirectory).nodeify(callback);
}, function(callback) { }, function(callback) {
return resin.models.application.get(params.name, callback); return resin.models.application.get(params.name, callback);
}, function(application, callback) { }, function(application, callback) {
return vcs.addRemote(currentDirectory, application.git_repository, callback); return vcs.associate(currentDirectory, application.git_repository).nodeify(callback);
} }
], function(error, remoteUrl) { ], function(error, remoteUrl) {
if (error != null) { if (error != null) {

2
build/actions/device.js
View File

@ -192,7 +192,7 @@
if (options.application != null) { if (options.application != null) {
return callback(null, options.application); return callback(null, options.application);
} }
return vcs.getApplicationName(process.cwd(), callback); return vcs.getApplicationName(process.cwd()).nodeify(callback);
}, function(applicationName, callback) { }, function(applicationName, callback) {
options.application = applicationName; options.application = applicationName;
return resin.models.application.has(options.application, callback); return resin.models.application.has(options.application, callback);

3
build/actions/examples.js
View File

@ -80,8 +80,7 @@
return done(error); return done(error);
} }
console.info("Cloning " + example.display_name + " to " + destination); console.info("Cloning " + example.display_name + " to " + destination);
vcs.clone(example.repository, destination, done); return vcs.clone(example.repository, destination).nodeify(done);
return done();
}); });
} }
}; };

4
lib/actions/app.coffee
View File

@ -175,13 +175,13 @@ exports.associate =
(confirmed, callback) -> (confirmed, callback) ->
return done() if not confirmed return done() if not confirmed
vcs.initialize(currentDirectory, callback) vcs.initialize(currentDirectory).nodeify(callback)
(callback) -> (callback) ->
resin.models.application.get(params.name, callback) resin.models.application.get(params.name, callback)
(application, callback) -> (application, callback) ->
vcs.addRemote(currentDirectory, application.git_repository, callback) vcs.associate(currentDirectory, application.git_repository).nodeify(callback)
], (error, remoteUrl) -> ], (error, remoteUrl) ->
return done(error) if error? return done(error) if error?

2
lib/actions/device.coffee
View File

@ -272,7 +272,7 @@ exports.init =
(callback) -> (callback) ->
return callback(null, options.application) if options.application? return callback(null, options.application) if options.application?
vcs.getApplicationName(process.cwd(), callback) vcs.getApplicationName(process.cwd()).nodeify(callback)
(applicationName, callback) -> (applicationName, callback) ->
options.application = applicationName options.application = applicationName

3
lib/actions/examples.coffee
View File

@ -91,5 +91,4 @@ exports.clone =
mkdirp destination, (error) -> mkdirp destination, (error) ->
return done(error) if error? return done(error) if error?
console.info("Cloning #{example.display_name} to #{destination}") console.info("Cloning #{example.display_name} to #{destination}")
vcs.clone(example.repository, destination, done) vcs.clone(example.repository, destination).nodeify(done)
return done()

2
man/resin-completion.1
View File

@ -1,4 +1,4 @@
.TH "RESIN" "1" "May 2015" "" "" .TH "RESIN" "1" "July 2015" "" ""
.SH "NAME" .SH "NAME"
\fBresin\fR \- tab completion for resin \fBresin\fR \- tab completion for resin
.SH DESCRIPTION .SH DESCRIPTION

2
man/resin-plugins.1
View File

@ -1,4 +1,4 @@
.TH "RESIN\-PLUGINS" "1" "May 2015" "" "" .TH "RESIN\-PLUGINS" "1" "July 2015" "" ""
.SH "NAME" .SH "NAME"
\fBresin-plugins\fR \- Creating Resin CLI plugins \fBresin-plugins\fR \- Creating Resin CLI plugins
.SH DESCRIPTION .SH DESCRIPTION

2
man/resin.1
View File

@ -1,4 +1,4 @@
.TH "RESIN" "1" "May 2015" "" "" .TH "RESIN" "1" "July 2015" "" ""
.SH "NAME" .SH "NAME"
\fBresin\fR \- command line tool to interact with resin\.io \fBresin\fR \- command line tool to interact with resin\.io
.SH SYNOPSIS .SH SYNOPSIS

2
package.json
View File

@ -67,7 +67,7 @@
"resin-register-device": "^1.0.1", "resin-register-device": "^1.0.1",
"resin-sdk": "^1.7.4", "resin-sdk": "^1.7.4",
"resin-settings-client": "^1.2.0", "resin-settings-client": "^1.2.0",
"resin-vcs": "^1.2.0", "resin-vcs": "^2.0.0",
"selfupdate": "^1.1.0", "selfupdate": "^1.1.0",
"tmp": "^0.0.25", "tmp": "^0.0.25",
"underscore.string": "~2.4.0", "underscore.string": "~2.4.0",