slonik_migration 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8936286fac6f081421ce88208bf27c93a3978f
-  data.tar.gz: 195d0f1fffca356e1603bc5a87e785e7841d8907
+  metadata.gz: 0a9bac5e2a100f82b528a7e361791da8861df69c
+  data.tar.gz: 4f0d8060ee2efc0e090468e47269dbc1fd83667a
 SHA512:
-  metadata.gz: 86e7e0b38c967ff8a44796999adc2246094fed8e948922891d4aa9e28376f8d93a3020b35e74e0eeffbf353cf8c3a8d5bc94292c622b5c6096fbcbd58c8778ca
-  data.tar.gz: d2bd91364e1d9b89898fcae73f5efcb5990a05abf87386a94936d2613cf6979a13b3be0c4cbe4928e8c1740483ec39a0a001da05fe83ac5c2ae4a6b4e7c1be57
+  metadata.gz: 96882aac71029ddd3c17ef983b3701955d0bb6eee73ed333d127b4e1c51a29ddfbcea5638855daa71536a4b07aad32b7b641ff52de2ae485bc9388ba41488412
+  data.tar.gz: 71141e836529b0059b2434619ecd1aa4efb9778f4e46f7c0ec055006b15f391bdde0fa6a067b5b214ffc34dabb3f523ef01fc303aff85061c35b9db6c874bae9

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
 rvm:
-  - 2.3.4
-  - 2.4.1
+  - 2.3
+  - 2.4
+  - 2.5
 gemfile:
   - gemfiles/rails50.gemfile
   - gemfiles/rails51.gemfile
-before_install:
-  - gem install bundler -v 1.15.3
-script: bundle exec rspec
+  - gemfiles/rails52.gemfile
+script:
+  - bundle exec rspec spec/slonik_migration_spec.rb
+  - bundle exec rspec spec/slonik_migration_task_spec.rb
+

data/README.md

@@ -5,7 +5,7 @@ A rails migration gem for slony using `slonik_execute_script` command.
 ## Dependencies
 
 * ruby 2.3+
-* active_record 5.0+
+* activerecord 5.0+
 * slony 2.2+
 
 ## Installation
