guard-migrate 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51cb8315dfb14923f1bc1429a7e47a56ceb630d
-  data.tar.gz: e3b9a8da4701605a2ca85b1f5101bbd59d870533
+  metadata.gz: 6071bbfbe6292826de322859de484c8dd5dc0125
+  data.tar.gz: e9a9b0dfab9190ff9e8ca5b11f680e0b372e84ce
 SHA512:
-  metadata.gz: c6cbfe64a7bb7cffc6a1a8dff35aa5ef2f92e1f88199b0ad179d4804404adc16b143c941a202e55aad174b7158781be47510a2cf71936bda535b00def3ba5ec0
-  data.tar.gz: 70d80717b6085fc39a004c169c76b39609b841c9090ec908bb422e1259d0ceaeb7300303fff93afa80b488edcdf8560d8945e0f16203a39018b9909eab4a3ec1
+  metadata.gz: 9cfdbca1c0ffe16b272a8acd877aeb64f3f2f795610008d96ec960c2663ab8b0bede856f1548a3416a095055389d6accfbc7bb5d0098086ed9c9f598c46273cf
+  data.tar.gz: 083669965c9746167e05117b178a60b50d249b6df0b21faad44e3680a28b70fe7f7fe7754be6d715a37e25da88679d9df2334b8942e074814388ceb8fb2c5cdf

data/README.rdoc

@@ -28,6 +28,7 @@ Add guard definition to your Guardfile by running this command:
 
 Available options:
 
+* :cmd - this will specify a custom command to run, you can use it to speed up migrations if you use `zeus`, `spring` or simillar in your project. Defaults to `rake`
 * :run_on_start - this will run the migration task when you start, reload or run all. Defaults to false. If reset is set to true with this, then it will run a reset on the start, reload, run all instead of just a regular migrate
 * :test_clone - this will run the with the additional `db:test:clone` to update the test database. Defaults to true.
 * :reset - this will run `rake db:migrate:reset` every time migrate is run. Defaults to false.

data/lib/guard/migrate.rb

@@ -10,6 +10,7 @@ module Guard
     def initialize(watchers=[], options={})
       super
 
+      @cmd = options[:cmd].to_s unless options[:cmd].to_s.empty?
       @reset = true if options[:reset] == true
       @test_clone = true unless options[:test_clone] == false
       @run_on_start = true if options[:run_on_start] == true
@@ -25,6 +26,10 @@ module Guard
       !!@run_on_start
     end
 
+    def cmd?
+      !!@cmd
+    end
+
     def test_clone?
       !!@test_clone
     end
@@ -99,6 +104,8 @@ module Guard
 
     def rake_string(version = nil)
       [
+        bundler_command,
+        custom_command,
         rake_command,
         migrate_string(version),
         seed_string,
@@ -109,6 +116,8 @@ module Guard
 
     def seed_only_string
       [
+        bundler_command,
+        custom_command,
         rake_command,
         seed_string,
         clone_string,
@@ -134,10 +143,15 @@ module Guard
     end
 
     def rake_command
-      command = ""
-      command += "bundle exec " if bundler?
-      command += "rake"
-      command
+      "rake" unless custom_command.to_s.match(/rake/)
+    end
+
+    def bundler_command
+      "bundle exec" if bundler?
+    end
+
+    def custom_command
+      "#{@cmd.strip}" if cmd?
     end
 
     def rails_env_string
@@ -145,7 +159,9 @@ module Guard
     end
 
     def clone_string
-      "db:test:clone" if test_clone?
+      if test_clone? and !custom_command.to_s.match(/db:test:clone/)
+        "db:test:clone"
+      end
     end
 
     def seed_string
@@ -153,10 +169,12 @@ module Guard
     end
 
     def migrate_string(version)
-      string = "db:migrate"
-      string += ":reset" if reset?
-      string += ":redo VERSION=#{version}" if run_redo?(version)
-      string
+      if !custom_command.to_s.match(/db:migrate/)
+        string = "db:migrate"
+        string += ":reset" if reset?
+        string += ":redo VERSION=#{version}" if run_redo?(version)
+        string
+      end
     end
 
   end

data/lib/guard/migrate/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module MigrateVersion
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/guard/migrate_spec.rb

@@ -13,8 +13,8 @@ describe Guard::Migrate do
 
   after(:all) do
     FileUtils.rm_rf('db')
-  end  
-  
+  end
+
   describe "options" do
     context "bundler" do
       context "with a gemfile found" do
@@ -28,8 +28,58 @@ describe Guard::Migrate do
         its(:bundler?){should_not be_true}
         its(:rake_string){should match(/^rake/)}
       end
+    end
+
+    context "cmd" do
+      context "without command customization" do
+        its(:cmd?){should_not be_true}
+      end
+
+      context "with command customization" do
+        before{File.stub(:exist?).and_return(false)}
+        let(:options){ { :cmd => "custom command rake" } }
+
+        its(:cmd?){should be_true}
+        its(:rake_string){should match(/^custom command rake/)}
+
+        context "without presence of 'rake' keyword" do
+          let(:options){ { :cmd => "custom command" } }
+
+          it "should raise and error" do
+            pending
+          end
+        end
+
+        context "with Bundler" do
+          before{File.stub(:exist?).and_return(true)}
 
+          its(:rake_string){should match(/^bundle exec custom command rake/)}
+        end
+
+        context "with custom rake task specified" do
+          context "with duplication of db:migrate" do
+            let(:options){ { :cmd => "custom command rake db:migrate" } }
+
+            context "rake_string" do
+              it "should contains 'db:migrate' once" do
+                subject.rake_string.scan("db:migrate").size.should == 1
+              end
+            end
+          end
+
+          context "with duplication of db:test:clone" do
+            let(:options){ { :cmd => "custom command rake db:test:clone" } }
+
+            context "rake_string" do
+              it "should contains 'db:test:clone' once" do
+                subject.rake_string.scan("db:test:clone").size.should == 1
+              end
+            end
+          end
+        end
+      end
     end
+
     context "test clone" do
       context "with no options passed" do
         its(:test_clone?){should be_true}
@@ -209,7 +259,7 @@ describe Guard::Migrate do
 
       subject.should_not_receive(:system).with(subject.rake_string('1234'))
       subject.run_on_changes [migration.path]
-    end    
+    end
   end
 
 end

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: guard-migrate
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Geoff Lanotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.5
 description: Guard::Migrate automatically runs your database migrations when needed
 email:
 - geofflanotte@gmail.com
@@ -59,13 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.rdoc
+- lib/guard/migrate.rb
 - lib/guard/migrate/migration.rb
 - lib/guard/migrate/notify.rb
 - lib/guard/migrate/templates/Guardfile
 - lib/guard/migrate/version.rb
-- lib/guard/migrate.rb
-- LICENSE.txt
-- README.rdoc
 - spec/guard/migrate/notifier_spec.rb
 - spec/guard/migrate/template_spec.rb
 - spec/guard/migrate_spec.rb
@@ -77,24 +63,24 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
-- --main=README.rdoc
-- --exclude='(lib|test|spec)|(Gem|Guard|Rake)file'
+- "--charset=UTF-8"
+- "--main=README.rdoc"
+- "--exclude='(lib|test|spec)|(Gem|Guard|Rake)file'"
 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: 1.3.6
 requirements: []
 rubyforge_project: guard-migrate
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Guard gem for rails migrations