From 6050bd37b062f98e2a66b7d77a4781bc0cca598f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 30 Jun 2014 11:09:21 -0400 Subject: cleanup seeds stuff for scripting --- bin/devel/db-drop | 3 +-- db/seeds.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/devel/db-drop b/bin/devel/db-drop index 40c2b4c..06e24dc 100755 --- a/bin/devel/db-drop +++ b/bin/devel/db-drop @@ -4,5 +4,4 @@ PATH=$bindir:$PATH set -e rake db:drop -rake db:migrate -rake db:seed +rake db:setup diff --git a/db/seeds.rb b/db/seeds.rb index adc740f..869aa86 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -24,7 +24,7 @@ rockpaperscissors.settings.create!(display_order: 4, name: "lizard_spock_allowed rockpaperscissors.settings.create!(display_order: 5, name: "favorite_object" , description: "What is your favorite object in RPS?", vartype: GameSetting::types[:pick_one_radio], type_opt: "rock,paper,scissors", default: "rock") rockpaperscissors.settings.create!(display_order: 6, name: "check_boxes" , description: "Example boxes" , vartype: GameSetting::types[:pick_several] , type_opt: "i_do_not_know,there_is_now_spoon,wow,because_electricity,wat?", default: "wow,wat?") -if Rails.env.development? +if Rails.env.development? or (ENV['FORCE_SEED'] and not ENV['FORCE_SEED'].empty?) # User 1, the ADMIN admin = User.create!(name: "Administrator", user_name: "admin", email: "root@localhost.lan", password: "password", permissions: 0xFFFFFFFF) -- cgit v1.2.3