@@ -30,6 +30,9 @@ Edit `config/slonik.yml`.
 
 ```yaml
 default: &default
+  # enable migration with slonik
+  enabled: true
+
   # slonik command. $SQL is replaced with raw SQL.
   command: slonik_execute_script -c $SQL 1 | sed "s/set id = 1,//" | slonik
 
@@ -51,13 +54,21 @@ production:
 
 ## Usage
 
-Migrate:
+This gem enhances following rails commands:
+
+* db:migrate
+* db:migrate:up
+* db:migrate:down
+
+You can use migration command as usual:
+
+    $ bundle exec rake db:migrate RAILS_ENV=production
 
-    $ bundle exec rake slonik:db:migrate RAILS_ENV=production
+If you want to specify config file:
 
-Migrate with specify config file:
+    $ bundle exec rake db:migrate RAILS_ENV=production CONFIG=/path/to/slonik.yml
 
-    $ bundle exec rake slonik:db:migrate RAILS_ENV=production CONFIG=/path/to/slonik.yml
+## Execution example
 
 Migration command executes `slonik_execute_command` as the following example:
 
@@ -69,7 +80,7 @@ Bug reports and pull requests are welcome at https://github.com/kanety/slonik_mi
 
 ## Reference
 
-This gem is inspired by the discussions [here](http://justatheory.com/computers/databases/postgresql/rails_and_slony.html).
+This gem is inspired by [the discussions](http://justatheory.com/computers/databases/postgresql/rails_and_slony.html).
 
 ## License
 

data/gemfiles/rails50.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.0.0"
+gem "rails", "~> 5.0.0"
+gem "pg", "~> 0.18"
 
 # Specify your gem's dependencies in params_keeper_rails.gemspec
 gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.1.0"
+gem "rails", "~> 5.1.0"
+gem "pg", "~> 0.18"
 
 # Specify your gem's dependencies in params_keeper_rails.gemspec
 gemspec path: "../"

data/gemfiles/rails52.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 5.2.0.rc1"
+
+# Specify your gem's dependencies in params_keeper_rails.gemspec
+gemspec path: "../"

data/lib/generators/slonik_migration/templates/slonik.yml

@@ -1,4 +1,7 @@
 default: &default
+  # enable migration with slonik
+  enabled: true
+
   # slonik command. $SQL is replaced with raw SQL.
   command: slonik_execute_script -c $SQL 1 | sed "s/set id = 1,//" | slonik
 

data/lib/slonik_migration/command.rb

@@ -4,9 +4,7 @@ require 'shellwords'
 module SlonikMigration
   class Command
     def initialize
-      config_file = ENV['CONFIG_FILE'] || 'config/slonik.yml'
-      env = ENV['RAILS_ENV'] || 'development'
-      @config = YAML.load(ERB.new(IO.read(config_file)).result)[env].deep_symbolize_keys
+      @config = SlonikMigration::Config.load
     end
 
     def execute(sql, options = {})
@@ -18,13 +16,13 @@ module SlonikMigration
     private
 
     def build(sql, target: nil, name: nil, owner: nil)
-      sql << %Q|; ALTER #{target} "#{name}" OWNER TO #{@config[:owner]}| if target && name && @config[:owner]
-      @config[:command].gsub(%r{\$SQL}, Shellwords.escape(sql))
-                       .gsub(%r{\$(\w+)}) { replace($1.to_sym) }
+      sql << %Q|; ALTER #{target} "#{name}" OWNER TO #{@config.owner}| if target && name && @config.owner
+      @config.command.gsub(%r{\$SQL}, Shellwords.escape(sql))
+                     .gsub(%r{\$(\w+)}) { replace($1) }
     end
 
     def replace(key)
-      if (var = @config.dig(:variables, key))
+      if (var = @config.variables[key])
         Shellwords.escape(var.to_s)
       else
         "$#{key}"

data/lib/slonik_migration/config.rb

@@ -0,0 +1,25 @@
+require 'ostruct'
+
+module SlonikMigration
+  class Config
+    class << self
+      def load
+        file = config_file
+        env = ENV['RAILS_ENV'] || 'development'
+        OpenStruct.new(YAML.load(ERB.new(IO.read(file)).result)[env]).freeze
+      end
+
+      private
+
+      def config_file
+        if ENV['CONFIG_FILE']
+          ENV['CONFIG_FILE']
+        elsif defined?(Rails)
+          Rails.root.join('config/slonik.yml').to_s
+        else
+          File.join(Dir.pwd, 'config/slonik.yml')
+        end
+      end
+    end
+  end
+end

data/lib/slonik_migration/extension.rb

@@ -0,0 +1,42 @@
+require_relative 'command'
+
+module SlonikMigration
+  class Extension
+    class << self
+      def overwrite
+        ActiveRecord::Migrator.class_eval do
+          private
+          alias_method :orig_use_transaction?, :use_transaction?
+          def use_transaction?(migration)
+            false
+          end
+        end
+
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
+          alias_method :orig_execute, :execute
+          def execute(sql, name = nil)
+            if sql =~ /^create (table|sequence|view) "([^"]+)"/i
+              ret = SlonikMigration::Command.new.execute(sql, target: $1, name: $2)
+              raise "failed to execute slonik command." unless ret
+            elsif sql =~ /^(create|alter|drop)/i
+              ret = SlonikMigration::Command.new.execute(sql)
+              raise "failed to execute slonik command." unless ret
+            else
+              orig_execute sql, name
+            end
+          end
+        end
+      end
+
+      def restore
+        ActiveRecord::Migrator.class_eval do
+          alias_method :use_transaction?, :orig_use_transaction?
+        end
+
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
+          alias_method :execute, :orig_execute
+        end
+      end
+    end
+  end
+end

data/lib/slonik_migration/version.rb

@@ -1,3 +1,3 @@
 module SlonikMigration
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/slonik_migration.rb

@@ -2,48 +2,4 @@ require 'slonik_migration/version'
 require 'slonik_migration/railtie' if defined?(Rails)
 
 module SlonikMigration
-  class << self
-    def patch
-      overwrite
-      yield
-    ensure
-      restore
-    end
-
-    def overwrite
-      ActiveRecord::Migrator.class_eval do
-        private
-        alias_method :orig_use_transaction?, :use_transaction?
-        def use_transaction?(migration)
-          false
-        end
-      end
-
-      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
-        alias_method :orig_execute, :execute
-        def execute(sql, name = nil)
-          require 'slonik_migration/command'
-          if sql =~ /^create (table|sequence|view) "([^"]+)"/i
-            ret = SlonikMigration::Command.new.execute(sql, target: $1, name: $2)
-            raise "failed to execute slonik command." unless ret
-          elsif sql =~ /^(create|alter|drop)/i
-            ret = SlonikMigration::Command.new.execute(sql)
-            raise "failed to execute slonik command." unless ret
-          else
-            orig_execute sql, name
-          end
-        end
-      end
-    end
-
-    def restore
-      ActiveRecord::Migrator.class_eval do
-        alias_method :use_transaction?, :orig_use_transaction?
-      end
-
-      ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
-        alias_method :execute, :orig_execute
-      end
-    end
-  end
 end

data/lib/tasks/slonik_migration.rake

@@ -1,16 +1,39 @@
+require 'slonik_migration/config'
+require 'slonik_migration/extension'
+
+if SlonikMigration::Config.load.enabled
+  namespace :slonik do
+    task :migration do
+      SlonikMigration::Extension.overwrite
+    end
+  end
+
+  Rake::Task["db:migrate"].enhance(["slonik:migration"]) do 
+    SlonikMigration::Extension.restore
+  end
+
+  Rake::Task["db:migrate:up"].enhance(["slonik:migration"]) do 
+    SlonikMigration::Extension.restore
+  end
+
+  Rake::Task["db:migrate:down"].enhance(["slonik:migration"]) do 
+    SlonikMigration::Extension.restore
+  end
+end
+
 namespace :slonik do
   namespace :db do
     desc "Migrate database using slonik_execute_script"
     task :migrate => :environment do
-      SlonikMigration.patch { Rake::Task["db:migrate"].invoke }
+      Rake::Task["db:migrate"].invoke
     end
 
     namespace :migrate do
       task :up => :environment do
-        SlonikMigration.patch { Rake::Task["db:migrate:up"].invoke }
+        Rake::Task["db:migrate:up"].invoke
       end
       task :down => :environment do
-        SlonikMigration.patch { Rake::Task["db:migrate:down"].invoke }
+        Rake::Task["db:migrate:down"].invoke
       end
     end
   end

data/slonik_migration.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.0.0"
+  spec.add_dependency "activerecord", ">= 5.0"
 
-  spec.add_development_dependency "rails", ">= 5.0.0"
+  spec.add_development_dependency "rails", ">= 5.0"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-rails"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slonik_migration
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -110,10 +110,13 @@ files:
 - Rakefile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - lib/generators/slonik_migration/config_generator.rb
 - lib/generators/slonik_migration/templates/slonik.yml
 - lib/slonik_migration.rb
 - lib/slonik_migration/command.rb
+- lib/slonik_migration/config.rb
+- lib/slonik_migration/extension.rb
 - lib/slonik_migration/railtie.rb
 - lib/slonik_migration/version.rb
 - lib/tasks/slonik_migration.rake
@@ -137,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: A rails migration gem for slony