bard-rake 0.10.3 → 0.10.4

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.10.4

data/bard-rake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bard-rake"
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Micah Geisel"]
-  s.date = "2013-06-23"
+  s.date = "2013-06-24"
   s.description = "Rake tasks for all bard projects.\n* Bootstrap projects\n* Database backup"
   s.email = "micah@botandrose.com"
   s.extra_rdoc_files = [
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     "lib/bard/rake.rb",
     "lib/bard/rake/bootstrap.rb",
     "lib/bard/rake/db_dump_load.rb",
-    "lib/bard/rake/db_migrate_sanity.rb",
+    "lib/bard/rake/db_multiple_environment_sanity.rb",
     "lib/bard/rake/railtie.rb",
     "lib/bard/rake/testing.rb",
     "spec/bard-rake_spec.rb",

data/lib/bard/rake.rb

@@ -1,5 +1,5 @@
+require 'bard/rake/db_multiple_environment_sanity'
 require 'bard/rake/db_dump_load'
-require 'bard/rake/db_migrate_sanity'
 require 'bard/rake/bootstrap'
 require 'bard/rake/testing'
 

data/lib/bard/rake/db_dump_load.rb

@@ -1,10 +1,4 @@
 namespace :db do
-  namespace :drop do
-    task :current_environment => [:load_config, :rails_env] do
-      drop_database_and_rescue Rails.env
-    end
-  end
-
   desc "Dump the current database to db/data.sql"
   task :dump => :environment do
     klass = adapter_from_config BardRake.database_config
@@ -12,7 +6,7 @@ namespace :db do
   end
 
   desc "Load the db/data.sql data into the current database."
-  task :load => ["db:drop:current_environment", "db:create"] do
+  task :load => ["db:drop:current", "db:create:current"] do
     klass = adapter_from_config BardRake.database_config
     klass.load
   end

data/lib/bard/rake/{db_migrate_sanity.rb → db_multiple_environment_sanity.rb}

@@ -35,5 +35,27 @@ if defined?(ActiveRecord)
         configs_for_environment.each &block
       end
     end
+
+    namespace :drop do
+      task :current => [:load_config] do
+        if defined?(ActiveRecord::Tasks::DatabaseTasks)
+          config = ActiveRecord::Tasks::DatabaseTasks.current_config
+          ActiveRecord::Tasks::DatabaseTasks.drop config
+        else
+          drop_database current_config
+        end
+      end
+    end
+
+    namespace :create do
+      task :current => [:load_config] do
+        if defined?(ActiveRecord::Tasks::DatabaseTasks)
+          config = ActiveRecord::Tasks::DatabaseTasks.current_config
+          ActiveRecord::Tasks::DatabaseTasks.create config
+        else
+          create_database current_config
+        end
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bard-rake
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: ruby
 authors: 
 - Micah Geisel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-23 00:00:00 Z
+date: 2013-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -56,7 +56,7 @@ files:
 - lib/bard/rake.rb
 - lib/bard/rake/bootstrap.rb
 - lib/bard/rake/db_dump_load.rb
-- lib/bard/rake/db_migrate_sanity.rb
+- lib/bard/rake/db_multiple_environment_sanity.rb
 - lib/bard/rake/railtie.rb
 - lib/bard/rake/testing.rb
 - spec/bard-rake_spec.rb