hookup 1.2.2 → 1.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: a003ee5a9f2e61b570aaf4d4006b37ac6269ced76eee42df20ab78ac930764de
+  data.tar.gz: 2c76b14b8d34af3b719051ca21ff175e9ad1209d99ec1bc3cc2e2123f4f851d1
+SHA512:
+  metadata.gz: a7f7534b3ee8417f509699c602184156bb5347616c0904fff55245ac8c7a8ab5ce53cd9f64fa7c16d2d4d5b57c03f32d590385fc170fd9db64e5bdee1fd7a812
+  data.tar.gz: 28cfa49a9e6f3c06461ff5c04cc43fb14383812fbb966961e3e70567390cbd099ba5f1bf5067cfca960fc995615011b37f8ff734691be7a2fed2a5bc8ad02d53

data/README.markdown

@@ -48,6 +48,16 @@ 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
+    
+### Removing Hookup
+    
+    hookup remove
+
 ChangeLog
 ---------
 

data/hookup.gemspec

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

data/lib/hookup.rb

@@ -36,27 +36,57 @@ 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 bundler?
+    !!ENV['BUNDLE_GEMFILE']
+  end
+
+  def make_command(command)
+    bundler? ? command.insert(0, "bundle exec ") : command
+  end
+
+  def post_checkout_file
+    File.join(git_dir, 'hooks', 'post-checkout')
+  end
+
+  def info_attributes_file
+    File.join(git_dir, 'info', 'attributes')
+  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/
+      f.puts make_command(%(hookup post-checkout "$@")) if body !~ /hookup/
     end
 
-    append(File.join(git_dir, 'info', 'attributes')) do |body, f|
+    append(info_attributes_file) 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'
+    system 'git', 'config', 'merge.railsschema.driver', make_command('hookup resolve-schema %A %O %B %L')
 
     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 }
+
+    body = IO.readlines(info_attributes_file)
+    body.reject! { |item| item =~ /railsschema/ }
+    File.open(info_attributes_file, 'w') { |file| file.puts body.join }
+
+    system 'git', 'config', '--unset', 'merge.railsschema.driver'
+
+    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)
@@ -79,7 +109,13 @@ class Hookup
     end
 
     def schema_dir
-      File.expand_path(env['HOOKUP_SCHEMA_DIR'], working_dir)
+      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
@@ -115,7 +151,7 @@ class Hookup
     end
 
     def run
-      return if env['GIT_REFLOG_ACTION'] =~ /^(?:pull|rebase)/
+      return if skipped? || env['GIT_REFLOG_ACTION'] =~ /^(?:pull|rebase)/
       unless partial?
         bundle
         migrate
@@ -146,7 +182,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?
@@ -194,7 +230,9 @@ class Hookup
 
     def rake(*args)
       Dir.chdir(working_dir) do
-        if bundler?
+        if File.executable?('bin/rake')
+          system 'bin/rake', *args
+        elsif bundler?
           system 'bundle', 'exec', 'rake', *args
         else
           system 'rake', *args
@@ -202,19 +240,28 @@ class Hookup
       end
     end
 
+    def skipped?
+      env['SKIP_HOOKUP']
+    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
+    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} ([0-9_]+)\) do\n=+\n#{asd}\(#{version} ([0-9_]+)\) do\n>+ .*/) do
+      "#{asd}(#{version} #{[$1, $2].max}) do"
+    end
+  end
+
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hookup
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 1.2.5
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies: []
 description: Automatically bundle and migrate your Rails app when switching branches,
   merging upstream changes, and bisecting.
@@ -20,7 +19,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.markdown
@@ -30,26 +29,24 @@ files:
 - lib/hookup.rb
 homepage: https://github.com/tpope/hookup
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: hookup
-rubygems_version: 1.8.23
+rubygems_version: 3.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automate the bundle/migration tedium of Rails with Git hooks
 test_files: []