server-starter 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f33629e940e4557cc6d5847438d0cf62d2818335
-  data.tar.gz: 143bf7f144423f6c9d30dfdfabe5a65ab1b38349
+  metadata.gz: 68c36a989a31dbedc64dbf0151ae27ba31b62423
+  data.tar.gz: 4cf2050173783280a3c4a0f649af09badb8715b6
 SHA512:
-  metadata.gz: 51007aded32b09936333af26fb87de6942dd93504dce01302b5c9f253c8dd4d56b6fc7e853bed16ac7fb696bb8f3cc67f1027bc0b1abf5745cb52aa1979cec91
-  data.tar.gz: e50558d8b5a45b34720c79307579dbcde0a909a82367a380e9682f46a25b7aa25636d143d9bad82cd6fd1ed915011897c526a99a07bf86fc1a5bdc463b5161af
+  metadata.gz: 4f40f2dfcb2b27c656948cabd4971dfec25ecc190fbce8373c0483736bac0c19396be8afa46e19657cca01f8bedb5bca67ff7587933c006ab382fe1123dc236a
+  data.tar.gz: b5e563e113f13c990aefae3a29caa4d638a289d44ed3fc94d284c2da9c56645a87fac77de13f3c16501b7675eb3233490e274ffafb67edd216a6287a642579d0

data/.gitignore

@@ -13,6 +13,6 @@ coverage
 .ruby-version
 pkg/*
 .tags
-unicorn.stat
+start_server.stat
 start_server.pid
 start_server.log

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.5 (2016/04/03)
+
+Fixes:
+
+* Remove Timeout.timeout warning
+
 ## 0.1.4 (2015/04/06)
 
 Fixes:

data/README.md

@@ -24,8 +24,8 @@ Following is an example to run unicorn server under ```Server::Starter```.
 The command line example:
 
 ```
-bundle exec start_server.rb --status-file=/path/to/app/log/unicorn.stat \
-  --port=10080 --signal-on-hup=CONT --dir=/path/to/app -- \
+bundle exec start_server.rb --port=10080 --signal-on-hup=CONT --dir=/path/to/app \
+  --status-file=/path/to/app/log/start_server.stat --pid-file=/path/to/app/log/start_server.pid -- \
   bundle exec --keep-file-descriptors unicorn -c config/unicorn.conf.rb config.ru
 ```
 
@@ -39,7 +39,7 @@ worker_processes  2
 preload_app true
  
 APP_ROOT = File.expand_path('../..', __FILE__)
-status_file = File.join(APP_ROOT, 'log/unicorn.stat')
+status_file = File.join(APP_ROOT, 'log/start_server.stat')
 
 fd = listener.listen
 unless fd

data/example/config/unicorn.conf

@@ -5,7 +5,7 @@ worker_processes  2
 preload_app true
  
 APP_ROOT = File.expand_path('../..', __FILE__)
-status_file = File.join(APP_ROOT, 'log/unicorn.stat')
+status_file = File.join(APP_ROOT, 'log/start_server.stat')
 
 fd = listener.listen
 unless fd

data/example/restart_server

@@ -1,2 +1,2 @@
 #!/bin/sh
-bundle exec start_server.rb --restart --pid-file=log/start_server.pid --status-file=log/unicorn.stat
+bundle exec start_server.rb --restart --pid-file=log/start_server.pid --status-file=log/start_server.stat

data/example/start_server

@@ -6,7 +6,7 @@ bundle exec start_server.rb \
   --signal-on-hup=CONT \
   --signal-on-TERM=TERM \
   --pid-file=$(pwd)/log/start_server.pid \
-  --status-file=$(pwd)/log/unicorn.stat \
+  --status-file=$(pwd)/log/start_server.stat \
   --envdir=env \
   --enable-auto-restart \
   --auto-restart-interval=100 \

data/lib/server/starter/helper.rb

@@ -27,10 +27,17 @@ class Server
         ENV.update(orig_env)
       end
 
+      # A small tweaked version of Bundler.with_clean_env
+      #
+      # Bundler has Bundler.with_clean_env by its own, but the method
+      # replace ENV with ENV captured on starting.
+      # cf. https://github.com/bundler/bundler/blob/e8c962ef2a3215cdc6fd411b6724f091a16793d6/lib/bundler.rb#L230
+      # Server::Starter changes ENV during running to communicate
+      # with child processes, so we need to keep the changed ENV.
+      # This is why I needed this small tweaked version
       def bundler_with_clean_env(&block)
         if defined?(Bundler)
           begin
-            # Bundler.with_clean_env resets ENV to initial env on loading ruby
             orig_env = ENV.to_hash
             ENV.delete_if { |k,_| k[0,7] == 'BUNDLE_' }
             if ENV.has_key? 'RUBYOPT'

data/lib/server/starter/version.rb

@@ -1,5 +1,5 @@
 class Server
   class Starter
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/lib/server/starter.rb

@@ -213,7 +213,7 @@ class Server::Starter
       @signal_wait_thread = Thread.start do
         if flags != 0 && ENV['ENABLE_AUTO_RESTART']
           begin
-            timeout(1) do
+            Timeout.timeout(1) do
               pid = Process.waitpid(-1, flags)
               r = [pid, $?.exitstatus] if pid
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: server-starter
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: a superdaemon for hot-deploying server programs (ruby port of p5-Server-Starter)