Skip to content
This repository has been archived by the owner on Nov 8, 2021. It is now read-only.

Commit

Permalink
Copy license file(s) to out directory
Browse files Browse the repository at this point in the history
Check the Cagro.toml for a license and if one is found glob for LICENSE* files to copy to the out directory
  • Loading branch information
mstallmo committed Nov 17, 2018
1 parent 51e6351 commit 2d837f7
Show file tree
Hide file tree
Showing 8 changed files with 288 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ failure = "0.1.2"
flate2 = "1.0.2"
hex = "0.3"
human-panic = "1.0.1"
glob = "0.2"
indicatif = "0.9.0"
lazy_static = "1.1.0"
openssl = { version = '0.10.11', optional = true }
Expand Down
17 changes: 16 additions & 1 deletion src/command/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use command::utils::{create_pkg_dir, set_crate_path};
use emoji;
use failure::Error;
use indicatif::HumanDuration;
use license;
use lockfile::Lockfile;
use manifest;
use progressbar::Step;
Expand Down Expand Up @@ -209,6 +210,7 @@ impl Build {
step_create_dir,
step_create_json,
step_copy_readme,
step_copy_license,
step_install_wasm_bindgen,
step_run_wasm_bindgen,
],
Expand All @@ -219,13 +221,15 @@ impl Build {
step_create_dir,
step_create_json,
step_copy_readme,
step_copy_license,
step_run_wasm_bindgen
],
BuildMode::Force => steps![
step_build_wasm,
step_create_dir,
step_create_json,
step_copy_readme,
step_copy_license,
step_run_wasm_bindgen
],
}
Expand Down Expand Up @@ -300,7 +304,18 @@ impl Build {
Ok(())
}

