hookup 1.0.3 → 1.1.0

data/README.markdown

@@ -7,27 +7,41 @@ Git hooks.  It fires after events like
 * pulling in upstream changes
 * switching branches
 * stepping through a bisect
+* conflict in schema
 
 Usage
 -----
 
-    $ cd yourproject
-    $ gem install hookup
-    $ hookup install
-    Hooked up!
+    gem install hookup
+    cd yourproject
+    hookup install
 
-Bundling
---------
+### Bundling
 
 Each time your current HEAD changes, hookup checks to see if your
 `Gemfile`, `Gemfile.lock`, or gem spec has changed.  If so, it runs
 `bundle check`, and if that indicates any dependencies are unsatisfied,
 it runs `bundle install`.
 
-Migrating
----------
+### Migrating
 
 Each time your current HEAD changes, hookup checks to see if any
 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.
+
+### Schema Resolving
+
+Each time there's a conflict in `db/schema.rb` on the
+`Rails::Schema.define` line, hookup resolves it in favor of the newer of
+the two versions.
+
+ChangeLog
+---------
+
+[See it on the wiki](https://github.com/tpope/hookup/wiki/ChangeLog)
+
+License
+-------
+
+Copyright (c) Tim Pope.  MIT License.

data/hookup.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "hookup"
-  s.version     = "1.0.3"
+  s.version     = "1.1.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tim Pope"]
   s.email       = ["code@tp"+'ope.net']

data/lib/hookup.rb

@@ -3,10 +3,16 @@ class Hookup
   class Error < RuntimeError
   end
 
+  class Failure < Error
+  end
+
   EMPTY_DIR = '4b825dc642cb6eb9a060e54bf8d69288fbee4904'
 
   def self.run(*argv)
     new.run(*argv)
+  rescue Failure => e
+    puts e
+    exit 1
   rescue Error => e
     puts e
     exit
@@ -27,24 +33,38 @@ class Hookup
     end
   end
 
+  def git_dir
+    unless @git_dir
+      @git_dir = %x{git rev-parse --git-dir}.chomp
+      raise Error, dir unless $?.success?
+    end
+    @git_dir
+  end
+
   def install
-    dir = %x{git rev-parse --git-dir}.chomp
-    raise Error, dir unless $?.success?
-    hook = File.join(dir, 'hooks', 'post-checkout')
-    unless File.exist?(hook)
-      File.open(hook, 'w', 0777) do |f|
-        f.puts "#!/bin/bash"
-      end
+    append(File.join(git_dir, 'hooks', 'post-checkout'), 0777) do |body, f|
+      f.puts "#!/bin/bash" unless body
+      f.puts %(hookup post-checkout "$@") if body !~ /hookup/
     end
-    if File.read(hook) =~ /^[^#]*\bhookup\b/
-      puts "Already hooked up!"
-    else
-      File.open(hook, "a") do |f|
-        f.puts %(hookup post-checkout "$@")
-      end
-      puts "Hooked up!"
+
+    append(File.join(git_dir, 'info', 'attributes')) do |body, f|
+      map = 'db/schema.rb merge=railsschema'
+      f.puts map unless body.to_s.include?(map)
+    end
+
+    system 'git', 'config', 'merge.railsschema.driver', 'hookup resolve-schema %A %O %B %L'
+
+    puts "Hooked up!"
+  end
+
+  def append(file, *args)
+    Dir.mkdir(File.dirname(file)) unless File.directory?(File.dirname(file))
+    body = File.read(file) if File.exist?(file)
+    File.open(file, 'a', *args) do |f|
+      yield body, f
     end
   end
+  protected :append
 
   def post_checkout(*args)
     old, new = args.shift, args.shift || 'HEAD'
@@ -79,9 +99,10 @@ class Hookup
   def migrate(old, new, *args)
     return if args.first == '0'
 
-    schema = %x{git diff --name-status #{old} #{new} -- db/schema.rb}
-    if schema =~ /^A/
-      system 'rake', 'db:create'
+    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?
     end
 
     migrations = %x{git diff --name-status #{old} #{new} -- db/migrate}.scan(/.+/).map {|l| l.split(/\t/) }
@@ -106,7 +127,20 @@ class Hookup
       end
 
     ensure
-      system 'git', 'checkout', '--', 'db/schema.rb' if migrations.any?
+      system 'git', 'checkout', '--', *schemas if schemas.any?
+    end
+  end
+
+  def resolve_schema(a, o, b, marker_size = 7)
+    system 'git', 'merge-file', "--marker-size=#{marker_size}", a, o, b
+    body = File.read(a)
+    asd = "ActiveRecord::Schema.define"
+    x = body.sub!(/^<+ .*\n#{asd}\(:version => (\d+)\) do\n=+\n#{asd}\(:version => (\d+)\) do\n>+ .*/) do
+      "#{asd}(:version => #{[$1, $2].max}) do"
+    end
+    File.open(a, 'w') { |f| f.write(body) }
+    if body.include?('<' * marker_size.to_i)
+      raise Failure, 'Failed to automatically resolve schema conflict'
     end
   end
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: hookup
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Tim Pope
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -04:00
+date: 2011-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -50,21 +46,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hookup
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Automate the bundle/migration tedium of Rails with Git hooks