multibinder 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04308acfb4e6a38f2ec0d7bd53b3bf921328ece0
-  data.tar.gz: cd6936ec293af4d11edf3d13e6e26a402c6dcb9e
+  metadata.gz: dabc32c60bf41a7ac5df3709688f87b62aedf037
+  data.tar.gz: 1353e78eb3c9ba7b1d99a2ee7006b66f90af8214
 SHA512:
-  metadata.gz: 071505702ac618577faf5de290e3b87c6b0f52d4579fa08d259b501509d1b47a2b5e040eedabc32438e3e2b5bbe77cbbcc577269dba62b8d7fc69fb2eeac1e46
-  data.tar.gz: 7fbf21103b70a01ad7e87768774f6fd37eef0980f4375db09e3bb6996685969068b6b57ce1711b6962040e54177437077bec8226a8bba2d9cb5dcccfd0ec949b
+  metadata.gz: 1f8d608341c689a49983a185d4bc24201a701a95e3351e6518148e1e5ee9e8f9863a672bb0413a94cb23899308f037ee0b54080d8d79f234ef8581823d19ec5c
+  data.tar.gz: 42f99726970af3eeccb0b0adcb6ecbe30fc60a9a4dab7d1e2241a1da54ab61abf411dbb6c30801da01c62f65f40b04a382d0ee3f2f503fb2de2703569fac96ae

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 *.gem
+vendor/gems

data/bin/multibinder

@@ -2,6 +2,7 @@
 
 require 'socket'
 require 'json'
+require 'fcntl'
 
 class MultiBinderServer
   def initialize(control_file)

data/lib/multibinder/version.rb

@@ -1,3 +1,3 @@
 module MultiBinder
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/multibinder.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/script/cibuild

@@ -3,9 +3,9 @@
 export RUBY_VERSION=2.1.6-github
 export RBENV_VERSION=2.1.6-github
 export PATH=/usr/share/rbenv/shims:/usr/sbin:$PATH
-export BASE_DIR=/data/binder
+export BASE_DIR=/data/multibinder
 
-#bundle install --local --quiet --path vendor/gems
+bundle install --local --quiet --path vendor/gems
 
 REALPATH=$(cd $(dirname "$0") && pwd)
 

data/script/deploy

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+export RUBY_VERSION=2.1.6-github
+export RBENV_VERSION=2.1.6-github
+export PATH=/usr/share/rbenv/shims:/usr/sbin:$PATH
+export BASE_DIR=/data/multibinder
+
+REALPATH=$(cd $(dirname "$0") && pwd)
+cd $REALPATH/../
+
+bundle install --local --quiet --path vendor/gems
+
+sudo sv 1 multibinder

data/test/httpbinder.rb

@@ -9,13 +9,17 @@ loop do
   request = socket.gets
   puts request
 
-  socket.print "HTTP/1.0 200 OK\r\n"
-  socket.print "Content-Type: text/plain\r\n"
-  socket.print "Connection: close\r\n"
+  begin
+    socket.print "HTTP/1.0 200 OK\r\n"
+    socket.print "Content-Type: text/plain\r\n"
+    socket.print "Connection: close\r\n"
 
-  socket.print "\r\n"
+    socket.print "\r\n"
 
-  socket.print "Hello World #{ARGV[1] || ''}!\n"
+    socket.print "Hello World #{ARGV[1] || ''}!\n"
 
-  socket.close
+    socket.close
+  rescue Errno::EPIPE
+    puts 'Client unexpectedly closed connection'
+  end
 end

data/test/test-haproxy.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # test-haproxy.sh: check that we can work with haproxy (if it's installed)
 
@@ -9,7 +9,7 @@ TEST_PORT=8000
 
 tests_use_port $TEST_PORT
 
-if ! which -s haproxy; then
+if ! which haproxy >/dev/null 2>&1; then
   echo "haproxy not available, skipping tests."
   exit 0
 fi
@@ -20,7 +20,7 @@ begin_test "haproxy runs with multibinder"
 
   export TEMPDIR
 
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "haproxy" bundle exec ruby test/haproxy_shim.rb $(offset_port $TEST_PORT)
+  launch_service "haproxy" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/haproxy_shim.rb $(offset_port $TEST_PORT)
 
   wait_for_port "haproxy" $(offset_port $TEST_PORT)
 

data/test/test-simple.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # test-simple.sh: simple sanity checks
 
@@ -13,7 +13,7 @@ begin_test "server binds and accepts through multibinder"
 (
   setup
 
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "http" bundle exec ruby test/httpbinder.rb $(offset_port $TEST_PORT)
+  launch_service "http" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/httpbinder.rb $(offset_port $TEST_PORT)
 
   wait_for_port "binder" $(offset_port $TEST_PORT)
 
@@ -25,7 +25,7 @@ begin_test "server can restart without requests failing while down"
 (
   setup
 
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "http" bundle exec ruby test/httpbinder.rb $(offset_port $TEST_PORT)
+  launch_service "http" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/httpbinder.rb $(offset_port $TEST_PORT)
 
   wait_for_port "binder" $(offset_port $TEST_PORT)
 
@@ -37,7 +37,7 @@ begin_test "server can restart without requests failing while down"
   sleep 0.5
 
   # now restart the service
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "http" bundle exec ruby test/httpbinder.rb $(offset_port $TEST_PORT)
+  launch_service "http" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/httpbinder.rb $(offset_port $TEST_PORT)
 
   # curl should finish, and succeed
   wait $curl_pid
@@ -49,12 +49,12 @@ begin_test "server can load a second copy then terminate the first"
 (
   setup
 
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "http" bundle exec ruby test/httpbinder.rb $(offset_port $TEST_PORT) "first"
+  launch_service "http" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/httpbinder.rb $(offset_port $TEST_PORT) "first"
   wait_for_port "binder" $(offset_port $TEST_PORT)
 
   curl --max-time 5 http://localhost:$(offset_port $TEST_PORT)/r1 | grep -q 'Hello World first'
 
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "http2" bundle exec ruby test/httpbinder.rb $(offset_port $TEST_PORT) "second"
+  launch_service "http2" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/httpbinder.rb $(offset_port $TEST_PORT) "second"
 
   curl --max-time 5 http://localhost:$(offset_port $TEST_PORT)/r2 | egrep -q 'Hello World (first|second)'
 
@@ -70,7 +70,7 @@ begin_test "multibinder restarts safely on sigusr1"
 (
   setup
 
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "http" bundle exec ruby test/httpbinder.rb $(offset_port $TEST_PORT)
+  launch_service "http" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/httpbinder.rb $(offset_port $TEST_PORT)
   wait_for_port "binder" $(offset_port $TEST_PORT)
 
   curl --max-time 5 http://localhost:$(offset_port $TEST_PORT)/r1 | grep -q 'Hello World'
@@ -86,7 +86,7 @@ begin_test "multibinder restarts safely on sigusr1"
   lsof -i :$(offset_port $TEST_PORT) -a -p $(service_pid "multibinder")
 
   # should be able to request the bind again
-  MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock launch_service "http" bundle exec ruby test/httpbinder.rb $(offset_port $TEST_PORT)
+  launch_service "http" bundle exec env MULTIBINDER_SOCK=${TEMPDIR}/multibinder.sock ruby test/httpbinder.rb $(offset_port $TEST_PORT)
   wait_for_port "multibinder" $(offset_port $TEST_PORT)
 
   # requests should work

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multibinder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Theo Julienne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,6 +56,7 @@ files:
 - lib/multibinder/version.rb
 - multibinder.gemspec
 - script/cibuild
+- script/deploy
 - script/test
 - test/haproxy_shim.rb
 - test/httpbinder.rb