fn step_install_wasm_bindgen(&mut self, step: &Step, log: &Logger) -> Result<(), Error> {
fn step_copy_license(&mut self, step: &Step, log: &Logger) -> Result<(), failure::Error> {
info!(&log, "Copying license from crate...");
license::copy_from_crate(&self.crate_path, &self.out_dir, step)?;
info!(&log, "Copied license from crate to {:#?}.", &self.out_dir);
Ok(())
}

fn step_install_wasm_bindgen(
&mut self,
step: &Step,
log: &Logger,
) -> Result<(), failure::Error> {
info!(&log, "Identifying wasm-bindgen dependency...");
let lockfile = Lockfile::new(&self.crate_data)?;
let bindgen_version = lockfile.require_wasm_bindgen()?;
Expand Down
3 changes: 3 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ extern crate dirs;
extern crate failure;
extern crate flate2;
extern crate hex;
extern crate glob;
extern crate indicatif;
#[macro_use]
extern crate lazy_static;
Expand All @@ -36,6 +37,8 @@ pub mod build;
pub mod child;
pub mod command;
pub mod emoji;
pub mod error;
pub mod license;
pub mod lockfile;
pub mod logger;
pub mod manifest;
Expand Down
76 changes: 76 additions & 0 deletions src/license.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
//! Copy `LICENSE` file(s) for the packaged wasm.
use failure;
use std::fs;
use std::path::Path;

use emoji;
use glob::glob;
use manifest;
use progressbar::Step;
use PBAR;

fn get_license(path: &Path) -> Option<String> {
match manifest::get_crate_license(path) {
Ok(license) => license,
Err(_) => None,
}
}

fn glob_license_files(path: &Path) -> Result<Vec<String>, failure::Error> {
let mut license_files: Vec<String> = Vec::new();
for entry in glob(path.join("LICENSE*").to_str().unwrap())? {
match entry {
Ok(globed_path) => {
license_files.push(String::from(
globed_path.file_name().unwrap().to_str().unwrap(),
));
}
Err(e) => println!("{:?}", e),
}
}
Ok(license_files)
}

/// Copy the crate's license into the `pkg` directory.
pub fn copy_from_crate(path: &Path, out_dir: &Path, step: &Step) -> Result<(), failure::Error> {
assert!(
fs::metadata(path).ok().map_or(false, |m| m.is_dir()),
"crate directory should exist"
);

assert!(
fs::metadata(&out_dir).ok().map_or(false, |m| m.is_dir()),
"crate's pkg directory should exist"
);

match get_license(path) {
Some(_) => {
let msg = format!("{}Copying over your LICENSE...", emoji::DANCERS);
PBAR.step(step, &msg);
let license_files = glob_license_files(path);

match license_files {
Ok(files) => {
if files.len() == 0 {
PBAR.info("License key is set in Cargo.toml but no LICENSE file(s) were found; Please add the LICENSE file(s) to your project directory");
return Ok(());
}
for license_file in files {
let crate_license_path = path.join(&license_file);
let new_license_path = out_dir.join(&license_file);
if let Err(_) = fs::copy(&crate_license_path, &new_license_path) {
PBAR.info("origin crate has no LICENSE");
}
}
}
Err(_) => PBAR.info("origin crate has no LICENSE"),
}
}
None => {
PBAR.step(step, "No LICENSE found in Cargo.toml skipping...");
}
};

Ok(())
}
125 changes: 125 additions & 0 deletions tests/all/license.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
extern crate failure;
extern crate wasm_pack;

use std::fs;

use utils::{self, fixture};
use wasm_pack::license;

#[test]
fn it_copies_a_license_default_path() {
let fixture = fixture::single_license();
let out_dir = fixture.path.join("pkg");
fs::create_dir(&out_dir).expect("should create pkg directory OK");

let step = wasm_pack::progressbar::Step::new(1);
assert!(license::copy_from_crate(&fixture.path, &out_dir, &step).is_ok());

let crate_license_path = fixture.path.join("LICENSE-WTFPL");
let pkg_license_path = out_dir.join("LICENSE-WTFPL");
println!(
"wasm-pack: should have copied LICENSE from '{}' to '{}'",
crate_license_path.display(),
pkg_license_path.display()
);
assert!(fs::metadata(&crate_license_path).is_ok());

assert!(fs::metadata(&pkg_license_path).is_ok());

let crate_license = utils::file::read_file(&crate_license_path).unwrap();
let pkg_license = utils::file::read_file(&pkg_license_path).unwrap();
assert_eq!(crate_license, pkg_license);
}

#[test]
fn it_copies_a_license_provied_path() {
let fixture = fixture::single_license();
let out_dir = fixture.path.join("pkg");
fs::create_dir(&out_dir).expect("should create pkg directory OK");

let step = wasm_pack::progressbar::Step::new(1);
assert!(license::copy_from_crate(&fixture.path, &out_dir, &step).is_ok());
let crate_license_path = fixture.path.join("LICENSE-WTFPL");
let pkg_license_path = out_dir.join("LICENSE-WTFPL");
println!(
"wasm-pack: should have copied LICENSE-WTFPL from '{}' to '{}'",
crate_license_path.display(),
pkg_license_path.display()
);
assert!(fs::metadata(&crate_license_path).is_ok());
assert!(fs::metadata(&pkg_license_path).is_ok());

let crate_license = utils::file::read_file(&crate_license_path).unwrap();
let pkg_license = utils::file::read_file(&pkg_license_path).unwrap();
assert_eq!(crate_license, pkg_license);
}

#[test]
fn it_copies_all_licenses_default_path() {
let fixture = fixture::dual_license();
let out_dir = fixture.path.join("pkg");
fs::create_dir(&out_dir).expect("should create pkg directory OK");

let step = wasm_pack::progressbar::Step::new(1);
assert!(license::copy_from_crate(&fixture.path, &out_dir, &step).is_ok());

let crate_license_path = fixture.path.join("LICENSE-WTFPL");
let pkg_license_path = out_dir.join("LICENSE-WTFPL");

let crate_license_path_2 = fixture.path.join("LICENSE-MIT");
let pkg_license_path_2 = out_dir.join("LICENSE-MIT");

println!(
"wasm-pack: should have copied LICENSE from '{}' to '{}'",
crate_license_path.display(),
pkg_license_path.display()
);
assert!(fs::metadata(&crate_license_path).is_ok());
assert!(fs::metadata(&pkg_license_path).is_ok());

assert!(fs::metadata(&crate_license_path_2).is_ok());
assert!(fs::metadata(&pkg_license_path_2).is_ok());

let crate_license = utils::file::read_file(&crate_license_path).unwrap();
let pkg_license = utils::file::read_file(&pkg_license_path).unwrap();
assert_eq!(crate_license, pkg_license);

let crate_license_2 = utils::file::read_file(&crate_license_path_2).unwrap();
let pkg_license_2 = utils::file::read_file(&pkg_license_path_2).unwrap();
assert_eq!(crate_license_2, pkg_license_2);
}

#[test]
fn it_copies_all_licenses_provided_path() {
let fixture = fixture::dual_license();
let out_dir = fixture.path.join("pkg");
fs::create_dir(&out_dir).expect("should create pkg directory OK");

let step = wasm_pack::progressbar::Step::new(1);
assert!(license::copy_from_crate(&fixture.path, &out_dir, &step).is_ok());

let crate_license_path = fixture.path.join("LICENSE-WTFPL");
let pkg_license_path = out_dir.join("LICENSE-WTFPL");

let crate_license_path_2 = fixture.path.join("LICENSE-MIT");
let pkg_license_path_2 = out_dir.join("LICENSE-MIT");

println!(
"wasm-pack: should have copied LICENSE from '{}' to '{}'",
crate_license_path.display(),
pkg_license_path.display()
);
assert!(fs::metadata(&crate_license_path).is_ok());
assert!(fs::metadata(&pkg_license_path).is_ok());

assert!(fs::metadata(&crate_license_path_2).is_ok());
assert!(fs::metadata(&pkg_license_path_2).is_ok());

let crate_license = utils::file::read_file(&crate_license_path).unwrap();
let pkg_license = utils::file::read_file(&pkg_license_path).unwrap();
assert_eq!(crate_license, pkg_license);

let crate_license_2 = utils::file::read_file(&crate_license_path_2).unwrap();
let pkg_license_2 = utils::file::read_file(&pkg_license_path_2).unwrap();
assert_eq!(crate_license_2, pkg_license_2);
}
1 change: 1 addition & 0 deletions tests/all/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ extern crate wasm_pack;

mod bindgen;
mod build;
mod license;
mod lockfile;
mod manifest;
mod readme;
Expand Down
59 changes: 59 additions & 0 deletions tests/all/utils/fixture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,44 @@ impl Fixture {
)
}

/// Add `WTFPL LICENSE` file to the fixture.
pub fn wtfpl_license(&self) -> &Self {
self.file(
"LICENSE-WTFPL",
r#"
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
Copyright (C) 2004 Sam Hocevar <[email protected]>
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. You just DO WHAT THE FUCK YOU WANT TO.
"#,
)
}

/// Add `MIT LICENSE` file to the fixture.
pub fn mit_license(&self) -> &Self {
self.file(
"LICENSE-MIT",
r#"
Copyright <YEAR> <COPYRIGHT HOLDER>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"#,
)
}

/// Add a `Cargo.toml` with a correctly configured `wasm-bindgen`
/// dependency, `wasm-bindgen-test` dev-dependency, and `crate-type =
/// ["cdylib"]`.
Expand Down Expand Up @@ -590,3 +628,24 @@ pub fn transitive_dependencies() -> Fixture {
project_main_fixture(&mut fixture);
fixture
}

pub fn single_license() -> Fixture {
let fixture = Fixture::new();
fixture
.readme()
.cargo_toml("single_license")
.wtfpl_license()
.hello_world_src_lib();
fixture
}

pub fn dual_license() -> Fixture {
let fixture = Fixture::new();
fixture
.readme()
.cargo_toml("dual_license")
.wtfpl_license()
.mit_license()
.hello_world_src_lib();
fixture
}

0 comments on commit 2d837f7

Please sign in to comment.