psql-cm 0.0.3 → 0.0.4

data/History.md

@@ -1,3 +1,7 @@
+# 0.0.4 - 2012-04-18
+
+'restore' action functional.
+
 # 0.0.3 - 2012-04-18
 
 'setup' action functional.

data/lib/psql-cm/base.rb

@@ -32,7 +32,7 @@ module PSQLCM
 
     def schemas(name = 'postgres')
       @schemas = db(name).
-        exec("SELECT nspname as name FROM pg_namespace WHERE nspname !~ '^pg_.*|information_schema';").
+        exec("SELECT nspname AS name FROM pg_namespace WHERE nspname !~ '^pg_.*|information_schema';").
         map{|row| row["name"]}
       debug "schemas> #{@schemas}"
       @schemas
@@ -77,7 +77,7 @@ module PSQLCM
             FileUtils.touch(base_file)
             FileUtils.touch(cm_file)
 
-            command = "pg_dump --schema-only --no-owner --schema=#{schema} "
+            command = "pg_dump #{db(database).psql_args} --schema-only --no-owner --schema=#{schema} "
             if File.size(base_file) > 0
               command += "--file=#{cm_file}  --table=psql_cm "
             else
@@ -95,10 +95,9 @@ module PSQLCM
       debug "setup> Setting up pg_psql_cm table in each target schema."
       tree.each_pair do |database, schema_hash|
         schema_hash.keys.each do |schema|
-          debug "setup:#{database}> #{schema}"
-          db(database).exec <<-SQL
+          sql = <<-SQL
             SET search_path = #{schema}, public;
-            CREATE TABLE IF NOT EXISTS pg_psql_cm
+            CREATE TABLE IF NOT EXISTS #{schema}.pg_psql_cm
             (
               id bigserial NOT NULL PRIMARY KEY ,
               is_base boolean NOT NULL,
@@ -107,44 +106,45 @@ module PSQLCM
               content text NOT NULL
             );
           SQL
+          debug "setup:#{database}:#{schema}> sql\n#{sql}"
+          db(database).exec sql
         end
       end
     end
 
     def restore!
-      # TODO: Restore psql-cm filesystem path files {base,cm}.sql into database
-      # structure.
       unless config.sql_path
         $stdout.puts "Warning: --sql-path was not set, defaulting to $PWD/sql."
         config.sql_path = "#{ENV["PWD"]}/sql"
       end
 
       debug "restore> sql_path: #{config.sql_path}"
-      FileUtils.mkdir(config.sql_path) unless File.directory?(config.sql_path)
+      File.directory?(config.sql_path) or
+        halt! "Cannot restore from a path that does not exist: #{config.sql_path}"
+
       Dir.chdir(config.sql_path) do
-        tree.each_pair do |database, schema_hash|
-          debug "restore> database: #{database}"
 
-          File.directory?(File.join(config.sql_path,database)) or
-            FileUtils.mkdir(File.join(config.sql_path,database))
+        Dir['*'].each do |database|
+          next unless File.directory? database
 
-          schema_hash.each_pair do |schema, files|
-            debug "restore> schema: #{schema}"
-            File.directory?(File.join(config.sql_path,database,schema)) or
-              FileUtils.mkdir(File.join(config.sql_path,database,schema))
+          Dir.chdir(database) do
+            sh "restore", "createdb #{db(database).psql_args} #{database}"
 
-            base_file = File.join(config.sql_path,database,schema,'base.sql')
-            cm_file = File.join(config.sql_path,database,schema,'cm.sql')
+            debug "restore:#{database}>"
+            Dir['*'].each do |schema|
+              next unless File.directory? schema
 
-            FileUtils.touch(base_file)
-            FileUtils.touch(cm_file)
+              base_file = File.join(config.sql_path,database,schema,'base.sql')
+              cm_file = File.join(config.sql_path,database,schema,'cm.sql')
 
-            command = "psql #{database} < #{base_file}"
-            sh 'restore', command
+              debug "restore:#{database}:#{schema}> #{base_file}"
+              sh 'restore', "psql #{db(database).psql_args} #{database} < #{base_file}"
 
-            next if File.size(cm_file) == 0
-            command = "psql #{database} < #{cm_file}"
-            sh 'restore', command
+              next if File.size(cm_file) == 0
+
+              debug "restore:#{database}:#{schema}> #{cm_file}"
+              sh 'restore', "psql #{db(database).psql_args} #{database} < #{cm_file}"
+            end
           end
         end
       end
@@ -167,8 +167,6 @@ module PSQLCM
       end
     end
 
-    private
-
     def sh(tag, command)
       debug "sh:#{tag}> #{command}"
       %x[#{command}]

data/lib/psql-cm/database.rb

@@ -1,8 +1,10 @@
 module PSQLCM
+
   class Connection < Delegator
+
     def initialize(options = {})
-      @name = options[:dbname] || 'postgres'
       @config = ::PSQLCM.config.connection.merge(options)
+      @config[:dbname] = options[:dbname] || 'postgres'
 
       super # For delegator pattern:
       @delegated_object = db
@@ -13,6 +15,10 @@ module PSQLCM
     def __setobj__(object) ;  end
 
     def db
+      unless @config[:dbname] == 'postgres'
+        ::PSQLCM.sh 'createdb', "createdb #{psql_args} #{@config[:dbname]}"
+      end
+
       @db || connect!
     end
 
@@ -20,7 +26,7 @@ module PSQLCM
       @db = PG.connect(@config)
     end
 
-    def reconnect!(name = @name)
+    def reconnect!(name = @config[:dbname])
       close!
       connect!
     end
@@ -28,6 +34,28 @@ module PSQLCM
     def close!
       @db.close
     end
+
+    def pgpass # Ensure a pgpass entry exists for this connection.
+      pgpass_line = [
+        @config[:host], @config[:port], @config[:dbname], @config[:user],
+        @config[:password]
+      ].join(':')
+
+      content = File.open(File.join(ENV['HOME'], '.pgpass'), 'r') { |file| file.read }
+      unless content.lines.detect{ |line| line == pgpass_line }
+        File.open(File.join(ENV['HOME'], '.pgpass'), 'w') do |file|
+          file.write(content + pgpass_line + "\n")
+        end
+      end
+
+      pgpass_line
+    end # def pgpass
+
+    def psql_args
+      pgpass
+      "-h #{@config[:host]} -p #{@config[:port]} -U #{@config[:user]}"
+    end # def psql_args
+
   end # class Connection
 
   class << self
@@ -35,6 +63,7 @@ module PSQLCM
       @db ||= {}
       return @db[name] if @db[name]
       @config.connection || configure!
+
       @db[name] = Connection.new(:dbname => name)
     end
 
@@ -51,7 +80,7 @@ module PSQLCM
         :host => uri.host,
         :port => uri.port || 5432,
         :dbname => "postgres", # uri.path.sub('/',''),
-        :user => uri.user,
+        :user => uri.user || ENV['USER'],
         :password => uri.password,
         :connect_timeout => timeout.empty? ? 20 : timeout.to_i,
         :sslmode => sslmode.empty? ? "disable" : sslmode # (disable|allow|prefer|require)

data/lib/psql-cm/version.rb

@@ -1,4 +1,4 @@
 module PSQLCM
-  Version = '0.0.3'
+  Version = '0.0.4'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psql-cm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg