guard-rails 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f706a3d0e897b3af7c6ae0713db3d8ade6d5cf0
-  data.tar.gz: 2e21cce2bb912fac6154e3d647bb00165c693798
+  metadata.gz: 980372bd165663983bfe2fea772e9fd71a1a5f3d
+  data.tar.gz: 46733d354a02061658029e303b3c81379052f462
 SHA512:
-  metadata.gz: 13fe51ed5e54ba072118cc082ec0c837a16248624178e0a8a38f865b9c01426933d15524db59ac9af7d59dd7861bae19fdae00cbfc76c82742be66ba3cce5cda
-  data.tar.gz: 61bca0ffe0aaa08459812f5422de03be15c857b986be57f68e9272ebd8b0d843e68c340f2093b7d99e4d4bb85411d21d3462e41822c1d31e29ec4dc1461048f9
+  metadata.gz: 94923d164e99b0dc22f6d19ff2a0e9177f3b6d653bff8ea4c6f30424685f8064784f86db53f9fc374f6d9837240e45921b225ab0868aa6f0a013e343353cc43c
+  data.tar.gz: 97d23ae5780d127d1a00a91337d5a1ddeb816d2b61b859d8c747e3080b1eedb9acda1b43e48c6c1fe4ff3fcb8ca541b441fc7f3a515191b1f826042da4af0d0f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guard-rails (0.7.1)
+    guard-rails (0.7.2)
       guard (~> 2.11)
       guard-compat (~> 1.0)
 

data/LICENSE

@@ -1,22 +1,21 @@
-                        FOLLOW YOUR HEART PUBLIC LICENSE
-                              Version 1, July 2013
+The MIT License (MIT)
 
-Copyright (C) 2013, Ranmocy Sheng <ranmocy@gmail.com>
+Copyright (c) 2013, Ranmocy Sheng <ranmocy@gmail.com>
 
-Permission to use, copy, modify, and/or distribute this license for any purpose
-with or without fee is hereby granted, provided that the above copyright notice
-and this permission notice appear in all copies, under this license itself.
+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 WORK IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS WORK INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS WORK.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-1. You MUST follow your heart to do what you REALLY want to do with this WORK.
-2. If you are working on something you don't truely like, you are NOT permitted
-to use this WORK in what you are working on.
-3. Any work based on this work MUST under this license or the combination of this
-license and other compatible license.
+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.md

@@ -18,7 +18,7 @@ Add Guard::Rails to your `Gemfile`:
 
 ```ruby
 group :development do
-  gem 'guard-rails'
+  gem 'guard-rails', require: false
 end
 ```
 
@@ -73,28 +73,30 @@ And I will be there as your call.
 * John Bintz
 * cablegram
 * Joel Moss
-* Sidney Burks
 * Paul Schyska
+* Sidney Burks
 * Adam Michel
+* Adib Saad
 * Cezary Baginski
 * Nathan Broadbent
 * Tim Preston
 * killphi
 * Benjamin Sullivan
-* Grant Hutchins and Jonathan Mukai-Heidt
-* Everard Brown
-* Sho Kusano
 * Darrin Holst
+* Everard Brown
+* Grant Hutchins and Jonathan Mukai-Heidt
+* Johnny Robeson
+* Leo Lou
 * Luciano Sousa
 * Michel Pavan Macedo
-* Johnny Robeson
+* Sho Kusano
 
 ## Copyright
 
-Guard-rails is under **[FOLLOW YOUR HEART PUBLIC LICENSE][FYHPL]** version 1.
+Guard-rails is under **[MIT license][MIT]**.
 
 [ranmocy-guard-rails]: http://github.com/ranmocy/guard-rails
 [guard]: https://github.com/guard/guard
 [zeus]: https://github.com/burke/zeus
 [zeus-custom-plan]: https://github.com/burke/zeus/blob/master/docs/ruby/modifying.md
-[FYHPL]: http://ranmocy.info/piece/FYHPL.txt
+[MIT]: http://opensource.org/licenses/MIT

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/guard/rails/runner.rb

@@ -14,6 +14,12 @@ module Guard
 
       def start
         kill_unmanaged_pid! if options[:force_run]
+
+        if options[:zeus] && !wait_for_zeus
+          UI.info "[Guard::Rails::Error] Could not find zeus socket file."
+          return false
+        end
+
         run_rails_command!
         wait_for_pid
       end
@@ -65,6 +71,10 @@ module Guard
         options[:timeout].to_f / MAX_WAIT_COUNT.to_f
       end
 
+      def wait_for_zeus
+        wait_for_loop { File.exist?(zeus_sockfile) }
+      end
+
       private
 
       # command builders
@@ -138,24 +148,22 @@ module Guard
         nil
       end
 
-      private
-
       def wait_for_pid
