Add --output-dir parameters to commands 'serve' and 'build' #191

verpeteren · 2017-12-04T13:51:32Z

This is useful for example when you want to generate a site to a different document-root.

Keats · 2017-12-04T17:35:31Z

This is useful for example when you want to generate a site to a different document-root.

What are the reasons against using the default one?

verpeteren · 2017-12-04T17:58:37Z

I'd like to create several themes that can work together with the same content.
Currently, I use gutenberg build && mv public var/www/something.

It would be convienient to render different variants by just changing the theme = something in the config.toml file, gutenberg --base-url https://example/com/something --output-dir var/www/something.

(Ideally, an additional '--config-file config_something.toml' parameter, would make this perfect.)

Keats

Few comments but looks good otherwise.
Can you change the PR to be on the next branch though please?

Keats · 2017-12-05T10:44:48Z

src/cmd/build.rs

@@ -5,8 +5,9 @@ use site::Site;

 use console;

-pub fn build(config_file: &str, base_url: Option<&str>) -> Result<()> {
+pub fn build(config_file: &str, base_url: Option<&str>, public: &str) -> Result<()> {


I would name public output_dir instead, public is not very explicit in the code

Keats · 2017-12-05T10:44:58Z

src/cmd/serve.rs

@@ -77,7 +77,7 @@ fn rebuild_done_handling(broadcaster: &Sender, res: Result<()>, reload_path: &st
    }
 }

-pub fn serve(interface: &str, port: &str, config_file: &str) -> Result<()> {
+pub fn serve(interface: &str, port: &str, public: &str, config_file: &str) -> Result<()> {


same as above

Keats · 2017-12-05T10:45:41Z

src/main.rs

@@ -43,7 +43,8 @@ fn main() {
        ("build", Some(matches)) => {
            console::info("Building site...");
            let start = Instant::now();
-            match cmd::build(config_file, matches.value_of("base_url")) {
+            let public = matches.value_of("output_dir").unwrap_or("public");


Is the unwrap needed since there is a default value in clap?

Keats · 2017-12-05T10:45:52Z

src/main.rs

@@ -54,8 +55,9 @@ fn main() {
        ("serve", Some(matches)) => {
            let interface = matches.value_of("interface").unwrap_or("127.0.0.1");
            let port = matches.value_of("port").unwrap_or("1111");
+            let public = matches.value_of("output_dir").unwrap_or("public");


same as above

I followed the same structure as :

interface

https://github.com/Keats/gutenberg/blob/master/src/cli.rs#L38
https://github.com/Keats/gutenberg/blob/master/src/main.rs#L55

port

https://github.com/Keats/gutenberg/blob/master/src/cli.rs#L43
https://github.com/Keats/gutenberg/blob/master/src/main.rs#L56

Please advice

I'm just not sure how the default works, I guess you can try removing the unwrap_or and see if it still works?

Without the unwrap_or, the type goes from &str to Option<&str>.
It could be made working with if let Some(x) = ..{}, but IMHO that would be less clearer then the unwrap_or.

What might be interesting, to make the main.rs more uniform, is make the same unwrap_or for base_url change:

https://github.com/Keats/gutenberg/blob/master/src/main.rs#L46

https://github.com/Keats/gutenberg/blob/master/src/cmd/build.rs#L10-L12

Please advice.

the type goes from &str to Option<&str>

I guess with a default, it can never be None right? So a normal .unwrap() would work

Keats · 2017-12-05T10:46:20Z

docs/content/documentation/getting-started/cli-usage.md

+$ gutenberg build --output-dir $DOCUMENT_ROOT
+```
+
+This is useful for example when you want to generate a site to a different document-root.


This sentence seems a bit redundant, I would remove it

See getzola#191 for details.

Keats · 2017-12-12T09:16:02Z

Looks like tests are failing now. Can you also remove my commit from your branch?

Keats · 2017-12-13T10:38:21Z

There's still my commit in the list. You can probably just merge all your commits and delete mine to fix it

verpeteren · 2017-12-15T07:22:33Z

Sorry; my git knowledge is not sufficient.
That is why I manually reverted your commit.
Could you guide me through the needed steps?

Keats · 2017-12-15T12:15:20Z

So that would look something like:

$ git rebase -i HEAD~7

(7 here is a number representing all the commits in the branch, the one at the top should be mine)

On my commit and the manual revert replace pick with d. On all other commits except your first one, replace pick with s. That should leave you with a single commit with all the changes that you can git push -f.
Another approach but which would require a new PR I believe would be to do git rebase -i HEAD~6, drop the manual merge in the interface and use s for all commits except the first one and copy that resulting commit hash.
On a new branch based on next, you can git cherry-pick myhash to move the commit onto that new branch.

Add the detection of ChangeKind::Sass to tests Add --output-dir parameters to commands 'serve' and 'build' Update documentation and command line completion with 'output-dir' flag processed feedback See getzola#191 for details. Add trailing_slash opt. to get_url (getzola#173) * Added inital trailing_slash impl * Added simple test * Updated docs website to use trailing_slash option * Updated documentation to reflect new trailing_slash option * Added combined cachebust and trailing_slash test Add get_taxonomy_url global_fn And fix bug with taxonomies urls Add earliest Rust version to travis Fix tests and add taxonomies to changelog Update to Tera 0.11 beta Update Tera in cargo.lock Add default templates repeat paste fix

Keats · 2017-12-29T17:55:24Z

Ha I think the rebase merging got some earlier commits. Git 😨
I'll add the changes locally myself and push to the branch directly

From #191

Keats · 2017-12-29T18:27:10Z

I've added the changes in 14edd2b
Thanks!

Keats requested changes Dec 5, 2017

View reviewed changes

verpeteren added a commit to verpeteren/gutenberg that referenced this pull request Dec 11, 2017

processed feedback

4e06117

See getzola#191 for details.

verpeteren changed the base branch from master to next December 11, 2017 15:46

verpeteren force-pushed the output_path branch from 44305fe to fbecd9e Compare December 22, 2017 08:42

Keats pushed a commit that referenced this pull request Dec 29, 2017

Add output-dir option to build & serve

98cb4d5

From #191

Keats pushed a commit that referenced this pull request Dec 29, 2017

Add output-dir option to build & serve

14edd2b

From #191

Keats closed this Dec 29, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add --output-dir parameters to commands 'serve' and 'build' #191

Add --output-dir parameters to commands 'serve' and 'build' #191

verpeteren commented Dec 4, 2017

Keats commented Dec 4, 2017

verpeteren commented Dec 4, 2017

Keats left a comment

Keats Dec 5, 2017

Keats Dec 5, 2017

Keats Dec 5, 2017

Keats Dec 5, 2017

verpeteren Dec 5, 2017

Keats Dec 6, 2017

verpeteren Dec 7, 2017

Keats Dec 7, 2017 •

edited

Loading

Keats Dec 5, 2017

Keats commented Dec 12, 2017

Keats commented Dec 13, 2017

verpeteren commented Dec 15, 2017

Keats commented Dec 15, 2017 •

edited

Loading

Keats commented Dec 29, 2017

Keats commented Dec 29, 2017

Add --output-dir parameters to commands 'serve' and 'build' #191

Add --output-dir parameters to commands 'serve' and 'build' #191

Conversation

verpeteren commented Dec 4, 2017

Keats commented Dec 4, 2017

verpeteren commented Dec 4, 2017

Keats left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

interface

port

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Keats Dec 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Keats commented Dec 12, 2017

Keats commented Dec 13, 2017

verpeteren commented Dec 15, 2017

Keats commented Dec 15, 2017 • edited Loading

Keats commented Dec 29, 2017

Keats commented Dec 29, 2017

Keats Dec 7, 2017 •

edited

Loading

Keats commented Dec 15, 2017 •

edited

Loading