waterpig 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318ff8fa9afe73198a7e40f033a80df4a7f6e756
-  data.tar.gz: e0497a4ce25ea9f435bfcdcd51c368e1c49af4be
+  metadata.gz: bb3ae7798c87c5797fa48f5f879563361ac7d419
+  data.tar.gz: dea722855e6c224e2d976408f6e8c4491fae9db7
 SHA512:
-  metadata.gz: ce3aa8b7b4369f071f1a70d91fdcfe07f844c5788940072ad68fdf51891795e213bcfd1e5e162e302588c420748d5cce813d7bb3fa051eeb600be3ff6385697b
-  data.tar.gz: 275f405d9b585bbae00e209a0cece55684435d6c243d78220525efdee52d058d615c577c7cc2c660cbe27b2a9501d817b78d1fdcb428db979c19476fb5898ef6
+  metadata.gz: bca828861118469c32033ab0a9b657d6a13ae9c78b5e3f06a064fc79c0957bf33900ffe1659226eca983e355a11bc2acb1491418837bf335aae45b93e0f6e57b
+  data.tar.gz: 36b4b15b43e9f0fc048f94500c77e6eb0fa9db5661e4e31e33f5b55ce768e859d3da3320ae7f0932d5bde98b6bab4791e1c466ad7f18ab370969a9c725815934

data/lib/waterpig/database-cleaner.rb

@@ -1,16 +1,28 @@
 require 'database_cleaner'
 
+require 'waterpig/template-refresh'
+require 'waterpig/request-wait-middleware'
+
 RSpec.configure do |config|
   #config.use_transactional_fixtures = false
   DatabaseCleaner.strategy = :transaction
 
   config.add_setting :waterpig_exclude_cleaning_key, :default => :manual_database_cleaning
+  config.add_setting :waterpig_explicit_cleaning_method_key, :default => :clean_with
+
+  config.add_setting :waterpig_database_reset_method, :default => :truncation
   config.add_setting :waterpig_truncation_types, :default => [:feature]
+  config.add_setting :waterpig_reset_types, :default => [:feature]
+
   config.add_setting :waterpig_skip_cleaning_types, :default => []
   config.add_setting :waterpig_exclude_seeds_types, :default => []
+
   config.add_setting :waterpig_database_truncation_config, :default => {:except => %w[spatial_ref_sys]}
   config.add_setting :waterpig_db_seeds, :default => 'db/seeds.rb'
 
+  config.add_setting :waterpig_test_database_config, :default => :test
+  config.add_setting :waterpig_test_template_database_config, :default => :test_template
+
   def with_showing(show, detailed)
     begin
       old_show, old_show_detailed =
@@ -25,18 +37,57 @@ RSpec.configure do |config|
     end
   end
 
+  def cleaning_policy(config, metadata)
+    return :no_clean if metadata[config.waterpig_exclude_cleaning_key]
+    unless (explicit_method = metadata[config.waterpig_explicit_cleaning_method_key]).nil?
+      if explicit_method == :reset
+        return config.waterpig_database_reset_method
+      else
+        return explicit_method
+      end
+    end
+
+    return :no_clean if config.waterpig_skip_cleaning_types.include?(metadata[:type])
+
+    if config.waterpig_database_reset_method == :truncation
+      return :truncate if config.waterpig_truncation_types.include?(metadata[:type])
+      return :truncate if config.waterpig_reset_types.include?(metadata[:type])
+    else
+      return :refresh if config.waterpig_reset_types.include?(metadata[:type])
+    end
+    return :transaction
+  end
+
+  def use_refresh?(config, metadata)
+    cleaning_policy(config, metadata) == :refresh
+  end
+
   def use_truncate?(config, metadata)
-    return false if metadata[config.waterpig_exclude_cleaning_key]
-    return false if config.waterpig_skip_cleaning_types.include?(metadata[:type])
-    return false unless config.waterpig_truncation_types.include?(metadata[:type])
-    return true
+    cleaning_policy(config, metadata) == :truncate
   end
 
   def use_transaction?(config, metadata)
