Deploy subcommand for CLI tool #23

ogoding · Mar 17, 2016

Implements the deploy subcommand.

deploy cleans the relevant target directory, runs tests and builds the project. It then creates a deploy directory, zips all files (including the directory itself) in resources, and copies all dynamically linked libraries and binaries to deploy.

I was also planning on including the option of specifying the deploy directory, but I think that could wait for some time in the future.

ogoding · Mar 17, 2016

I was also planning on including the option of specifying the deploy directory, but I think that could wait for some time in the future.

@ogoding #24 should allow to pass strings to subcommands, but will aso break your code, so you'll need to merge from master, if my PR is going to land (I hope it will).

White-Oak · Mar 22, 2016

@ogoding #24 should allow to pass strings to subcommands, but will aso break your code, so you'll need to merge from master, if my PR is going to land (I hope it will).

@White-Oak Ah, so now Vec<&str> are ArgMatches interchangeable for the commands? Cool. I'll have a look at merging from master when it lands 😄 I'll make deploy always just supply vec!["--release", "--color=always"] to test and build.

ogoding · Mar 22, 2016

@White-Oak Ah, so now Vec<&str> are ArgMatches interchangeable for the commands? Cool. I'll have a look at merging from master when it lands 😄 I'll make deploy always just supply vec!["--release", "--color=always"] to test and build.

@ogoding those commands already supply color=always and instead of --release, you'll need to supply release to them (that's what they're looking for).

White-Oak · Mar 22, 2016

@ogoding those commands already supply color=always and instead of --release, you'll need to supply release to them (that's what they're looking for).

@White-Oak Pull request #24 looks pretty good to me. @ogoding, what are your thoughts? Whose PR should I merge first to minimize breakage?

ebkalderon · Mar 22, 2016

@White-Oak Pull request #24 looks pretty good to me. @ogoding, what are your thoughts? Whose PR should I merge first to minimize breakage?

@ebkalderon #24 is going to be merged first, since @ogoding 's work is dependent on this.

White-Oak · Mar 22, 2016

@ebkalderon #24 is going to be merged first, since @ogoding 's work is dependent on this.

@ogoding All right, #24 has been merged. Go ahead and rebase! If you need any assistance, I'm sure we'd all be happy to help.

ebkalderon · Mar 22, 2016

@ogoding All right, #24 has been merged. Go ahead and rebase! If you need any assistance, I'm sure we'd all be happy to help.

@ebkalderon Merging it now, just trying to work out how to call/import the new methods from the deploy Cmd struct at the moment.

ogoding · Mar 23, 2016

@ebkalderon Merging it now, just trying to work out how to call/import the new methods from the deploy Cmd struct at the moment.

@ebkalderon Should be merged without issue now! Will try to finish off the conversion from std;:io::Error to &str and then it'll all be finally done! 😄

ogoding · Mar 23, 2016

@ebkalderon Should be merged without issue now! Will try to finish off the conversion from std;:io::Error to &str and then it'll all be finally done! 😄

@ogoding I have some work done with that. Would you like me to give you a small PR that removes the tryio! macro so we can just use try! everywhere and not have that borrow issue.

LucioFranco · Mar 23, 2016

@ogoding I have some work done with that. Would you like me to give you a small PR that removes the tryio! macro so we can just use try! everywhere and not have that borrow issue.

White-Oak · Mar 23, 2016

White-Oak reviewed Mar 23, 2016

View changes

White-Oak · Mar 23, 2016

src/cli/subcmds/deploy.rs

+impl AmethystCmd for Cmd {
+    /// Compresses and deploys the project as a distributable program.
+    fn execute<I: AmethystArgs>(matches: &I) -> cargo::CmdResult {
+        let cargo_args = vec!["--release"];


Once again, build and test subcommands look for release argument, not --release.

Oh whoops, sorry @White-Oak. I'll fix that now.

@LucioFranco That'd be great, thanks. Hopefully you don't have any conflicts, but I suspect you might.

ogoding · Mar 23, 2016

@LucioFranco That'd be great, thanks. Hopefully you don't have any conflicts, but I suspect you might.

@ogoding I am almost ready with the new error system. Expect a PR within the next 20. (Hopefully) :)

LucioFranco · Mar 23, 2016

@ogoding I am almost ready with the new error system. Expect a PR within the next 20. (Hopefully) :)

@ebkalderon PR is finally all done! Let me know if there is anything else that I should improve.

ogoding · Mar 23, 2016

@ebkalderon PR is finally all done! Let me know if there is anything else that I should improve.

Wonderful job! I'll try it out on my laptop tomorrow.

ebkalderon · Mar 23, 2016

Wonderful job! I'll try it out on my laptop tomorrow.

@ogoding The generated resources.zip file structure seems incorrect when deploying an empty project on my laptop.

Currently it results in:

resources.zip
- resources/ (folder)
  - entities (zero-length file)
  - prefabs (zero-length file)
  - config.yml (file)
  - input.yml (file)
- resources (zero-length file)

It should be:

resources.zip
- entities/ (folder)
- prefabs/ (folder)
- config.yml (file)
- input.yml (file)

ebkalderon · Mar 24, 2016

@ogoding The generated resources.zip file structure seems incorrect when deploying an empty project on my laptop.

Currently it results in:

resources.zip
- resources/ (folder)
  - entities (zero-length file)
  - prefabs (zero-length file)
  - config.yml (file)
  - input.yml (file)
- resources (zero-length file)

It should be:

resources.zip
- entities/ (folder)
- prefabs/ (folder)
- config.yml (file)
- input.yml (file)

@ebkalderon hmm, I'll have a look at it. Probably that resources file is due to walkdir using the given path as the first file/folder it iterates.

ogoding · Mar 24, 2016

@ebkalderon hmm, I'll have a look at it. Probably that resources file is due to walkdir using the given path as the first file/folder it iterates.

@ebkalderon Just pushed a fix for those compression issues. Turns out that rust doesn't include a / character at the end of a directory's path. Also WalkDir starts in the current directory so I had to change it back to fs::read_dir(path) and use WalkDir for any sub directories in resources/.

ogoding · Mar 26, 2016

@ebkalderon Just pushed a fix for those compression issues. Turns out that rust doesn't include a / character at the end of a directory's path. Also WalkDir starts in the current directory so I had to change it back to fs::read_dir(path) and use WalkDir for any sub directories in resources/.

@ogoding Testing it now...

ebkalderon · Mar 28, 2016

@ogoding Testing it now...

@ogoding It works perfectly! Thank you so much for your effort and patience. I think this pull request is finally ready to be merged.

ebkalderon · Mar 28, 2016

@ogoding It works perfectly! Thank you so much for your effort and patience. I think this pull request is finally ready to be merged.

White-Oak referenced this pull request Mar 22, 2016
Merged
New API for subcommands #24

Merge branch 'master' from ebkalderon/amethyst_tools into impl-deploy…
…-subcmd. Resolving conflicts with src/cli/subcmds/deploy.rs

9234f4e

ogoding added some commits Mar 23, 2016

Removed a little bit of unwrap() chaining. Fixed a mistake with relea…
…se cargo command arguments.

ff887c8

Removed displaying build args in cli in deploy command.

d47ec70

ebkalderon referenced this pull request Mar 24, 2016
Merged
Check for most commands if the project is an amethyst project #25
4 of 4 tasks complete

Fixed bugs with compressing resources where it would be deflated to r…
…esources/ instead of into current folder ./ and where directories would be turned into zero-length files during compression process.

a5386b5

ebkalderon merged commit d1f26a9 into amethyst:master Mar 28, 2016
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

White-Oak referenced this pull request Mar 28, 2016
Closed
Implement deploy subcommand #22

ogoding deleted the ogoding:impl-deploy-subcmd branch Mar 28, 2016

amethyst/tools

Join GitHub today

Deploy subcommand for CLI tool #23

Conversation

ogoding commented Mar 17, 2016

ogoding added some commits Mar 2, 2016

This comment has been minimized.

ogoding commented Mar 17, 2016

White-Oak and others added some commits Mar 17, 2016

White-Oak referenced this pull request Mar 22, 2016

This comment has been minimized.

White-Oak commented Mar 22, 2016

This comment has been minimized.

ogoding commented Mar 22, 2016

This comment has been minimized.

White-Oak commented Mar 22, 2016

This comment has been minimized.

ebkalderon commented Mar 22, 2016

This comment has been minimized.

White-Oak commented Mar 22, 2016

This comment has been minimized.

ebkalderon commented Mar 22, 2016

This comment has been minimized.

ogoding commented Mar 23, 2016

This comment has been minimized.

ogoding commented Mar 23, 2016

This comment has been minimized.

LucioFranco commented Mar 23, 2016

White-Oak reviewed Mar 23, 2016 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

ogoding commented Mar 23, 2016

ogoding added some commits Mar 23, 2016

This comment has been minimized.

LucioFranco commented Mar 23, 2016

LucioFranco and others added some commits Mar 23, 2016

This comment has been minimized.

ogoding commented Mar 23, 2016

This comment has been minimized.

ebkalderon commented Mar 23, 2016

ebkalderon referenced this pull request Mar 24, 2016

This comment has been minimized.

ebkalderon commented Mar 24, 2016

This comment has been minimized.

ogoding commented Mar 24, 2016

This comment has been minimized.

ogoding commented Mar 26, 2016

This comment has been minimized.

ebkalderon commented Mar 28, 2016

This comment has been minimized.

ebkalderon commented Mar 28, 2016

Hide details View details ebkalderon merged commit d1f26a9 into amethyst:master Mar 28, 2016 1 check passed

1 check passed

White-Oak referenced this pull request Mar 28, 2016

ogoding deleted the ogoding:impl-deploy-subcmd branch Mar 28, 2016

White-Oak reviewed Mar 23, 2016

View changes

ebkalderon merged commit `d1f26a9` into amethyst:master Mar 28, 2016
1 check passed