From 1f15a10b9d3468109f30b1cc1da446c6aefecd20 Mon Sep 17 00:00:00 2001 From: Stephen Burgess Date: Tue, 12 Jun 2018 23:01:29 -0500 Subject: [PATCH 1/2] feat(Docs): Development guide --- DEVELOPMENT.md | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 DEVELOPMENT.md diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md new file mode 100644 index 00000000..f9bb02be --- /dev/null +++ b/DEVELOPMENT.md @@ -0,0 +1,70 @@ +# Development Guide +## Running Plume locally +### Mac OSX +All commands are run in the Mac Terminal or terminal emulator of your choice, such as iTerm2. First, you will need [Git](https://git-scm.com/download/mac), [Homebrew](https://brew.sh/), [Rust](https://www.rust-lang.org/en-US/), and [Postgres](https://www.postgresql.org/). Follow the instructions to install Homebrew before continuing if you don't already have it. +#### Download the Repository +Navigate to the directory on your machine where you would like to install the repository, such as in `~/dev` by running `cd dev`. Now, clone the remote repository by running `git clone https://github.com/Plume-org/Plume.git`. This will install the codebase to the `Plume` subdirectory. Navigate into that directory by running `cd Plume`. +#### Rust +If you think you might already have rust on your machine, you can check by running +``` +rustc --version +# Should output something like +# rustc 1.28.0-nightly (a805a2a5e 2018-06-10) +``` +If you don't already have Rust, install it by running +``` +curl https://sh.rustup.rs -sSf | sh +``` +In the interactive installation, choose the option of the nightly toolchain. Restart your console so that the `rustc` CLI tool is available. +#### Postgres +Now we will use Homebrew to install Postgres. If you think you might already have it, try running `brew info postgres`. If it is not available, continue to install Postgres by running the following: +``` +brew install postgres +``` +Now, you can use the following command to start Postgres on a one-time basis. +``` +pg_ctl -D /usr/local/var/postgres start +``` +After starting Postgres, we need to enter [PSQL](http://postgresguide.com/utilities/psql.html), the interactive terminal for running postgres queries. We'll be running this as the user `postgres` which is an admin-type postgres user. +``` +psql postgres +``` +Now that you are in psql, enter the following queries to prepare the database for Plume. +``` +CREATE DATABASE plume; +CREATE USER plume WITH PASSWORD 'plume'; +GRANT ALL PRIVILEGES ON DATABASE plume to plume; +\q +``` +The final command `\q` lets us exit psql and returns us to the Terminal. Now, we will open psql again, this time as the `plume` user we just created. Then we'll give all privileges on all tables and sequences to our `plume` user. This is for local development use only and it's not recommend to give complete access to this user in a production environment. +``` +psql plume +GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO plume; +GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO plume; +\q +``` +#### Database Migration +Now that the Postgres database is set up and the `plume` user has the privileges it needs, we can set up the database using the diesel CLI. If this was your time installing Rust, you will probably need to run that using `cargo`. `cargo` is installed with `rustc` so if you followed the earlier instructions it will already be available. +``` +cargo install diesel_cli +``` +The first time you run this, you can run setup. After that, every time you pull the repository you will want to run the migration command in case there were any migrations. Those commands are +``` +diesel setup --database-url='postgres://localhost/plume' +diesel migration run --database-url='postgres://localhost/plume' +``` +#### Configuration +Now Plume should be running on your machine at [http://localhost:8000](http://localhost:8000). The first time you run the application, you'll want to configure your blog name on the [http://localhost:8000/configuration](http://localhost:8000/configuration) page. You'll be able to change this name later. + +#### Running Plume +To run Plume locally, make sure you are once again in the Plume directory, such as `~/dev/Plume`. Now you will be able to run the application using the command +``` +cargo run +``` +#### Making a Pull Request +To create an upstream fork of the repository in GitHub, click "Fork" in the top right button on the main page of the [Plume repository](https://github.com/Plume-org/Plume). Now, in the command line, set another remote for the repository by running the following command, replacing `myname` with the name under which you forked the repo. You can use another name besides `upstream` if you prefer +``` +git remote add upstream https://github.com/myname/Plume.git +``` +Now, make any changes to the code you want. After committing your changes, push to the upstream fork. Once your changes are made, visit the GitHub page for your fork and select "Make Pull Request". Add descriptive text, any issue numbers using hashtags to reference the issue number, screenshots of your changes if relevant, a description of how you tested your changes, and any other information that will help the project maintainers be able to quickly accept your pull requests. +The project maintainers may suggestion further changes to improve the pull request even more. After implementing this locally, you can push to your upstream fork again and the changes will immediately show up in the pull request after pushing. Once all the suggested changes are made, the pull request may be accepted. Thanks for contributing. \ No newline at end of file From 4cfa0060eaba67b8a5a2d1312493dd30bae67049 Mon Sep 17 00:00:00 2001 From: Stephen Burgess Date: Wed, 13 Jun 2018 07:44:04 -0500 Subject: [PATCH 2/2] feat(Docs): Development docs --- DEVELOPMENT.md | 33 +++++++++++++++++++++------ README.md | 61 +------------------------------------------------- 2 files changed, 27 insertions(+), 67 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index f9bb02be..171d1e7e 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -53,18 +53,37 @@ The first time you run this, you can run setup. After that, every time you pull diesel setup --database-url='postgres://localhost/plume' diesel migration run --database-url='postgres://localhost/plume' ``` -#### Configuration -Now Plume should be running on your machine at [http://localhost:8000](http://localhost:8000). The first time you run the application, you'll want to configure your blog name on the [http://localhost:8000/configuration](http://localhost:8000/configuration) page. You'll be able to change this name later. - #### Running Plume To run Plume locally, make sure you are once again in the Plume directory, such as `~/dev/Plume`. Now you will be able to run the application using the command ``` cargo run ``` +#### Configuration +Now Plume should be running on your machine at [http://localhost:8000](http://localhost:8000). The first time you run the application, you'll want to configure your blog name on the [http://localhost:8000/configuration](http://localhost:8000/configuration) page. You'll be able to change this name later. +#### Testing the federation + +To test the federation, you'll need to setup another database (see "Setup the database"), +also owned by the "plume" user, but with a different name. Then, you'll need to run the +migrations for this database too. + +``` +diesel migration run --database-url postgres://plume:plume@localhost/my_other_plume_db +``` + +To run this other instance, you'll need to give two environment variables: + +- `ROCKET_PORT`, the port on which your app will run +- `DB_NAME`, the name of the database you just created + +``` +ROCKET_PORT=3033 DB_NAME=my_other_plume_db cargo run +``` #### Making a Pull Request -To create an upstream fork of the repository in GitHub, click "Fork" in the top right button on the main page of the [Plume repository](https://github.com/Plume-org/Plume). Now, in the command line, set another remote for the repository by running the following command, replacing `myname` with the name under which you forked the repo. You can use another name besides `upstream` if you prefer +To create an upstream fork of the repository in GitHub, click "Fork" in the top right button on the main page of the [Plume repository](https://github.com/Plume-org/Plume). Now, in the command line, set another remote for the repository by running the following command, replacing `myname` with the name under which you forked the repo. You can use another name besides `upstream` if you prefer. Using [SSH](https://help.github.com/articles/connecting-to-github-with-ssh/) is recommended. ``` -git remote add upstream https://github.com/myname/Plume.git +git remote add upstream git@github.com/myname/Plume.git +# Alt # git remote add upstream https://github.com/myname/Plume.git ``` -Now, make any changes to the code you want. After committing your changes, push to the upstream fork. Once your changes are made, visit the GitHub page for your fork and select "Make Pull Request". Add descriptive text, any issue numbers using hashtags to reference the issue number, screenshots of your changes if relevant, a description of how you tested your changes, and any other information that will help the project maintainers be able to quickly accept your pull requests. -The project maintainers may suggestion further changes to improve the pull request even more. After implementing this locally, you can push to your upstream fork again and the changes will immediately show up in the pull request after pushing. Once all the suggested changes are made, the pull request may be accepted. Thanks for contributing. \ No newline at end of file +Now, make any changes to the code you want. After committing your changes, push to the upstream fork. Once your changes are made, visit the GitHub page for your fork and select "New pull request". Add descriptive text, any issue numbers using hashtags to reference the issue number, screenshots of your changes if relevant, a description of how you tested your changes, and any other information that will help the project maintainers be able to quickly accept your pull requests. + +The project maintainers may suggest further changes to improve the pull request even more. After implementing this locally, you can push to your upstream fork again and the changes will immediately show up in the pull request after pushing. Once all the suggested changes are made, the pull request may be accepted. Thanks for contributing. diff --git a/README.md b/README.md index bec73041..4c55247e 100644 --- a/README.md +++ b/README.md @@ -3,63 +3,4 @@ Federated blogging engine, based on ActivityPub. [**Demo instance**](https://baptiste.gelez.xyz/) - -## Setup the database - -You'll need Postgres. - -``` -sudo su postgres - -psql - -CREATE DATABASE plume; -CREATE USER plume WITH PASSWORD 'plume'; -GRANT ALL PRIVILEGES ON DATABASE plume to plume; -\q - -exit -``` - -Then run the migrations - -``` -diesel migrations run # Install diesel with `cargo install diesel_cli` if needed -``` - -You should repeat this operation every time the database schema has been modified. -A good practice is to run it after every `git pull`. - -## Starting the app - -Just use: - -``` -cargo run -``` - -You'll need Rust nightly. - -Once the app started, try to visit [localhost:8000](http://localhost:8000). - -To configure the instance (needed before you can do anything else), -go on [/configure](http://localhost:8000/configure). - -## Testing the federation - -To test the federation, you'll need to setup another database (see "Setup the database"), -also owned by the "plume" user, but with a different name. Then, you'll need to run the -migrations for this database too. - -``` -diesel migration run --database-url postgres://plume:plume@localhost/my_other_plume_db -``` - -To run this other instance, you'll need to give two environment variables: - -- `ROCKET_PORT`, the port on which your app will run -- `DB_NAME`, the name of the database you just created - -``` -ROCKET_PORT=3033 DB_NAME=my_other_plume_db cargo run -``` +[Development Guide](https://github.com/Plume-org/Plume/blob/master/DEVELOPMENT.md)