phobos_db_checkpoint 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de27a32446794373ad83b3e24571a326c2d5a6e3
-  data.tar.gz: 64e6311b8116a8c2032fb6d095fe70808489e626
+  metadata.gz: 5b5b26c404a1ef381a22acb11321da68ff796a07
+  data.tar.gz: f70ffacba27f60a03be78c40caef88af565d61b0
 SHA512:
-  metadata.gz: b179b09d5a525b361a75790818aa51cfb4ce3c0e3314744f91b474f6c3b08e1d590139a8279dfcd3fa590e59a3636495dc6ec11d6e7a1e6d2ceeefca2a36feb1
-  data.tar.gz: 474b3e6c693da823068125862020544651e140a2256200fa270070070071b4df7ac49a0bfbc72703a1428c981cddd86826d435133f55a0996e4519ff21a54ec4
+  metadata.gz: e06985bb11ffc04fb94e00dcbedb158aa423643958e50cef89645e9dbf80c03bc7af391323c1483e32f9770deec18e27b1ba48a10fd1ac4537edcd4995c68a54
+  data.tar.gz: f152ff0bc835ee77cb10f9ba5c238eaaef7d33abea0556ded954ed30ea65fe8fe54a727a4672aadf4084ac868c14866894c47ad541a4ba6a09633a1272bcebf5

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.2.0 (2016-09-06)
+- [feature] New CLI command to generate migrations #6
+- [feature] Automatically sets database pool size based on listeners max_concurrency #2
+
 ## 0.1.1 (2016-09-02)
 - [bugfix] Handler is not injecting start and stop methods #4
 

data/README.md

@@ -89,6 +89,13 @@ $ phobos_db_checkpoint copy-migrations
 
 This command has no side effects, if the migration is already present it will ignore it.
 
+You can generate new migrations using the command __migration__, example:
+
+```sh
+phobos_db_checkpoint migration add-new-column
+      create  db/migrate/20160904200449879052_add_new_column.rb
+```
+
 ### <a name="handler"></a> Handler
 
 In order to use the database checkpointing, your handler should be changed to include `PhobosDBCheckpoint::Handler` instead of `Phobos::Handler`. Phobos DB Checkpoint handler uses the Phobos `around_consume` functionality, which means you need to implement a `#consume` method to handle the event.

data/lib/phobos_db_checkpoint.rb

@@ -31,11 +31,15 @@ module PhobosDBCheckpoint
       @db_config_path ||= DEFAULT_DB_CONFIG_PATH
       configs = YAML.load_file(File.expand_path(@db_config_path))
       @db_config = configs[env]
+
+      if Phobos.config
+        pool_size = Phobos.config.listeners.map { |listener| listener.max_concurrency || 1 }.inject(&:+)
+        @db_config.merge!('pool' => pool_size)
+      end
     end
 
     def close_db_connection
-      connection = ActiveRecord::Base.connection
-      connection.disconnect! if connection
+      ActiveRecord::Base.connection_pool.disconnect!
     rescue ActiveRecord::ConnectionNotEstablished
     end
 

data/lib/phobos_db_checkpoint/cli.rb

@@ -53,23 +53,40 @@ module PhobosDBCheckpoint
         end
       end
 
+      desc 'migration NAME', 'Generates a new migration with the given name. Use underlines (_) as a separator, ex: add_new_column'
+      option :destination,
+             aliases: ['-d'],
+             default: 'db/migrate',
+             banner: 'Destination folder relative to your project'
+      def migration(name)
+        migration_name = name.gsub(/[^\w]*/, '')
+        @new_migration_class_name = migration_name.split('_').map(&:capitalize).join('')
+        file_name = "#{migration_number}_#{migration_name}.rb"
+        destination_fullpath = File.join(destination_root, options[:destination], file_name)
+        template(new_migration_template, destination_fullpath)
+      end
+
       def self.source_root
         File.expand_path(File.join(File.dirname(__FILE__), '../..'))
       end
 
       private
+
       def migration_exists?(list, name)
         list.find { |filename| filename =~ /#{name}/ }
       end
 
+      def migration_number(index = 0)
+        [Time.now.utc.strftime('%Y%m%d%H%M%S%6N'), '%.21d' % index].max
+      end
+
       def template_migrations_metadata
         @template_migrations_metadata ||= begin
           index = 0
           template_migrations.map do |path|
-            number = [Time.now.utc.strftime('%Y%m%d%H%M%S%6N'), '%.21d' % index].max
             name = path.split('/').last
             index += 1
-            {path: path, name: path.gsub(/\.erb$/, ''), number: number}
+            {path: path, name: path.gsub(/\.erb$/, ''), number: migration_number(index)}
           end
         end
       end
@@ -90,6 +107,10 @@ module PhobosDBCheckpoint
       def phobos_boot_template
         File.join(self.class.source_root, 'templates/phobos_boot.rb')
       end
+
+      def new_migration_template
+        File.join(self.class.source_root, 'templates/new_migration.rb.erb')
+      end
     end
   end
 end

data/lib/phobos_db_checkpoint/handler.rb

@@ -36,6 +36,10 @@ module PhobosDBCheckpoint
         else
           instrument('db_checkpoint.event_skipped', event_metadata)
         end
+      ensure
+        # Returns any connections in use by the current thread back to the pool, and also returns
+        # connections to the pool cached by threads that are no longer alive.
+        ActiveRecord::Base.clear_active_connections!
       end
     end
   end

data/lib/phobos_db_checkpoint/tasks.rb

@@ -11,7 +11,7 @@ module PhobosDBCheckpoint
 
       task :load_config do
         PhobosDBCheckpoint.load_db_config
-        task_db_config = Hash[PhobosDBCheckpoint.env, PhobosDBCheckpoint.db_config]
+        task_db_config = Hash[PhobosDBCheckpoint.env, PhobosDBCheckpoint.db_config.merge('pool' => 1)]
         ActiveRecord::Tasks::DatabaseTasks.database_configuration = task_db_config
       end
     end

data/lib/phobos_db_checkpoint/version.rb

@@ -1,3 +1,3 @@
 module PhobosDBCheckpoint
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/templates/new_migration.rb.erb

@@ -0,0 +1,7 @@
+class <%= @new_migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def up
+  end
+
+  def down
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phobos_db_checkpoint
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,6 +232,7 @@ files:
 - phobos_db_checkpoint.gemspec
 - templates/database.yml.example
 - templates/migrate/phobos_01_create_events.rb.erb
+- templates/new_migration.rb.erb
 - templates/phobos_boot.rb
 homepage: https://github.com/klarna/phobos_db_checkpoint
 licenses:
@@ -254,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Phobos DB Checkpoint is a plugin to Phobos and is meant as a drop in replacement