hookup 1.2.2 → 1.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 70820867b9752ec2ecbc3ab1401c0e216e01b2f9
+  data.tar.gz: abe373824ef50ab0c41cbaf53d27faa64a5c30e5
+SHA512:
+  metadata.gz: 627629152cb201179573371eef16f8c547c8f0577d414ac41385955c5ff090d33e05660c1812caec19fa58d5aed85435a4fb84596dadfbde29cd008c8ab3c342
+  data.tar.gz: 1431da32d144716b13c5fbed4f90b93d4b0bb1892f81b2d30e0d814ad3bebf9b44c0a13f40b0d82003395c6d85902a4d4833386c897e77bb4d814c464d9f364e

data/hookup.gemspec

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

data/lib/hookup.rb

@@ -79,7 +79,7 @@ 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 working_dir
@@ -115,7 +115,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
@@ -202,6 +202,10 @@ class Hookup
       end
     end
 
+    def skipped?
+      env['SKIP_HOOKUP']
+    end
+
   end
 
   def resolve_schema(a, o, b, marker_size = 7)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hookup
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 1.2.3
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Automatically bundle and migrate your Rails app when switching branches,
   merging upstream changes, and bisecting.
@@ -30,26 +29,26 @@ 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: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automate the bundle/migration tedium of Rails with Git hooks
 test_files: []
+has_rdoc: