rehabilitate 0.3.6 → 0.3.7

data/Rakefile

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'echoe'
+require 'lib/rehabilitate.rb'
 
-Echoe.new('rehabilitate', "0.3.6") do |p|
+Echoe.new('rehabilitate', Rehabilitate::VERSION) do |p|
   p.description     = "Backup stuff"
   p.url             = "https://github.com/fearoffish/rehabilitate"
   p.author          = "Jamie van Dyke"

data/bin/rehabilitate

@@ -28,7 +28,7 @@ require 'fileutils'
 include Log4r
 
 program :name, 'Rehabilitate'
-program :version, '0.3.2'
+program :version, Rehabilitate::VERSION
 program :description, 'A backup system that can be given commands to be run before and after a backup or restore'
 
 global_option('-d', '--debug', 'More verbose logging and nothing is actually run') { $DEBUG = true }

data/lib/rehabilitate/plugins/postgresql.rb

@@ -19,10 +19,10 @@ class Postgresql < Plugin
       drop_table_sql =  File.join(options.tmp, 'droptables.sql')
       log %[psql -t -h #{options.host} -U #{options.user} -d #{options.database} -c "SELECT 'DROP TABLE ' || n.nspname || '.' || c.relname || ' CASCADE;' FROM pg_catalog.pg_class AS c LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE relkind = 'r' AND n.nspname NOT IN ('pg_catalog', 'pg_toast') AND pg_catalog.pg_table_is_visible(c.oid)" > #{drop_table_sql} ]
       log %x[psql -t -h #{options.host} -U #{options.user} -d #{options.database} -c "SELECT 'DROP TABLE ' || n.nspname || '.' || c.relname || ' CASCADE;' FROM pg_catalog.pg_class AS c LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE relkind = 'r' AND n.nspname NOT IN ('pg_catalog', 'pg_toast') AND pg_catalog.pg_table_is_visible(c.oid)" > #{drop_table_sql} ]
-      log %[psql -h #{options.host} -U #{options.user} #{options.database} < #{drop_table_sql} ] unless $? == 256
-      log %x[psql -h #{options.host} -U #{options.user} #{options.database} < #{drop_table_sql} ] unless $? == 256
-      log %[psql -h #{options.host} -U #{options.user} #{options.database} < #{backup_file}] unless $? == 256
-      log %x[psql -h #{options.host} -U #{options.user} #{options.database} < #{backup_file}] unless $? == 256
+      log %[psql -h #{options.host} -U #{options.user} #{options.database} < #{drop_table_sql} #{"> /dev/null 2>&1" unless options.debug} ] unless $? == 256
+      log %x[psql -h #{options.host} -U #{options.user} #{options.database} < #{drop_table_sql} #{"> /dev/null 2>&1" unless options.debug} ] unless $? == 256
+      log %[psql -h #{options.host} -U #{options.user} #{options.database} < #{backup_file} #{"> /dev/null 2>&1" unless options.debug} ] unless $? == 256
+      log %x[psql -h #{options.host} -U #{options.user} #{options.database} < #{backup_file} #{"> /dev/null 2>&1" unless options.debug} ]] unless $? == 256
       options._tmp_files << drop_table_sql
       options._failure = true if $? == 256
     end

data/lib/rehabilitate.rb

@@ -2,6 +2,8 @@ require 'rehabilitate/plugin'
 require 'rehabilitate/plugins/splitter'
 
 class Rehabilitate
+  VERSION = "0.3.7"
+  
   def self.backup(options)
     driver = Plugin::create( options.driver )
     driver.backup(options)

data/rehabilitate.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rehabilitate}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamie van Dyke"]
-  s.date = %q{2011-01-10}
+  s.date = %q{2011-01-12}
   s.default_executable = %q{rehabilitate}
   s.description = %q{Backup stuff}
   s.email = %q{jamie@fearoffish.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rehabilitate
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Jamie van Dyke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +00:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency