rails_pwnerer 0.6.60 → 0.6.61

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.61. Smarter code for choosing between mysql and mysql2, since the latter is still buggy.
+
 v0.6.60. Switched Rails database adapter to mysql2.
 
 v0.6.59. Bugfix in pgsql scaffold code.

data/lib/pwnage/app/db/mysql.rb

@@ -71,8 +71,11 @@ ENDSQL
     db_name, db_user, db_pass = app_config[:db_name], app_config[:db_user], app_config[:db_pass]
     
     config_file = File.join app_config[:app_path], 'config', 'database.yml'
-    configuration = File.open(config_file, 'r') { |f| YAML.load f }    
-    configuration['production'].merge! 'adapter' => 'mysql2', 'database' => db_name, 'username' => db_user, 'password' => db_pass
+    configuration = File.open(config_file, 'r') { |f| YAML.load f }
+    unless /mysql/ =~ (configuration['production'] || '')
+      configuration['production'] = 'mysql2'
+    end
+    configuration['production'].merge! 'database' => db_name, 'username' => db_user, 'password' => db_pass
     configuration['production'].merge! mysql_host_info()
     File.open(config_file, 'w') { |f| YAML.dump(configuration, f) }
     

data/rails_pwnerer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.60"
+  s.version = "0.6.61"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 60
-  version: 0.6.60
+  - 61
+  version: 0.6.61
 platform: ruby
 authors: 
 - Victor Costan