hookup 1.1.0 → 1.2.0

data/README.markdown

@@ -30,6 +30,10 @@ migrations have been added, deleted, or modified.  Deleted and modified
 migrations are given the `rake db:migrate:down` treatment, then `rake
 db:migrate` is invoked to bring everything else up to date.
 
+To force reloading the database if migrating fails, Add
+`--load-schema="rake db:reset"` to the `hookup post-checkout` line in
+`.git/hooks/post-checkout`.
+
 ### Schema Resolving
 
 Each time there's a conflict in `db/schema.rb` on the

data/hookup.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name        = "hookup"
-  s.version     = "1.1.0"
+  s.version     = "1.2.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tim Pope"]
   s.email       = ["code@tp"+'ope.net']
-  s.homepage    = ""
+  s.homepage    = "https://github.com/tpope/hookup"
   s.summary     = %q{Automate the bundle/migration tedium of Rails with Git hooks}
   s.description = %q{Automatically bundle and migrate your Rails app when switching branches, merging upstream changes, and bisecting.}
 

data/lib/hookup.rb

@@ -67,68 +67,121 @@ class Hookup
   protected :append
 
   def post_checkout(*args)
-    old, new = args.shift, args.shift || 'HEAD'
-    if old == '0000000000000000000000000000000000000000'
-      old = EMPTY_DIR
-    elsif old.nil?
-      old = '@{-1}'
-    end
-    bundle(old, new, *args)
-    migrate(old, new, *args)
+    PostCheckout.new(ENV, *args).run
   end
 
-  def bundle(old, new, *args)
-    return if args.first == '0'
+  class PostCheckout
 
-    return unless File.exist?('Gemfile')
-    if %x{git diff --name-only #{old} #{new}} =~ /^Gemfile|\.gemspec$/
-      begin
-        # If Bundler in turn spawns Git, it can get confused by $GIT_DIR
-        git_dir = ENV.delete('GIT_DIR')
-        %x{bundle check}
-        unless $?.success?
-          puts "Bundling..."
-          system("bundle | grep -v '^Using ' | grep -v ' is complete'")
-        end
-      ensure
-        ENV['GIT_DIR'] = git_dir
+    attr_reader :old, :new, :env
+
+    def partial?
+      @partial
+    end
+
+    def initialize(environment, *args)
+      @env ||= environment.to_hash.dup
+      require 'optparse'
+      opts = OptionParser.new
+      opts.banner = "Usage: hookup post-checkout <old> <new> <full>"
+      opts.on('--load-schema=COMMAND', 'Run COMMAND on migration failure') do |command|
+        env['HOOKUP_LOAD_SCHEMA'] = command
+      end
+      opts.parse!(args)
+
+      @old = args.shift
+      if @old == '0000000000000000000000000000000000000000'
+        @old = EMPTY_DIR
+      elsif @old.nil?
+        @old = '@{-1}'
       end
+      @new = args.shift || 'HEAD'
+      @partial = (args.shift == '0')
     end
-  end
 
-  def migrate(old, new, *args)
-    return if args.first == '0'
+    def run
+      return if env['GIT_REFLOG_ACTION'] =~ /^(?:pull|rebase)/
+      unless partial?
+        bundle
+        migrate
+      end
+    end
 
-    schemas = %w(db/schema.rb db/development_structure.sql).select do |schema|
-      status = %x{git diff --name-status #{old} #{new} -- #{schema}}.chomp
-      system 'rake', 'db:create' if status =~ /^A/
-      status !~ /^D/ && !status.empty?
+    def bundler?
+      File.exist?('Gemfile')
     end
 
-    migrations = %x{git diff --name-status #{old} #{new} -- db/migrate}.scan(/.+/).map {|l| l.split(/\t/) }
-    begin
-      migrations.select {|(t,f)| %w(D M).include?(t)}.reverse.each do |type, file|
+    def bundle
+      return unless bundler?
+      if %x{git diff --name-only #{old} #{new}} =~ /^Gemfile|\.gemspec$/
         begin
-          system 'git', 'checkout', old, '--', file
-          unless system 'rake', 'db:migrate:down', "VERSION=#{File.basename(file)}"
-            raise Error, "Failed to rollback #{File.basename(file)}. Consider rake db:setup"
+          # If Bundler in turn spawns Git, it can get confused by $GIT_DIR
+          git_dir = ENV.delete('GIT_DIR')
+          %x{bundle check}
+          unless $?.success?
+            puts "Bundling..."
+            system("bundle | grep -v '^Using ' | grep -v ' is complete'")
           end
         ensure
-          if type == 'D'
-            system 'git', 'rm', '--force', '--quiet', '--', file
-          else
-            system 'git', 'checkout', new, '--', file
-          end
+          ENV['GIT_DIR'] = git_dir
         end
       end
+    end
+
+    def migrate
+      schemas = %w(db/schema.rb db/development_structure.sql).select do |schema|
+        status = %x{git diff --name-status #{old} #{new} -- #{schema}}.chomp
+        rake 'db:create' if status =~ /^A/
+        status !~ /^D/ && !status.empty?
+      end
 
-      if migrations.any? {|(t,f)| %w(A M).include?(t)}
-        system 'rake', 'db:migrate'
+      return if schemas.empty?
+
+      migrations = %x{git diff --name-status #{old} #{new} -- db/migrate}.scan(/.+/).map {|l| l.split(/\t/) }
+      begin
+        migrations.select {|(t,f)| %w(D M).include?(t)}.reverse.each do |type, file|
+          begin
+            system 'git', 'checkout', old, '--', file
+            unless rake 'db:migrate:down', "VERSION=#{File.basename(file)}"
+              raise Error, "Failed to rollback #{File.basename(file)}"
+            end
+          ensure
+            if type == 'D'
+              system 'git', 'rm', '--force', '--quiet', '--', file
+            else
+              system 'git', 'checkout', new, '--', file
+            end
+          end
+        end
+
+        if migrations.any? {|(t,f)| %w(A M).include?(t)}
+          rake 'db:migrate'
+        end
+
+      ensure
+        changes = %x{git diff --name-status #{new} -- #{schemas.join(' ')}}
+
+        unless changes.empty?
+          system 'git', 'checkout', '--', *schemas
+
+          puts "Schema out of sync."
+
+          fallback = env['HOOKUP_LOAD_SCHEMA']
+          if fallback && fallback != ''
+            puts "Trying #{fallback}..."
+            system fallback
+          end
+        end
       end
+    end
 
-    ensure
-      system 'git', 'checkout', '--', *schemas if schemas.any?
+    def rake(*args)
+      if bundler?
+        system 'bundle', 'exec', 'rake', *args
+      else
+        system 'rake', *args
+      end
     end
+
   end
 
   def resolve_schema(a, o, b, marker_size = 7)

metadata

@@ -1,29 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hookup
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-24 00:00:00 -04:00
-default_executable: 
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies: []
-
-description: Automatically bundle and migrate your Rails app when switching branches, merging upstream changes, and bisecting.
-email: 
+description: Automatically bundle and migrate your Rails app when switching branches,
+  merging upstream changes, and bisecting.
+email:
 - code@tpope.net
-executables: 
+executables:
 - hookup
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -32,33 +28,28 @@ files:
 - bin/hookup
 - hookup.gemspec
 - lib/hookup.rb
-has_rdoc: true
-homepage: ""
+homepage: https://github.com/tpope/hookup
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: hookup
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Automate the bundle/migration tedium of Rails with Git hooks
 test_files: []
-