upstart-unicorn-launcher 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81675d74f21b08aa061a2ce4beaed5b6c9370961
-  data.tar.gz: acc2ca0094d53dcd461f0dd9f39bd259b10b344a
+  metadata.gz: bdfc24e5bf5ef2d9924b8a92e106ab2252d3b1af
+  data.tar.gz: 9dd25c996216aab6a037231260936fcdf303b63b
 SHA512:
-  metadata.gz: 8fb5f6084e831a664202ea5dc0a61620ad054c928c601a9b192dffe0631e7720ee7c983a86c71f86ed5027a47ea782405ad51fb4891c7017a20acfc3b5d6e799
-  data.tar.gz: 3aa5c4869908646138cc1781606b99210cd9e6b2bcd7816e760ea5ef47dc170d3294d566f0470e52b92f64197f08d864e37c651c78acc160ce80c1828db6d72f
+  metadata.gz: b1f3a6509d84cbc26e19c33717828c8af1ca1e3df00cac8966d8aa3334e49e3b0a99d04d573a0cfd349de1eee7b730a2baef56bfbbdb3fe2e5b2a42e569a0f86
+  data.tar.gz: 09a808562a61fe9f18758e4c7e6096d458ff35aae8d9bd2ef96b10f68b10d66b18cfc3688b0781d27b548da75a4ebbc560cde1cd42392de24306333c6aa0dcbf

data/README.md

@@ -1 +1,9 @@
 A simple unicorn launcher for use with upstart, in the same manner as https://github.com/alphagov/unicornherder
+
+## Credits
+
+upstart-unicorn-launcher was written by [Tom Ward](http://tomafro.net) when he worked at [Go Free Range Ltd](http://gofreerange.com).
+
+## License
+
+upstart-unicorn-launcher is released under the [MIT License](https://github.com/freerange/upstart-unicorn-launcher/blob/master/LICENSE).

data/lib/upstart_unicorn_launcher.rb

@@ -17,9 +17,8 @@ class UpstartUnicornLauncher
     quit_server_on :QUIT, :INT, :TERM
     forward_to_server :USR1, :USR2, :WINCH, :TTIN, :TTOU
     start_server
-    loop do
-      sleep 1
-    end
+
+    wait_for_server_to_quit
   end
 
   private
@@ -57,6 +56,12 @@ class UpstartUnicornLauncher
     wait_for_with_timeout { !running? }
   end
 
+  def wait_for_server_to_quit
+    until !running?
+      sleep 1
+    end
+  end
+
   def restart_server
     reexecute_running_binary
     wait_for_with_timeout { old_pid }

data/lib/upstart_unicorn_launcher/version.rb

@@ -1,3 +1,3 @@
 class UpstartUnicornLauncher
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/spec_helper.rb

@@ -13,6 +13,12 @@ module SpecHelper
     Process.kill signal, @launcher_pid
   end
 
+  def launcher_running?
+    !!Process.getpgid(@launcher_pid)
+  rescue Errno::ESRCH
+    false
+  end
+
   def kill_launcher
     puts "Killing #{@launcher_pid}"
     Process.kill "QUIT", @launcher_pid

data/spec/templates/test/unicorn.rb

@@ -1 +1 @@
-pid "/Users/tomw/Projects/tools/upstart-unicorn-launcher/spec/templates/test/unicorn.pid"
+pid "spec/templates/test/unicorn.pid"

data/spec/upstart_integration_spec.rb

@@ -42,7 +42,7 @@ describe 'Upstart integration' do
     start_launcher
     original_response = perform_request.body_str
     send_to_launcher 'HUP'
-    sleep 1
+    sleep 5
     expect(perform_request.body_str).to_not eql(original_response)
   end
 
@@ -56,4 +56,11 @@ describe 'Upstart integration' do
     end
     expect(responses.uniq.size).to eql(2)
   end
+
+  it 'stops running when server quits' do
+    start_launcher
+    send_to_launcher 'QUIT'
+    sleep 2
+    expect(launcher_running?).to be(false)
+  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: upstart-unicorn-launcher
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tom Ward
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Launch unicorn with upstart
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -84,17 +84,17 @@ 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Helps launch unicorn using upstart process management
@@ -104,3 +104,4 @@ test_files:
 - spec/templates/test/config.ru
 - spec/templates/test/unicorn.rb
 - spec/upstart_integration_spec.rb
+has_rdoc: