Gemfile script asserts that RAILS_ENV or development env are defined,…

… which is false in a production only environment. Enhance error message and protect against nil values
Ada-C4 · May 6, 2012 · b63ec3a · b63ec3a
1 parent e9c893f
commit b63ec3a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,8 +5,9 @@ unless File.exists?(dbfile)
   raise "You need to configure config/database.yml first"
 else
   conf = YAML.load(File.read(dbfile))
-  adapter = conf[env]['adapter']
-  raise "You need define an adapter in your database.yml" if adapter == '' || adapter.nil?
+  environment = conf[env]
+  adapter = environment['adapter'] if environment
+  raise "You need define an adapter in your database.yml or set your RAILS_ENV variable" if adapter == '' || adapter.nil?
   case adapter
   when 'sqlite3'
     gem 'sqlite3'