diff --git a/.gitignore b/.gitignore index 9186e12..b34f7ec 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,11 @@ /db/*.sqlite3 # Ignore all logfiles and tempfiles. +.DS_Store +package-lock.json /log/*.log.* /log/*.log /tmp +/config/app_environment_variables.rb +vendor/.DS_Store +vendor/bundle/ diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..633c00d --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.0.0-p648 diff --git a/Gemfile.lock b/Gemfile.lock index 991fc0d..7e263da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,7 +188,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rollbar (2.16.2) + rollbar (2.16.3) multi_json rubyzip (1.2.1) sass (3.2.14) @@ -204,7 +204,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sshkit (1.16.1) + sshkit (1.17.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) therubyracer (0.12.3) @@ -221,7 +221,7 @@ GEM rack-accept (~> 0.4) tilt (>= 1.4, < 3) tzinfo (0.3.54) - uglifier (4.1.14) + uglifier (4.1.16) execjs (>= 0.3.0, < 3) underscore-rails (1.8.3) unf (0.1.4) @@ -275,4 +275,4 @@ DEPENDENCIES yaml_db BUNDLED WITH - 1.16.2 + 1.16.3 diff --git a/config/application.yml b/config/application.yml index a863ce3..4a1d7e2 100644 --- a/config/application.yml +++ b/config/application.yml @@ -1,15 +1,15 @@ defaults: &defaults development: - app_id: "REPLACE_ME" - app_secret: "REPLACE_ME" - callback_url: "http://localhost:3000/session/callback" - aws_key: "REPLACE_ME" - aws_secret: "REPLACE_ME" - cloudwatch_key: "REPLACE_ME" - cloudwatch_secret: "REPLACE_ME" - google_maps_key: "REPLACE_ME" - s3_bucket: "REPLACE_ME" + app_id: "<%= ENV['FOURSQUARE_CLIENT_ID'] %>" + app_secret: "<%= ENV['FOURSQUARE_CLIENT_SECRET'] %>" + callback_url: "<%= ENV['OAUTH_CALLBACK'] %>" + aws_key: "<%= ENV['AWS_KEY'] %>" + aws_secret: "<%= ENV['AWS_SECRET'] %>" + cloudwatch_key: "<%= ENV['CLOUDWATCH_KEY'] %>" + cloudwatch_secret: "<%= ENV['CLOUDWATCH_SECRET'] %>" + google_maps_key: "<%= ENV['GOOGLE_MAPS_KEY'] %>" + s3_bucket: "<%= ENV['AWS_S3_BUCKET'] %>" test: diff --git a/config/database.yml b/config/database.yml index 6431285..1d26f4f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -4,11 +4,11 @@ # Ensure the SQLite 3 gem is defined in your Gemfile # gem 'sqlite3' development: - adapter: mysql2 - database: REPLACE_ME - username: REPLACE_ME - password: REPLACE_ME - host: localhost + adapter: "<%= ENV['DB_ADAPTER'] %>" + database: "<%= ENV['DB_DATABASE'] %>" + username: "<%= ENV['DB_USERNAME'] %>" + password: "<%= ENV['DB_PASSWORD'] %>" + host: "<%= ENV['DB_HOST'] %>" # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -23,10 +23,10 @@ production: adapter: mysql2 database: REPLACE_ME username: REPLACE_ME - password: REPLACE_ME + password: REPLACE_ME host: localhost -beta: +beta: adapter: mysql2 database: REPLACE_ME username: REPLACE_ME diff --git a/config/environment.rb b/config/environment.rb index 281b8ea..a382047 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,10 @@ # Load the rails application require File.expand_path('../application', __FILE__) +# Load the app's custom environment variables here, so that they are loaded before environments/*.rb +# via https://stackoverflow.com/questions/4911607/is-it-possible-to-set-env-variables-for-rails-development-environment-in-my-code/11765775#11765775 +app_environment_variables = File.join(Rails.root, 'config', 'app_environment_variables.rb') +load(app_environment_variables) if File.exists?(app_environment_variables) + # Initialize the rails application Foursweep::Application.initialize! diff --git a/config/initializers/abstract_mysql2_adapter.rb b/config/initializers/abstract_mysql2_adapter.rb new file mode 100644 index 0000000..4df9c29 --- /dev/null +++ b/config/initializers/abstract_mysql2_adapter.rb @@ -0,0 +1,5 @@ +require 'active_record/connection_adapters/mysql2_adapter' + +class ActiveRecord::ConnectionAdapters::Mysql2Adapter + NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY" +end diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb index e1c4da4..e52f25c 100644 --- a/config/initializers/rollbar.rb +++ b/config/initializers/rollbar.rb @@ -2,7 +2,7 @@ Rollbar.configure do |config| config.enabled = false - config.access_token = 'REPLACE_ME' + config.access_token = ENV['ROLLBAR_ACCESS_TOKEN'] config.exception_level_filters.merge!('ActionController::RoutingError' => 'ignore') config.dj_threshold = 5 diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 7bb23b9..06e0629 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -4,4 +4,4 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -Foursweep::Application.config.secret_token = 'REPLACE_ME' +Foursweep::Application.config.secret_token = ENV['APP_SECRET']