Use rust-dotenv to manage env vars in development

This repo includes a `.env` file, but it doesn't appear to be used (at
least not on the Rust side. I haven't looked at the ember side).

This adds the `dotenv` crate to use the .env file to automatically set
the environment variables from that file when set, without messing with
the acutal environment of the machine.

As part of this, I've taken the liberty of moving the heavily duplicated
`env` function to somewhere common. I've also moved `.env` to
`.env.sample`, and added `.env` to gitignore, as a person's specific
environment variables shouldn't be in the repo, and the `.env` file
provided isn't actually valid.

Author: sgrif

.env renamed to .env.sample

@@ -16,3 +16,4 @@
 /libpeerconnection.log
 npm-debug.log
 testem.log
+.env

.gitignore

@@ -57,6 +57,7 @@ log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
 license-exprs = "^1.1"
+dotenv = "0.8.0"
 
 conduit = "0.7"
 conduit-conditional-get = "0.7"

Cargo.lock

@@ -16,7 +16,7 @@ use std::env;
 use std::io;
 use std::io::prelude::*;
 
-use cargo_registry::Crate;
+use cargo_registry::{Crate, env};
 
 #[allow(dead_code)]
 fn main() {
@@ -30,13 +30,6 @@ fn main() {
     }
 }
 
-fn env(s: &str) -> String {
-    match env::var(s).ok() {
-        Some(s) => s,
-        None => panic!("must have `{}` defined", s),
-    }
-}
-
 fn delete(tx: &postgres::Transaction) {
     let name = match env::args().nth(1) {
         None => { println!("needs a crate-name argument"); return }

Cargo.toml

@@ -16,7 +16,7 @@ use std::env;
 use std::io;
 use std::io::prelude::*;
 
-use cargo_registry::{Crate, Version};
+use cargo_registry::{Crate, Version, env};
 
 #[allow(dead_code)]
 fn main() {
@@ -30,13 +30,6 @@ fn main() {
     }
 }
 
-fn env(s: &str) -> String {
-    match env::var(s).ok() {
-        Some(s) => s,
-        None => panic!("must have `{}` defined", s),
-    }
-}
-
 fn delete(tx: &postgres::Transaction) {
     let name = match env::args().nth(1) {
         None => { println!("needs a crate-name argument"); return }

src/bin/delete-crate.rs

@@ -8,6 +8,7 @@ use std::env;
 use std::collections::HashSet;
 use migrate::Migration;
 
+use cargo_registry::env;
 use cargo_registry::krate::Crate;
 use cargo_registry::model::Model;
 
@@ -23,13 +24,6 @@ fn main() {
     } else {
         apply(conn.transaction().unwrap(), migrations).unwrap();
     }
-
-    fn env(s: &str) -> String {
-        match env::var(s).ok() {
-            Some(s) => s,
-            None => panic!("must have `{}` defined", s),
-        }
-    }
 }
 
 fn apply(tx: postgres::Transaction,

src/bin/delete-version.rs

@@ -15,6 +15,8 @@ use std::env;
 use time::Duration;
 use rand::{StdRng, Rng};
 
+use cargo_registry::env;
+
 #[allow(dead_code)]
 fn main() {
     let conn = postgres::Connection::connect(&env("DATABASE_URL")[..],
@@ -27,13 +29,6 @@ fn main() {
     }
 }
 
-fn env(s: &str) -> String {
-    match env::var(s).ok() {
-        Some(s) => s,
-        None => panic!("must have `{}` defined", s),
-    }
-}
-
 fn update(tx: &postgres::Transaction) -> postgres::Result<()> {
     let ids = env::args().skip(1).filter_map(|arg| {
         arg.parse::<i32>().ok()

src/bin/migrate.rs

@@ -6,6 +6,7 @@ extern crate civet;
 extern crate git2;
 extern crate env_logger;
 
+use cargo_registry::env;
 use civet::Server;
 use std::env;
 use std::fs::{self, File};
@@ -78,10 +79,3 @@ fn main() {
     let (_tx, rx) = channel::<()>();
     rx.recv().unwrap();
 }
-
-fn env(s: &str) -> String {
-    match env::var(s).ok() {
-        Some(s) => s,
-        None => panic!("must have `{}` defined", s),
-    }
-}

src/bin/populate.rs

@@ -9,7 +9,7 @@ use std::env;
 use std::collections::HashMap;
 use std::time::Duration;
 
-use cargo_registry::{VersionDownload, Version, Model};
+use cargo_registry::{VersionDownload, Version, Model, env};
 
 static LIMIT: i64 = 1000;
 
@@ -31,13 +31,6 @@ fn main() {
     }
 }
 
-fn env(s: &str) -> String {
-    match env::var(s).ok() {
-        Some(s) => s,
-        None => panic!("must have `{}` defined", s),
-    }
-}
-
 fn update(conn: &postgres::GenericConnection) -> postgres::Result<()> {
     let mut max = 0;
     loop {
@@ -148,10 +141,10 @@ mod test {
     use postgres;
     use semver;
 
-    use cargo_registry::{Version, Crate, User, Model};
+    use cargo_registry::{Version, Crate, User, Model, env};
 
     fn conn() -> postgres::Connection {
-        postgres::Connection::connect(&::env("TEST_DATABASE_URL")[..],
+        postgres::Connection::connect(&env("TEST_DATABASE_URL")[..],
                                       postgres::SslMode::None).unwrap()
     }
 

src/bin/server.rs

@@ -8,6 +8,7 @@
 extern crate postgres as pg;
 extern crate rustc_serialize;
 extern crate curl;
+extern crate dotenv;
 extern crate flate2;
 extern crate git2;
 extern crate license_exprs;
@@ -188,3 +189,11 @@ pub fn now() -> time::Timespec {
 pub fn encode_time(ts: time::Timespec) -> String {
     time::at_utc(ts).rfc3339().to_string()
 }
+
+pub fn env(s: &str) -> String {
+    dotenv::dotenv().ok();
+    match ::std::env::var(s) {
+        Ok(s) => s,
+        Err(_) => panic!("must have `{}` defined", s),
+    }
+}

src/bin/update-downloads.rs

@@ -6,6 +6,7 @@ extern crate conduit;
 extern crate conduit_middleware;
 extern crate conduit_test;
 extern crate curl;
+extern crate dotenv;
 extern crate git2;
 extern crate postgres;
 extern crate rustc_serialize;
@@ -72,6 +73,7 @@ mod version;
 mod team;
 
 fn app() -> (record::Bomb, Arc<App>, conduit_middleware::MiddlewareBuilder) {
+    dotenv::dotenv().ok();
     static INIT: Once = ONCE_INIT;
     git::init();