proxymachine 0.2.8 → 1.0.0

data/History.txt

@@ -1,3 +1,6 @@
+= 1.0.0 / 2009-10-19
+  * No changes. Production ready!
+
 = 0.2.8 / 2009-10-14
   * Minor changes
     * Always log proxy connection

data/README.md

@@ -3,10 +3,6 @@ ProxyMachine
 
 By Tom Preston-Werner (tom@mojombo.com)
 
-WARNING: This software is alpha and should not be used in production without
-extensive testing. You should not consider this project production ready until
-it is released as 1.0.
-
 
 Description
 -----------
@@ -30,6 +26,8 @@ backend connections are hooked up to form a transparent proxy. This
 bidirectional proxy continues to exist until either the client or backend
 close the connection.
 
+ProxyMachine was developed for GitHub's federated architecture and is successfully used in production to proxy millions of requests every day. The performance and memory profile have both proven to be excellent.
+
 
 Installation
 ------------

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 8
-:major: 0
+:minor: 0
+:patch: 0
+:major: 1

data/proxymachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxymachine}
-  s.version = "0.2.8"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-10-19}
   s.default_executable = %q{proxymachine}
   s.email = %q{tom@mojombo.com}
   s.executables = ["proxymachine"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/proxymachine/client_connection.rb",
      "lib/proxymachine/server_connection.rb",
      "proxymachine.gemspec",
+     "test/configs/simple.rb",
      "test/proxymachine_test.rb",
      "test/test_helper.rb"
   ]
@@ -42,7 +43,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{ProxyMachine is a simple content aware (layer 7) TCP routing proxy.}
   s.test_files = [
-    "test/proxymachine_test.rb",
+    "test/configs/simple.rb",
+     "test/proxymachine_test.rb",
      "test/test_helper.rb",
      "examples/git.rb",
      "examples/long.rb",

data/test/configs/simple.rb

@@ -0,0 +1,19 @@
+LOGGER = Logger.new(File.new('/dev/null', 'w'))
+
+proxy do |data|
+  if data == 'a'
+    { :remote => "localhost:9980" }
+  elsif data == 'b'
+    { :remote => "localhost:9981" }
+  elsif data == 'c'
+    { :remote => "localhost:9980", :data => 'ccc' }
+  elsif data == 'd'
+    { :close => 'ddd' }
+  elsif data == 'e' * 2048
+    { :noop => true }
+  elsif data == 'e' * 2048 + 'f'
+    { :remote => "localhost:9980" }
+  else
+    { :close => true }
+  end
+end

data/test/proxymachine_test.rb

@@ -1,7 +1,39 @@
 require 'test_helper'
 
+def assert_proxy(host, port, send, recv)
+  sock = TCPSocket.new(host, port)
+  sock.write(send)
+  assert_equal recv, sock.read
+  sock.close
+end
+
 class ProxymachineTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  should "handle simple routing" do
+    assert_proxy('localhost', 9990, 'a', '9980:a')
+    assert_proxy('localhost', 9990, 'b', '9981:b')
+  end
+
+  should "handle connection closing" do
+    sock = TCPSocket.new('localhost', 9990)
+    sock.write('xxx')
+    assert_equal nil, sock.read(1)
+    sock.close
+  end
+
+  should "handle rewrite routing" do
+    assert_proxy('localhost', 9990, 'c', '9980:ccc')
+  end
+
+  should "handle rewrite closing" do
+    assert_proxy('localhost', 9990, 'd', 'ddd')
+  end
+
+  should "handle noop" do
+    sock = TCPSocket.new('localhost', 9990)
+    sock.write('e' * 2048)
+    sock.flush
+    sock.write('f')
+    assert_equal '9980:' + 'e' * 2048 + 'f', sock.read
+    sock.close
   end
 end

data/test/test_helper.rb

@@ -1,10 +1,57 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'socket'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'proxymachine'
 
-class Test::Unit::TestCase
+# A simple echo server to use in tests
+module EventMachine
+  module Protocols
+    class TestConnection < Connection
+      def self.start(host, port)
+        @@port = port
+        EM.start_server(host, port, self)
+      end
+
+      def receive_data(data)
+        send_data("#{@@port}:#{data}")
+        close_connection_after_writing
+      end
+    end
+  end
+end
+
+def harikari(ppid)
+  Thread.new do
+    loop do
+      begin
+        Process.kill(0, ppid)
+      rescue
+        exit
+      end
+      sleep 1
+    end
+  end
 end
+
+ppid = Process.pid
+
+# Start the simple proxymachine
+fork do
+  harikari(ppid)
+  load(File.join(File.dirname(__FILE__), *%w[configs simple.rb]))
+  ProxyMachine.run('simple', 'localhost', 9990)
+end
+
+# Start two test daemons
+[9980, 9981].each do |port|
+  fork do
+    harikari(ppid)
+    EM.run do
+      EventMachine::Protocols::TestConnection.start('localhost', port)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: proxymachine
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 1.0.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -07:00
+date: 2009-10-19 00:00:00 -07:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - lib/proxymachine/client_connection.rb
 - lib/proxymachine/server_connection.rb
 - proxymachine.gemspec
+- test/configs/simple.rb
 - test/proxymachine_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -78,6 +79,7 @@ signing_key:
 specification_version: 3
 summary: ProxyMachine is a simple content aware (layer 7) TCP routing proxy.
 test_files: 
+- test/configs/simple.rb
 - test/proxymachine_test.rb
 - test/test_helper.rb
 - examples/git.rb