hookup 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70820867b9752ec2ecbc3ab1401c0e216e01b2f9
-  data.tar.gz: abe373824ef50ab0c41cbaf53d27faa64a5c30e5
+  metadata.gz: 21d8368abed9ca30e0bf5b42f4a9940dc4a168a3
+  data.tar.gz: ff0246d9aa5d3e003e60c63238d052934814f13c
 SHA512:
-  metadata.gz: 627629152cb201179573371eef16f8c547c8f0577d414ac41385955c5ff090d33e05660c1812caec19fa58d5aed85435a4fb84596dadfbde29cd008c8ab3c342
-  data.tar.gz: 1431da32d144716b13c5fbed4f90b93d4b0bb1892f81b2d30e0d814ad3bebf9b44c0a13f40b0d82003395c6d85902a4d4833386c897e77bb4d814c464d9f364e
+  metadata.gz: fc6771c38811c794949497c737921954978e668280f7943cb1a97102afe3bf55114c13976b427961f3d68e9e1c806c52d0b158e185c5b87f4cbc88fa520ccbc2
+  data.tar.gz: 75e885ad88596ba381bec73023938d3b9105eb673569dde15bf677384ec7e6b1845b98c7b4c7f53690a0a74131e98b618367a36e58e65c86e90a4c8b2e9cd543

data/README.markdown

@@ -48,6 +48,12 @@ 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.
 
+### Skip Hookup
+
+Set the `SKIP_HOOKUP` environment variable to skip hookup.
+
+    SKIP_HOOKUP=1 git checkout master
+
 ChangeLog
 ---------
 

data/hookup.gemspec

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

data/lib/hookup.rb

@@ -36,13 +36,17 @@ class Hookup
   def git_dir
     unless @git_dir
       @git_dir = %x{git rev-parse --git-dir}.chomp
-      raise Error, dir unless $?.success?
+      raise Error unless $?.success?
     end
     @git_dir
   end
 
+  def post_checkout_file
+    File.join(git_dir, 'hooks', 'post-checkout')
+  end
+
   def install
-    append(File.join(git_dir, 'hooks', 'post-checkout'), 0777) do |body, f|
+    append(post_checkout_file, 0777) do |body, f|
       f.puts "#!/bin/bash" unless body
       f.puts %(hookup post-checkout "$@") if body !~ /hookup/
     end
@@ -57,6 +61,14 @@ class Hookup
     puts "Hooked up!"
   end
 
+  def remove
+    body = IO.readlines(post_checkout_file)
+    body.reject! { |item| item =~ /hookup/ }
+    File.open(post_checkout_file, 'w') { |file| file.puts body.join }
+
+    puts "Hookup removed!"
+  end
+
   def append(file, *args)
     Dir.mkdir(File.dirname(file)) unless File.directory?(File.dirname(file))
     body = File.read(file) if File.exist?(file)
@@ -82,6 +94,12 @@ class Hookup
       File.join(working_dir, env['HOOKUP_SCHEMA_DIR'])
     end
 
+    def possible_schemas
+      %w(development_structure.sql schema.rb structure.sql).map do |file|
+        File.join schema_dir, file
+      end
+    end
+
     def working_dir
       env['HOOKUP_WORKING_DIR'] || '.'
     end
@@ -146,7 +164,7 @@ class Hookup
     end
 
     def migrate
-      schemas = %W(#{schema_dir}/schema.rb #{schema_dir}/development_structure.sql).select do |schema|
+      schemas = possible_schemas.select do |schema|
         status = %x{git diff --name-status #{old} #{new} -- #{schema}}.chomp
         rake 'db:create' if status =~ /^A/
         status !~ /^D/ && !status.empty?
@@ -211,14 +229,19 @@ class Hookup
   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
+    resolve_schema_version body, ":version =>"
+    resolve_schema_version body, "version:"
     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
 
+  def resolve_schema_version(body, version)
+    asd = "ActiveRecord::Schema.define"
+    body.sub!(/^<+ .*\n#{asd}\(#{version} (\d+)\) do\n=+\n#{asd}\(#{version} (\d+)\) do\n>+ .*/) do
+      "#{asd}(#{version} #{[$1, $2].max}) do"
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hookup
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies: []
 description: Automatically bundle and migrate your Rails app when switching branches,
   merging upstream changes, and bisecting.
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: hookup
-rubygems_version: 2.0.3
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Automate the bundle/migration tedium of Rails with Git hooks