napa 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9da429ae573a9e4204d8a2cf060185ef578b881
-  data.tar.gz: 477095dad47b80a1f3de19c47b104d2b2b9a04fb
+  metadata.gz: 4fe0fa94a5dd767848ebc3aa7cd844852d337fe0
+  data.tar.gz: c3a75f4bc02be82326a6b4c84a5b7a822e5053dd
 SHA512:
-  metadata.gz: 5ba07a913e24c756cd7de67fb2b32d4cc55d4e50e917fdeb3e64a67b2cabc7ed7602201c8bd825b9d65319b1595f908405b193afb564e7170c048aff64049a1d
-  data.tar.gz: e4b7643b90506178f03964aaef1693cf42ec2be3b1ac625c9c2585ea40a0637411786bbb135cb463ea61aa057b233889dc7e3932bb87485d876ea92244fc2c8b
+  metadata.gz: 120c728a6838492420a2c97b5e4aa35e0c6ce1cf1be1223076d60f0a6304211a67d919c0433a3abce911d2e1991ff3694c3a17682239832bf673797cb83d8107
+  data.tar.gz: 8c745d7661deba0db7ccdb4bb163f880cae94306f4d01949a7a15d11cd4bb42396792f09e1694d4252aae98fe0f2b195d7923a473c05d5265113f83bd12d30be

data/.rubocop.yml

@@ -14,4 +14,10 @@ NumericLiterals:
   Enabled: false
 
 MethodLength:
-  Enabled: false
+  Enabled: false
+
+AllCops:
+  Excludes:
+    - db/**
+    - config/**
+    - script/**

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 
   class Version
     class << self

data/lib/tasks/db.rake

@@ -7,6 +7,7 @@ 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 )
@@ -15,18 +16,14 @@ unless defined?(Rails)
 
     desc "Create the database"
     task :create => :environment do
-      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'))
+      establish_connection
+      ActiveRecord::Base.connection.create_database(db_conf.fetch('database'))
     end
 
     desc "Delete the database"
     task :drop => :environment do
-      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'))
+      establish_connection
+      ActiveRecord::Base.connection.drop_database(db_conf.fetch('database'))
     end
 
     desc "Create the test database"
@@ -86,4 +83,19 @@ 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.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake