activerecord-migrations 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eae2931191d7a98df4c19bea4bb55d100be3573b
-  data.tar.gz: d25d1db9c8fecc378e71c5de060ac27c87595acc
+  metadata.gz: f27fbcf202ed3051454f299ecac2250ab3c82671
+  data.tar.gz: 795e2d9c89a56d81086afb33bc5fab8046584c4e
 SHA512:
-  metadata.gz: af0538820698e7750c130aeb99fd64e81a091497695fb2a8d03c82c4c50058ba6046e84d4751983e77596147c4da354b08ad2fb7368ad65379a7e0fe0b7c018e
-  data.tar.gz: 4fc9b25f826fdbc65b23ad286867b9dfa74fe84431ceaa650def7a666609d1d881ef9e91d45b0937ac2445bdb4e22f844ad193d0d5cddb52e9721b43a77663da
+  metadata.gz: 06e39eea69ef2f62824906c146332448473a069b8b155f03d5ad629a64e210a6175eb00301ac3dbb8c5073ff536461a17c4d8b0977f30910c33ac36576c2aa70
+  data.tar.gz: bc9c52f8b6ac392378024116782977ba1952219fdbde9a44314f836b01352c5de33dad1086c1a8ab1a97540a267bb1a51b1ac23e8937f647097d2654086fc844

data/.gitignore

@@ -7,3 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+spec/active_record/project/db/development.db
+spec/active_record/project/db/schema.rb
+

data/README.md

@@ -49,22 +49,17 @@ end
 
 ### Deployment
 
-This gem includes an additional task `db:deploy` which is designed to assist with deployment of sites with databases. When deploying a site for the first time, this task will create the database and load the seed data. If deploying the site to an existing database it will simply run migrations.
+This gem includes an additional task `db:deploy` which is designed to assist with deployment of sites with databases. When deploying a site for the first time, this task will create the database and load the seed data, then run any outstanding migrations. If deploying the site to an existing database it will simply run migrations.
 
-### `db/seed.rb`
+The typical usage is to run `db:fixtures:update` which will generate all the required files into `db/fixtures/$DATABASE/`, which includes the contents of all tables and the current `schema.rb`.
 
-This file should contain the logic for loading your fixtures or other seed data. Something like this:
+### Fixtures
 
-```ruby
-require_relative 'environment'
+Fixtures are generated into `db/fixtures/$DATABASE_ENV/$TABLE_NAME.yml` by running `rake db:fixtures:dump`. You can limit this to specific tables by editing `db/fixtures/$DATABASE_ENV/tables.conf` which is loaded if present, or by specifying `TABLES=table1,table2` environment variable.
 
-puts "Loading fixtures..."
-system("rake", "db:fixtures:load")
-```
-
-### Fixtures
+### Seed
 
-Fixtures are generated into `db/fixtures/#{environment}/table.yml` by running `rake db:fixtures:dump`.
+This gem replaces the existing data seed mechanism with `db:fixtures:load`.
 
 ## Contributing
 

data/lib/active_record/migrations/tasks.rb

@@ -19,8 +19,6 @@
 # THE SOFTWARE.
 
 require_relative 'tasks/db'
-require_relative 'tasks/db/migrations'
-require_relative 'tasks/db/fixtures'
 
 module ActiveRecord
 	module Migrations

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

@@ -38,7 +38,7 @@ namespace :db do
 		database_tasks.db_dir = File.join(root, 'db')
 		database_tasks.env = DATABASE_ENV.to_s
 		database_tasks.database_configuration = ActiveRecord::Base.configurations
-		database_tasks.migrations_paths = File.join(root, 'db/migrate')
+		database_tasks.migrations_paths = [File.join(root, 'db/migrate')]
 		database_tasks.fixtures_path = File.join(root, 'db/fixtures', DATABASE_ENV.to_s)
 		
 		database_tasks.send(:define_method, :load_seed) do
@@ -46,17 +46,32 @@ namespace :db do
 		end
 	end
 	
-	task 'Setup a new database if required and run migrations.'
-	task :deploy => :load_config do
+	task :schema_path => :load_config do
 		database_tasks = ActiveRecord::Tasks::DatabaseTasks
 		
-		schema_path = File.join(database_tasks.db_dir, 'schema.rb')
-		unless File.exist? schema_path
-			abort "Missing #{schema_path}, cannot deploy!"
+		paths = [
+			ENV['SCHEMA'],
+			File.join(database_tasks.fixtures_path, 'schema.rb'),
+			File.join(database_tasks.db_dir, 'schema.rb'),
+		].compact
+		
+		unless @schema_path = paths.select{|path| File.exist?(path)}.first
+			abort "Could not locate schema file: #{paths.inspect}!"
 		end
 		
+		puts "Schema path: #{@schema_path}"
+	end
+	
+	desc 'Setup a new database if required and run migrations.'
+	task :deploy => [:load_config, :schema_path] do
+		database_tasks = ActiveRecord::Tasks::DatabaseTasks
+		
 		unless ActiveRecord::Migrations.database?
-			Rake::Task['db:setup'].invoke
+			Rake::Task['db:create'].invoke
+			
+			ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:ruby, @schema_path)
+			
+			Rake::Task['db:seed'].invoke
 		end
 		
 		Rake::Task['db:migrate'].invoke
@@ -88,12 +103,7 @@ end
 # Loading this AFTER we define our own load_config task is critical, we need to make sure things are set up correctly before we run the task of the same name from ActiveRecord.
 load 'active_record/railties/databases.rake'
 
-# Now we work around some existing broken tasks:
-Rake::Task['db:seed'].clear
-
-namespace :db do
-	desc 'Load the seed data into the database.'
-	task :seed do
-		ActiveRecord::Tasks::DatabaseTasks.load_seed
-	end
-end
+# We load these afterwards as it augments/replace the existing tasks:
+require_relative 'db/seed'
+require_relative 'db/fixtures'
+require_relative 'db/migrations'

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

@@ -1,42 +1,89 @@
+# Copyright, 2016, 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.
 
 namespace :db do
 	namespace :fixtures do
-		task :tables => :environment do
+		task :fixtures_path => :load_config do
+			@fixtures_path = ENV.fetch('FIXTURES_PATH') {ActiveRecord::Tasks::DatabaseTasks.fixtures_path}
+			@tables_path = File.join(@fixtures_path, 'tables.conf')
+		end
+		
+		desc 'List the tables to be dumped, either via `ENV[\'TABLES\']` or `tables.conf`.'
+		task :tables => :fixtures_path do
 			all_tables = ActiveRecord::Base.connection.tables
 			
 			if tables_string = ENV['TABLES']
 				@tables = tables_string.split(',')
+			elsif File.exist?(@tables_path)
+				puts "Loading tables from: #{@tables_path}"
+				@tables = YAML::load_file(@tables_path)
 			else
 				# We skip update/event tables since these contain a lot of non-critical data.
-				@tables = all_tables.grep_v(/.*?(_update|_event|_notification)/)
+				@tables = all_tables.grep_v(/ar_internal_metadata/)
 			end
 			
-			puts "Dumping Tables: #{@tables.join(', ')}"
-			puts "Skipping Tables: #{(all_tables - @tables).join(', ')}"
+			puts "Dumping tables: #{@tables.join(', ')}"
+			puts "Skipping tables: #{(all_tables - @tables).join(', ')}"
+		end
+		
+		desc 'Copy the current schema to the fixtures schema.'
+		task :copy_schema => :fixtures_path do
+			database_tasks = ActiveRecord::Tasks::DatabaseTasks
+			
+			fixtures_schema_path = File.join(database_tasks.fixtures_path, 'schema.rb')
+			db_schema_path = File.join(database_tasks.db_dir, 'schema.rb')
+			
+			FileUtils.cp(db_schema_path, fixtures_schema_path)
 		end
 		
 		desc 'Create YAML fixtures from data in an existing database.'
 		task :dump => :tables do
-			sql  = "SELECT * FROM %s"
+			sql = "SELECT * FROM %s"
 			
-			root = ENV.fetch('FIXTURES_PATH') {ActiveRecord::Tasks::DatabaseTasks.fixtures_path}
-			FileUtils.mkpath root
+			FileUtils.mkpath @fixtures_path
 			
 			@tables.each do |table_name|
-				fixture_path = "#{root}/#{table_name}.yml"
+				# It's with regret that we have to use .yml here, as that's the only extension supported by ActiveRecord db:fixtures:load
+				fixture_path = "#{@fixtures_path}/#{table_name}.yml"
 				
 				puts "Dumping #{table_name} to #{fixture_path}..."
 				
 				i = "000"
 				
 				File.open(fixture_path, 'w') do |file|
-					data = ActiveRecord::Base.connection.select_all(sql % table_name)
-					file.write data.inject({}) { |hash, record|
-						hash["#{table_name}_#{i.succ!}"] = record
-						hash
-					}.to_yaml
+					rows = ActiveRecord::Base.connection.select_all(sql % table_name)
+					
+					records = rows.each_with_object({}) do |row, hash|
+						hash["#{table_name}_#{i.succ!}"] = row
+					end
+					
+					file.write records.to_yaml
 				end
 			end
 		end
+		
+		desc 'Update the fixtures and copy the schema.'
+		task :update => [:copy_schema, :dump] do
+			unless File.exist? @tables_path
+				File.write(@tables_path, YAML::dump(@tables))
+			end
+		end
 	end
-end
+end

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

@@ -35,7 +35,8 @@ namespace :db do
 			require "rails/generators"
 			
 			parameters = [name] + options
-			Rails::Generators.invoke "active_record:migration", parameters, :destination_root => ActiveRecord::Migrations.root
+			
+			files = Rails::Generators.invoke "active_record:migration", parameters, :destination_root => ActiveRecord::Migrations.root
 		end
 	end
 end

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

@@ -0,0 +1,28 @@
+# Copyright, 2016, 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.
+
+# Now we work around some existing broken tasks:
+Rake::Task['db:seed'].clear
+
+namespace :db do
+	desc 'Load the seed data into the database.'
+	task :seed => 'db:fixtures:load' do
+	end
+end

data/lib/active_record/migrations/version.rb

@@ -20,6 +20,6 @@
 
 module ActiveRecord
 	module Migrations
-		VERSION = "1.1.2"
+		VERSION = "1.2.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-migrations
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,6 +114,7 @@ files:
 - lib/active_record/migrations/tasks/db.rb
 - lib/active_record/migrations/tasks/db/fixtures.rb
 - lib/active_record/migrations/tasks/db/migrations.rb
+- lib/active_record/migrations/tasks/db/seed.rb
 - lib/active_record/migrations/version.rb
 homepage: https://github.com/ioquatix/activerecord-migrations
 licenses: