From deed994322dcc1386b8f6e26fe51c67778b29e4e Mon Sep 17 00:00:00 2001 From: Brad Anderson Date: Sat, 25 Feb 2017 21:46:39 -0600 Subject: [PATCH 1/4] Add travis configuration --- .travis.yml | 9 +++++++++ build-site.sh | 2 ++ src/pages/table_of_contents.md | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..59a8127 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: rust + +before_install: + - sudo apt-get update -qq + - sudo apt-get install git pip + - sudo pip install ghp-import + - cargo install mdbook + +script: build-site.sh diff --git a/build-site.sh b/build-site.sh index 69cd988..9bdb107 100755 --- a/build-site.sh +++ b/build-site.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Returns 1 if program is installed and 0 otherwise function program_installed { local return_=1 diff --git a/src/pages/table_of_contents.md b/src/pages/table_of_contents.md index 072c2b0..7dd1b8c 100644 --- a/src/pages/table_of_contents.md +++ b/src/pages/table_of_contents.md @@ -11,7 +11,7 @@ A practical guide to the Rust crate ecosystem. * [rand](pages/rand.html) [![rand-badge]][rand] ## Contributing -If you'd like to make changes to the project, please see [this guide](CONTRIBUTING.md). +If you'd like to make changes to the project, please see [this guide](CONTRIBUTING.html). ## License From 32914ce9da90e3adaa4c148bf9fed87d14eafa03 Mon Sep 17 00:00:00 2001 From: Brad Anderson Date: Sat, 25 Feb 2017 21:50:57 -0600 Subject: [PATCH 2/4] Modify travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59a8127..b8621c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ before_install: - sudo pip install ghp-import - cargo install mdbook -script: build-site.sh +after_success: build-site.sh From bb1aff944025b964d6275aa7f1ed1bac851e6511 Mon Sep 17 00:00:00 2001 From: Brad Anderson Date: Sat, 25 Feb 2017 21:56:57 -0600 Subject: [PATCH 3/4] Fix contributing link on front page --- book/index.html | 2 +- book/pages/contributing.html | 1 + book/pages/table_of_contents.html | 2 +- book/print.html | 3 ++- src/pages/contributing.md | 2 ++ src/pages/table_of_contents.md | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/book/index.html b/book/index.html index a3ea3db..23a7aef 100644 --- a/book/index.html +++ b/book/index.html @@ -78,7 +78,7 @@
  • rand rand-badge

    • Contributing

     -

    If you'd like to make changes to the project, please see this guide.

    +

    If you'd like to make changes to the project, please see this guide.

    License

    MIT/Apache-2.0

    diff --git a/book/pages/contributing.html b/book/pages/contributing.html index 8aacd0a..a59db34 100644 --- a/book/pages/contributing.html +++ b/book/pages/contributing.html @@ -97,6 +97,7 @@ TODO: Pull requests

    Tests

    TODO: Write about writing tests

    Style

     +

    https://aturon.github.io

    Git Commit Messages

    https://chris.beams.io/posts/git-commit/
    TODO: Possibly take relevant parts from this post or write our own

    diff --git a/book/pages/table_of_contents.html b/book/pages/table_of_contents.html index e89665d..f306d1f 100644 --- a/book/pages/table_of_contents.html +++ b/book/pages/table_of_contents.html @@ -79,7 +79,7 @@
  • rand rand-badge

    • Contributing

     -

    If you'd like to make changes to the project, please see this guide.

    +

    If you'd like to make changes to the project, please see this guide.

    License

    MIT/Apache-2.0

    diff --git a/book/print.html b/book/print.html index 39ce22e..ee807f2 100644 --- a/book/print.html +++ b/book/print.html @@ -79,7 +79,7 @@
  • rand rand-badge

    • Contributing

     -

    If you'd like to make changes to the project, please see this guide.

    +

    If you'd like to make changes to the project, please see this guide.

    License

    MIT/Apache-2.0

    @@ -408,6 +408,7 @@ TODO: Pull requests

    Tests

    TODO: Write about writing tests

    Style

     +

    https://aturon.github.io

    Git Commit Messages

    https://chris.beams.io/posts/git-commit/
    TODO: Possibly take relevant parts from this post or write our own

    diff --git a/src/pages/contributing.md b/src/pages/contributing.md index f0744bd..85c4368 100644 --- a/src/pages/contributing.md +++ b/src/pages/contributing.md @@ -31,6 +31,8 @@ TODO: How to add new crates to project TODO: Write about writing tests ## Style +https://aturon.github.io + ### Git Commit Messages https://chris.beams.io/posts/git-commit/ TODO: Possibly take relevant parts from this post or write our own diff --git a/src/pages/table_of_contents.md b/src/pages/table_of_contents.md index 7dd1b8c..c3bb348 100644 --- a/src/pages/table_of_contents.md +++ b/src/pages/table_of_contents.md @@ -11,7 +11,7 @@ A practical guide to the Rust crate ecosystem. * [rand](pages/rand.html) [![rand-badge]][rand] ## Contributing -If you'd like to make changes to the project, please see [this guide](CONTRIBUTING.html). +If you'd like to make changes to the project, please see [this guide](pages/contributing.html). ## License From be581695be1209415bbc1fbfeb02dfcdafb1a7bb Mon Sep 17 00:00:00 2001 From: Brad Anderson Date: Sat, 25 Feb 2017 22:03:10 -0600 Subject: [PATCH 4/4] Fix badges on table of contents and README --- README.md | 12 ++++++------ book/index.html | 26 ++++++++++++++++++++------ book/pages/IO.html | 14 ++++++++++++++ book/pages/byteorder.html | 14 ++++++++++++++ book/pages/cli_parsing.html | 14 ++++++++++++++ book/pages/contributing.html | 14 ++++++++++++++ book/pages/error_handling_note.html | 14 ++++++++++++++ book/pages/file_io.html | 14 ++++++++++++++ book/pages/json.html | 14 ++++++++++++++ book/pages/math.html | 14 ++++++++++++++ book/pages/rand.html | 14 ++++++++++++++ book/pages/serialization.html | 14 ++++++++++++++ book/pages/table_of_contents.html | 26 ++++++++++++++++++++------ book/pages/toml.html | 14 ++++++++++++++ book/print.html | 26 ++++++++++++++++++++------ src/pages/table_of_contents.md | 10 +++++----- 16 files changed, 225 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index e5f7878..40966de 100644 --- a/README.md +++ b/README.md @@ -20,17 +20,17 @@ MIT/Apache-2.0 -[byteorder-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=byteorder +[byteorder-badge]: https://img.shields.io/crates/v/byteorder.svg?label=byteorder [byteorder]: https://docs.rs/byteorder -[file-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=file +[file-badge]: https://img.shields.io/crates/v/file.svg?label=file [file]: https://doc.rust-lang.org/std/fs/struct.File.html -[clap-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=clap +[clap-badge]: https://img.shields.io/crates/v/clap.svg?label=clap [clap]: https://kbknapp.github.io/clap-rs/clap/struct.Arg.html -[json-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=json +[json-badge]: https://img.shields.io/crates/v/json.svg?label=json [json]: http://json.rs/doc/json -[toml-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=toml +[toml-badge]: https://img.shields.io/crates/v/toml.svg?label=toml [toml]: http://alexcrichton.com/toml-rs/toml/ [rand-badge]: https://img.shields.io/crates/v/rand.svg?label=rand [rand]: https://doc.rust-lang.org/rand/rand/index.html [error-docs]: https://doc.rust-lang.org/book/error-handling.html -[error-blog]: https://brson.github.io/2016/11/30/starting-with-error-chaini +[error-blog]: https://brson.github.io/2016/11/30/starting-with-error-chain diff --git a/book/index.html b/book/index.html index 23a7aef..7bec4f8 100644 --- a/book/index.html +++ b/book/index.html @@ -70,15 +70,15 @@

    A practical guide to the Rust crate ecosystem.

    Recipes

    Contributing

     -

    If you'd like to make changes to the project, please see this guide.

    +

    If you'd like to make changes to the project, please see this guide.

    License

    MIT/Apache-2.0

    @@ -116,6 +116,20 @@ + + diff --git a/book/pages/IO.html b/book/pages/IO.html index 293f63f..eb28edc 100644 --- a/book/pages/IO.html +++ b/book/pages/IO.html @@ -109,6 +109,20 @@ + + diff --git a/book/pages/byteorder.html b/book/pages/byteorder.html index 8fb3f78..fd78ffe 100644 --- a/book/pages/byteorder.html +++ b/book/pages/byteorder.html @@ -159,6 +159,20 @@ fn main() { run().unwrap() } + + diff --git a/book/pages/cli_parsing.html b/book/pages/cli_parsing.html index a329e04..b0d3efe 100644 --- a/book/pages/cli_parsing.html +++ b/book/pages/cli_parsing.html @@ -109,6 +109,20 @@ + + diff --git a/book/pages/contributing.html b/book/pages/contributing.html index a59db34..5138dea 100644 --- a/book/pages/contributing.html +++ b/book/pages/contributing.html @@ -138,6 +138,20 @@ TODO: Maybe provide a template?

    + + diff --git a/book/pages/error_handling_note.html b/book/pages/error_handling_note.html index 4b9ac28..df21a7a 100644 --- a/book/pages/error_handling_note.html +++ b/book/pages/error_handling_note.html @@ -146,6 +146,20 @@ makes the ? operator work

    + + diff --git a/book/pages/file_io.html b/book/pages/file_io.html index e11a2a1..d50d2d6 100644 --- a/book/pages/file_io.html +++ b/book/pages/file_io.html @@ -109,6 +109,20 @@ + + diff --git a/book/pages/json.html b/book/pages/json.html index ab4eb7a..7b34c22 100644 --- a/book/pages/json.html +++ b/book/pages/json.html @@ -148,6 +148,20 @@ fn main(){ + + diff --git a/book/pages/math.html b/book/pages/math.html index c233fbf..2fd377a 100644 --- a/book/pages/math.html +++ b/book/pages/math.html @@ -110,6 +110,20 @@ + + diff --git a/book/pages/rand.html b/book/pages/rand.html index 29dbedc..00b472c 100644 --- a/book/pages/rand.html +++ b/book/pages/rand.html @@ -210,6 +210,20 @@ fn main() { + + diff --git a/book/pages/serialization.html b/book/pages/serialization.html index fd39592..fbf836d 100644 --- a/book/pages/serialization.html +++ b/book/pages/serialization.html @@ -109,6 +109,20 @@ + + diff --git a/book/pages/table_of_contents.html b/book/pages/table_of_contents.html index f306d1f..24c05ff 100644 --- a/book/pages/table_of_contents.html +++ b/book/pages/table_of_contents.html @@ -71,15 +71,15 @@

    A practical guide to the Rust crate ecosystem.

    Recipes

    Contributing

     -

    If you'd like to make changes to the project, please see this guide.

    +

    If you'd like to make changes to the project, please see this guide.

    License

    MIT/Apache-2.0

    @@ -117,6 +117,20 @@ + + diff --git a/book/pages/toml.html b/book/pages/toml.html index 38c6d0c..79ad9ac 100644 --- a/book/pages/toml.html +++ b/book/pages/toml.html @@ -176,6 +176,20 @@ fn main() { + + diff --git a/book/print.html b/book/print.html index ee807f2..c5139b3 100644 --- a/book/print.html +++ b/book/print.html @@ -71,15 +71,15 @@

    A practical guide to the Rust crate ecosystem.

    Recipes

    Contributing

     -

    If you'd like to make changes to the project, please see this guide.

    +

    If you'd like to make changes to the project, please see this guide.

    License

    MIT/Apache-2.0

    @@ -441,6 +441,20 @@ TODO: Maybe provide a template?

    + + diff --git a/src/pages/table_of_contents.md b/src/pages/table_of_contents.md index c3bb348..1317154 100644 --- a/src/pages/table_of_contents.md +++ b/src/pages/table_of_contents.md @@ -20,15 +20,15 @@ MIT/Apache-2.0 -[byteorder-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=byteorder +[byteorder-badge]: https://img.shields.io/crates/v/byteorder.svg?label=byteorder [byteorder]: https://docs.rs/byteorder -[file-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=file +[file-badge]: https://img.shields.io/crates/v/file.svg?label=file [file]: https://doc.rust-lang.org/std/fs/struct.File.html -[clap-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=clap +[clap-badge]: https://img.shields.io/crates/v/clap.svg?label=clap [clap]: https://kbknapp.github.io/clap-rs/clap/struct.Arg.html -[json-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=json +[json-badge]: https://img.shields.io/crates/v/json.svg?label=json [json]: http://json.rs/doc/json -[toml-badge]: https://img.shields.io/crates/v/rustc-serialize.svg?label=toml +[toml-badge]: https://img.shields.io/crates/v/toml.svg?label=toml [toml]: http://alexcrichton.com/toml-rs/toml/ [rand-badge]: https://img.shields.io/crates/v/rand.svg?label=rand [rand]: https://doc.rust-lang.org/rand/rand/index.html