softprops/action-gh-release
0
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Into idiom

Browse Source
This commit is contained in:
softprops 2019-08-25 22:41:08 -04:00
parent 4cac8612c9
commit d2478527cf
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.rs
View File

@ -12,7 +12,7 @@ use std::{
type BoxError = Box<dyn Error>; type BoxError = Box<dyn Error>;
#[derive(Deserialize, Default, Debug, PartialEq)] #[derive(Deserialize, Default, Debug, PartialEq, Clone)]
struct Config { struct Config {
// github provided // github provided
github_token: String, github_token: String,
@ -25,23 +25,25 @@ struct Config {
input_draft: Option<bool>, input_draft: Option<bool>,
} }
fn release(conf: &Config) -> Release { impl Into<Release> for Config {
fn into(self) -> Release {
let Config { let Config {
github_ref, github_ref,
input_name, input_name,
input_body, input_body,
input_draft, input_draft,
.. ..
} = conf; } = self;
let tag_name = github_ref.trim_start_matches("refs/tags/").to_string(); let tag_name = github_ref.trim_start_matches("refs/tags/").to_string();
let name = input_name.clone().or_else(|| Some(tag_name.clone())); let name = input_name.clone().or_else(|| Some(tag_name.clone()));
let draft = *input_draft; let draft = input_draft;
Release { Release {
tag_name, tag_name,
name, name,
body: input_body.clone(), body: input_body.clone(),
draft, draft,
} }
}
} }
fn is_tag<R>(gitref: R) -> bool fn is_tag<R>(gitref: R) -> bool
@ -88,12 +90,16 @@ fn run(
let ReleaseResponse { id, html_url } = releaser.release( let ReleaseResponse { id, html_url } = releaser.release(
conf.github_token.as_str(), conf.github_token.as_str(),
conf.github_repository.as_str(), conf.github_repository.as_str(),
release(&conf), conf.clone().into(),
)?; )?;
if let Some(patterns) = conf.input_files { if let Some(patterns) = conf.input_files {
for path in paths(patterns)? { for path in paths(patterns)? {
println!("⬆️ Uploading {} asset {}", mime_or_default(&path), path.display()); println!(
"⬆️ Uploading {} asset {}",
mime_or_default(&path),
path.display()
);
let status = uploader.upload( let status = uploader.upload(
conf.github_token.as_str(), conf.github_token.as_str(),
conf.github_repository.as_str(), conf.github_repository.as_str(),
@ -154,7 +160,7 @@ mod tests {
}, },
), ),
] { ] {
assert_eq!(release(&conf), expect); assert_eq!(expect, conf.into());
} }
Ok(()) Ok(())
} }
@ -182,6 +188,7 @@ mod tests {
("INPUT_NAME".into(), "test release".into()), ("INPUT_NAME".into(), "test release".into()),
("INPUT_BODY".into(), ":)".into()), ("INPUT_BODY".into(), ":)".into()),
("INPUT_FILES".into(), "*.md".into()), ("INPUT_FILES".into(), "*.md".into()),
("INPUT_DRAFT".into(), "true".into()),
], ],
Config { Config {
github_token: "123".into(), github_token: "123".into(),
@ -190,6 +197,7 @@ mod tests {
input_name: Some("test release".into()), input_name: Some("test release".into()),
input_body: Some(":)".into()), input_body: Some(":)".into()),
input_files: Some(vec!["*.md".into()]), input_files: Some(vec!["*.md".into()]),
input_draft: Some(true),
}, },
)] { )] {
assert_eq!(expect, envy::from_iter::<_, Config>(env)?) assert_eq!(expect, envy::from_iter::<_, Config>(env)?)