guard-rack 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1693fd9ffffc04e573e62d07bb451f41c683f208
-  data.tar.gz: ae10b900e9a66affab8ca576d0b812088580c61e
+  metadata.gz: 1027a4c30df921126d63d31e33a24640bb0324f2
+  data.tar.gz: d41f10eab3a4f8e824963a2554438887112d4827
 SHA512:
-  metadata.gz: bf801856afb6a1c92995030f9e8c059fba2dccda7de9d3bacde809691cebc878fb00998c6fa5e0247a5088d0f260517118a14c7592561938235ebc802b86b88a
-  data.tar.gz: 75cf912170aa128c42e014711e17d7471db233d04ccd99f024dca57220047e1e6576204872bddc56038d25ee0cb9fa85431b724057f4d28470aabd82e5841ff2
+  metadata.gz: 17708fee8472eb67659aea02a64821f3a4b125b81539e147518bd9aaabf524fdcc04ea419df9c8cce122a5aafc481861229072297ee3437d584db5450f630232
+  data.tar.gz: d23e966a7226cc183d3040cc23492b09be2ccc4beeaca75ca2e40c88c1be313f41611c55ea518748b5be4d98f4f709c884ee8562d0bbcd7d1720cfa098236c1b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.2.0 (4/16/2016)
+=================
+
+* [#23](https://github.com/dblock/guard-rack/pull/23) Added Windows support - [@jonyeezs](https://github.com/jonyeezs).
+
 2.1.1 (03/07/2015)
 ============
 
@@ -55,4 +60,3 @@
 ================
 
 * Initial public release - [@dblock](https://github.com/dblock).
-

data/lib/guard/rack.rb

@@ -8,15 +8,15 @@ module Guard
     attr_reader :options, :runner
 
     DEFAULT_OPTIONS = {
-      port: 9292,
-      host: '0.0.0.0',
-      environment: 'development',
+      port:           9292,
+      host:           '0.0.0.0',
+      environment:    'development',
       start_on_start: true,
-      force_run: false,
-      timeout: 20,
-      debugger: false,
-      config: 'config.ru',
-      cmd: 'rackup'
+      force_run:      false,
+      timeout:        20,
+      debugger:       false,
+      config:         'config.ru',
+      cmd:            'rackup'
     }
 
     def initialize(options = {})

data/lib/guard/rack/custom_process.rb

@@ -0,0 +1,59 @@
+require 'timeout'
+
+module Guard
+  class Rack
+    class CustomProcess
+      attr_reader :options
+
+      def self.new(options = {})
+        if Gem.win_platform?
+          os_instance = Windows.allocate
+        else
+          os_instance = Nix.allocate
+        end
+        os_instance.send :initialize, options
+        os_instance
+      end
+
+      def initialize(options)
+        @options = options
+      end
+
+      class Nix < Rack::CustomProcess
+        def kill(pid, force = false)
+          result = -1
+          UI.debug("Trying to kill Rack (PID #{pid})...")
+          unless force
+            Process.kill('INT', pid)
+            begin
+              Timeout.timeout(options[:timeout]) do
+                _, status = Process.wait2(pid)
+                result = status.exitstatus
+                UI.debug("Killed Rack (Exit status: #{result})")
+              end
+            rescue Timeout::Error
+              UI.debug("Couldn't kill Rack with INT, switching to TERM")
+              force = true
+            end
+          end
+          Process.kill('TERM', pid) if force
+          result
+        end
+      end
+
+      class Windows < Rack::CustomProcess
+        def kill(pid, _force = true)
+          # Doesn't matter if its forceful or not. There's only one way of ending it
+          system("taskkill /pid #{pid} /T /f")
+          result = $CHILD_STATUS.exitstatus
+          if result == 0
+            UI.debug("Killed Rack (Exit status: #{result})")
+          else
+            UI.debug("Couldn't kill Rack")
+          end
+          result
+        end
+      end
+    end
+  end
+end

data/lib/guard/rack/runner.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
-require 'timeout'
 require 'spoon'
 require 'guard/rack/command'
+require 'guard/rack/custom_process'
 
 module Guard
   class RackRunner
@@ -38,26 +38,7 @@ module Guard
     private
 
     def kill(pid, force = false)
-      result = -1
-
-      UI.debug("Trying to kill Rack (PID #{pid})...")
-      unless force
-        Process.kill('INT', pid)
-        begin
-          Timeout.timeout(options[:timeout]) do
-            _, status = Process.wait2(pid)
-            result = status.exitstatus
-            UI.debug("Killed Rack (Exit status: #{result})")
-          end
-        rescue Timeout::Error
-          UI.debug("Couldn't kill Rack with INT, switching to TERM")
-          force = true
-        end
-      end
-
-      Process.kill('TERM', pid) if force
-
-      result
+      Guard::Rack::CustomProcess.new(options).kill pid, force
     end
 
     def run_rack_command!

data/lib/guard/rack/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RackVersion
-    VERSION = '2.1.1'
+    VERSION = '2.2.0'
   end
 end

data/spec/lib/guard/process_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+require 'guard/rack/custom_process'
+
+describe Guard::Rack::CustomProcess do
+  let(:options) { { environment: 'development', port: 'one', config: 'config.ru', host: '0.0.0.0', timeout: 1 } }
+  let(:process) { Guard::Rack::CustomProcess }
+
+  describe 'create instance' do
+    context '*nix' do
+      before do
+        Gem.stubs(:win_platform?).returns(false)
+      end
+
+      it 'should instantiate correctly' do
+        instance = process.new(options)
+        expect(instance).to be_a Guard::Rack::CustomProcess::Nix
+      end
+    end
+
+    context 'windows' do
+      before do
+        Gem.stubs(:win_platform?).returns(true)
+      end
+
+      it 'should instantiate correctly' do
+        instance = process.new(options)
+        expect(instance).to be_a Guard::Rack::CustomProcess::Windows
+      end
+    end
+  end
+
+  describe '*nix' do
+    before do
+      Gem.stubs(:win_platform?).returns(false)
+    end
+
+    context 'pid exists' do
+      let(:pid) { 12_345 }
+      let(:status_stub) { stub('process exit status') }
+      let(:subject) { process.new(options) }
+      let(:wait_stub) { Process.stubs(:wait2) }
+
+      before do
+        Process.expects(:kill).with('INT', pid)
+      end
+
+      context 'rackup returns successful exit status' do
+        before do
+          wait_stub.returns([pid, status_stub])
+          status_stub.stubs(:exitstatus).returns(0)
+        end
+
+        it 'should return true' do
+          expect(subject.kill pid).to eq(0)
+        end
+      end
+
+      context 'rackup returns unsuccessful exit status' do
+        before do
+          Guard::UI.stubs(:info)
+          wait_stub.returns([pid, status_stub])
+          status_stub.stubs(:exitstatus).returns(1)
+        end
+
+        it 'should return false' do
+          expect(subject.kill pid).to eq(1)
+        end
+      end
+
+      context 'kill times out' do
+        before do
+          wait_stub.raises(Timeout::Error)
+          Process.expects(:kill).with('TERM', pid)
+        end
+
+        it 'should return false' do
+          expect(subject.kill pid).to eq(-1)
+        end
+      end
+    end
+  end
+
+  describe 'windows' do
+    before do
+      Gem.stubs(:win_platform?).returns(true)
+    end
+
+    context 'pid exist' do
+      let(:pid) { 123_45 }
+      let(:subject) { process.new }
+      before do
+        subject.expects(:system).with("taskkill /pid #{pid} /T /f")
+      end
+
+      describe 'kill' do
+        context 'successful exit status' do
+          before do
+            $CHILD_STATUS.stubs(:exitstatus).returns 0
+          end
+
+          it 'should result in 0' do
+            expect(subject.kill pid).to eq(0)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/guard/runner_spec.rb

@@ -37,7 +37,7 @@ describe Guard::RackRunner do
   describe '#start' do
     let(:unmanaged_pid) { 4567 }
     let(:pid) { 1234 }
-    let(:kill_expectation) { Process.expects(:kill).with('TERM', unmanaged_pid) }
+    let(:kill_expectation) { runner.expects(:kill) }
 
     before do
       runner.expects(:spawn).once.returns(pid)
@@ -70,21 +70,17 @@ describe Guard::RackRunner do
 
   describe '#stop' do
     context 'pid exists' do
-      let(:pid) { 12_345 }
-      let(:status_stub) { stub('process exit status') }
-      let(:wait_stub) { Process.stubs(:wait2) }
+      let(:pid) { 123_45 }
+      let(:process) { Guard::Rack::CustomProcess.stubs(:new) }
 
       before do
         runner.stubs(:spawn).returns(pid)
         runner.start
-
-        Process.expects(:kill).with('INT', pid)
       end
 
       context 'rackup returns successful exit status' do
         before do
-          wait_stub.returns([pid, status_stub])
-          status_stub.stubs(:exitstatus).returns(0)
+          process.returns(stub(kill: 0))
         end
 
         it 'should return true' do
@@ -95,25 +91,7 @@ describe Guard::RackRunner do
       context 'rackup returns unsuccessful exit status' do
         before do
           Guard::UI.stubs(:info)
-          wait_stub.returns([pid, status_stub])
-          status_stub.stubs(:exitstatus).returns(1)
-        end
-
-        it 'should return false' do
-          expect(runner.stop).to be_falsey
-        end
-
-        it 'should send some kind of message to UI.info' do
-          Guard::UI.expects(:info).with(regexp_matches(/.+/))
-          runner.stop
-        end
-      end
-
-      context 'kill times out' do
-        before do
-          Guard::UI.stubs(:info)
-          wait_stub.raises(Timeout::Error)
-          Process.expects(:kill).with('TERM', pid)
+          process.returns(stub(kill: 1))
         end
 
         it 'should return false' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rack
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -159,11 +159,13 @@ files:
 - lib/guard-rack.rb
 - lib/guard/rack.rb
 - lib/guard/rack/command.rb
+- lib/guard/rack/custom_process.rb
 - lib/guard/rack/runner.rb
 - lib/guard/rack/templates/Guardfile
 - lib/guard/rack/version.rb
 - spec/lib/guard/integration.ru
 - spec/lib/guard/integration_spec.rb
+- spec/lib/guard/process_spec.rb
 - spec/lib/guard/rack/command_spec.rb
 - spec/lib/guard/rack_spec.rb
 - spec/lib/guard/runner_spec.rb
@@ -188,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Automatically reloads your Rack based app on file change using Guard.