turnout_proxy 0.0.1 → 0.0.3

data/.travis.yml

@@ -7,3 +7,5 @@ rvm:
 branches:
   only:
     - master
+env:
+  - rvmsudo_secure_path=1

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/lib/turnout_proxy.rb

@@ -1,10 +1,8 @@
 require 'em-proxy'
 require 'turnout_proxy/host_chooser'
+require 'turnout_proxy/version'
 
 module TurnoutProxy
-  version_file = File.expand_path('../VERSION', File.dirname(__FILE__))
-  VERSION = File.read(version_file).freeze
-
   def self.run(options = {})
     Proxy.start(options) do |conn|
       callbacks = HostChooser.new(conn, options)

data/lib/turnout_proxy/host_chooser.rb

@@ -1,31 +1,37 @@
 module TurnoutProxy
 
   class HostChooser
-    attr_accessor :file_checker
-
     def initialize(connection, options = {})
       @connection = connection
-      @file_checker = File
+      @file_checker = options.fetch(:file_checker) { File }
 
       @default = validate_host(options[:default])
       @alternate = validate_host(options[:alternate])
 
       @lock_file = options[:lock_file]
+
+      choose_destination_server!
     end
 
     def on_data(data)
-      use_alternate? ? @connection.server(:alternate, @alternate) : @connection.server(:default, @default)
       data
     end
 
     private
 
+    def choose_destination_server!
+      name, proxy_options = if use_alternate?
+        [:alternate, @alternate]
+      else
+        [:default, @default]
+      end
+      @connection.server(name, proxy_options.merge(:relay_client => true, :relay_server => true))
+    end
+
     def use_alternate?
       @file_checker.exists?(@lock_file)
     end
 
-    private
-
     def validate_host(host_config)
       if host_config.nil? || String(host_config[:host]).empty?  || host_config[:port].nil?
         raise ArgumentError, "Bad host config, both host and port must be present."

data/lib/turnout_proxy/version.rb

@@ -0,0 +1,4 @@
+module TurnoutProxy
+  version_file = File.expand_path('../../../VERSION', __FILE__)
+  VERSION = File.read(version_file).freeze
+end

data/test/acceptance/test_turnout_proxy.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 require 'fileutils'
 require 'net/http'
-require 'posix/spawn'
+require 'support/travis_spawn'
 require 'support/hello_server'
 require 'turnout_proxy'
 
 class TestTurnoutProxy < TurnoutProxyTestCase
-  include POSIX::Spawn
+  include TravisSpawn
   include TurnoutProxy
 
   TEST_LOCK_FILE = PROJECT_ROOT.join("lock")
@@ -51,12 +51,10 @@ class TestTurnoutProxy < TurnoutProxyTestCase
   end
 
   test "doesn't fail if destination server isn't responding" do
-    @pid = nil
     with_running_proxy(8085) do |pid|
-      @pid = pid
       Net::HTTP.get(URI("http://127.0.0.1:5678")) rescue nil
+      assert_equal 0, `kill -0 #{pid}`.chomp.to_i
     end
-    Process.kill 0, @pid
   end
 
 end

data/test/lib/turnout_proxy/test_host_chooser.rb

@@ -31,14 +31,14 @@ class TestHostChooser < TurnoutProxyTestCase
     @file_checker = FakeFile.new
   end
 
-  ALTERNATE_CONFIG = { :host => "127.0.0.1", :port => 19999 }
-  DEFAULT_CONFIG = { :host => "127.0.0.1", :port => 9012 }
+  ALTERNATE_CONFIG = { :host => "127.0.0.1", :port => 19999, :relay_client => true, :relay_server => true }
+  DEFAULT_CONFIG = { :host => "127.0.0.1", :port => 9012, :relay_client => true, :relay_server => true }
 
   def host_chooser
     host_chooser = HostChooser.new(@connection,
                                    :default => DEFAULT_CONFIG,
-                                   :alternate => ALTERNATE_CONFIG)
-    host_chooser.file_checker = @file_checker
+                                   :alternate => ALTERNATE_CONFIG,
+                                   :file_checker => @file_checker)
     host_chooser
   end
 

data/test/support/hello_server.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'posix/spawn'
+require 'support/travis_spawn'
 require 'eventmachine'
 
 class HelloServer
-  include POSIX::Spawn
+  include TravisSpawn
 
   def initialize(port, message)
-    @pid = spawn("ruby #{__FILE__} #{port} #{message}")
+    @pid = spawn("ruby -Itest #{__FILE__} #{port} #{message}")
     at_exit { die }
   end
 

data/test/support/travis_spawn.rb

@@ -0,0 +1,12 @@
+require 'posix/spawn'
+
+module TravisSpawn
+  include POSIX::Spawn
+
+  def spawn(command, *args)
+    if ENV["TRAVIS"]
+      command = "rvmsudo " + command
+    end
+    super(command, *args)
+  end
+end

data/turnout_proxy.gemspec

@@ -2,7 +2,7 @@
 
 $:.unshift File.expand_path('../lib/', __FILE__)
 
-require 'turnout_proxy'
+require 'turnout_proxy/version'
 require 'date'
 
 Gem::Specification.new do |s|

metadata

@@ -1,75 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: turnout_proxy
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Vladimir Yarotsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: em-proxy
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
-  requirement: *id001
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
   prerelease: false
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: posix-spawn
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
 description: 
 email: vladimir.yarotksy@gmail.com
-executables: 
+executables:
 - turnout_proxy
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -80,48 +78,44 @@ files:
 - bin/turnout_proxy
 - lib/turnout_proxy.rb
 - lib/turnout_proxy/host_chooser.rb
+- lib/turnout_proxy/version.rb
 - test/acceptance/test_turnout_proxy.rb
 - test/lib/turnout_proxy/test_host_chooser.rb
 - test/support/hello_server.rb
+- test/support/travis_spawn.rb
 - test/test_helper.rb
 - turnout_proxy.gemspec
 homepage: http://github.com/v-yarotsky/turnout_proxy
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 241058783050928805
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Proxy server which allows to switch between two destinations using lock file
-test_files: 
+test_files:
 - test/acceptance/test_turnout_proxy.rb
 - test/lib/turnout_proxy/test_host_chooser.rb
 - test/support/hello_server.rb
+- test/support/travis_spawn.rb
 - test/test_helper.rb