-    return false if metadata[config.waterpig_exclude_cleaning_key]
-    return false if use_truncate?(config, metadata)
-    return false if config.waterpig_skip_cleaning_types.include?(metadata[:type])
-    return true
+    cleaning_policy(config, metadata) == :transaction
+  end
+
+  last_type = nil
+
+  config.after(:all) do
+    last_type = self.class.metadata[:type].to_s
+  end
+
+  config.before(:all, :description => proc{|value, metadata| use_refresh?(config, metadata)}) do
+    Waterpig::RequestWaitMiddleware.wait_for_idle do
+      Waterpig::TemplateRefresh.refresh_database(config.waterpig_test_database_config)
+    end
+  end
+
+  #Before the first group following a refresh-group, refresh again.
+  #Faster than refreshing before and after all the feature groups
+  config.before(:all, :description => proc{|value, metadata| !use_refresh?(config, metadata) }) do
+    if config.waterpig_reset_types.include?(last_type)
+      Waterpig::TemplateRefresh.refresh_database(config.waterpig_test_database_config)
+    end
   end
 
   config.before :all, :description => proc{ |value, metadata| use_truncate?(config, metadata) } do
@@ -52,7 +103,6 @@ RSpec.configure do |config|
 
   config.after :all, :description => proc{ |value, metadata| use_truncate?(config, metadata) } do
     with_showing(true, true) do
-      Rails.application.config.action_dispatch.show_detailed_exceptions = true
       DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
       if config.waterpig_db_seeds?
         load config.waterpig_db_seeds
@@ -69,9 +119,17 @@ RSpec.configure do |config|
   end
 
   config.before :suite do
-    DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
-    if config.waterpig_db_seeds?
-      load config.waterpig_db_seeds
+    if config.waterpig_database_reset_method == :truncation
+      DatabaseCleaner.clean_with :truncation, config.waterpig_database_truncation_config
+      if config.waterpig_db_seeds?
+        load config.waterpig_db_seeds
+      end
+    elsif config.waterpig_database_reset_method == :refresh
+      Waterpig::TemplateRefresh.load_if_pending!(config.waterpig_test_template_database_config)
+      Waterpig::TemplateRefresh.commandeer_database(config.waterpig_test_database_config)
+      Waterpig::TemplateRefresh.refresh_database(config.waterpig_test_database_config)
+    else
+      warn "Waterpig: Unknown database reset method: #{config.waterpig_database_reset_method}"
     end
   end
 end

data/lib/waterpig/template-refresh.rb

@@ -1,122 +1,126 @@
-module Waterpig
-
-
-  # Tool to handle migrations and rebuilds on a test template database.  For
-  # explanation of what the test templated DB is and how it's used, see the
-  # README.
-  #
-  # This should auto detect any needed migrations in that database. However, it
-  # does not detect changes to db/seeds.rb, so if you have changed seeds
-  # without adding a DB migration, you will need to drop and rebuild the
-  # test_template.
-  module TemplateRefresh
-    Base = ActiveRecord::Base
-    Migrator = ActiveRecord::Migrator
-    DatabaseTasks = ActiveRecord::Tasks::DatabaseTasks
-
-    extend self
-
-    def load_config
-      Base.configurations       = DatabaseTasks.database_configuration || {}
-      Migrator.migrations_paths = DatabaseTasks.migrations_paths
-    end
+begin
+  require 'activerecord'
+  module Waterpig
+
+
+    # Tool to handle migrations and rebuilds on a test template database.  For
+    # explanation of what the test templated DB is and how it's used, see the
+    # README.
+    #
+    # This should auto detect any needed migrations in that database. However, it
+    # does not detect changes to db/seeds.rb, so if you have changed seeds
+    # without adding a DB migration, you will need to drop and rebuild the
+    # test_template.
+    module TemplateRefresh
+      Base = ActiveRecord::Base
+      Migrator = ActiveRecord::Migrator
+      DatabaseTasks = ActiveRecord::Tasks::DatabaseTasks
+
+      extend self
+
+      def load_config
+        Base.configurations       = DatabaseTasks.database_configuration || {}
+        Migrator.migrations_paths = DatabaseTasks.migrations_paths
+      end
 
-    def purge_env(env)
-      DatabaseTasks.purge(config_for(env))
-    end
+      def purge_env(env)
+        DatabaseTasks.purge(config_for(env))
+      end
 
-    def with_temporary_connection(env)
-      begin
-        should_reconnect = Base.connection_pool.active_connection?
+      def with_temporary_connection(env)
+        begin
+          should_reconnect = Base.connection_pool.active_connection?
 
-        yield
-      ensure
-        if should_reconnect
-          Base.establish_connection(config_for(DatabaseTasks.env))
+          yield
+        ensure
+          if should_reconnect
+            Base.establish_connection(config_for(DatabaseTasks.env))
+          end
         end
       end
-    end
 
-    #Assumes schema_format == ruby
-    def load_schema(env)
-      ActiveRecord::Schema.verbose = false
-      DatabaseTasks.load_schema_for config_for(env), :ruby, ENV['SCHEMA']
-    end
+      #Assumes schema_format == ruby
+      def load_schema(env)
+        ActiveRecord::Schema.verbose = false
+        DatabaseTasks.load_schema_for config_for(env), :ruby, ENV['SCHEMA']
+      end
 
-    def load_seed
-      DatabaseTasks.load_seed
-      # load('spec/test_seeds.rb')
-    end
+      def load_seed
+        DatabaseTasks.load_seed
+        # load('spec/test_seeds.rb')
+      end
 
 
-    def config_for(env)
-      Base.configurations.fetch(env.to_s)
-    end
+      def config_for(env)
+        Base.configurations.fetch(env.to_s)
+      end
 
-    def connection_for(env)
-      Base.establish_connection(env).connection
-    end
+      def connection_for(env)
+        Base.establish_connection(env).connection
+      end
 
-    def if_needs_migration(env)
-      if Migrator.needs_migration?(connection_for(env))
-        begin
-          current_config = Base.connection_config
-          Base.clear_all_connections!
+      def if_needs_migration(env)
+        if Migrator.needs_migration?(connection_for(env))
+          begin
+            current_config = Base.connection_config
+            Base.clear_all_connections!
 
-          yield
+            yield
 
-        ensure
-          Base.establish_connection(current_config)
+          ensure
+            Base.establish_connection(current_config)
 
-          ActiveRecord::Migration.check_pending!
+            ActiveRecord::Migration.check_pending!
+          end
         end
       end
-    end
 
-    def ensure_created(env)
-      Base.establish_connection(env).connection
-    rescue ActiveRecord::NoDatabaseError
-      DatabaseTasks.create(config_for(env))
-    end
+      def ensure_created(env)
+        Base.establish_connection(env).connection
+      rescue ActiveRecord::NoDatabaseError
+        DatabaseTasks.create(config_for(env))
+      end
 
 
-    def load_if_pending!(env)
-      ensure_created(env)
-      if_needs_migration(env) do
-        puts "Refreshing unmigrated test env: #{env}"
-        purge_env(env)
-        with_temporary_connection(env) do
-          load_schema(env)
-          load_seed
+      def load_if_pending!(env)
+        ensure_created(env)
+        if_needs_migration(env) do
+          puts "Refreshing unmigrated test env: #{env}"
+          purge_env(env)
+          with_temporary_connection(env) do
+            load_schema(env)
+            load_seed
+          end
         end
       end
-    end
 
-    def commandeer_database(env)
-      config = config_for(env)
-      connection_for(env).select_all(
-        "select pid, pg_terminate_backend(pid) " +
-        "from pg_stat_activity where datname='#{config['database']}' AND state='idle';")
-    end
+      def commandeer_database(env)
+        config = config_for(env)
+        connection_for(env).select_all(
+          "select pid, pg_terminate_backend(pid) " +
+          "from pg_stat_activity where datname='#{config['database']}' AND state='idle';")
+      end
 
-    def refresh_database(env)
-      Rails.logger.fatal("Resetting test DB...")
-      config = config_for(env)
+      def refresh_database(env)
+        Rails.logger.fatal("Resetting test DB...")
+        config = config_for(env)
 
-      tasks = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(config)
+        tasks = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(config)
 
-      start = Time.now
-      Rails.logger.fatal("Dropping")
-      begin
-        tasks.drop
-      end
-      Rails.logger.fatal("Creating")
-      begin
-        tasks.create
+        start = Time.now
+        Rails.logger.fatal("Dropping")
+        begin
+          tasks.drop
+        end
+        Rails.logger.fatal("Creating")
+        begin
+          tasks.create
+        end
+        message = "Test database recopied in #{Time.now - start}s"
+        #puts message
+        Rails.logger.fatal(message)
       end
-      message = "Test database recopied in #{Time.now - start}s"
-      #puts message
-      Rails.logger.fatal(message)
     end
   end
+rescue LoadError
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterpig
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Judson Lester
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -105,7 +105,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- waterpig-0.8.1 Documentation
+- waterpig-0.9.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement