@@ -10,7 +10,11 @@ Example class MyMigration < ActiveRecord::Migration - git_fu + # Will rollback to the commit that this file was checked in on + use_git + + # Will rollback to a certain commit that you define + # use_git :revision => "2024589c214b41c8b29bcd6444c2d49807760a5a" def self.up puts "This is a test migration" README @@ -23,7 +23,8 @@ module GittyMigration module ClassMethods - def git_fu + def use_git(options={}) + @@options = options class_eval do class << self alias_method_chain :migrate, :git @@ -34,7 +35,8 @@ module GittyMigration def migrate_with_git(direction, version) settings = MigrationSettings.new( :version => version, - :klass => self.to_s.underscore + :klass => self.to_s.underscore, + :revision => @@options[:revision] ) before_migrate(settings) migrate_without_git(direction) @@ -42,18 +44,21 @@ module GittyMigration end 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 + begin + g = settings.git + # Find the commit that matches your sha1 + commit = g.gcommit("#{settings.revision}") + # Will throw an error if the commit isn't known. Bit of a hack :( + commit.gtree + say "Migrating with git" say "SHA1: #{settings.revision}" say "AUTHOR: #{settings.revision_author}" say "DATE: #{settings.revision_date}" say "MESSAGE: #{settings.revision_message}" + rescue + say "WARNING => Could not find git sha1 that matches '#{settings.revision}'. The migration will continue without gitty migrations" + else # 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 lib/gitty_migration.rb @@ -24,6 +24,8 @@ class MigrationSettings @revision = commit.sha end @revision + rescue + @revision = nil end def stash? lib/migration_settings.rb 0fdf502ece8922723be1fd54df4bbe0b9f5de11c Eric Goodwin eric@ericgoodwin.com http://github.com/ericgoodwin/gitty-migrations/commit/7c6e495f29fd3c49bb5059451fcaf0a59969de8a 7c6e495f29fd3c49bb5059451fcaf0a59969de8a 2008-03-31T11:04:51-07:00 2008-03-31T11:04:51-07:00 Added rescue blocks incase getting the proper revision fails Added revision options back in Renamed the invocation method again Rewrote readme to relect changes 88be3c8d0e1a0b1ebf6c874c9501ddea1f286816 Eric Goodwin eric@ericgoodwin.com