rails-rebase-migrations 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d0ca849e1f5950f015eaeef7855a48a6f47417f2af44e6e08c98c6012a5b7f
-  data.tar.gz: 86404f335d1f13542dae315f73a1b4e8bdd9c70e56c69b9bd6a1629db5ac5afd
+  metadata.gz: 149586aa30a8a973134792134bf10161d182dca6f7e4dedeade559eb69c6e94b
+  data.tar.gz: e9ce9804c4732d2cff593fb5c2743b6514e010f44493b006cf44cde583088e14
 SHA512:
-  metadata.gz: ecd9355bbdda6dbcc2fbf033f6bc4af38f54938a02bd7a820a95208912f0eced1d2f34cf5b0c06cb1470f41b15542b7debe067ab63a3b9b27518086a612cdbb7
-  data.tar.gz: 06a539a4a9bbc6ee0d711068457e0e3052a2fbe269870352d31bc5d0cbcc5325d18e994ae91b3e726a3aa38c369e1312e3f1809237379ef8db137a153e2e9c52
+  metadata.gz: 812711df02461db5d757203817142a1c28272672813d3e4f7794d96a12a9a95ad13605126b4726380b9eb916ee84066163ff9bdcbbde55093f27c2642d9ecb97
+  data.tar.gz: f4c1c9a5a2a74024710b0f744386b07c0ec8c11a492592ae2ef92ec2039f95c15bf3784ed1e906d7b06d8b542d3374b09e7a0ee146c1e86bcb2db2115b82bfde

data/lib/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, in: 'Z').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.1
+  version: 1.2.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-14 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,7 +78,7 @@ description: |
 
   To skip a specific migration files from the `--check` include `_skip_rebase` in
   its filename.
-email: 
+email:
 executables:
 - rebase-migrations
 extensions: []
@@ -91,7 +91,7 @@ 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: []