pliny 0.30.1 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594ffc14e101ac813df431ff24c41370089114f5d5505b5a0ff72b0f6b2bc3bf
-  data.tar.gz: 1567a181f563ab92e1e7cef94cfcc38f60cd4f742b16a16580a1d2705396712b
+  metadata.gz: 03b6f9bac86953d6bef8858e6c4c1f6f94f06073fac8175b9572728ffed5a276
+  data.tar.gz: c20333f978e5f8e908b13f6eaf9d37a3dbdb0f10204c1db9a8b5f83b02fbac11
 SHA512:
-  metadata.gz: bdae87227f343e45275c2cc40afce4ed16d5610dc2c9cbc824ac96ecbd4a88747d5599abacec72c9fdfa8ee5d217aab426cb5b42dcfe1931b8a9e98bf38f13d8
-  data.tar.gz: 0b4f1418cdfa8adb477063400cbbd16398cf44b2615dee460bb23f0e839820567b1bf6c7bfa590ed37ae32490336b022e1df53e03161b893e331d44b4e23b09c
+  metadata.gz: e851ccdd1fb0a3d548fa672d209829e9cd8ecf69023d1c7a2fb6ad0fb84ee1616d2d3b2a761d11ba9c13a989d2fb5176c31d3eb6acf9a02e20c6e7bc4b01386f
+  data.tar.gz: aefb3c02dc44ba282595bb9b2e85dc52e2891cb16ac6395693ab63bd79c603b7c68e9b93dea4c494c1b574e8be308b26a34e40040d4e71e0a74cb9a9f828a207

data/README.md

@@ -1,7 +1,8 @@
 # Pliny
 
 [![Gem version](http://img.shields.io/gem/v/pliny.svg)](https://rubygems.org/gems/pliny)
-[![Build Status](https://travis-ci.org/interagent/pliny.svg?branch=master)](https://travis-ci.org/interagent/pliny)
+[![Github Actions CI](https://github.com/interagent/pliny/actions/workflows/ruby.yml/badge.svg)](https://github.com/interagent/pliny/actions)
+
 
 Pliny helps Ruby developers write and maintain excellent APIs.
 

data/lib/pliny/db_support.rb

@@ -46,25 +46,43 @@ module Pliny
       db.run(%{CREATE DATABASE "#{name}"})
     end
 
-    def migrate(target=nil)
-      Sequel::Migrator.apply(db, "./db/migrate", target)
+    def migrate(target = nil)
+      Sequel::Migrator.apply(db, MIGRATION_DIR, target)
+    end
+
+    def version
+      return 0 unless db.table_exists?(:schema_migrations)
+
+      current = db[:schema_migrations].order(Sequel.desc(:filename)).first
+
+      return 0 unless current
+
+      version = current[:filename].match(Sequel::Migrator::MIGRATION_FILE_PATTERN).captures.first
+      version ||= 0
+      Integer(version)
     end
 
     def rollback
-      return unless db.tables.include?(:schema_migrations)
-      return unless current = db[:schema_migrations].order(Sequel.desc(:filename)).first
+      current_version = version
+      return if current_version.zero?
+
+      migrations = Dir["#{MIGRATION_DIR}/*.rb"].map { |f| File.basename(f).to_i }.sort
 
-      migrations = Dir["./db/migrate/*.rb"].map { |f| File.basename(f).to_i }.sort
-      target     = 0 # by default, rollback everything
-      index      = migrations.index(current[:filename].to_i)
+      target = 0 # by default, rollback everything
+      index = migrations.index(current_version)
       if index > 0
         target = migrations[index - 1]
       end
-      Sequel::Migrator.apply(db, "./db/migrate", target)
+      Sequel::Migrator.apply(db, MIGRATION_DIR, target)
     end
 
     def disconnect
       @db.disconnect
     end
+
+    private
+
+    MIGRATION_DIR = "./db/migrate".freeze
+    private_constant :MIGRATION_DIR
   end
 end

data/lib/pliny/tasks/db.rake

@@ -8,6 +8,13 @@ begin
   require "pliny/db_support"
 
   namespace :db do
+    desc "Get current schema version"
+    task :version do
+      Pliny::DbSupport.run(database_urls.first, $stdout) do |helper|
+        puts "Current version: #{helper.version}"
+      end
+    end
+
     desc "Run database migrations"
     task :migrate do
       next if Dir["./db/migrate/*.rb"].empty?

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.30.1"
+  VERSION = "0.31.0"
 end

data/lib/template/Gemfile

@@ -4,7 +4,7 @@ ruby "2.4.0"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.30"
+gem "pliny", "~> 0.31"
 gem "pry"
 gem "puma", "~> 3"
 gem "rack-ssl"

data/spec/db_support_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 require "pliny/db_support"
 
 describe Pliny::DbSupport do
+  subject(:support) { Pliny::DbSupport.new(url, logger) }
   let(:url) { ENV["TEST_DATABASE_URL"] }
   let(:logger) { Logger.new(StringIO.new) }
-  let(:support) { Pliny::DbSupport.new(url, logger) }
 
   around do |example|
     Dir.mktmpdir("plinytest-") do |dir|
@@ -88,4 +88,30 @@ describe Pliny::DbSupport do
       support.rollback # should noop
     end
   end
+
+  describe "#version" do
+    it "is zero if the migrations table doesn't exist" do
+      assert_equal 0, support.version
+    end
+
+    context "with migrations table" do
+      before do
+        DB.create_table(:schema_migrations) do
+          text :filename
+        end
+      end
+
+      it "is zero if the migrations table is empty" do
+        assert_equal 0, support.version
+      end
+
+      it "is the highest timestamp from a filename in the migrations table" do
+        migrations = DB[:schema_migrations]
+        migrations.insert(filename: "1630551344_latest_change.rb")
+        migrations.insert(filename: "1524000760_earlier_change.rb")
+
+        assert_equal 1630551344, support.version
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.31.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport