lib/gitty_migrator.rb lib/migration_settings.rb @@ -2,7 +2,7 @@ GittyMigrations =============== Requires a extended 'rubygit' gem that has stashes -cd vendor/plugins/smart_migrations/extended_rubygit_gem +cd vendor/plugins/gitty_migrations/extended_rubygit_gem sudo gem install git-1.0.5 Example @@ -10,11 +10,7 @@ Example class MyMigration < ActiveRecord::Migration - # Would be better if you used a git-tag to tag the revision - # You now don't have to put in a sha1 hash. If you don't it will take the migration that you migration was checked in on - use_git_revision - # or - # use_git_revision "675bacdd870a098a98aa3f858d92e1047ba28a7d" # if you want to be explicit + git_fu def self.up puts "This is a test migration" README @@ -1,3 +1,6 @@ require 'git' +require 'migration_settings' require 'gitty_migration' -ActiveRecord::Migration.send(:include, GittyMigration) \ No newline at end of file +#require 'gitty_migrator' +#ActiveRecord::Migrator.send(:extend, GittyMigrator) +ActiveRecord::Migration.send(:include, GittyMigration) init.rb @@ -19,91 +19,64 @@ module GittyMigration def self.included(base) base.extend ClassMethods - base.class_eval do - class << self - alias_method_chain :migrate, :git - end - end end module ClassMethods - - @@gitty_migration ||= {} - @@gitty_migration[:enabled] = false - - def use_git_revision(revision_name=nil) - g = Git.open("#{RAILS_ROOT}") - raise "Couldn't find the .git directory. Does this project use git?" if g.nil? - - # TODO - # See if there are any stashes already. If there arent' then set a flag to clear the stash after we are done. - @@gitty_migration[:git] = g - @@gitty_migration[:enabled] = true - @@gitty_migration[:stash] = (g.status.changed.size > 0) ? true : false - @@gitty_migration[:clear_stash] = (g.branch.stashes.size > 0) ? true : false - @@gitty_migration[:branch] = "smart_migration_".concat Digest::MD5.hexdigest("#{Time.now}-#{revision_name}") - @@gitty_migration[:revision] = revision_name - @@gitty_migration[:original_branch] = g.branch.name - end - - def migrate_with_git(direction, migration_version) - before_migrate(migration_version) if @@gitty_migration[:enabled] == true - migrate_without_git(direction) - after_migrate if @@gitty_migration[:enabled] == true - end - - def before_migrate(migration_version) - m = @@gitty_migration - if m[:enabled] - g = m[:git] - - if m[:revision].nil? - filename = "#{migration_version}_#{self.to_s.underscore}.rb" - file = Dir["db/migrate/0*#{filename}"].first - commit = g.log(1000).object(file).each{|c|c}.reverse.first - #puts commit.author.name - #puts commit.author.email - #puts commit.author.date.to_s - #puts commit.sha - @@gitty_migration[:revision] = commit.sha - end - say "Migrating with git revision #{m[:revision]}" - - g.branch(m[:original_branch]).stashes.save(m[:revision]) if @@gitty_migration[:stash] - g.branch(m[:branch]).checkout - commit = g.gcommit("#{m[:revision]}") - - # If we can't find the commit, - # let the user know and revert back to the original branch - if commit.nil? - say "Could not find git revision #{m[:revision]}. Using HEAD" - revert_to_original - else - g.reset_hard(commit) + def git_fu + class_eval do + class << self + alias_method_chain :migrate, :git end - end end - def after_migrate - revert_to_original + def migrate_with_git(direction, version) + settings = MigrationSettings.new( + :version => version, + :klass => self.to_s.underscore + ) + before_migrate(settings) + migrate_without_git(direction) + after_migrate(settings) end - def revert_to_original - m = @@gitty_migration - if m[:enabled] - say "Done migration. Switching back to your normal branch" - g = @@gitty_migration[:git] - g.branch(m[:original_branch]).checkout - g.branch(m[:original_branch]).stashes.apply if @@gitty_migration[:stash] - # g.branch(m[:original_branch]).stashes.clear if @@gitty_migration[:clear_stash] - g.branch(m[:branch]).delete - # If we've already deleted the branch, then don't revert again - # revert_to_original will be called in the after migrate even if we couldn't find the commit - @@gitty_migration[:enabled] = false + def before_migrate(settings) + g = settings.git + # Find the commit that matches your sha1 + commit = g.gcommit("#{settings.revision}") + # If we can't find the commit, continue without using gitty migrations + if commit.nil? + say "Could not find git sha1 that matches '#{settings.revision}'. The migration will continue without git_fu" + else + say "Migrating with git" + say "SHA1: #{settings.revision}" + say "AUTHOR: #{settings.revision_author}" + say "DATE: #{settings.revision_date}" + say "MESSAGE: #{settings.revision_message}" + # Stash any changes that you may have in your current branch + g.branch(settings.original_branch).stashes.save(settings.revision) if settings.stash? + # Checkout a new branch to use for your migration + g.branch(settings.migration_branch).checkout + # Rollback to the commit that you wanted + g.reset_hard(commit) end end + def after_migrate(settings) + say "Done migration. Switching back to your normal branch" + g = settings.git + # Checkout your original branch + g.branch(settings.original_branch).checkout + # Apply your stash if you have one + g.branch(settings.original_branch).stashes.apply if settings.stash? + # Clear your stashes if you have only the one that we used + # g.branch(m[:original_branch]).stashes.clear if @@gitty_migration[:clear_stash] + # Delete the branch that you used for the migration + g.branch(settings.migration_branch).delete + # If we've already deleted the branch, then don't revert again + # revert_to_original will be called in the after migrate even if we couldn't find the commit + end + end end lib/gitty_migration.rb d645f8d4ce786f55c23fd5aced0535c76ce62c0d Eric Goodwin eric@ericgoodwin.com http://github.com/ericgoodwin/gitty-migrations/commit/0fdf502ece8922723be1fd54df4bbe0b9f5de11c 0fdf502ece8922723be1fd54df4bbe0b9f5de11c 2008-03-30T18:29:18-07:00 2008-03-30T18:29:18-07:00 Clean up Moved most of the settings into the migration settings class Updated the README f6471633f1585e0b58782eb2cdfdcfed4074dc4f Eric Goodwin eric@ericgoodwin.com