rails-rebase-migrations 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 308418a394a967adb56ba7e5a4826f1e23b139e9250a219ced47ea195e65e9e8
-  data.tar.gz: 04f7d242120998f9632ba540fd3b2ffaa06b8cc5a6537275ed37c33f808c478f
+  metadata.gz: f79db527980388ea6c6f5698697f2f66e4c4be9b41a1ec913882b8f189c7a0bd
+  data.tar.gz: e67332a3333de2cbeb10fac6f9c38369f3eed6105b6ad8a9ec3434299e05a063
 SHA512:
-  metadata.gz: f547e60c2d6b62b5173b9b1ab136b6d4951a4c8e91202d61b3d6c871587a43a2884bfb6c1f19d260c9831cbdc9dbb1e220760497ad9c0d6fdc9e2cecf4fd2108
-  data.tar.gz: dc692ba49d38af2f21ae9ab6b88fc3f91e0c0865ea30816206deb475fbf8544beafbbce206cfb509f4c11ecd3b3565529c460b916b6ee481a4afd69a52f6b074
+  metadata.gz: c216288bd6e547687f6aeff84ad7d3bb3f3bce2d636179a5a838eb68ea18910470a50d3bbdbabdc49b4f236c837f80e5b0c7912bd154c0bdcf0f99a11d3d72b1
+  data.tar.gz: cced489ea2630bd3f5abbc01176dbf856602374f59d6416fb4f46ffc0f3085a5807c372ba1818014b472eff5d0312428d0f20a2ef9cce2acff6bf50f36c0b49c

data/lib/{rebase_migrations.rb → rails_rebase_migrations.rb}

@@ -1,32 +1,37 @@
-#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 require 'open3'
 require 'optparse'
 require 'shellwords'
+require 'time'
 
 class RebaseMigrations
   SKIP_REBASE = '_skip_rebase_'
 
   MIGRATIONS_DIR = 'db/migrate/'
-  MIGRATION_NAME_RE = /^(\d+)(.*)$/
+  MIGRATION_NAME_RE = /\A(\d+)(.*)\z/
+
+  TIME_FORMAT = '%Y%m%d%H%M%S'
 
   def main
     ref, options = parse_args
 
     out = subprocess('git', 'ls-files', '--', MIGRATIONS_DIR)
-    all_migrations = out.split("\n").to_a.sort
+    all_migrations = out.lines(chomp: true).to_a.sort
 
-    out = subprocess('git', 'diff', '--diff-filter=A', '--name-only', ref, '--', MIGRATIONS_DIR)
-    new_migrations = out.split("\n").to_a.sort
+    out = subprocess('git', 'ls-tree', '--name-only', ref, '--', MIGRATIONS_DIR)
+    ref_migrations = out.lines(chomp: true).to_a.sort
 
-    starting_index = all_migrations.length - new_migrations.length
+    starting_index = ref_migrations.length
 
-    now = Time.now.to_i
+    basename = File.basename(ref_migrations.last)
+    match = MIGRATION_NAME_RE.match(basename)
+    last_timestamp = match[1]
+    now = [Time.now.utc, Time.strptime("#{last_timestamp}Z", "#{TIME_FORMAT}%Z")].max.to_i
 
-    return if new_migrations.empty?
+    all_migrations.each do |path|
+      next if ref_migrations.include?(path)
 
-    new_migrations.each do |path|
       basename = File.basename(path)
       match = MIGRATION_NAME_RE.match(File.basename(path))
       migration_timestamp = match[1]
@@ -42,26 +47,24 @@ class RebaseMigrations
             Migration #{basename} is out of order. It should come after
             pre-existing migrations. To fix, run the command:
 
-              $ ./tools/rebase-migrations
+              $ bundle exec rebase-migrations
 
             If the migration is intentionally out of order, add the magic
             string "#{SKIP_REBASE}" to the beginning of the migration name:
 
               $ git mv #{path} #{MIGRATIONS_DIR}#{skip_migration_name}
-
-            If this pull request is merging across branches prod, staging, or
-            main, then add the "review-merge" label.
           MSG
 
           exit 1
         end
       else
-        new_timestamp = Time.at(now).utc.strftime('%Y%m%d%H%M%S')
-        new_migration_name = "#{new_timestamp}#{migration_name_base}"
-        subprocess('git', 'mv', path, "#{MIGRATIONS_DIR}#{new_migration_name}")
         # Add 120s so the new migrations maintain the same order and provides
         # room between the migrations to inject new ones.
         now += 120
+
+        new_timestamp = Time.at(now).strftime(TIME_FORMAT)
+        new_migration_name = "#{new_timestamp}#{migration_name_base}"
+        subprocess('git', 'mv', path, "#{MIGRATIONS_DIR}#{new_migration_name}")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-rebase-migrations
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pioneer Valley Books
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ description: |
   ## Installation
 
   ```console
-  $ bundle add rebase-migrations --group=development,test
+  $ bundle add rails-rebase-migrations --group=development,test
   ```
 
   ## Scenario
@@ -78,20 +78,20 @@ description: |
 
   To skip a specific migration files from the `--check` include `_skip_rebase` in
   its filename.
-email: 
+email:
 executables:
 - rebase-migrations
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/rebase-migrations
-- lib/rebase_migrations.rb
+- lib/rails_rebase_migrations.rb
 homepage: https://github.com/Pioneer-Valley-Books/rebase-migrations
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,15 +99,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Rebase Rails migrations to be the latest
 test_files: []