activerecord-migrations 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aedf5f1fecf8cf4ab31c1b94e28f549f373a2ec8
-  data.tar.gz: 2f39bf268e9cd6c24dea0f3ca96d01eb539d33fc
+  metadata.gz: d638b63c5c8e22e7da7c043b28fd11572f649d2d
+  data.tar.gz: 276ac84d4cd5c477419620ff1580d29d4e7b5275
 SHA512:
-  metadata.gz: 77796efe511842b401d4c702ee1cf92adc3bb45f0b461a67093fc6ffe51871c27735d7c15071f8d396c1fb8a2ec4acfebd5ef9ef061e6a87f6ec243d2e4e42da
-  data.tar.gz: e352d462055868a684125e7bccd3b175f1b7c5a0852254e8cc7785af265e1c46b7a5d48972e806f3f2723338ea473061147a270191f02526a3bd5855e1368688
+  metadata.gz: a62506e9d2e75a553eb5f6d6b8af023613aba6595d4d5ba416e33eb6b12a9af32c99d4f893fc1b1bf290ea4d544caaa85fce8e06f309d115464570e55228d2e9
+  data.tar.gz: d10972e07782d7ebea25dc1bebc164f8b5f5ec06ec0be84b8f8008712ce261dd4f77429cdeb64319ff4a9c3b4cb19f66be6d8668fb3a29b8d839d16b583a0f37

data/lib/active_record/migrations/generator.rb

@@ -0,0 +1,41 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'rails/generators'
+require 'rails/generators/active_record/migration/migration_generator'
+require 'active_record/tasks/database_tasks'
+
+module ActiveRecord
+	module Migrations
+		class Generator < ::ActiveRecord::Generators::MigrationGenerator
+			source_root ::ActiveRecord::Generators::MigrationGenerator.source_root
+
+			def create_migration_file
+				set_local_assigns!
+				validate_file_name!
+				migration_template @migration_template, File.join(db_migrate_path, "#{file_name}.rb")
+			end
+
+			def db_migrate_path
+				::ActiveRecord::Migrations.migrations_root
+			end
+		end
+	end
+end

data/lib/active_record/migrations/tasks/db.rb

@@ -59,7 +59,7 @@ namespace :db do
 			abort "Could not locate schema file: #{paths.inspect}!"
 		end
 		
-		puts "Schema path: #{@schema_path}"
+		puts "Found schema: #{@schema_path}"
 	end
 	
 	desc 'Setup a new database if required and run migrations.'

data/lib/active_record/migrations/tasks/db/migrations.rb

@@ -32,11 +32,11 @@ namespace :db do
 				options = []
 			end
 			
-			require_relative 'generators'
+			require_relative '../../generator'
 			
 			parameters = [name] + options
-
-			files = Rails::Generators.invoke "active_record:migration", parameters, :destination_root => ActiveRecord::Migrations.root
+			
+			Rails::Generators.invoke "active_record:migrations:generator", parameters, :destination_root => ActiveRecord::Migrations.root
 		end
 	end
 end

data/lib/active_record/migrations/version.rb

@@ -20,6 +20,6 @@
 
 module ActiveRecord
 	module Migrations
-		VERSION = "1.2.1"
+		VERSION = "1.3.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-migrations
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -110,10 +110,10 @@ files:
 - Rakefile
 - activerecord-migrations.gemspec
 - lib/active_record/migrations.rb
+- lib/active_record/migrations/generator.rb
 - lib/active_record/migrations/tasks.rb
 - lib/active_record/migrations/tasks/db.rb
 - lib/active_record/migrations/tasks/db/fixtures.rb
-- lib/active_record/migrations/tasks/db/generators.rb
 - lib/active_record/migrations/tasks/db/migrations.rb
 - lib/active_record/migrations/tasks/db/seed.rb
 - lib/active_record/migrations/version.rb

data/lib/active_record/migrations/tasks/db/generators.rb

@@ -1,13 +0,0 @@
-
-require 'rails/generators'
-
-if ActiveRecord::version >= Gem::Version.new("5.0.2")
-	# This is a monkey patch to work around the flakey design of ActiveRecord migrations.
-	require 'rails/generators/active_record/migration/migration_generator'
-
-	class ::ActiveRecord::Generators::MigrationGenerator
-		def db_migrate_path
-			ActiveRecord::Migrations.migrations_root
-		end
-	end
-end