Merge remote-tracking branch 'upstream/master' into 81-show-crate-readme

Author: carols10cents

.env.sample

@@ -6,9 +6,9 @@ export DATABASE_URL=
 # If you are running a mirror of crates.io, uncomment this line.
 # export MIRROR=1
 
-# Key to sign and encrypt cookies with. Change this to a long, random string
-# for production.
-export SESSION_KEY=badkey
+# Key to sign and encrypt cookies with. Must be at least 32 bytes. Change this 
+# to a long, random string for production.
+export SESSION_KEY=badkeyabcdefghijklmnopqrstuvwxyzabcdef
 
 # If you will be running the tests, set this to another database that you
 # have created. For example, if your test database is named
@@ -22,7 +22,8 @@ export TEST_DATABASE_URL=
 # export S3_BUCKET=
 # export S3_ACCESS_KEY=
 # export S3_SECRET_KEY=
-# export S3_REGION=      # not needed if the S3 bucket is in US standard
+# not needed if the S3 bucket is in US standard
+# export S3_REGION=
 
 # Remote and local locations of the registry index. You can leave these to
 # use a `tmp` subdirectory of the working directory, which is what the

Cargo.lock

@@ -29,9 +29,7 @@ semver = "0.5"
 url = "1.2.1"
 tar = "0.4.13"
 
-postgres = { version = "0.14.0", features = ["with-time", "with-openssl", "with-serde_json", "with-chrono"] }
 r2d2 = "0.7.0"
-r2d2_postgres = "0.12.0"
 openssl = "0.9.9"
 curl = "0.4"
 oauth2 = "0.3"
@@ -76,6 +74,3 @@ diesel = { version = "0.15.0", features = ["postgres"] }
 [features]
 unstable = []
 lint = ["clippy"]
-
-[replace]
-"postgres:0.14.2" = { git = "https://github.com/sfackler/rust-postgres.git" }

Cargo.toml

@@ -57,6 +57,6 @@
   "buildpacks": [
       {
         "url": "https://github.com/heroku/heroku-buildpack-multi"
-      },
+      }
   ]
 }

app.json

@@ -8,6 +8,8 @@ use dotenv::dotenv;
 use std::env;
 
 fn main() {
+    println!("cargo:rerun-if-env-changed=TEST_DATABASE_URL");
+    println!("cargo:rerun-if-changed=build.rs");
     if env::var("PROFILE") == Ok("debug".into()) {
         let _ = dotenv();
         if let Ok(database_url) = env::var("TEST_DATABASE_URL") {

build.rs

@@ -77,7 +77,7 @@ as well.
 
 #### Frontend requirements
 
-In order to run the frontend, you will need to have installed:
+In order to run the frontend on Windows and macOS, you will need to have installed:
 
 - [node](https://nodejs.org/en/) >= 6.10.0
 - [npm](https://www.npmjs.com/get-npm) >= 4.0.0
@@ -86,7 +86,11 @@ Follow the links for each of these tools for their recommended installation
 instructions. If you already have these tools, or you have a different
 preferred method of installing packages like these, that should work fine.
 
-> Note that you may need to install these as root using `sudo` in some cases.
+If you are on Linux, use [nvm](https://github.com/creationix/nvm/blob/master/README.md) 
+to install to ensure that the use of `npm` does not require the use of `sudo`.
+
+The front end should run fine after these steps. Please file an issue if you run
+into any trouble.
 
 #### Building and serving the frontend
 
@@ -316,27 +320,6 @@ with `CTRL-C` and rerun this command every time you change the backend code):
 cargo run --bin server
 ```
 
-> If you get an error that looks like:
->
-> ```
-> thread 'main' panicked at 'must have `GIT_REPO_URL` defined', src/lib.rs:227
-> ```
->
-> Edit your `.env` and remove the comment after the `S3_REGION` variable. That
-> is, change this:
->
-> ```
-> export S3_REGION=      # not needed if the S3 bucket is in US standard
-> ```
->
-> to this:
->
-> ```
-> export S3_REGION=
-> ```
->
-> and then try running `cargo run --bin server` again.
-
 Then start a frontend that uses this backend by running this command in another
 terminal session (the frontend picks up frontend changes using live reload
 without a restart needed, and you can leave the frontend running while you

docs/CONTRIBUTING.md

@@ -20,9 +20,6 @@ use {db, Config};
 #[allow(missing_debug_implementations)]
 pub struct App {
     /// The database connection pool
-    pub database: db::Pool,
-
-    /// The diesel database connection pool
     pub diesel_database: db::DieselPool,
 
     /// The GitHub OAuth2 configuration
@@ -83,12 +80,6 @@ impl App {
             _ => 1,
         };
 
-        // We need two connection pools until we finish transitioning everything to use diesel.
-        let db_config = r2d2::Config::builder()
-            .pool_size(db_pool_size)
-            .min_idle(db_min_idle)
-            .helper_threads(db_helper_threads)
-            .build();
         let diesel_db_config = r2d2::Config::builder()
             .pool_size(db_pool_size)
             .min_idle(db_min_idle)
@@ -98,7 +89,6 @@ impl App {
         let repo = git2::Repository::open(&config.git_repo_checkout).unwrap();
 
         App {
-            database: db::pool(&config.db_url, db_config),
             diesel_database: db::diesel_pool(&config.db_url, diesel_db_config),
             github: github,
             session_key: config.session_key.clone(),

src/app.rs

@@ -4,12 +4,11 @@ use conduit::{Request, Response};
 use conduit_router::RequestParams;
 use diesel::*;
 use diesel::pg::PgConnection;
-use pg::rows::Row;
 
+use Crate;
 use db::RequestTransaction;
 use schema::*;
 use util::{RequestUtils, CargoResult};
-use {Model, Crate};
 
 #[derive(Clone, Identifiable, Queryable, Debug)]
 #[table_name = "categories"]
@@ -186,22 +185,6 @@ impl<'a> NewCategory<'a> {
     }
 }
 
-impl Model for Category {
-    fn from_row(row: &Row) -> Category {
-        Category {
-            id: row.get("id"),
-            created_at: row.get("created_at"),
-            crates_cnt: row.get("crates_cnt"),
-            category: row.get("category"),
-            slug: row.get("slug"),
-            description: row.get("description"),
-        }
-    }
-    fn table_name(_: Option<Category>) -> &'static str {
-        "categories"
-    }
-}
-
 /// Handles the `GET /categories` route.
 pub fn index(req: &mut Request) -> CargoResult<Response> {
     let conn = req.db_conn()?;