napa 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4f80b689c9f468319a5344e2659ee3da3dc0160
-  data.tar.gz: fae65a84303bb8594fedc3304e8738adc2bf8930
+  metadata.gz: 0656c5cfb68fbe78e50bcdaf0801223aa080b5d8
+  data.tar.gz: d41e0ac597f0377b8a8503eb511ed0e4b9b15d52
 SHA512:
-  metadata.gz: 6e7c700701738067b6f95a8cca9d10e21dab86f1fbbf339750207e0fc911d95e46b714914110d9b20eddb18033e334e1f6625a981379d8017e5f81a7eccc30cc
-  data.tar.gz: b161248d7731dfd51f173403c2825e9a0d02683ca13264ffc2345db4d114eb7f511623e5d89918399598c40f726532d4b3c17dcecdf7eece9dd3c67cb1b91eb8
+  metadata.gz: 0f836563f066fd8be7e31f45b6005a2dee477072a1d52100eba1f834fb680565b6bcc411b523411677c94c32a6f31cf54644cac927ec6eab2e3c181893a08180
+  data.tar.gz: 8f31591367c3f71de85d7a4837f296774f3ed38a2f3df58652d5e0d3c03d515222e2929ad6237e47703f45d5ea4747fedd26c3f4266231079ab361a641fdb059

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 
   class Version
     class << self

data/lib/tasks/db.rake

@@ -7,7 +7,6 @@ unless defined?(Rails)
   end
 
   namespace :db do
-
     desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x"
     task :migrate => :environment do
       ActiveRecord::Migrator.migrate('db/migrate', ENV["VERSION"] ? ENV["VERSION"].to_i : nil )
@@ -16,14 +15,18 @@ unless defined?(Rails)
 
     desc "Create the database"
     task :create => :environment do
-      establish_connection
-      ActiveRecord::Base.connection.create_database(db_conf.fetch('database'))
+      db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Napa.env]
+      adapter = db.merge({'database'=> 'mysql'})
+      ActiveRecord::Base.establish_connection(adapter)
+      ActiveRecord::Base.connection.create_database(db.fetch('database'))
     end
 
     desc "Delete the database"
     task :drop => :environment do
-      establish_connection
-      ActiveRecord::Base.connection.drop_database(db_conf.fetch('database'))
+      db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Napa.env]
+      adapter = db.merge({'database'=> 'mysql'})
+      ActiveRecord::Base.establish_connection(adapter)
+      ActiveRecord::Base.connection.drop_database(db.fetch('database'))
     end
 
     desc "Create the test database"
@@ -83,19 +86,4 @@ unless defined?(Rails)
       end
     end
   end
-
-  def db_conf
-    config = YAML.load(ERB.new(File.read('config/database.yml')).result)[Napa.env]
-  end
-
-  def establish_connection
-    ActiveRecord::Base.configurations = db_conf
-    if db_conf['adapter'] == 'em_postgresql' || db_conf['adapter'] == 'postgresql'
-      # drop and create need to be performed with a connection to the 'postgres' (system) database
-      ActiveRecord::Base.establish_connection db_conf.merge('database' => 'postgres',
-                                                            'schema_search_path' => 'public')
-    else
-      ActiveRecord::Base.establish_connection(db_conf)
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: napa
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake