bard-rake 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bard-rake.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bard-rake}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Micah Geisel}]
-  s.date = %q{2011-08-16}
+  s.date = %q{2011-08-30}
   s.description = %q{Rake tasks for all bard projects.
 * Bootstrap projects
 * Database backup}

data/lib/bard/rake/db.rb

@@ -1,24 +1,30 @@
 namespace :db do
   desc "Dump the current database to db/data.sql"
-  task :dump => :"backup:db" do
-    config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
-    db_file = Dir.glob("../#{config['database'].gsub(/_/, '-')}-*.sql").first
-    FileUtils.move db_file, "db/data.sql"
+  task :dump => :environment do
+    mysqldump = `which mysqldump`.strip
+    raise RuntimeError, "Cannot find mysqldump." if mysqldump.blank?
+    sh "#{mysqldump} -e #{mysql_options} > #{file_path}"
   end
 
   desc "Load the db/data.sql data into the current database."
-  task :load => :environment do
-    config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
-    Rake::Task["db:drop"].invoke
-    Rake::Task["db:create"].invoke
+  task :load => ["db:drop", "db:create"] do
     mysql = `which mysql`.strip
-    options  = " -u#{config['username']}"
-    options += " -p#{config['password']}" if config['password']
-    options += " -h #{config['host']}"    if config['host']
-
-    raise RuntimeError, "I only work with mysql." unless config['adapter'].include? 'mysql'
     raise RuntimeError, "Cannot find mysql." if mysql.blank?
+    sh "#{mysql} #{mysql_options} < #{file_path}"
+  end
+
+  def file_path
+    "db/data.sql"
+  end
+
+  def mysql_options
+    config = ActiveRecord::Base.configurations[Rails.env || "development"]
+    raise RuntimeError, "I only work with mysql." unless config["adapter"].starts_with? "mysql"
 
-    sh "#{mysql} #{options} '#{config["database"]}' < db/data.sql"
+    options =  " -u #{config["username"]}"
+    options += " -p'#{config["password"]}'" if config["password"]
+    options += " -h #{config["host"]}"      if config["host"]
+    options += " -S #{config["socket"]}"    if config["socket"]
+    options += " '#{config["database"]}'"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bard-rake
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Micah Geisel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 Z
+date: 2011-08-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec