hookup 1.2.0 → 1.2.1

data/README.markdown

@@ -30,7 +30,15 @@ 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
+Hookup provides a `-C` option to change to a specified directory prior to
+running `bundle` or `rake`. This should be used if your `Gemfile` and
+`Rakefile` are in a non-standard location.
+
+To use a non-standard `db` directory (where `schema.rb` and `migrate/`
+live), add `--schema-dir="database/path"` to the `hookup post-checkout`
+line in `.git/hooks/post-checkout`.
+
+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`.
 

data/hookup.gemspec

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

data/lib/hookup.rb

@@ -78,11 +78,25 @@ class Hookup
       @partial
     end
 
+    def schema_dir
+      File.expand_path(env['HOOKUP_SCHEMA_DIR'], working_dir)
+    end
+
+    def working_dir
+      env['HOOKUP_WORKING_DIR'] || '.'
+    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('-Cdirectory', 'cd to directory') do |directory|
+        env['HOOKUP_WORKING_DIR'] = directory
+      end
+      opts.on('--schema-dir=DIRECTORY', 'Path to DIRECTORY containing schema.rb and migrate/') do |directory|
+        env['HOOKUP_SCHEMA_DIR'] = directory
+      end
       opts.on('--load-schema=COMMAND', 'Run COMMAND on migration failure') do |command|
         env['HOOKUP_LOAD_SCHEMA'] = command
       end
@@ -96,6 +110,8 @@ class Hookup
       end
       @new = args.shift || 'HEAD'
       @partial = (args.shift == '0')
+
+      env['HOOKUP_SCHEMA_DIR'] = 'db' unless schema_dir && File.directory?(schema_dir)
     end
 
     def run
@@ -119,7 +135,9 @@ class Hookup
           %x{bundle check}
           unless $?.success?
             puts "Bundling..."
-            system("bundle | grep -v '^Using ' | grep -v ' is complete'")
+            Dir.chdir(working_dir) do
+              system("bundle | grep -v '^Using ' | grep -v ' is complete'")
+            end
           end
         ensure
           ENV['GIT_DIR'] = git_dir
@@ -128,7 +146,7 @@ class Hookup
     end
 
     def migrate
-      schemas = %w(db/schema.rb db/development_structure.sql).select do |schema|
+      schemas = %W(#{schema_dir}/schema.rb #{schema_dir}/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?
@@ -136,7 +154,7 @@ class Hookup
 
       return if schemas.empty?
 
-      migrations = %x{git diff --name-status #{old} #{new} -- db/migrate}.scan(/.+/).map {|l| l.split(/\t/) }
+      migrations = %x{git diff --name-status #{old} #{new} -- #{schema_dir}/migrate}.scan(/.+/).map {|l| l.split(/\t/) }
       begin
         migrations.select {|(t,f)| %w(D M).include?(t)}.reverse.each do |type, file|
           begin
@@ -175,10 +193,12 @@ class Hookup
     end
 
     def rake(*args)
-      if bundler?
-        system 'bundle', 'exec', 'rake', *args
-      else
-        system 'rake', *args
+      Dir.chdir(working_dir) do
+        if bundler?
+          system 'bundle', 'exec', 'rake', *args
+        else
+          system 'rake', *args
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hookup
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies: []
 description: Automatically bundle and migrate your Rails app when switching branches,
   merging upstream changes, and bisecting.
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: hookup
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Automate the bundle/migration tedium of Rails with Git hooks