-        wait_for_pid_loop { has_pid? }
+        wait_for_loop { has_pid? }
       end
 
       def wait_for_no_pid
-        wait_for_pid_loop { !has_pid? }
+        wait_for_loop { !has_pid? }
       end
 
       def remove_pid_file_and_wait_for_no_pid
-        wait_for_pid_loop do
+        wait_for_loop do
           FileUtils.rm pid_file, force: true
           !has_pid?
         end
       end
 
-      def wait_for_pid_loop
+      def wait_for_loop
         count = 0
         while !yield && count < MAX_WAIT_COUNT
           wait_for_pid_action
@@ -182,6 +190,10 @@ module Guard
         nil
       end
 
+      def zeus_sockfile
+        File.join(@root, '.zeus.sock')
+      end
+
     end
   end
 end

data/spec/lib/guard/rails/runner_spec.rb

@@ -291,47 +291,91 @@ describe Guard::Rails::Runner do
     let(:kill_expectation) { mock(runner).kill_unmanaged_pid! }
     let(:pid_stub) { stub(runner).has_pid? }
 
-    before do
-      mock(runner).run_rails_command!.once
-    end
-
-    context 'without options[:force_run]' do
+    context 'without options[:zeus]' do
       before do
-        pid_stub.returns(true)
-        kill_expectation.never
-        mock(runner).wait_for_pid_action.never
+        mock(runner).wait_for_zeus.never
+        mock(runner).run_rails_command!.once
       end
 
-      it "starts as normal" do
-        expect(runner.start).to be true
+      context 'without options[:force_run]' do
+        before do
+          pid_stub.returns(true)
+          kill_expectation.never
+          mock(runner).wait_for_pid_action.never
+        end
+
+        it "starts as normal" do
+          expect(runner.start).to be true
+        end
       end
-    end
 
-    context 'with options[:force_run]' do
-      let(:options) { default_options.merge(force_run: true) }
+      context 'with options[:force_run]' do
+        let(:options) { default_options.merge(force_run: true) }
 
-      before do
-        pid_stub.returns(true)
-        kill_expectation.once
-        mock(runner).wait_for_pid_action.never
+        before do
+          pid_stub.returns(true)
+          kill_expectation.once
+          mock(runner).wait_for_pid_action.never
+        end
+
+        it "starts as normal" do
+          expect(runner.start).to be true
+        end
       end
 
-      it "starts as normal" do
-        expect(runner.start).to be true
+      context "doesn't write the pid" do
+        before do
+          pid_stub.returns(false)
+          kill_expectation.never
+          mock(runner).wait_for_pid_action.times(Guard::Rails::Runner::MAX_WAIT_COUNT)
+        end
+
+        it "doesn't start" do
+          expect(runner.start).to be false
+        end
       end
     end
 
-    context "doesn't write the pid" do
-      before do
-        pid_stub.returns(false)
-        kill_expectation.never
-        mock(runner).wait_for_pid_action.times(Guard::Rails::Runner::MAX_WAIT_COUNT)
+    context 'with options[:zeus]' do
+      let(:options) { default_options.merge(zeus: true) }
+
+      context 'when zeus socket file is absent' do
+        before do
+          stub(runner).sleep { 1 }
+          mock(File).exist?(File.join(Dir.pwd, '.zeus.sock')) { false }.at_least(1)
+        end
+
+        it "waits for zeus" do
+          expect(runner.wait_for_zeus).to be false
+        end
+
+        it 'returns false' do
+          mock(Guard::UI).info("[Guard::Rails::Error] Could not find zeus socket file.")
+          mock(runner).run_rails_command!.never
+          mock(runner).wait_for_pid.never
+          expect(runner.start).to be false
+        end
       end
 
-      it "doesn't start" do
-        expect(runner.start).to be false
+      context 'when zeus socket file is present' do
+        before do
+          mock(runner).sleep(1).never
+          mock(File).exist?(File.join(Dir.pwd, '.zeus.sock')) { true }.once
+        end
+
+        it "doesn't wait for zeus" do
+          expect(runner.wait_for_zeus).to be true
+        end
+
+        it 'returns true' do
+          # mock(runner).wait_for_zeus { true }
+          mock(runner).run_rails_command!.once
+          mock(runner).wait_for_pid.once { true }
+          expect(runner.start).to be true
+        end
       end
     end
+
   end
 
   describe '#stop' do
@@ -463,4 +507,5 @@ describe Guard::Rails::Runner do
       expect(runner.sleep_time).to eq (timeout.to_f / Guard::Rails::Runner::MAX_WAIT_COUNT.to_f)
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - John Bintz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -140,11 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Guard your Rails to always be there.
-test_files:
-- spec/lib/guard/rails/runner_spec.rb
-- spec/lib/guard/rails_spec.rb
-- spec/spec_helper.rb
+test_files: []