reorganizing ruby files and gem stuff

Manifest

@@ -1,5 +1,6 @@
 Rakefile
 lib/localtunnel.rb
+lib/localtunnel/tunnel.rb
+lib/localtunnel/net_ssh_gateway_patch.rb
 bin/localtunnel
-server.py
 Manifest

Rakefile

@@ -2,11 +2,14 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('localtunnel', '0.2') do |p|
+Echoe.new('localtunnel', '0.3') do |p|
   p.description    = "instant public tunnel to your local web server"
   p.url            = "http://github.com/progrium/localtunnel"
   p.author         = "Jeff Lindsay"
   p.email          = "jeff.lindsay@twilio.com"
+  p.has_rdoc       = false
+  p.rdoc_pattern   = //
+  p.rdoc_options   = []
   p.ignore_pattern = ["tmp/*", "script/*"]
   p.executable_pattern = ["bin/*"]
   p.runtime_dependencies = ["json >=1.2.4", "net-ssh >=2.0.22", "net-ssh-gateway >=1.0.1"]

bin/localtunnel

@@ -22,10 +22,9 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-base_dir = File.dirname(File.expand_path(__FILE__))
-
-require base_dir + '/../lib/local_tunnel'
-require base_dir + '/../lib/net_ssh_gateway_patch'
+require 'rubygems'
+require 'optparse'
+require 'localtunnel'
 
 key = nil
 options = OptionParser.new do |o|
@@ -43,6 +42,6 @@ unless local_port
   exit
 end
 
-x = LocalTunnel.new(local_port, key)
-x.register_tunnel
-x.start_tunnel
+t = LocalTunnel::Tunnel.new(local_port, key)
+t.register_tunnel
+t.start_tunnel

lib/localtunnel.rb

@@ -1 +1,2 @@
-## Nothing to see here
+$: << File.expand_path(File.dirname(__FILE__))
+require 'localtunnel/tunnel'

lib/net_ssh_gateway_patch.rb → lib/localtunnel/net_ssh_gateway_patch.rb

@@ -1,10 +1,6 @@
 require 'rubygems'
 require 'net/ssh'
 require 'net/ssh/gateway'
-require 'net/http'
-require 'uri'
-require 'optparse'
-require 'json'
 
 # http://groups.google.com/group/capistrano/browse_thread/thread/455c0c8a6faa9cc8?pli=1
 class Net::SSH::Gateway

lib/local_tunnel.rb → lib/localtunnel/tunnel.rb

@@ -3,10 +3,13 @@
 require 'net/ssh/gateway'
 require 'net/http'
 require 'uri'
-require 'optparse'
 require 'json'
 
-class LocalTunnel
+require 'localtunnel/net_ssh_gateway_patch'
+
+module LocalTunnel; end
+
+class LocalTunnel::Tunnel
 
   attr_accessor :port, :key, :host