nandi 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff51dca733bf2e4a5bff9ff71ac930c6d849fa734106a31b1244777fb25db9c0
-  data.tar.gz: ceeaebbaee681e1a4e6e857ec32289d59d821b9c627f899b371b607c214b077a
+  metadata.gz: 1da0a62d10387d4dc47b1b00045d351559d8c3a6a08b9f3de2ad029b7948e0da
+  data.tar.gz: f56710ba940ee97e004113b9d96aa6a5e4cc34b963f9c2d5dcbd8d3ae6c4b893
 SHA512:
-  metadata.gz: aa53ecf85370d256a09197547d0d99ceb4a3f731620f25341ea05b44364749ba452a3f375554f180879426b1b757f0b551cca1e86ede08f755070adcb62a879f
-  data.tar.gz: 80f8945b42a0931dced7e02e83ff0c43e4173009d9d5e6f74c876f18f5fe037280488cd524fce8683301001a86eacdcc9df6674ea649ef1ae71f2b9a1fa6c2f5
+  metadata.gz: 5f9a1879fa3f414c020703cf521200a1d436f2af0da8b7051beadd91bbadf9556f3e811eef17d842e54b8c962b4051529f347b8900dda3ffe5c887bc4565928f
+  data.tar.gz: fcbbc52d37437d8052016e3ff1182f3b603994ab002827ef7e6fbb182ee2a816ff383abde467f0c12f99da54141cbe8ffccb99748950143d047f04233e220733

data/README.md

@@ -4,7 +4,7 @@ Friendly Postgres migrations for people who don't want to take down their databa
 
 ## Supported
 
-- Ruby 2.4 or above
+- Ruby 2.5 or above
 - Rails 5.2 or above
 - Postgres 11 or above
 

data/exe/nandi-enforce

@@ -31,6 +31,6 @@ OptionParser.new do |o|
   end
 end.parse!
 
-enforcer = Nandi::SafeMigrationEnforcer.new(opts)
+enforcer = Nandi::SafeMigrationEnforcer.new(**opts)
 
 enforcer.run

data/lib/nandi/file_matcher.rb

@@ -37,7 +37,7 @@ module Nandi
     end
 
     def ignored_filenames
-      ignored_files.map(&File.method(:basename))
+      ignored_files.map { |file| File.basename(file) }
     end
 
     def match_timestamp

data/lib/nandi/instructions/remove_column.rb

@@ -8,7 +8,12 @@ module Nandi
       def initialize(table:, name:, **extra_args)
         @table = table
         @name = name
-        @extra_args = extra_args if extra_args.any?
+        @extra_args =
+          if extra_args.any?
+            extra_args
+          else
+            {}
+          end
       end
 
       def procedure

data/lib/nandi/lockfile.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/hash/indifferent_access"
+require "digest"
 
 module Nandi
   class Lockfile
@@ -42,7 +43,26 @@ module Nandi
       end
 
       def persist!
-        File.write(path, lockfile.to_h.deep_stringify_keys.to_yaml)
+        # This is a somewhat ridiculous trick to avoid merge conflicts in git.
+        #
+        # Normally, new migrations are added to the bottom of the Nandi lockfile.
+        # This is relatively unfriendly to git's merge algorithm, and means that
+        # if someone merges a pull request with a completely unrelated migration,
+        # you'll have to rebase to get yours merged as the last line of the file
+        # will be seen as a conflict (both branches added content there).
+        #
+        # This is in contrast to something like Gemfile.lock, where changes tend
+        # to be distributed throughout the file. The idea behind sorting by
+        # SHA-256 hash is to distribute new Nandi lockfile entries evenly, but
+        # also stably through the file. It needs to be stable or we'd have even
+        # worse merge conflict problems (e.g. if we randomised the order on
+        # writing the file, the whole thing would conflict pretty much every time
+        # it was regenerated).
+        content = lockfile.to_h.deep_stringify_keys.sort_by do |k, _|
+          Digest::SHA256.hexdigest(k)
+        end.to_h.to_yaml
+
+        File.write(path, content)
       end
 
       def path

