hookup 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 21d8368abed9ca30e0bf5b42f4a9940dc4a168a3
-  data.tar.gz: ff0246d9aa5d3e003e60c63238d052934814f13c
+SHA256:
+  metadata.gz: a003ee5a9f2e61b570aaf4d4006b37ac6269ced76eee42df20ab78ac930764de
+  data.tar.gz: 2c76b14b8d34af3b719051ca21ff175e9ad1209d99ec1bc3cc2e2123f4f851d1
 SHA512:
-  metadata.gz: fc6771c38811c794949497c737921954978e668280f7943cb1a97102afe3bf55114c13976b427961f3d68e9e1c806c52d0b158e185c5b87f4cbc88fa520ccbc2
-  data.tar.gz: 75e885ad88596ba381bec73023938d3b9105eb673569dde15bf677384ec7e6b1845b98c7b4c7f53690a0a74131e98b618367a36e58e65c86e90a4c8b2e9cd543
+  metadata.gz: a7f7534b3ee8417f509699c602184156bb5347616c0904fff55245ac8c7a8ab5ce53cd9f64fa7c16d2d4d5b57c03f32d590385fc170fd9db64e5bdee1fd7a812
+  data.tar.gz: 28cfa49a9e6f3c06461ff5c04cc43fb14383812fbb966961e3e70567390cbd099ba5f1bf5067cfca960fc995615011b37f8ff734691be7a2fed2a5bc8ad02d53

data/README.markdown

@@ -53,6 +53,10 @@ the two versions.
 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.4"
+  s.version     = "1.2.5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tim Pope"]
   s.email       = ["code@tp"+'ope.net']

data/lib/hookup.rb

@@ -41,22 +41,34 @@ class Hookup
     @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(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
@@ -66,6 +78,12 @@ class Hookup
     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
 
@@ -212,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
@@ -239,7 +259,7 @@ class Hookup
 
   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
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hookup
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 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.
@@ -19,7 +19,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.markdown
@@ -36,19 +36,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: hookup
-rubygems_version: 2.3.0
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Automate the bundle/migration tedium of Rails with Git hooks
 test_files: []
-has_rdoc: