updated Gemfile and database_example.yml on server

apileipzig · Jan 24, 2012 · b9c231d · b9c231d
1 parent 4e93eb2
commit b9c231d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,14 +7,21 @@ gem "authlogic"
 gem "rake"
 gem "shotgun"
 
-gem "sqlite3",          :groups => [:development, :test]
-gem "rack-test",        :groups => [:development, :test], :require => "rack/test"
-gem "assert_json",      :groups => [:development, :test]
-gem "turn",             :groups => [:development, :test]
-gem "minitest",         :groups => [:development, :test]
-gem "shoulda-context",  :groups => [:development, :test]
-gem "factory_girl",     :groups => [:development, :test]
-gem "database_cleaner", :groups => [:development, :test]
-gem "activesupport",    :group => :test, :require => "active_support/testing/assertions"
+group :development do
+  gem "sqlite3"
+end
 
-gem "mysql2", :group => :production
+group :test do
+  gem "rack-test", :require => "rack/test"
+  gem "assert_json"
+  gem "turn"
+  gem "minitest"
+  gem "shoulda-context"
+  gem "factory_girl"
+  gem "database_cleaner"
+  gem "activesupport", :require => "active_support/testing/assertions"
+end
+
+group :production do
+  gem "mysql2", "~> 0.2.0"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,7 +25,7 @@ GEM
     i18n (0.5.0)
     json (1.6.5)
     minitest (2.10.1)
-    mysql2 (0.3.11)
+    mysql2 (0.2.18)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -57,7 +57,7 @@ DEPENDENCIES
   factory_girl
   json
   minitest
-  mysql2
+  mysql2 (~> 0.2.0)
   rack-test
   rake
   shotgun

diff --git a/database_example.yml b/database_example.yml
@@ -8,4 +8,11 @@ test:
   adapter: sqlite3
   database: db/test.sqlite3
 
-
+#example for mysql
+#production:
+#  database: db_name
+#  adapter: mysql2
+#  host: localhost
+#  username: db_user
+#  password: db_pass
+#  encoding: utf8