data/lib/nandi/migration.rb

@@ -357,9 +357,9 @@ module Nandi
       end.uniq
     end
 
-    def method_missing(name, *args, &block)
+    def method_missing(name, *args, **kwargs, &block)
       if Nandi.config.custom_methods.key?(name)
-        invoke_custom_method(name, *args, &block)
+        invoke_custom_method(name, *args, **kwargs, &block)
       else
         super
       end
@@ -381,9 +381,9 @@ module Nandi
       Nandi.config.access_exclusive_lock_timeout
     end
 
-    def invoke_custom_method(name, *args, &block)
+    def invoke_custom_method(name, *args, **kwargs, &block)
       klass = Nandi.config.custom_methods[name]
-      current_instructions << klass.new(*args, &block)
+      current_instructions << klass.new(*args, **kwargs, &block)
     end
   end
 end

data/lib/nandi/renderers/active_record/generate.rb

@@ -30,7 +30,7 @@ module Nandi
 
         def should_disable_ddl_transaction?
           [*up_instructions, *down_instructions].
-            select { |i| i.procedure =~ /index/ }.any?
+            select { |i| i.procedure.to_s.include?("index") }.any?
         end
 
         def activerecord_version

data/lib/nandi/validation/timeout_validator.rb

@@ -24,7 +24,9 @@ module Nandi
       private
 
       def timeout_policies
-        instructions.map(&Nandi::TimeoutPolicies.method(:policy_for)).uniq
+        instructions.map do |instruction|
+          Nandi::TimeoutPolicies.policy_for(instruction)
+        end.uniq
       end
 
       def instructions

data/lib/nandi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nandi
-  VERSION = "0.10.0"
+  VERSION = "0.12.0"
 end

data/lib/templates/nandi/renderers/active_record/instructions/add_column/show.rb.erb

@@ -2,5 +2,5 @@ add_column(
   <%= table %>,
   <%= name %>,
   <%= type %>,
-  <%= extra_args %>
+  **<%= extra_args || {} %>
 )

data/lib/templates/nandi/renderers/active_record/instructions/add_foreign_key/show.rb.erb

@@ -1,5 +1,5 @@
 add_foreign_key(
   <%= table %>,
   <%= target %>,
-  <%= extra_args %>
+  **<%= extra_args || {} %>
 )

data/lib/templates/nandi/renderers/active_record/instructions/add_index/show.rb.erb

@@ -1,5 +1,5 @@
 add_index(
   <%= table %>,
   <%= fields %>,
-  <%= extra_args %>
+  **<%= extra_args || {} %>
 )

data/lib/templates/nandi/renderers/active_record/instructions/add_reference/show.rb.erb

@@ -1,5 +1,5 @@
 add_reference(
   <%= table %>,
   <%= ref_name %>,
-  <%= extra_args %>
+  **<%= extra_args || {} %>
 )

data/lib/templates/nandi/renderers/active_record/instructions/remove_column/show.rb.erb

@@ -1,5 +1,5 @@
 remove_column(
   <%= table %>,
   <%= name %>,
-  <%= extra_args %>
+  **<%= extra_args || {} %>
 )

data/lib/templates/nandi/renderers/active_record/instructions/remove_index/show.rb.erb

@@ -1,4 +1,4 @@
 remove_index(
   <%= table %>,
-  <%= extra_args %>
+  **<%= extra_args || {} %>
 )

data/lib/templates/nandi/renderers/active_record/instructions/remove_reference/show.rb.erb

@@ -1,5 +1,5 @@
 remove_reference(
   <%= table %>,
   <%= ref_name %>,
-  <%= extra_args %>
+  **<%= extra_args || {} %>
 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nandi
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - GoCardless Engineering
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.15.0
+        version: 2.25.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: 
+description:
 email:
 - engineering@gocardless.com
 executables:
@@ -303,7 +303,7 @@ homepage: https://github.com/gocardless/nandi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -318,8 +318,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Fear-free migrations for PostgreSQL
 test_files: []