slonik_migration 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0a9bac5e2a100f82b528a7e361791da8861df69c
-  data.tar.gz: 4f0d8060ee2efc0e090468e47269dbc1fd83667a
+SHA256:
+  metadata.gz: 3caa52c10f2bf3e46027dbb8c0ff309e8dad46d9f5efc45694d31af21c2ba9f7
+  data.tar.gz: 5f430959a86ff8b3bcb71e911eba4115bb8e4f2acb69c03554a19e66cc9b19d6
 SHA512:
-  metadata.gz: 96882aac71029ddd3c17ef983b3701955d0bb6eee73ed333d127b4e1c51a29ddfbcea5638855daa71536a4b07aad32b7b641ff52de2ae485bc9388ba41488412
-  data.tar.gz: 71141e836529b0059b2434619ecd1aa4efb9778f4e46f7c0ec055006b15f391bdde0fa6a067b5b214ffc34dabb3f523ef01fc303aff85061c35b9db6c874bae9
+  metadata.gz: a06fdbe3f87891a5c456ad5da721a064044db89ab66059dcb1a0f4ce3c5a84601f785a3f37de2d8ac9a15e118b5855e8b1e71f550774c54f714497e7eb8f7674
+  data.tar.gz: 8a9ff1a400a121b4759251733892dd49bcecb21e1bcf0e47b4718c039743f6102879f51cb44c790c88038b99d6739440b1a4786d0595b4a10e6ccc92032451d7

data/.github/workflows/ci.yml

@@ -0,0 +1,62 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    services:
+      postgres:
+        image: postgres:9.5
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
+        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70']
+        exclude:
+          - ruby: 2.4
+            gemfile: rails60
+          - ruby: 2.4
+            gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails70
+          - ruby: 2.5
+            gemfile: rails70
+          - ruby: 2.6
+            gemfile: rails70
+          - ruby: 3.0
+            gemfile: rails50
+          - ruby: 3.0
+            gemfile: rails51
+          - ruby: 3.0
+            gemfile: rails52
+          - ruby: 3.1
+            gemfile: rails50
+          - ruby: 3.1
+            gemfile: rails51
+          - ruby: 3.1
+            gemfile: rails52
+
+    name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
+
+    env:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run test
+      run: |
+        bundle exec rspec spec/slonik_migration_spec.rb
+        bundle exec rspec spec/slonik_migration_task_spec.rb

data/.gitignore

@@ -1,12 +1,9 @@
 .bundle/
-.yardoc
 .project
 Gemfile.lock
-_yardoc/
 coverage/
-doc/
+gemfiles/*.lock
 pkg/
-spec/reports/
 spec/dummy/db/schema.rb
 spec/dummy/log/*.log
 spec/dummy/tmp/*

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+# CHANGELOG
+
+## 1.2.0
+
+* Support ruby 3.1.
+* Drop support for ruby 2.3.
+
+## 1.1.3
+
+* Fix deprecation warning for ruby 2.7.
+
+## 1.1.2
+
+* Fix shell command escape.
+
+## 1.1.1
+
+* Check config file existence before read.
+
+## 1.1.0
+
+* Enhance db:migrate related tasks.
+* Remove activesupport dependency.
+
+## 1.0.0
+
+* First release.

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in slonik_migration.gemspec
 gemspec

data/README.md

@@ -4,7 +4,7 @@ A rails migration gem for slony using `slonik_execute_script` command.
 
 ## Dependencies
 
-* ruby 2.3+
+* ruby 2.4+
 * activerecord 5.0+
 * slony 2.2+
 

data/gemfiles/rails50.gemfile

@@ -3,5 +3,4 @@ source 'https://rubygems.org'
 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

@@ -3,5 +3,4 @@ source 'https://rubygems.org'
 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

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

data/gemfiles/rails60.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 6.0.0"
+gem "psych", "~> 3.3.0"
+
+gemspec path: "../"

data/gemfiles/rails61.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/gemfiles/rails70.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 7.0.1"
+
+gemspec path: "../"

data/lib/slonik_migration/command.rb

@@ -8,7 +8,7 @@ module SlonikMigration
     end
 
     def execute(sql, options = {})
-      command = build(sql, options)
+      command = build(sql, **options)
       puts command if ENV['VERBOSE']
       system command
     end
@@ -17,8 +17,10 @@ module SlonikMigration
 
     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) }
+      command = @config.command.dup
+      command.gsub!(%r{\$SQL}) { Shellwords.escape(sql) }
+      command.gsub!(%r{\$(\w+)}) { replace($1) }
+      command
     end
 
     def replace(key)

data/lib/slonik_migration/config.rb

@@ -4,13 +4,30 @@ 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
+        hash = load_file
+        OpenStruct.new(hash).freeze
       end
 
       private
 
+      def load_file
+        file = config_file
+        if File.exist?(file)
+          load_yaml(file).fetch(ENV['RAILS_ENV'] || 'development', {})
+        else
+          {}
+        end
+      end
+
+      def load_yaml(file)
+        yaml = ERB.new(IO.read(file)).result
+        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("4.0")
+          YAML.load(yaml, aliases: true)
+        else
+          YAML.load(yaml)
+        end
+      end
+
       def config_file
         if ENV['CONFIG_FILE']
           ENV['CONFIG_FILE']

data/lib/slonik_migration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slonik_migration
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,9 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -111,6 +112,9 @@ files:
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
+- gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/generators/slonik_migration/config_generator.rb
 - lib/generators/slonik_migration/templates/slonik.yml
 - lib/slonik_migration.rb
@@ -139,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A rails migration gem for slony

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-gemfile:
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
-  - gemfiles/rails52.gemfile
-script:
-  - bundle exec rspec spec/slonik_migration_spec.rb
-  - bundle exec rspec spec/slonik_migration_task_spec.rb
-