pronto-rails_migrations_annotated 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5270eebfc0ad05c95f238584e149069712818b382a49cb42f7efbe0d300e631
-  data.tar.gz: c44948d8bd1d701e5a737c3c8c77f604135b3e6d4984bd3e5a96cd95a272d933
+  metadata.gz: 89475a6adfbe75efa5ddedde4bf3a3903fa0af08a785d87a879e41f1cee58736
+  data.tar.gz: 19a2822864b7098ea985950b20a25980fc8ef4139d82172a6734eea1041941fc
 SHA512:
-  metadata.gz: 47a6007b846b61c7dc51b32e839c7e31d743e40070a92c2155d22cffff3580843cb3d628c130f1b5a22033590004eb385282d6a9455a9590c8e24770a0160a18
-  data.tar.gz: 115d1367976f343abb9167f43bde15a8096500ce849fb4b0699cad3b43b1bc56d7070a61d5eee73cb9ae2651b3cf658116425b2fe5eda9a4b99a59ecc7d4f503
+  metadata.gz: 5a945a8d9e39a13b05826b34766efbdd634ce3529f7e937987e78933152d3fa1e9752df40debc0f82d83664a703c389df33975617009c9bb601c11bbb5e4eb50
+  data.tar.gz: 123f8d704e85d0748e1abea9d2bcc491fd2d2d788a4f18fddbe6e7a0a68fe1fc30212c13725e3fa0b5936d6b428657e92871990f92f767a40802ff4e4b96d5ac

data/Gemfile.lock

@@ -1,61 +1,45 @@
 PATH
   remote: .
   specs:
-    pronto-rails_migrations_annotated (0.0.4)
+    pronto-rails_migrations_annotated (0.0.6)
       pronto (~> 0.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     diff-lcs (1.4.4)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    gitlab (4.17.0)
-      httparty (~> 0.18)
-      terminal-table (~> 1.5, >= 1.5.1)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    gitlab (4.19.0)
+      httparty (~> 0.20)
+      terminal-table (>= 1.5.1)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mini_mime (1.1.5)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    octokit (4.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    net-http (0.4.1)
+      uri
+    octokit (7.2.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    pronto (0.11.0)
-      gitlab (~> 4.4, >= 4.4.0)
-      httparty (>= 0.13.7)
-      octokit (~> 4.7, >= 4.7.0)
+    pronto (0.11.2)
+      gitlab (>= 4.4.0, < 5.0)
+      httparty (>= 0.13.7, < 1.0)
+      octokit (>= 4.7.0, < 8.0)
       rainbow (>= 2.2, < 4.0)
-      rexml (~> 3.2)
-      rugged (>= 0.23.0, < 1.1.0)
+      rexml (>= 3.2.5, < 4.0)
+      rugged (>= 0.23.0, < 2.0)
       thor (>= 0.20.3, < 2.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.4)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)
@@ -92,17 +76,18 @@ GEM
     rubocop-rspec (2.6.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    rugged (1.0.1)
-    sawyer (0.8.2)
+    rugged (1.7.1)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (1.1.0)
+      faraday (>= 0.17.3, < 3)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.3.0)
     unicode-display_width (1.8.0)
+    uri (0.13.0)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
 
 DEPENDENCIES
@@ -115,4 +100,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.2.31
+   2.3.10

data/lib/pronto/rails_migrations_annotated/version.rb

@@ -2,6 +2,6 @@
 
 module Pronto
   module RailsMigrationsAnnotatedVersion
-    VERSION = "0.0.4"
+    VERSION = "0.0.6"
   end
 end

data/lib/pronto/rails_migrations_annotated.rb

@@ -25,7 +25,9 @@ module Pronto
     private
 
     def add_message_at_patch(patches, message, level = :warning, line: :first)
-      patches = [patches] unless patches.is_a?(Array)
+      patches = [patches].compact unless patches.is_a?(Array)
+      raise "Patch not found for message (#{message.inspect})" if patches.empty?
+
       patches.each do |patch|
         target_line = case line
                       when :first then patch.added_lines.first || patch.lines.first
@@ -97,7 +99,7 @@ module Pronto
     end
 
     def check_structure_migration_version_numbers
-      return unless migration_patches.any?
+      # return unless migration_patches.any?
 
       structure_file_name = "db/structure.sql"
       return if !File.exist?(structure_file_name) || gitignored?(structure_file_name)
@@ -108,7 +110,7 @@ module Pronto
       check_structure_versions_present(versions_from_schema)
       check_structure_migration_missing
 
-      check_structure_versions_syntax(versions_from_schema)
+      check_structure_versions_syntax(versions_from_schema) if versions_from_schema.any?
       check_structure_versions_sorted(versions_from_schema)
       check_structure_ending(structure_file_lines)
     end
@@ -122,28 +124,51 @@ module Pronto
                              "Migration #{wrong_version} is missing from structure.sql", :error)
       end
 
-      return if structure_patches.any? || found_missing_migration
+      return if structure_patches.any? || found_missing_migration || migration_patches.none?
 
       add_message_at_patch(migration_patches, "Migration file detected, but no changes in structure.sql")
     end
 
     def check_structure_migration_missing
       structure_patches.each do |patch|
+        next if patch.delta.old_file[:oid] == "0000000000000000000000000000000000000000" # new structure.sql file
+
+        triggered = false
         patch.added_lines.select { |line| line.content.match?(migration_line_regex) }.each do |line|
           version = line.content.match(migration_line_regex)[:version]
           next if migration_version_numbers.include?(version)
           next if line.content.end_with?(",\n") &&
                   patch.deleted_lines.any? { |del| del.content.include?("#{version}');") }
 
+          triggered = true
           add_message_at_patch(patch, "Migration #{version} is not present in this changeset", :error, line: line)
         end
+
+        if !triggered && migration_version_numbers.none?
+          add_message_at_patch(patch, "structure.sql changed without migrations", :error, line: patch.lines.first)
+        end
       end
     end
 
     def check_structure_versions_sorted(versions_from_schema)
       return if versions_from_schema == versions_from_schema.sort
+      return if versions_from_schema == versions_from_schema.sort.reverse
+
+      # guess sort order by lower offending migrations count
+      offending = [
+        versions_from_schema.each_cons(2).select { |(a, b)| a > b }, # if ascending
+        versions_from_schema.each_cons(2).select { |(a, b)| a < b } # if sort is desc
+      ].min_by(&:size).flat_map { |pair| pair.map { |line| line.gsub(/[^0-9]+/, "") } }
+
+      if structure_patches.none?
+        puts "WARNING: structure.sql migrations are not sorted (not in changes, offending #{offending.join(', ')})"
+        return
+      end
+
+      offending_regex = Regexp.union(offending)
 
       add_message_at_patch(
+        structure_patches.first { |patch| patch.lines.any? { |line| line.content.match?(offending_regex) } } ||
         structure_patches.first { |patch| patch.lines.any? { |line| line.content.match?(migration_line_regex) } },
         "Migration versions must be sorted and have correct syntax"
       )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pronto-rails_migrations_annotated
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Vasily Fedoseyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pronto
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Pronto runner to check rails migrations to be separate from other code, but