tidy_reset 0.1.7 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee3b2f4de00346cb4d31fe33d07923462f021ffb
-  data.tar.gz: f22b8181daff87cace62ea5b6f0070a13edfda45
+  metadata.gz: 2467525c189eb0dfdaa6214ba410575a054701b3
+  data.tar.gz: 61bb134500c23e1a8a300e60e342df0235296bf9
 SHA512:
-  metadata.gz: 5a27f20e94423bfd79d304efd266ac515deb599d2af4faadb3d6d84ccfd39533666214c00bc05431d6f86fc03794ec17f763c27a754ef3ab9848119fe88d67cc
-  data.tar.gz: 80de73d3dadc5073d950882733a99a9968c47568bdde2a63d1dd1c0e3b9d339f33c9bdba4f31a328b18f85d935f2af2db235bb9832c183752ec2e35e3bb96499
+  metadata.gz: 31a97e89ae24b52b236c5bdb93c3c60e08206038fbdec42b366d513c6e8db303f59acb53aa20287ac988e27126c9dbd2596cb95d3fb517d7f3d24fff1f8cb7c2
+  data.tar.gz: adaca1fcc6306bcc0dffb786b00956f6ddf51a4c357dff3af887b1c0cf97cf04907747b6a4d570e25d66053b702afadd61abf84d9f9356c3c84e2c3a81b8a35f

data/README.md

@@ -70,4 +70,9 @@ test:
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-
+## Releasing tidy_reset
+```
+# Using the Ruby jeweler
+rake version:bump:patch
+rake release REMOTE=upstream
+```

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.11

data/lib/tidy_reset.rb

@@ -27,12 +27,18 @@ module TidyReset
     end
 
     def database_purge(db_config)
-      begin
-        encoding = configuration.database_encoding
-        ActiveRecord::Base.remove_connection
+      encoding = configuration.database_encoding
+      ActiveRecord::Base.remove_connection
+
+      # 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
+      else 
+        establish_connection_method = :establish_connection
+      end
 
-        activerecord_import_exists = ActiveRecord::Base.respond_to?(:establish_connection_without_activerecord_import)
-        establish_connection_method = activerecord_import_exists ? :establish_connection_without_activerecord_import : :establish_connection
+      begin
+        # Get connection to master/maintenance database 'postgres'
         pool = ActiveRecord::Base.send(establish_connection_method, db_config.merge(
                 'database'           => 'postgres',
                 'schema_search_path' => 'public'
@@ -41,14 +47,36 @@ module TidyReset
           raise RuntimeError, "Pool an array size #{pool.size}. First: #{pool.first}"
         end
         master_connection = pool.connection
-        master_connection.select_all("SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE datname='#{db_config['database']}' AND state='idle';")
+
+        # Test connection
+        master_connection.select_all("SELECT 1;")
+
+        # Disallow connections from thinknear user. 
+        master_connection.select_all("ALTER DATABASE #{db_config['database']} CONNECTION LIMIT 0;")
+
+        # Terminate all connections to the database
+        master_connection.select_all("SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE datname='#{db_config['database']}' AND pid <> pg_backend_pid();")
+
+        # Drop the database
         master_connection.drop_database(db_config['database'])
+
+        # Create the database
         master_connection.create_database(db_config['database'], db_config.merge('encoding' => encoding))
+
+        # Enable connections from thinknear user
+        master_connection.select_all("ALTER DATABASE #{db_config['database']} CONNECTION LIMIT -1;")
+        
+        # Connect to created database to set extensions
         ActiveRecord::Base.remove_connection
         ActiveRecord::Base.send(establish_connection_method, db_config).connection.execute("CREATE EXTENSION IF NOT EXISTS postgis")
+
       rescue ActiveRecord::StatementInvalid => error
         if /database .* already exists/ === error.message
           raise DatabaseAlreadyExists
+        elsif /database .* is being accessed by other users/ === error.message
+          result = ActiveRecord::Base.send(establish_connection_method, db_config).connection.select_all("SELECT * FROM pg_stat_activity;")
+          puts result.to_hash
+          raise
         else
           raise
         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.7 ruby lib
+# stub: tidy_reset 0.1.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tidy_reset"
-  s.version = "0.1.7"
+  s.version = "0.1.11"
 
   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-07-31"
+  s.date = "2014-08-18"
   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.7
+  version: 0.1.11
 platform: ruby
 authors:
 - Thinknear
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler