Comparing version 0.6.9-66 to 0.6.10-70
@@ -9,3 +9,3 @@ | ||
apps.usage = "\nfhc apps [list]" | ||
+ "\nfhc apps create <app-title> [<git-repo> <git-branch> <key-file>]" | ||
+ "\nfhc apps create <app-title> [<git-repo> <git-branch>]" | ||
+ "\nfhc apps [read] <app-id>" | ||
@@ -49,4 +49,3 @@ + "\nfhc apps update <app-id> <property-name> <property-value>" | ||
var branch = args[2]; | ||
var key = args[3]; | ||
return create(title, repo, branch, key, cb); | ||
return create(title, repo, branch, cb); | ||
}else if (action === 'update' || action === 'set'){ | ||
@@ -100,3 +99,3 @@ args.shift(); | ||
// create app | ||
function create(appTitle, repo, key, branch, cb) { | ||
function create(appTitle, repo, branch, cb) { | ||
var nodejsEnabled = ini.get('nodejs') === true; | ||
@@ -114,12 +113,5 @@ var params = { | ||
} | ||
if (key) { | ||
if (!path.existsSync(key)) { | ||
return cb("Key file does not exist: " + key); | ||
} | ||
var buf = fs.readFileSync(key); | ||
params.scmkey = buf.toString(); | ||
} | ||
if (branch) { | ||
params.scmurl = repo; | ||
params.scmbranch = branch; | ||
} | ||
@@ -130,3 +122,10 @@ | ||
log.silly(data, "app create"); | ||
apps.message = "App created, id: " + data.guid; | ||
apps.message = "\nApp created, id: " + data.guid + "\n"; | ||
if (data.isScmApp && data.isScmPrivate) { | ||
apps.message += "\nDetected a private repository.\n"; | ||
apps.message += "Please add the following public key to your repository's authorised keys.\n\n"; | ||
apps.message += data.publicKey + "\n\n"; | ||
apps.message += "Once added, you can trigger a pull using the following command:\n"; | ||
apps.message += "fhc git pull " + data.guid; | ||
} | ||
if(data.tasks && data.tasks[0]) { | ||
@@ -133,0 +132,0 @@ async.map([data.tasks[0]], common.waitFor, function(err, results) { |
@@ -75,2 +75,2 @@ | ||
} | ||
}; | ||
}; |
@@ -94,2 +94,8 @@ process.title = "fhc"; | ||
] | ||
, fhcList = fhc.fhcList = [ | ||
,'fhcfg' | ||
,'completion' | ||
,'help' | ||
,'set' | ||
] | ||
, plumbing = [ | ||
@@ -96,0 +102,0 @@ // internal commands/work in progress |
@@ -5,3 +5,3 @@ { | ||
"keywords" : [ "cli", "feedhenry" ], | ||
"version": "0.6.9-66", | ||
"version": "0.6.10-70", | ||
"preferGlobal" : true, | ||
@@ -8,0 +8,0 @@ "homepage" : "http://git.io/fh-fhc", |
@@ -1,1 +0,1 @@ | ||
0.6.9-66 | ||
0.6.10-70 |
Sorry, the diff of this file is not supported yet
223784
5937