Fixing passwords with the postgresql database adaptor

Updated a bit of verbosity in the specs

lib/backup/database/postgresql.rb

@@ -65,11 +65,19 @@ def tables_to_dump
       ##
       # Builds the credentials PostgreSQL syntax to authenticate the user
       # to perform the database dumping process
-      def credential_options
+      def username_options
         return '' unless username.is_a?(String) and not username.empty?
         "--username='#{username}'"
       end
 
+      ##
+      # Builds the password syntax PostgreSQL uses to authenticate the user
+      # to perform database dumping
+      def password_options
+        return '' unless password.is_a?(String) and not username.empty?
+        "PGPASSWORD='#{password}'"
+      end
+
       ##
       # Builds the PostgreSQL connectivity options syntax to connect the user
       # to perform the database dumping process, socket gets gsub'd to host since
@@ -92,8 +100,9 @@ def options
       ##
       # Builds the full pgdump string based on all attributes
       def pgdump
-        "#{ utility(:pg_dump) } #{ credential_options } #{ connectivity_options } " +
-        "#{ options } #{ tables_to_dump } #{ tables_to_skip } #{ name }"
+        ("#{password_options} " +
+        "#{ utility(:pg_dump) } #{ username_options } #{ connectivity_options } " +
+        "#{ options } #{ tables_to_dump } #{ tables_to_skip } #{ name }").strip
       end
 
       ##

spec/database/postgresql_spec.rb

@@ -49,18 +49,20 @@
       db.additional_options.should == []
     end
 
-    it do
+    it 'handles an empty username' do
       db = Backup::Database::PostgreSQL.new {}
       db.username = ''
 
-      db.credential_options.should == ''
+      db.username_options.should == ''
+      db.password_options.should == ''
     end
 
-    it do
+    it 'handles a nil username' do
       db = Backup::Database::PostgreSQL.new {}
       db.username = nil
 
-      db.credential_options.should == ''
+      db.username_options.should == ''
+      db.password_options.should == ''
     end
 
     it 'should ensure the directory is available' do
@@ -91,17 +93,23 @@
     end
   end
 
-  describe '#credential_options' do
-    it 'should return the postgresql syntax for the credential options' do
-      db.credential_options.should == "--username='someuser'"
+  describe '#username_options' do
+    it 'should return the postgresql syntax for the username options' do
+      db.username_options.should == "--username='someuser'"
     end
 
     it 'should only return the postgresql syntax for the user' do
       db = Backup::Database::PostgreSQL.new do |db|
         db.username = 'someuser'
       end
 
-      db.credential_options.should == "--username='someuser'"
+      db.username_options.should == "--username='someuser'"
+    end
+  end
+
+  describe '#password_options' do
+    it 'returns the environment variable set for the password' do
+      db.password_options.should == "PGPASSWORD='secret'"
     end
   end
 
@@ -133,14 +141,27 @@
   end
 
   describe '#pg_dump_string' do
-    it 'should return the full pg_dump string' do
+    before do
       db.expects(:utility).with(:pg_dump).returns('pg_dump')
+    end
+
+    it 'should return the full pg_dump string' do
       db.pgdump.should ==
-      "pg_dump --username='someuser' " +
+      "PGPASSWORD='secret' pg_dump --username='someuser' " +
       "--host='localhost' --port='123' --host='/pg.sock' " +
       "--single-transaction --quick --table='users' --table='pirates' " +
       "--exclude-table='logs' --exclude-table='profiles' mydatabase"
     end
+
+    it 'returns the full pg_dump string when a password is not specified' do
+      db.password = nil
+      db.pgdump.should ==
+          "pg_dump --username='someuser' " +
+          "--host='localhost' --port='123' --host='/pg.sock' " +
+          "--single-transaction --quick --table='users' --table='pirates' " +
+          "--exclude-table='logs' --exclude-table='profiles' mydatabase"
+
+    end
   end
 
   describe '#perform!' do