fix(version-up): code updated to v0.1.6, latest CLI

* also includes publishing tag files
This commit is contained in:
Sebastian Thiel
2015-04-26 13:42:31 +02:00
parent 4e275eaadd
commit c2dd9c7a02
770 changed files with 63340 additions and 31427 deletions

View File

@@ -105,7 +105,7 @@ pub fn parse_kv_arg<'a>(kv: &'a str, err: &mut InvalidOptionsError, for_hashmap:
let key = &kv[..pos];
if kv.len() <= pos + 1 {
add_err();
return (key, None)
return (key, Some(""))
}
(key, Some(&kv[pos+1..]))
}

View File

@@ -19,36 +19,37 @@ use std::io::{self, Write};
docopt!(Options derive Debug, "
Usage:
deploymentmanager2-beta1 [options] deployments delete <project> <deployment> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] deployments get <project> <deployment> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] deployments insert <project> -r <kv>... [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] deployments list <project> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] manifests get <project> <deployment> <manifest> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] manifests list <project> <deployment> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] operations get <project> <operation> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] operations list <project> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] resources get <project> <deployment> <resource> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] resources list <project> <deployment> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] types list <project> [-p <v>]... [-o <out>]
deploymentmanager2-beta1 [options] deployments delete <project> <deployment> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] deployments get <project> <deployment> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] deployments insert <project> -r <kv>... [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] deployments list <project> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] manifests get <project> <deployment> <manifest> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] manifests list <project> <deployment> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] operations get <project> <operation> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] operations list <project> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] resources get <project> <deployment> <resource> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] resources list <project> <deployment> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 [options] types list <project> [-p <v>...] [-o <out>]
deploymentmanager2-beta1 --help
All documentation details can be found TODO: <URL to github.io docs here, see #51>
All documentation details can be found at
http://byron.github.io/google-apis-rs/google_deploymentmanager2_beta1_cli/index.html
Configuration:
--scope <url>
Specify the authentication a method should be executed in. Each scope requires
the user to grant this application permission to use it.
Specify the authentication a method should be executed in. Each scope
requires the user to grant this application permission to use it.
If unset, it defaults to the shortest scope url for a particular method.
--config-dir <folder>
A directory into which we will store our persistent data. Defaults to a user-writable
directory that we will create during the first invocation.
A directory into which we will store our persistent data. Defaults to
a user-writable directory that we will create during the first invocation.
[default: ~/.google-service-cli]
--debug
Output all server communication to standard error. `tx` and `rx` are placed into
the same stream.
Output all server communication to standard error. `tx` and `rx` are placed
into the same stream.
--debug-auth
Output all communication related to authentication to standard error. `tx` and `rx` are placed into
the same stream.
Output all communication related to authentication to standard error. `tx`
and `rx` are placed into the same stream.
");
mod cmn;
@@ -97,6 +98,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -140,6 +144,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -156,8 +163,45 @@ impl Engine {
fn _deployments_insert(&self, dry_run: bool, err: &mut InvalidOptionsError)
-> Option<api::Error> {
let mut request = api::Deployment::default();
let mut call = self.hub.deployments().insert(&request, &self.opt.arg_project);
let mut field_cursor = FieldCursor::default();
for kvarg in self.opt.arg_kv.iter() {
let last_errc = err.issues.len();
let (key, value) = parse_kv_arg(&*kvarg, err, false);
let mut temp_cursor = field_cursor.clone();
if let Err(field_err) = temp_cursor.set(&*key) {
err.issues.push(field_err);
}
if value.is_none() {
field_cursor = temp_cursor.clone();
if err.issues.len() > last_errc {
err.issues.remove(last_errc);
}
continue;
}
match &temp_cursor.to_string()[..] {
"target-config" => {
request.target_config = Some(value.unwrap_or("").to_string());
},
"manifest" => {
request.manifest = Some(value.unwrap_or("").to_string());
},
"id" => {
request.id = Some(value.unwrap_or("").to_string());
},
"name" => {
request.name = Some(value.unwrap_or("").to_string());
},
"description" => {
request.description = Some(value.unwrap_or("").to_string());
},
_ => {
err.issues.push(CLIError::Field(FieldError::Unknown(temp_cursor.to_string())));
}
}
}
let mut call = self.hub.deployments().insert(request, &self.opt.arg_project);
for parg in self.opt.arg_v.iter() {
let (key, value) = parse_kv_arg(&*parg, err, false);
match key {
@@ -179,39 +223,14 @@ impl Engine {
_ => err.issues.push(CLIError::UnknownParameter(key.to_string())),
}
}
let mut field_name = FieldCursor::default();
for kvarg in self.opt.arg_kv.iter() {
let (key, value) = parse_kv_arg(&*kvarg, err, false);
if let Err(field_err) = field_name.set(&*key) {
err.issues.push(field_err);
}
match &field_name.to_string()[..] {
"target-config" => {
request.target_config = Some(value.unwrap_or("").to_string());
},
"manifest" => {
request.manifest = Some(value.unwrap_or("").to_string());
},
"id" => {
request.id = Some(value.unwrap_or("").to_string());
},
"name" => {
request.name = Some(value.unwrap_or("").to_string());
},
"description" => {
request.description = Some(value.unwrap_or("").to_string());
},
_ => {
err.issues.push(CLIError::Field(FieldError::Unknown(field_name.to_string())));
}
}
}
let protocol = "standard-request";
if dry_run {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -261,6 +280,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -304,6 +326,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -353,6 +378,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -396,6 +424,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -445,6 +476,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -488,6 +522,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -537,6 +574,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -586,6 +626,9 @@ impl Engine {
None
} else {
assert!(err.issues.len() == 0);
if self.opt.flag_scope.len() > 0 {
call = call.add_scope(&self.opt.flag_scope);
}
let mut ostream = writer_from_opts(self.opt.flag_o, &self.opt.arg_out);
match match protocol {
"standard-request" => call.doit(),
@@ -719,6 +762,7 @@ impl Engine {
fn main() {
let opts: Options = Options::docopt().decode().unwrap_or_else(|e| e.exit());
let debug = opts.flag_debug;
match Engine::new(opts) {
Err(err) => {
writeln!(io::stderr(), "{}", err).ok();
@@ -726,8 +770,11 @@ fn main() {
},
Ok(engine) => {
if let Some(err) = engine.doit() {
writeln!(io::stderr(), "{:?}", err).ok();
writeln!(io::stderr(), "{}", err).ok();
if debug {
writeln!(io::stderr(), "{:?}", err).ok();
} else {
writeln!(io::stderr(), "{}", err).ok();
}
env::set_exit_status(1);
}
}