dblink 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0e7af330863d700229caf232c3c2ae55931b42
-  data.tar.gz: bb6ab4186a21d60076e51bd484ffc3f2be908b9a
+  metadata.gz: 456b57a2e4619b08713f7921299b7046a5750649
+  data.tar.gz: c704b0a9743500ac4f421452ea9eae534fdde7b6
 SHA512:
-  metadata.gz: 4316a3ab2414ee53970ef3a21c49996448f93744e2d9d720f332bfaa9202d872568b32b447ae2044a064b15453371cdc96226e453f83c8e618741b7eb79b7058
-  data.tar.gz: ecbb1c23a0b4aac78ebe3358cd4f5af84420e767392a7c0be7db375c5fc4dc60c38cff05e8cf1a8aab26880cc932d04fe36920d02d96b04d3dbe56430b4d120c
+  metadata.gz: 9d3e6b98eaf0977bea19f4c88b131c70a0655459462dc1d9bf8b6e7fc9174f2b32538f778a2088b69bb41a2af40ad0524bb4430e5db2ee119b37a51bb2f81f88
+  data.tar.gz: 3387240003ec5445e121f69ee031d99309038c1c7413e4c8203e412e4b673ec1bb8db77b2ef9495544eeeebaa42050cf98c21a1c11f51bbd2066e46ac7b2062e

data/bin/dblink

@@ -110,6 +110,16 @@ if CLI_OPTS[:verbose]
   puts "Config folder: #{pgb_runner.tmp_folder}"
 end
 
+pgb_runner_at_exit = Proc.new do
+  print "Stoping pgbouncer ..."
+  pgb_runner.stop_async
+  puts
+end
+
+at_exit do
+  pgb_runner_at_exit.call
+end
+
 print "Starting pgbouncer "
 pgb_runner.run_async
 pgb_pid = pgb_runner.wait_for_pid
@@ -117,6 +127,23 @@ puts "- " + "OK".green + " (pid: #{pgb_pid})"
 
 print "Starting SSH tonnel "
 tonnel = TonnelRunner.new(pgb_runner.pgb_port, tmp_dir: pgb_runner.tmp_folder, verbose: CLI_OPTS[:verbose])
+
+tonnel_at_exit = Proc.new do
+  print "Stoping ssh ..."
+  tonnel.stop_async
+  puts
+
+  tonnel.runner_thread.kill
+
+  puts "Removing tmp dir ..."
+  FileUtils.rm_rf(pgb_runner.tmp_folder)
+end
+
+at_exit do
+  pgb_runner_at_exit.call
+  tonnel_at_exit.call
+end
+
 tonnel.run_async
 tonnel.wait_remote_port_allocated
 
@@ -168,18 +195,11 @@ if web_response['status'] == 'success'
 end
 
 at_exit do
-  print "Stoping pgbouncer ..."
-  pgb_runner.stop_async
-  puts
-  print "Stoping ssh ..."
-  tonnel.stop_async
-  puts
+  pgb_runner_at_exit.call
+  tonnel_at_exit.call
 
   tonnel.runner_thread.kill
 
-  puts "Removing tmp dir ..."
-  FileUtils.rm_rf(pgb_runner.tmp_folder)
-
   exit!
 end
 

data/dblink.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name       = "dblink"
-  s.version    = "0.2"
+  s.version    = "0.3"
   s.author     = ["Pavel Evstigneev"]
   s.description= "CLI utility to share access to your local PostgreSQL server"
   s.email      = ["pavel.evst@gmail.com"]

data/lib/dblink/pg_bouncer_runner.rb

@@ -117,7 +117,7 @@ class PgBouncerRunner
 
   private
   def render_template(file, params)
-    erb = ERB.new(File.read(file))
+    erb = ERB.new(File.read(BASE_DIR + '/' + file))
     erb.filename = file
     erb.result(binding)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dblink
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Pavel Evstigneev