proxylocal 0.0.4 → 0.0.5

data/Rakefile

@@ -2,7 +2,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('proxylocal', '0.0.4') do |p|
+require 'lib/client'
+
+Echoe.new('proxylocal', ProxyLocal::VERSION) do |p|
   p.description     = 'http://proxylocal.com/'
   p.url             = 'http://proxylocal.com/'
   p.author          = 'Just Lest'

data/bin/proxylocal

@@ -3,24 +3,44 @@
 require 'optparse'
 require File.expand_path('client', File.join(File.dirname(__FILE__), '..', 'lib'))
 
-server_host = nil
-server_port = nil
+options = {}
 
-options = OptionParser.new do |o|
-  o.banner = "Usage: localtunnel [options] PORT"
-  o.on('-s', '--server SERVER', 'default proxylocal.com') do |server|
-    server_host, server_port = server.split(':')
+cmd_args = OptionParser.new do |opts|
+  opts.banner = 'Usage: proxylocal [options] [PORT]'
+
+  opts.on('-s', '--server SERVER') do |s|
+    options[:server_host], options[:server_port] = s.split(':')
+  end
+
+  opts.on('--[no-]tls', 'Use TLS') do |tls|
+    options[:tls] = tls
+  end
+
+  opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
+    options[:verbose] = v
+  end
+
+  opts.on_tail('-h', '--help', 'Show this message') do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("--version", "Show version") do
+    puts ProxyLocal::VERSION
+    exit
   end
-  o.on('-h', "--help", "show this help") { puts o; exit }
-end
+end.parse!
 
-args = options.parse!
+options[:local_port] = cmd_args[0]
 
-server_host ||= 'proxylocal.com'
-server_port ||= '8282'
+default_options = {
+  :server_host => 'proxylocal.com',
+  :server_port => '8282',
+  :local_port => '80',
+  :tls => true,
+  :verbose => false
+}
 
-local_port = args[0] || 80
+options = default_options.merge(options.reject { |k, v| v.nil? })
 
-ProxyLocal::Client.run(:server_host => server_host,
-                       :server_port => server_port,
-                       :local_port  => local_port)
+ProxyLocal::Client.run(options)

data/lib/client.rb

@@ -1,8 +1,11 @@
+require 'logger'
 require 'rubygems'
 require 'eventmachine'
 require 'bert'
 
 module ProxyLocal
+  VERSION = '0.0.5'
+
   module Serializer
     def self.dump(object)
       BERT.encode(object)
@@ -16,11 +19,12 @@ module ProxyLocal
   class Client < EventMachine::Connection
     include EventMachine::Protocols::ObjectProtocol
 
-    def serializer
-      Serializer
-    end
-
     def self.run(options = {})
+      @@logger = Logger.new(STDOUT)
+      @@logger.level = options[:verbose] ? Logger::INFO : Logger::WARN
+
+      @@logger.info("Run with options #{options.inspect}")
+
       trap "SIGCLD", "IGNORE"
       trap "INT" do
         puts
@@ -29,27 +33,53 @@ module ProxyLocal
       end
 
       EventMachine.run do
-        EventMachine::connect(options[:server_host], options[:server_port], self) do |c|
+        EventMachine.connect(options[:server_host], options[:server_port], self) do |c|
           c.instance_eval do
             @options = options
-            send_object(BERT::Tuple[:options, @options])
+            if @options[:tls]
+              @@logger.info("Request TLS")
+              send_object(:start_tls)
+            else
+              send_options
+            end
           end
         end
       end
     end
 
+    def serializer
+      Serializer
+    end
+
+    def send_options
+      send_object(BERT::Tuple[:options, @options])
+    end
+
+    def ssl_handshake_completed
+      send_options
+    end
+
+    def first_line(data)
+      data.split(/\r?\n/, 2).first
+    end
+
     def receive_object(message)
       message = [message] unless message.is_a?(Array)
 
       case message[0]
+      when :start_tls
+        @@logger.info("Start TLS")
+        start_tls
       when :message
         puts message[1]
       when :halt
         EventMachine.stop_event_loop
       when :request
         _, uuid, request = message
-        EventMachine::connect('127.0.0.1', @options[:local_port], ClientProxy) do |connection|
+        @@logger.info(first_line(request))
+        EventMachine.connect('127.0.0.1', @options[:local_port], ClientProxy) do |connection|
           connection.callback do |data|
+            @@logger.info("#{first_line(data)} - #{first_line(request)}")
             send_object(BERT::Tuple[:response, uuid, data])
           end
           connection.send_data(request)

data/proxylocal.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxylocal}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Just Lest"]
-  s.date = %q{2010-11-12}
+  s.date = %q{2010-11-17}
   s.default_executable = %q{proxylocal}
   s.description = %q{http://proxylocal.com/}
   s.email = %q{just.lest@gmail.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proxylocal
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Just Lest
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +02:00
+date: 2010-11-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency