Auto merge of #3795 - jryans:template-year, r=alexcrichton

Add year to project template variables

This adds the current year as a `year` variable for project templates. Some license files / headers include the year, so this should make it easier to include those in a template.

Author: bors

Cargo.lock

@@ -43,6 +43,7 @@ shell-escape = "0.1"
 tar = { version = "0.4", default-features = false }
 tempdir = "0.3"
 term = "0.4.4"
+time = "0.1.36"
 toml = "0.3"
 url = "1.1"
 

Cargo.toml

@@ -26,6 +26,7 @@ extern crate shell_escape;
 extern crate tar;
 extern crate tempdir;
 extern crate term;
+extern crate time;
 extern crate toml;
 extern crate url;
 

src/cargo/lib.rs

@@ -10,6 +10,7 @@ use term::color::BLACK;
 
 use handlebars::{Handlebars, no_escape};
 use tempdir::TempDir;
+use time;
 use toml;
 
 use core::Workspace;
@@ -520,6 +521,7 @@ fn mk(config: &Config, opts: &MkOptions) -> CargoResult<()> {
     let mut data = BTreeMap::new();
     data.insert("name".to_owned(), name.to_owned());
     data.insert("author".to_owned(), author);
+    data.insert("year".to_owned(), (time::now().tm_year + 1900).to_string());
 
     let template_set = try!(get_input_template(config, opts));
     for template in template_set.template_files.iter() {

src/cargo/ops/cargo_new.rs

@@ -29,7 +29,7 @@ repository by default. If you don't want it to do that, pass `--vcs none`.
 
 You can also use your own template to scaffold cargo projects! See the
 [Templates](#templates) section for more details.
-  
+
 Let’s check out what Cargo has generated for us:
 
 ```shell
@@ -480,7 +480,8 @@ $ cargo new proj --template http://your/project/repo
 The variables available for use are:
 
 - `name`: the name of the project
-- `authors`: the toml formatted name of the project author
+- `author`: the toml formatted name of the project author
+- `year`: the current year
 
 In the future, more variables may be added. Suggestions welcome!
 

src/doc/guide.md

@@ -2,6 +2,7 @@ extern crate cargo;
 extern crate cargotest;
 extern crate hamcrest;
 extern crate tempdir;
+extern crate time;
 
 use std::fs::{self, File};
 use std::io::prelude::*;
@@ -75,6 +76,10 @@ fn simple_template() {
 name = "{{name}}"
 version = "0.0.1"
 authors = ["{{author}}"]
+"#).unwrap();
+File::create(&root.join("home/.cargo/templates/testtemplate/LICENSE"))
+                  .unwrap().write_all(br#"
+(c) {{year}} {{author}}
 "#).unwrap();
     File::create(&root.join("home/.cargo/templates/testtemplate/src/main.rs"))
                       .unwrap().write_all(br#"
@@ -94,8 +99,15 @@ fn main () {
 
     assert_that(&paths::root().join("foo"), existing_dir());
     assert_that(&paths::root().join("foo/Cargo.toml"), existing_file());
+    assert_that(&paths::root().join("foo/LICENSE"), existing_file());
     assert_that(&paths::root().join("foo/src/main.rs"), existing_file());
 
+    let license = paths::root().join("foo/LICENSE");
+    let mut contents = String::new();
+    File::open(&license).unwrap().read_to_string(&mut contents).unwrap();
+    let expected = format!("(c) {} {}", (time::now().tm_year + 1900).to_string(), "foo");
+    assert!(contents.contains(&expected));
+
     assert_that(cargo_process("build").cwd(&paths::root().join("foo")),
                 execs().with_status(0));
     assert_that(&paths::root().join(&format!("foo/target/debug/foo{}",