slonik_migration 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebdc314418aa72db86e8e700cdf940f4c35899610ad91a43fbc374740e5d6886
-  data.tar.gz: 166c7b12ee29d8634410da3898c2c7c95ab032c3d4205ce9f1fde2dea2b6d80f
+  metadata.gz: 3caa52c10f2bf3e46027dbb8c0ff309e8dad46d9f5efc45694d31af21c2ba9f7
+  data.tar.gz: 5f430959a86ff8b3bcb71e911eba4115bb8e4f2acb69c03554a19e66cc9b19d6
 SHA512:
-  metadata.gz: c40b3d8247d8d27d01a7afdc517d41fdbc38c2be035083ef9f98fe29be8eee87623e527ee2b487cb1bc6f67d8e5e335f248a6527c1ac63a8bc8798f8c33226b2
-  data.tar.gz: ce38616d04d30060ddf887752cb2ace1ddf16fd8fefbc7e562c9d2d505805a65ecb445e93c2aa7076ff655a63709c3f87a9348d73d441674275bc1bf765f4157
+  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/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.2.0
+
+* Support ruby 3.1.
+* Drop support for ruby 2.3.
+
 ## 1.1.3
 
 * Fix deprecation warning for ruby 2.7.

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/rails60.gemfile

@@ -1,5 +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/config.rb

@@ -4,19 +4,30 @@ module SlonikMigration
   class Config
     class << self
       def load
-        file = config_file
-        env = ENV['RAILS_ENV'] || 'development'
-
-        hash = if File.exist?(file)
-                 YAML.load(ERB.new(IO.read(file)).result)[env]
-               else
-                 {}
-               end
+        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.3'
+  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.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-24 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -113,6 +113,8 @@ files:
 - 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

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-services:
-  - postgresql
-addons:
-  postgresql: "9.5"
-gemfile:
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
-  - gemfiles/rails52.gemfile
-  - gemfiles/rails60.gemfile
-matrix:
-  exclude:
-  - rvm: 2.3
-    gemfile: gemfiles/rails60.gemfile
-  - rvm: 2.4
-    gemfile: gemfiles/rails60.gemfile
-script:
-  - bundle exec rspec spec/slonik_migration_spec.rb
-  - bundle exec rspec spec/slonik_migration_task_spec.rb