capistrano-db-tasks 0.2 → 0.2.1

data/README.markdown

@@ -2,6 +2,7 @@ CapistranoDbTasks
 =================
 
 Add database AND assets tasks to capistrano to a Rails project.
+It only works with capistrano 2. Any pull requests for capistrano 3 support are welcome :)
 
 Currently
 
@@ -40,6 +41,11 @@ Add to config/deploy.rb:
     set :locals_rails_env, "production"
 ```
 
+Add to .gitignore
+```yml
+    /db/*.sql
+```
+
 Available tasks
 ===============
 

data/lib/capistrano-db-tasks/database.rb

@@ -15,9 +15,10 @@ module Database
 
     def credentials
       if mysql?
-        " -u #{@config['username']} " + (@config['password'] ? " -p\"#{@config['password']}\" " : '') + (@config['host'] ? " -h #{@config['host']}" : '') + (@config['socket'] ? " -S#{@config['socket']}" : '')
+        username = @config['username'] || @config['user']
+        (username ? " -u #{username} " : '') + (@config['password'] ? " -p'#{@config['password']}' " : '') + (@config['host'] ? " -h #{@config['host']}" : '') + (@config['socket'] ? " -S#{@config['socket']}" : '')
       elsif postgresql?
-        " -U #{@config['username']} " + (@config['host'] ? " -h #{@config['host']}" : '')
+        (@config['username'] ? " -U #{@config['username']} " : '') + (@config['host'] ? " -h #{@config['host']}" : '')
       end
     end
 
@@ -33,6 +34,9 @@ module Database
       @output_file ||= "db/#{database}_#{current_time}.sql.bz2"
     end
 
+    def pgpass
+      "PGPASSWORD='#{@config['password']}'" if @config['password']
+    end
 
   private
 
@@ -40,7 +44,7 @@ module Database
       if mysql?
         "mysqldump #{credentials} #{database} --lock-tables=false"
       elsif postgresql?
-        "pg_dump #{credentials} -c -O #{database}"
+        "#{pgpass} pg_dump #{credentials} -c -O #{database}"
       end
     end
 
@@ -48,7 +52,7 @@ module Database
       if mysql?
         "mysql #{credentials} -D #{database} < #{file}"
       elsif postgresql?
-        "psql #{credentials} #{database} < #{file}"
+        "#{pgpass} psql #{credentials} #{database} < #{file}"
       end
     end
 
@@ -61,7 +65,7 @@ module Database
       @cap.run("cat #{@cap.current_path}/config/database.yml") do |c, s, d|
         @config += d
       end
-      @config = YAML.load(@config)[@cap.rails_env]
+      @config = YAML.load(ERB.new(@config).result)[@cap.rails_env.to_s]
     end
 
     def dump
@@ -86,7 +90,7 @@ module Database
   class Local < Base
     def initialize(cap_instance)
       super(cap_instance)
-      @config = YAML.load_file(File.join('config', 'database.yml'))[@cap.local_rails_env]
+      @config = YAML.load(ERB.new(File.read(File.join('config', 'database.yml'))).result)[@cap.local_rails_env.to_s]
       puts "local #{@config}"
     end
 
@@ -94,8 +98,15 @@ module Database
     def load(file, cleanup)
       unzip_file = File.join(File.dirname(file), File.basename(file, '.bz2'))
       # system("bunzip2 -f #{file} && bundle exec rake db:drop db:create && #{import_cmd(unzip_file)} && bundle exec rake db:migrate")
+      @cap.logger.info("executing local: bunzip2 -f #{file} && #{import_cmd(unzip_file)}")
       system("bunzip2 -f #{file} && #{import_cmd(unzip_file)}")
-      File.unlink(unzip_file) if cleanup
+      if cleanup
+        @cap.logger.info("removing #{unzip_file}")
+        File.unlink(unzip_file)
+      else
+        @cap.logger.info("leaving #{unzip_file} (specify :db_local_clean in deploy.rb to remove)")
+      end
+      @cap.logger.info("Completed database import")
     end
 
     def dump

data/lib/capistrano-db-tasks/dbtasks.rb

@@ -8,7 +8,6 @@ if Capistrano::Configuration.instance(false)
 
     instance.set :local_rails_env, ENV['RAILS_ENV'] || 'development' unless exists?(:local_rails_env)
     instance.set :rails_env, 'production' unless exists?(:rails_env)
-    instance.set :stage, 'production' unless exists?(:stage)
     instance.set :db_local_clean, false unless exists?(:db_local_clean)
     instance.set :assets_dir, 'system' unless exists?(:assets_dir)
     instance.set :local_assets_dir, 'public' unless exists?(:local_assets_dir)
@@ -112,4 +111,4 @@ if Capistrano::Configuration.instance(false)
     end
   end
 
-end
+end

data/lib/capistrano-db-tasks/version.rb

@@ -1,3 +1,3 @@
 module CapistranoDbTasks
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-db-tasks
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -59,12 +59,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 22134957769426335
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 22134957769426335
 requirements: []
 rubyforge_project: capistrano-db-tasks
 rubygems_version: 1.8.23