hookup 1.0.0 → 1.0.2

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) Tim Pope
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -20,7 +20,7 @@ Bundling
 --------
 
 Each time your current HEAD changes, hookup checks to see if your
-`Gemfile`, `Gemfile.lock`, or gem spec has changed.  If so it runs
+`Gemfile`, `Gemfile.lock`, or gem spec has changed.  If so, it runs
 `bundle check`, and if that indicates any dependencies are unsatisfied,
 it runs `bundle install`.
 

data/hookup.gemspec

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

data/lib/hookup.rb

@@ -58,6 +58,8 @@ class Hookup
   end
 
   def bundle(old, new, *args)
+    return if args.first == '0'
+
     return unless File.exist?('Gemfile')
     if %x{git diff --name-only #{old} #{new}} =~ /^Gemfile|\.gemspec$/
       begin
@@ -83,22 +85,28 @@ class Hookup
     end
 
     migrations = %x{git diff --name-status #{old} #{new} -- db/migrate}.scan(/.+/).map {|l| l.split(/\t/) }
-
-    migrations.select {|(t,f)| %w(D M).include?(t)}.reverse.each do |type, file|
-      begin
-        system 'git', 'checkout', old, '--', file
-        system 'rake', 'db:migrate:down', "VERSION=#{File.basename(file)}"
-      ensure
-        if type == 'D'
-          system 'git', 'rm', '--force', '--quiet', '--', file
-        else
-          system 'git', 'checkout', new, '--', file
+    begin
+      migrations.select {|(t,f)| %w(D M).include?(t)}.reverse.each do |type, file|
+        begin
+          system 'git', 'checkout', old, '--', file
+          unless system 'rake', 'db:migrate:down', "VERSION=#{File.basename(file)}"
+            raise Error, "Failed to rollback #{File.basename(file)}. Consider rake db:setup"
+          end
+        ensure
+          if type == 'D'
+            system 'git', 'rm', '--force', '--quiet', '--', file
+          else
+            system 'git', 'checkout', new, '--', file
+          end
         end
       end
-    end
 
-    if migrations.any? {|(t,f)| %w(A M).include?(t)}
-      system 'rake', 'db:migrate'
+      if migrations.any? {|(t,f)| %w(A M).include?(t)}
+        system 'rake', 'db:migrate'
+      end
+
+    ensure
+      system 'git', 'checkout', '--', 'db/schema.rb' if migrations.any?
     end
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hookup
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tim Pope
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -04:00
+date: 2011-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +31,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- MIT-LICENSE
 - README.markdown
 - Rakefile
 - bin/hookup
@@ -49,6 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -57,13 +60,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: hookup
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Automate the bundle/migration tedium of Rails with Git hooks