Merge pull request #684 from integer32llc/dotenv-0.10.0

Improve environment variable setup for development

Author: alexcrichton

.env.sample

@@ -11,15 +11,18 @@ export DATABASE_URL=
 export SESSION_KEY=badkey
 
 # If you will be running the tests, set this to another database that you
-# have created. Otherwise, leave this blank.
+# have created. For example, if your test database is named
+# `cargo_registry_test`, this would look something like
+# `postgres://postgres@localhost/cargo_registry_test`
+# If you don't plan on running the tests, you can leave this blank.
 export TEST_DATABASE_URL=
 
-# Credentials for uploading packages to S3. You can leave these blank if
-# you're not publishing to s3 from your crates.io instance.
-export S3_BUCKET=
-export S3_ACCESS_KEY=
-export S3_SECRET_KEY=
-export S3_REGION=      # not needed if the S3 bucket is in US standard
+# Credentials for uploading packages to S3. You can leave these commented
+# out if you're not publishing to s3 from your crates.io instance.
+# export S3_BUCKET=
+# export S3_ACCESS_KEY=
+# export S3_SECRET_KEY=
+# export S3_REGION=      # not needed if the S3 bucket is in US standard
 
 # 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

@@ -33,7 +33,7 @@ log = "0.3"
 env_logger = "0.4"
 rustc-serialize = "0.3"
 license-exprs = "^1.3"
-dotenv = "0.9.0"
+dotenv = "0.10.0"
 toml = "0.2"
 diesel = { version = "0.12.0", features = ["postgres", "serde_json", "deprecated-time"] }
 diesel_codegen = "0.12.0"