edb 0.6.1 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e17dd73f932110daaefd68f24eba4d82996d1bfe
-  data.tar.gz: ed2f112288ebc8c6f2af8d419e68acfdf149ad3f
+  metadata.gz: 2426e583c0d94ddcc3c4fbf55620043de8c18969
+  data.tar.gz: 59808abd908171f56f439e0885dea15d99fc88f1
 SHA512:
-  metadata.gz: 6117055df2f1cc9b1df10eee1c12feb4f5255efba51ac22a8be0645a188071a2c6aa1bc5648a6841f058f0268d122da22da76c019078bd730ff0b63779eec176
-  data.tar.gz: 024d5044d2df77d90363b419468fe31c1a4a91cfe4352660168f83eff45073765eba607a5c5f800cdaedcb5440414e7a3c1ea2e8d2938d354e73f23fc50381f3
+  metadata.gz: 1f2806467e8187fcf5009f1e1e930b1177865199ecdcca96fc279d90164720a56c3fb8352516df3398e1d67e035414894a1feb2a1cda3cfacf9c1688a079c272
+  data.tar.gz: 8e57f560faa01069b81602fec1a4e7ec705bdd2655fa5d59a53202147e2f696b28a9270fd535feb60bc5633eb1d5381eca44c0a70e95789b79ac689c724c9207

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edb (0.6.1)
+    edb (0.7)
       aws-sdk (= 1.59.1)
       fast_secure_compare (~> 1.0)
       ftp_sync (~> 0.4)

data/example/edb.yml

@@ -7,6 +7,10 @@
     :database: sample_database
     :host: localhost
     :port: 5432
+    :include_cluster: true
+    :only_tables:    []
+    :exclude_tables: ['trash_table']
+    :run_sql_after_backup: ~/Documents/clear_tables.sql
 
   :MySQL:
     :binpath: /Applications/MAMP/Library/bin

data/lib/edb/dbms/postgresql.rb

@@ -29,17 +29,31 @@ module EDB
         def backup(dir_name)
           db    = ::EDB.opts[:DBMS][:PostgreSQL]
           files = {
-            dump:    File.join(dir_name, "#{db[:database]}.sql"),
-            cluster: File.join(dir_name, 'cluster.sql')
+            dump: File.join(dir_name, "#{db[:database]}.sql")
           }
 
           ::EDB::Logger.log(:info, "Dumping #{db[:database]}...")
+
+          only_tables    = (db[:only_tables]    || []).reject(&:empty?).map { |t| "-t #{t}" }.join(' ')
+          exclude_tables = (db[:exclude_tables] || []).reject(&:empty?).map { |t| "-T #{t}" }.join(' ')
+
           pg_dump = db[:binpath] && !db[:binpath].empty? ? File.join(db[:binpath], 'pg_dump') : 'pg_dump'
-          Kernel.system "PGPASSWORD='#{db[:password]}' #{pg_dump} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} -F c -b -f '#{files[:dump]}' #{db[:database]}"
+          Kernel.system "PGPASSWORD='#{db[:password]}' #{pg_dump} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} -F c -b -f '#{files[:dump]}' #{only_tables} #{exclude_tables} #{db[:database]}"
+
+          if db[:include_cluster] == true
+            ::EDB::Logger.log(:info, 'Dumping the cluster...')
+
+            files[:cluster] = File.join(dir_name, 'cluster.sql')
+            pg_dumpall = db[:binpath] && !db[:binpath].empty? ? File.join(db[:binpath], 'pg_dumpall') : 'pg_dumpall'
+            Kernel.system "PGPASSWORD='#{db[:password]}' #{pg_dumpall} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} -f '#{files[:cluster]}'"
+          end
+
+          if db[:run_sql_after_backup] && File.exists?(db[:run_sql_after_backup])
+            ::EDB::Logger.log(:info, "Executing #{File.basename(db[:run_sql_after_backup])}...")
 
-          ::EDB::Logger.log(:info, 'Dumping the cluster...')
-          pg_dumpall = db[:binpath] && !db[:binpath].empty? ? File.join(db[:binpath], 'pg_dumpall') : 'pg_dumpall'
-          Kernel.system "PGPASSWORD='#{db[:password]}' #{pg_dumpall} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} -f '#{files[:cluster]}'"
+            psql = db[:binpath] && !db[:binpath].empty? ? File.join(db[:binpath], 'psql') : 'psql'
+            Kernel.system "PGPASSWORD='#{db[:password]}' #{psql} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} -d #{db[:database]} -f #{db[:run_sql_after_backup]}"
+          end
 
           files.values
         end

data/lib/edb/version.rb

@@ -23,5 +23,5 @@
 #++
 
 module EDB
-  VERSION = '0.6.1'
+  VERSION = '0.7'
 end

data/specs/dbms/postgresql_spec.rb

@@ -2,22 +2,38 @@ require_relative '../spec_helper'
 
 describe EDB::DBMS::PostgreSQL do
   describe '#backup' do
-    let(:dump)    { "PGPASSWORD='password' /Applications/Postgres.app/Contents/Versions/9.3/bin/pg_dump -h localhost -p 5432 -U username -F c -b -f './sample_database.sql' sample_database" }
-    let(:cluster) { "PGPASSWORD='password' /Applications/Postgres.app/Contents/Versions/9.3/bin/pg_dumpall -h localhost -p 5432 -U username -f './cluster.sql'" }
+    let(:dump)      { "PGPASSWORD='password' /Applications/Postgres.app/Contents/Versions/9.3/bin/pg_dump -h localhost -p 5432 -U username -F c -b -f './sample_database.sql'  -T trash_table sample_database" }
+    let(:cluster)   { "PGPASSWORD='password' /Applications/Postgres.app/Contents/Versions/9.3/bin/pg_dumpall -h localhost -p 5432 -U username -f './cluster.sql'" }
+    let(:after_sql) { "PGPASSWORD='password' /Applications/Postgres.app/Contents/Versions/9.3/bin/psql -h localhost -p 5432 -U username -d sample_database -f ~/Documents/clear_tables.sql" }
 
     it 'calls pg_dump correctly' do
       allow(Kernel).to receive(:system).and_wrap_original do |m, *args|
-        expect(args[0]).to satisfy { |c| [dump, cluster].include?(c) }
+        expect(args[0]).to satisfy { |c| [dump, cluster, after_sql].include?(c) }
       end
 
       EDB::DBMS::PostgreSQL.backup('.')
     end
 
-    it 'returns the the files that have been created' do
-      allow(Kernel).to receive(:system).and_wrap_original {}
+    context 'include_cluster is true' do
+      it 'returns the files that have been created' do
+        allow(Kernel).to receive(:system).and_wrap_original {}
 
-      results = EDB::DBMS::PostgreSQL.backup('.')
-      expect(results).to eq ['./sample_database.sql', './cluster.sql']
+        results = EDB::DBMS::PostgreSQL.backup('.')
+        expect(results).to eq ['./sample_database.sql', './cluster.sql']
+      end
+    end
+
+    context 'include_cluster is false' do
+      before :each do
+        EDB.opts[:DBMS][:PostgreSQL][:include_cluster] = false
+      end
+
+      it 'returns the files that have been created' do
+        allow(Kernel).to receive(:system).and_wrap_original {}
+
+        results = EDB::DBMS::PostgreSQL.backup('.')
+        expect(results).to eq ['./sample_database.sql']
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: '0.7'
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk