guard-migrate 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b7d5e05d595a1d5a18a611c7b9c1a04f3f4ded17
+  data.tar.gz: fc3bdde15e2540bf963accf03b1712917fc162f8
+SHA512:
+  metadata.gz: c43f0dd14b4785264fae876157ae970fce76a000e9e7780a83d83821f66a87dda40917210b68be13ca8371b29c66812c495ac927c0cfced46e5ba53f9f9305c0
+  data.tar.gz: 80e14d5b39058868178d2a83761d99ed91c15e16f2ab7c83d1b6875532e6513046f2519593347b30292fafe98a83f709ace71007d96d6744ee4db8d46b9eaab2

data/README.rdoc

@@ -1,6 +1,6 @@
 
 = Guard::Migrate
-
+{<img src="https://badge.fury.io/rb/guard-migrate.png" alt="Gem Version" />}[http://badge.fury.io/rb/guard-migrate]
 {<img src="https://secure.travis-ci.org/glanotte/guard-migrate.png" />}[http://travis-ci.org/glanotte/guard-migrate]
 
 Migrate guard allows you to keep you migrations up to date while developing without needing to rerun them every time. I developed it because when I am first working out a project, the schema can change several times and this saves me several downs/ups/resets.
@@ -52,6 +52,6 @@ Available options:
 {Geoff Lanotte}[https://github.com/glanotte]
 == Copyright
 
-Copyright (c) 2011 Geoff Lanotte. See LICENSE.txt for
+Copyright (c) 2013 Geoff Lanotte. See LICENSE.txt for
 further details.
 

data/lib/guard/migrate.rb

@@ -4,6 +4,7 @@ require 'guard/guard'
 module Guard
   class Migrate < Guard
     autoload :Notify, 'guard/migrate/notify'
+    autoload :Migration, 'guard/migrate/migration'
     attr_reader :seed, :rails_env
 
     def initialize(watchers=[], options={})
@@ -65,20 +66,21 @@ module Guard
     # Called on file(s) modifications
     def run_on_changes(paths)
       if paths.any?{|path| path.match(%r{^db/migrate/(\d+).+\.rb})}
-        migrate(paths.map{|path| path.scan(%r{^db/migrate/(\d+).+\.rb}).flatten.first})
+        migrations = paths.map {|path| Migration.new(path)}
+        migrate(migrations)
       elsif paths.any?{|path| path.match(%r{^db/seeds\.rb$})}
         seed_only
       end
     end
 
-    def migrate(paths = [])
-      return if !reset? && paths.empty?
+    def migrate(migrations = [])
+      return if !reset? && migrations.empty?
       if reset?
         UI.info "Running #{rake_string}"
         result = system(rake_string)
         result &&= "reset"
       else
-        result = run_all_migrations(paths)
+        result = run_all_migrations(migrations)
       end
 
       Notify.new(result).notify
@@ -91,14 +93,14 @@ module Guard
       Notify.new(result).notify
     end
 
-    def run_redo?(path)
-      !reset? && path && !path.empty?
+    def run_redo?(version)
+      !reset? && version && !version.empty?
     end
 
-    def rake_string(path = nil)
+    def rake_string(version = nil)
       [
         rake_command,
-        migrate_string(path),
+        migrate_string(version),
         seed_string,
         clone_string,
         rails_env_string
@@ -116,12 +118,16 @@ module Guard
 
     private
 
-    def run_all_migrations(paths)
+    def run_all_migrations(migrations)
       result = nil
-      paths.each do |path|
-        UI.info "Running #{rake_string(path)}"
-        result = system rake_string(path)
-        break unless result
+      migrations.each do |migration|
+        if migration.valid?
+          UI.info "Running #{rake_string(migration.version)}"
+          result = system rake_string(migration.version)
+          break unless result
+        else
+          UI.info "Skip empty migration - #{migration.version}"
+        end
       end
 
       result
@@ -146,10 +152,10 @@ module Guard
       "db:seed" if @seed
     end
 
-    def migrate_string(path)
+    def migrate_string(version)
       string = "db:migrate"
       string += ":reset" if reset?
-      string += ":redo VERSION=#{path}" if run_redo?(path)
+      string += ":redo VERSION=#{version}" if run_redo?(version)
       string
     end
 

data/lib/guard/migrate/migration.rb

@@ -0,0 +1,27 @@
+module Guard
+  class Migrate
+    class Migration
+
+      attr_accessor :path
+
+      def initialize(_path)
+        @path = _path
+      end
+
+      def version
+        path.scan(%r{^db/migrate/(\d+).+\.rb}).flatten.first
+      end
+
+      def valid?
+        file = File.open(path, 'r')
+        content = file.read.gsub(/\s+/, '')
+        !content.empty? && content.match(/def(up|down|change)end/).nil?
+      rescue Errno::ENOENT
+        false
+      ensure
+        begin; file.close; rescue; end      
+      end  
+
+    end
+  end
+end

data/lib/guard/migrate/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module MigrateVersion
-    VERSION = "0.1.7"
+    VERSION = "0.2.0"
   end
 end

data/spec/guard/migrate_spec.rb

@@ -1,10 +1,19 @@
 require 'spec_helper'
+require 'tempfile'
 
 describe Guard::Migrate do
   let(:options){ {}}
   let(:paths){{}}
 
   subject{ Guard::Migrate.new(paths, options) }
+
+  before(:all) do
+    FileUtils.mkdir_p('db/migrate')
+  end
+
+  after(:all) do
+    FileUtils.rm_rf('db')
+  end  
   
   describe "options" do
     context "bundler" do
@@ -156,7 +165,7 @@ describe Guard::Migrate do
 
   context "run on change should fixup the path to only the version" do
     ##I don't like this test much - consider refactoring
-    let(:paths){ ['db/migrate/1234_i_like_cheese.rb'] }
+    let(:paths){ [create_valid_up_and_down_migration('1234_i_like_cheese').path] }
     it "should run the rake command" do
       subject.should_receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes paths
@@ -164,11 +173,43 @@ describe Guard::Migrate do
   end
 
   context "run on change when set to reset should only run migrations one time" do
-    let(:paths){ ['db/migrate/1234_i_like_cheese.rb', 'db/migrate/1235_i_really_like_cheese.rb'] }
+    let(:paths){ [create_valid_up_and_down_migration('1234_i_like_cheese').path, create_valid_change_migration('1235_i_like_cheese').path] }
     let(:options){ {:reset => true, :test_clone => true} }
     it "should run the rake command" do
       subject.should_receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes paths
     end
   end
+
+  context "valid/invalid migrations" do
+
+    it "should keep valid up/down migrations" do
+      migration = create_valid_up_and_down_migration('1234_i_like_cheese')
+
+      subject.should_receive(:system).with(subject.rake_string('1234'))
+      subject.run_on_changes [migration.path]
+    end
+
+    it "should keep valid change migrations" do
+      migration = create_valid_change_migration('1234_i_like_cheese')
+
+      subject.should_receive(:system).with(subject.rake_string('1234'))
+      subject.run_on_changes [migration.path]
+    end
+
+    it "should remove empty up/down migrations" do
+      migration = create_invalid_up_and_down_migration('1234_i_like_cheese')
+
+      subject.should_not_receive(:system).with(subject.rake_string('1234'))
+      subject.run_on_changes [migration.path]
+    end
+
+    it "should remove empty change migrations" do
+      migration = create_invalid_change_migration('1234_i_like_cheese')
+
+      subject.should_not_receive(:system).with(subject.rake_string('1234'))
+      subject.run_on_changes [migration.path]
+    end    
+  end
+
 end

data/spec/spec_helper.rb

@@ -26,4 +26,6 @@ RSpec.configure do |config|
   config.after(:each) do
     ENV["GUARD_ENV"] = nil
   end
+
+  config.include MigrationFactory
 end

data/spec/support/migration_factory.rb

@@ -0,0 +1,77 @@
+module MigrationFactory
+
+  def create_valid_up_and_down_migration(name)
+    create_migration(name, valid_up_and_down_migration)
+  end
+
+  def create_valid_change_migration(name)
+    create_migration(name, valid_change_migration)
+  end  
+
+  def create_invalid_up_and_down_migration(name)
+    create_migration(name, invalid_up_and_down_migration)
+  end
+
+  def create_invalid_change_migration(name)
+    create_migration(name, invalid_change_migration)
+  end    
+
+  private
+
+    def create_migration(name, content)
+      migration = File.new("db/migrate/#{name}.rb", 'w')
+      migration.write(content)
+      migration.close
+      migration      
+    end
+
+    def valid_up_and_down_migration
+      <<-EOS
+        class ILikeCheese < ActiveRecord::Migration
+          def up
+            add_column :my_table, :my_column, :string
+          end
+
+          def down
+            remove_column :my_table, :my_column
+          end
+        end
+        
+      EOS
+    end
+
+    def valid_change_migration
+      <<-EOS
+        class ILikeCheese < ActiveRecord::Migration
+          def change
+            add_column :my_table, :my_column, :string
+          end
+        end
+        
+      EOS
+    end    
+
+    def invalid_up_and_down_migration
+      <<-EOS
+        class ILikeCheese < ActiveRecord::Migration
+          def up
+          end
+
+          def down
+          end
+        end
+        
+      EOS
+    end
+
+    def invalid_change_migration
+      <<-EOS
+        class ILikeCheese < ActiveRecord::Migration
+          def change
+          end
+        end
+        
+      EOS
+    end  
+
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: guard-migrate
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Geoff Lanotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -66,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/guard/migrate/migration.rb
 - lib/guard/migrate/notify.rb
 - lib/guard/migrate/templates/Guardfile
 - lib/guard/migrate/version.rb
@@ -76,8 +70,10 @@ files:
 - spec/guard/migrate/template_spec.rb
 - spec/guard/migrate_spec.rb
 - spec/spec_helper.rb
+- spec/support/migration_factory.rb
 homepage: http://rubygems.org/gems/guard-migrate
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -86,25 +82,24 @@ 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: 1.3.6
 requirements: []
 rubyforge_project: guard-migrate
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Guard gem for rails migrations
 test_files:
 - spec/guard/migrate/notifier_spec.rb
 - spec/guard/migrate/template_spec.rb
 - spec/guard/migrate_spec.rb
 - spec/spec_helper.rb
+- spec/support/migration_factory.rb