rake_migrations 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b2674843e0d04ad4ed802931586a2d7b673e0b5
-  data.tar.gz: 169f48cd05126580f22959d5e66933ec075b7e56
+  metadata.gz: 68011dc09f0dfa5ff07666c91b53984cd8d93a40
+  data.tar.gz: be401fe1911da6d7f15575000e3c071df66a191c
 SHA512:
-  metadata.gz: e17a87999e4de49e343a12a6499700aab37d85fbd9ae5ac29f41d945a929350d3b51b011396db72cad7ca5f0b1563925bd5dfef32d720e149065ccfef7b2b51d
-  data.tar.gz: 4988a035ce299d1e0b02931fc3d640847457e6e0a71a07ddb847999e47dd77962c6cfc09163c3b7fa04e038420016b6ba4698b1934a9718e1690c257ac27c336
+  metadata.gz: 001216c2a2fa11b0fdc954fb5203de242d64f3300b657883c6cba643e0ecfbc0022906280b2279e9da4d8ce0447f3e918356709e6ec21f47cf89ad7e38e6fabe
+  data.tar.gz: 4d736d12e2811bad71b00c79c23b7f7dcd23b653e7ce11e1e49560bfc535e6f29df629de7a0be6081b533ae6786a773db6f31c563b33f5cfbd76156c061fb11b

data/README.md

@@ -72,13 +72,11 @@ namespace :users do
     User.update_all({role_id: 1}, {role_id: 2})
 
     # DO NOT REMOVE THIS PART
-    RakeMigration.find_or_create_by_version(__FILE__[/\d+/])
+    RakeMigration.mark_complete(__FILE__)
   end
 end
 ```
 
-Update: If you are using Rails 4 or greater, the find_or_create_by_version has been changed to find_or_create_by(version: __FILE__[/\d+/]).
-
 Simply insert your code above the "DO NOT REMOVE THIS PART" line. The checklist is there to help you and the person who is code-reviewing your code to think of problems that might occur from your rake task. Afterwards you can run the rake task normally:
 
 ```ruby

data/lib/rails/generators/rake_migrations/templates/rake_migrations_check.rb

@@ -6,12 +6,13 @@ module RakeMigrationsCheck
     results = client.query("select * from rake_migrations").map {|res| res["version"] }
     rake_migrations_lib = "#{`pwd`.strip}/lib/tasks/rake_migrations/*"
 
-    rake_files = Dir[rake_migrations_lib].map do |file|
-      if !results.include?(file[/\d+/])
+    rake_files = Dir[rake_migrations_lib].sort.map do |file|
+      rake_id = RakeMigration.version_from_path(file)
+      if !results.include?(rake_id)
         file = File.read(file)
-        namespace = file[/namespace :(.*?)do/m, 1].strip
-        task = file[/task (.*?):/m, 1]
-        "rake #{namespace}:#{task}"
+        namespace = file[/namespace :?([^: ,]*)/m, 1].strip
+        task = file[/task :?([^ :,]*)/m, 1]
+        "rake #{namespace}:#{task} # #{rake_id}"
       end
     end.compact
 
@@ -25,4 +26,4 @@ module RakeMigrationsCheck
   end
 end
 
-RakeMigrationsCheck.check
+RakeMigrationsCheck.check

data/lib/rails/generators/rake_migrations/templates/rake_migrations_check_pg.rb

@@ -4,15 +4,15 @@ module RakeMigrationsCheck
   def self.check
     client = PG.connect(host: "localhost", user: "<username>", dbname: "<database name>")
     results = client.exec("select * from rake_migrations").map {|res| res["version"] }
-
     rake_migrations_lib = "#{`pwd`.strip}/lib/tasks/rake_migrations/*"
 
-    rake_files = Dir[rake_migrations_lib].map do |file|
-      if !results.include?(file[/\d+/])
+    rake_files = Dir[rake_migrations_lib].sort.map do |file|
+      rake_id = RakeMigration.version_from_path(file)
+      if !results.include?(rake_id)
         file = File.read(file)
-        namespace = file[/namespace :(.*?)do/m, 1].strip
-        task = file[/task (.*?):/m, 1]
-        "rake #{namespace}:#{task}"
+        namespace = file[/namespace :?([^: ,]*)/m, 1].strip
+        task = file[/task :?([^ :,]*)/m, 1]
+        "rake #{namespace}:#{task} # #{rake_id}"
       end
     end.compact
 
@@ -26,4 +26,4 @@ module RakeMigrationsCheck
   end
 end
 
-RakeMigrationsCheck.check
+RakeMigrationsCheck.check

data/lib/rails/generators/task/templates/task.rb

@@ -14,11 +14,7 @@ namespace :<%= file_name %> do
 
 
     # DO NOT REMOVE THIS PART
-<% if Rails.version.to_i < 4 -%>
-    RakeMigration.find_or_create_by_version(__FILE__[/\d+/])
-<% else -%>
-    RakeMigration.find_or_create_by(version: __FILE__[/\d+/])
-<% end -%>
+    RakeMigration.mark_complete(__FILE__)
   end
 <% end -%>
 end

data/lib/rake_migration.rb

@@ -1,2 +1,18 @@
 class RakeMigration < ::ActiveRecord::Base
-end
+  def self.version_from_path(path)
+    path.split('/').last[/\d+/]
+  end
+
+  def self.findcreate_by_version(rake_id)
+    find_or_create_by_version(rake_id)
+  end
+
+  def self.mark_complete(file)
+    rake_id = version_from_path(file)
+    if methods.include?(:find_or_create_by)
+      find_or_create_by(version: rake_id)
+    else
+      findcreate_by_version(rake_id)
+    end
+  end
+end

data/lib/rake_migrations/version.rb

@@ -1,3 +1,3 @@
 module RakeMigrations
-  VERSION = "1.0.8"
-end
+  VERSION = "1.0.9"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_migrations
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Eyal Eizenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A gem to easily keep track of rake tasks