tidy_reset 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20c2af1a9aacdb1e1b345e7a33f6af35774b3a11
-  data.tar.gz: 7bed32abe8afbe42ebf81c7bc67764ad77ff70bb
+  metadata.gz: fe315012fd76fed565ec642b41aaccd8c4d51dae
+  data.tar.gz: 0704497370a0bbd0538a3980db2b9123618f2107
 SHA512:
-  metadata.gz: b426845e1f0b2f7de85abf2d0217d22c8b90eb3af86e4c6fc841d76034cb944db67a3c72904f4b3acee3e1cb185b26786e276474cc61a3c7062e53d6cd3a72b5
-  data.tar.gz: 7fe5b874f2edad1c44e7dd4878763222de424478fe586978c4ad5665ee82ebd3ae343b3a21a43c4689e7afd2087b9e0931b74a6b49d60c47ea95dbde556981aa
+  metadata.gz: 993878166be13bb37b0c93d8040e40ebd030ea31ea611724ee3bde0ddd85b8819610b9313d05da2c12f3724d1f427b836a28c8f4b0fbeec32bbd0ee2117723fb
+  data.tar.gz: ca974b7b162700741f04bd2b5a38fa7a7d15db22b2637ab1d7bb5ca884d7afdb6d55595db53e1b30edc0c86388fc356759747e939c8d7b953affd161b9b04271

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.14

data/lib/tidy_reset.rb

@@ -26,28 +26,33 @@ module TidyReset
       "#{configuration.app}-#{postfix}"
     end
 
-    def database_purge(db_config)
-      encoding = configuration.database_encoding
-      ActiveRecord::Base.remove_connection
+    def master_connection_from_db_config(db_config)
+      # Get connection to master/maintenance database 'postgres'
+      pool = ActiveRecord::Base.send(establish_connection_method, db_config.merge(
+              'database'           => 'postgres',
+              'schema_search_path' => 'public'
+            ))
+      if pool.is_a?(Array)
+        raise RuntimeError, "Pool an array size #{pool.size}. First: #{pool.first}"
+      end
+      pool.connection
+    end
 
+    def establish_connection_method
       # Choose proper connection method when ActiveRecord uses activerecord-import
       if ActiveRecord::Base.respond_to?(:establish_connection_without_activerecord_import)
-        establish_connection_method = :establish_connection_without_activerecord_import
+        :establish_connection_without_activerecord_import
       else 
-        establish_connection_method = :establish_connection
+        :establish_connection
       end
+    end
 
-      begin
-        # Get connection to master/maintenance database 'postgres'
-        pool = ActiveRecord::Base.send(establish_connection_method, db_config.merge(
-                'database'           => 'postgres',
-                'schema_search_path' => 'public'
-              ))
-        if pool.is_a?(Array)
-          raise RuntimeError, "Pool an array size #{pool.size}. First: #{pool.first}"
-        end
-        master_connection = pool.connection
+    def database_purge(db_config)
+      encoding = configuration.database_encoding
+      ActiveRecord::Base.remove_connection
 
+      begin
+        master_connection = master_connection_from_db_config(db_config)
         # Test connection
         master_connection.select_all("SELECT 1;")
 
@@ -80,6 +85,9 @@ module TidyReset
         else
           raise
         end
+      ensure
+        master_connection = master_connection_from_db_config(db_config)
+        master_connection.select_all("ALTER DATABASE #{db_config['database']} CONNECTION LIMIT -1;")
       end
     end
   end

data/tidy_reset.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tidy_reset 0.1.12 ruby lib
+# stub: tidy_reset 0.1.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tidy_reset"
-  s.version = "0.1.12"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Thinknear"]
-  s.date = "2014-08-19"
+  s.date = "2014-08-21"
   s.description = "Reset dynos, environment variables, deploys master git branch, and purges the database."
   s.email = "software@thinknear.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tidy_reset
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Thinknear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler