psql-cm 0.2.0 → 0.2.1

data/History.md

@@ -1,3 +1,8 @@
+# 0.2.1 - 2012-05-22
+
+Added more debug output.
+Explicitely exclude pg\_psql\_cm from setup dump.
+
 # 0.2.0 - 2012-05-17
 
 Ownership and privileges are now recorded.

data/lib/psql-cm/base.rb

@@ -76,7 +76,8 @@ module PSQLCM
 
     def sh(command)
       debug "$ #{command}"
-      %x[#{command} 2>&1 | awk '! /NOTICE/']
+      output = %x[#{command} 2>&1 | awk '! /NOTICE/']
+      debug output
     end
 
     def uri

data/lib/psql-cm/restore.rb

@@ -22,10 +22,10 @@ module PSQLCM
               psqlrc_file = File.join(ENV['HOME'],'.psqlrc')
               FileUtils.touch(psqlrc_file) unless File.exists?(psqlrc_file)
               psqlrc = File.read(psqlrc_file)
-              File.open(psqlrc_file,'w') do |file|
-                file.rewind
-                file.write "SET search_path TO #{schema}; "
-              end
+
+              file = File.open(psqlrc_file,'w')
+              file.write "SET search_path TO #{schema}; "
+              file.close
 
               begin
                 tag = "restore:#{database}:#{schema}>"
@@ -39,10 +39,10 @@ module PSQLCM
                 debug tag, "base:sql> #{sql}"
                 db(database).exec(sql).each do |base_row|
                   debug "BASE content:", base_row['content']
-                  Tempfile.open('base.sql') do |file|
-                    file.write(base_row['content'])
-                    sh "psql #{db(database).psql_args} #{database} < #{file.path}"
-                  end
+                  tempfile = Tempfile.open('base.sql')
+                  tempfile.write(base_row['content'])
+                  sh "psql #{db(database).psql_args} #{database} < #{tempfile.path}"
+                  tempfile.close
                 end
 
                 sql = "SELECT content from #{schema}.#{config.cm_table}
@@ -54,17 +54,15 @@ module PSQLCM
                 debug tag, "change:count>#{changes.cmd_tuples}"
                 changes.each do |row|
                   debug tag, "content>\n#{row['content']}"
-                  Tempfile.open('change.sql') do |file|
-                    file.write(row['content'])
-                    file.close
-                    sh "psql #{db(database).psql_args} #{database} < #{file.path}"
-                  end
+                  tempfile = Tempfile.open('change.sql')
+                  tempfile.write(row['content'])
+                  sh "psql #{db(database).psql_args} #{database} < #{tempfile.path}"
+                  tempfile.close
                 end
               ensure
-                File.open(psqlrc_file,'w') do |file|
-                  file.rewind
-                  file.write psqlrc
-                end
+                file = File.open(psqlrc_file,'w')
+                file.write psqlrc
+                file.close
               end
             end
           end

data/lib/psql-cm/setup.rb

@@ -9,7 +9,7 @@ module PSQLCM
 
           Tempfile.open('base.sql') do |temp_file|
             sh %W[ pg_dump #{db(database).psql_args}
-            --schema-only --no-owner --no-privileges
+            --schema-only --no-owner --no-privileges --exclude-table=pg_psql_cm
             --schema=#{schema} --file=#{temp_file.path} #{database}
             ].join(' ')
 

data/lib/psql-cm/version.rb

@@ -1,4 +1,4 @@
 module PSQLCM
-  Version = '0.2.0'
+  Version = '0.2.1'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psql-cm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg