Update management of settings

joegattnet · Sep 6, 2013 · 12a4a76 · 12a4a76
1 parent f074ffe
commit 12a4a76
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,12 +15,13 @@ doc/
 *~
 .project
 .DS_Store
+.ruby-*
 
 # Ignore files with passwords etc (except sample and model files)
-secret*
+/config/secret.yml
 !secret.rb
 !secret_token.rb
-!secret*.example
+!secret.sample.yml
 
 # Ignore resource files
 /public/resources/*/*.*
@@ -30,4 +31,4 @@ secret*
 trial
 
 * Ignore coverage
-coverage
+coverage
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
diff --git a/app/assets/images/static/debug-bg.png b/app/assets/images/static/debug-bg.png
diff --git a/app/models/secret.rb b/app/models/secret.rb
@@ -1,4 +1,8 @@
 class Secret < Settingslogic
-  source "#{Rails.root}/config/secret.yml"
+  secret_file = "#{ Rails.root }/config/secret.yml"
+  secret_sample_file = "#{ Rails.root }/config/secret.sample.yml"
+  source_file = (File.exists? secret_file) ? secret_file : secret_sample_file
+
+  source source_file
   namespace Rails.env
 end
diff --git a/app/models/settings.rb b/app/models/settings.rb
@@ -1,4 +1,4 @@
 class Settings < Settingslogic
-  source "#{Rails.root}/config/nembrot.yml"
+  source "#{ Rails.root }/config/settings.yml"
   namespace Rails.env
 end
diff --git a/config/html5_rails.yml b/config/html5_rails.yml
diff --git a/config/secret.yml → config/secret.sample.yml b/config/secret.yml → config/secret.sample.yml
diff --git a/config/nembrot.yml → config/settings.yml b/config/nembrot.yml → config/settings.yml