hsume2-localtunnel 0.3.beta.5 → 0.3

data/Manifest

@@ -2,6 +2,7 @@ Manifest
 README.rdoc
 Rakefile
 bin/localtunnel
+hsume2-localtunnel.gemspec
 lib/localtunnel.rb
 lib/localtunnel/net_ssh_gateway_patch.rb
 lib/localtunnel/tunnel.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('hsume2-localtunnel', '0.3.beta.5') do |p|
+Echoe.new('hsume2-localtunnel', '0.3') do |p|
   p.description    = "instant public tunnel to your local web server"
   p.url            = "http://github.com/hsume2/localtunnel"
   p.author         = "Jeff Lindsay"
@@ -12,6 +12,6 @@ Echoe.new('hsume2-localtunnel', '0.3.beta.5') do |p|
   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", "sinatra >=1.2.6", "POpen4 >=0.1.4", "twilio-ruby >=3.2.0"]
+  p.runtime_dependencies = ["json >=1.2.4", "net-ssh >=2.0.22", "net-ssh-gateway >=1.0.1", "sinatra >=1.3.2"]
   p.development_dependencies = []
 end

data/bin/localtunnel

@@ -24,32 +24,15 @@
 
 require 'rubygems'
 require 'optparse'
-require 'yaml'
 require 'localtunnel'
 
-key, config = nil, nil
+key = nil
 options = OptionParser.new do |o|
   o.banner = "Usage: localtunnel [options] <localport>"
   o.on("-k", "--key FILE", "upload a public key for authentication") do |k|
     key = File.exist?(k.to_s) ? File.open(k).read : nil
   end
   o.on('-h', "--help", "show this help") { puts o; exit }
-  o.on('-c', "--config FILE", "configure Twilio phone numbers for localtunnel from config file",
-                              "Example (YAML):",
-                              "  ---",
-                              "  - account_sid:        AC...",
-                              "    auth_token:         ...",
-                              "    phone_number_sid:   PN...",
-                              "    urls:",
-                              "      voice_url:          /voice/calls/...",
-                              "      status_callback:    /voice/calls/...",
-                              "      voice_fallback_url: /voice/calls/...",
-                              "      sms_url:            /voice/calls/...") do |k|
-    config = File.exist?(k.to_s) ? YAML::load(File.open(k)) : nil
-  end
-  o.on('-e', "--evaluate YAML", "configure Twilio phone numbers for localtunnel from YAML string") do |k|
-    config = YAML::load(k.gsub("\\n", "\n"))
-  end
 end
 
 args = options.parse!
@@ -59,6 +42,6 @@ unless local_port.to_i.between?(1, 65535)
   exit
 end
 
-t = LocalTunnel::Tunnel.new(local_port, key, config)
+t = LocalTunnel::Tunnel.new(local_port, key)
 t.register_tunnel
-t.start_tunnel
+t.start_tunnel

data/hsume2-localtunnel.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hsume2-localtunnel}
-  s.version = "0.3.beta.5"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Lindsay"]
-  s.date = %q{2012-02-22}
+  s.date = %q{2012-01-24}
   s.default_executable = %q{localtunnel}
   s.description = %q{instant public tunnel to your local web server}
   s.email = %q{jeff.lindsay@twilio.com}
   s.executables = ["localtunnel"]
-  s.extra_rdoc_files = ["README.rdoc", "Rakefile", "bin/localtunnel", "lib/localtunnel.rb", "lib/localtunnel/net_ssh_gateway_patch.rb", "lib/localtunnel/tunnel.rb", "lib/localtunnel/tunnel_app.rb", "server.py", "hsume2-localtunnel.gemspec"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "bin/localtunnel", "lib/localtunnel.rb", "lib/localtunnel/net_ssh_gateway_patch.rb", "lib/localtunnel/tunnel.rb", "lib/localtunnel/tunnel_app.rb", "server.py", "hsume2-localtunnel.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "Rakefile", "bin/localtunnel", "hsume2-localtunnel.gemspec", "lib/localtunnel.rb", "lib/localtunnel/net_ssh_gateway_patch.rb", "lib/localtunnel/tunnel.rb", "lib/localtunnel/tunnel_app.rb", "server.py"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "bin/localtunnel", "hsume2-localtunnel.gemspec", "lib/localtunnel.rb", "lib/localtunnel/net_ssh_gateway_patch.rb", "lib/localtunnel/tunnel.rb", "lib/localtunnel/tunnel_app.rb", "server.py"]
   s.homepage = %q{http://github.com/hsume2/localtunnel}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{hsume2-localtunnel}
@@ -26,23 +26,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 1.2.4"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.22"])
       s.add_runtime_dependency(%q<net-ssh-gateway>, [">= 1.0.1"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
-      s.add_runtime_dependency(%q<POpen4>, [">= 0.1.4"])
-      s.add_runtime_dependency(%q<twilio-ruby>, [">= 3.2.0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.3.2"])
     else
       s.add_dependency(%q<json>, [">= 1.2.4"])
       s.add_dependency(%q<net-ssh>, [">= 2.0.22"])
       s.add_dependency(%q<net-ssh-gateway>, [">= 1.0.1"])
-      s.add_dependency(%q<sinatra>, [">= 1.2.6"])
-      s.add_dependency(%q<POpen4>, [">= 0.1.4"])
-      s.add_dependency(%q<twilio-ruby>, [">= 3.2.0"])
+      s.add_dependency(%q<sinatra>, [">= 1.3.2"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.2.4"])
     s.add_dependency(%q<net-ssh>, [">= 2.0.22"])
     s.add_dependency(%q<net-ssh-gateway>, [">= 1.0.1"])
-    s.add_dependency(%q<sinatra>, [">= 1.2.6"])
-    s.add_dependency(%q<POpen4>, [">= 0.1.4"])
-    s.add_dependency(%q<twilio-ruby>, [">= 3.2.0"])
+    s.add_dependency(%q<sinatra>, [">= 1.3.2"])
   end
 end

data/lib/localtunnel/tunnel.rb

@@ -4,8 +4,6 @@ require 'net/ssh/gateway'
 require 'net/http'
 require 'uri'
 require 'json'
-require 'open4'
-require 'twilio-ruby'
 
 require 'localtunnel/net_ssh_gateway_patch'
 
@@ -17,13 +15,12 @@ class LocalTunnel::Tunnel
 
   SHELL_HOOK_FILE = "./.localtunnel_callback"
 
-  attr_accessor :port, :key, :host, :config
+  attr_accessor :port, :key, :host
 
-  def initialize(port, key, config)
+  def initialize(port, key)
     @port = port
     @key  = key
     @host = ""
-    @config = config
   end
 
   def register_tunnel(key=@key)
@@ -48,18 +45,8 @@ class LocalTunnel::Tunnel
   def start_tunnel
     port = @port
     tunnel = @tunnel
-
-    TunnelApp.tunnel = tunnel['host']
-    tunnel_pid = fork { TunnelApp.run! }
-
-    at_exit do
-      Process.kill('KILL', tunnel_pid)
-      Process.waitpid(tunnel_pid)
-    end
-
-    error = ''
-
-    status = Open4::popen4("ssh -nNT -g -R *:#{tunnel['through_port']}:0.0.0.0:#{port} #{tunnel['user']}@#{@host} -o PasswordAuthentication=no -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null") do |pid, i, o, e|
+    gateway = Net::SSH::Gateway.new(@host, tunnel['user'], :auth_methods => %w{ publickey })
+    gateway.open_remote(port.to_i, '127.0.0.1', tunnel['through_port'].to_i) do |rp,rh|
       puts "   " << tunnel['banner'] if tunnel.has_key? 'banner'
       if File.exists?(File.expand_path(SHELL_HOOK_FILE))
         system "#{SHELL_HOOK_FILE} ""#{tunnel['host']}""" if File.exists?(File.expand_path(SHELL_HOOK_FILE))
@@ -68,39 +55,25 @@ class LocalTunnel::Tunnel
           puts "   (Make sure it is executable)"
         end
       end
-
-      if @config && @config.any?
-        @config.each do |config|
-          client = Twilio::REST::Client.new(config['account_sid'], config['auth_token'])
-          account = client.account
-          properties = config['urls'].inject({}) do |urls, k_v|
-            k, v = k_v
-            urls[k] = URI.join("http://#{tunnel['host']}", v).to_s
-            urls
-          end
-          pn = account.incoming_phone_numbers.get(config['phone_number_sid']).update(properties)
-          puts "   Updated #{pn.phone_number} for localtunnel."
-        end
-      end
-
+      TunnelApp.tunnel = tunnel['host']
+      pid = fork {
+        TunnelApp.run!
+      }
       puts "   Port #{port} is now publicly accessible from http://#{tunnel['host']} ..."
-
       begin
-        while str = e.gets
-          error += str
-          puts str
-        end
+        sleep 1 while true
       rescue Interrupt
+        Process.kill('KILL', pid)
+        Process.waitpid(pid)
+        gateway.close_remote(rp, rh)
         exit
       end
     end
-
-    if error =~ /Permission denied/
-      possible_key = Dir[File.expand_path('~/.ssh/*.pub')].first
-      puts "   Failed to authenticate. If this is your first tunnel, you need to"
-      puts "   upload a public key using the -k option. Try this:\n\n"
-      puts "   localtunnel -k #{possible_key ? possible_key : '~/path/to/key'} #{port}"
-      exit
-    end
+  rescue Net::SSH::AuthenticationFailed
+    possible_key = Dir[File.expand_path('~/.ssh/*.pub')].first
+    puts "   Failed to authenticate. If this is your first tunnel, you need to"
+    puts "   upload a public key using the -k option. Try this:\n\n"
+    puts "   localtunnel -k #{possible_key ? possible_key : '~/path/to/key'} #{port}"
+    exit
   end
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hsume2-localtunnel
 version: !ruby/object:Gem::Version 
-  hash: 62196289
-  prerelease: 4
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 3
-  - beta
-  - 5
-  version: 0.3.beta.5
+  version: "0.3"
 platform: ruby
 authors: 
 - Jeff Lindsay
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-22 00:00:00 -08:00
+date: 2012-01-24 00:00:00 -08:00
 default_executable: localtunnel
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,46 +73,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 1
-        - 2
-        - 6
-        version: 1.2.6
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: POpen4
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: twilio-ruby
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
         - 3
         - 2
-        - 0
-        version: 3.2.0
+        version: 1.3.2
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id004
 description: instant public tunnel to your local web server
 email: jeff.lindsay@twilio.com
 executables: 
@@ -125,23 +91,23 @@ extra_rdoc_files:
 - README.rdoc
 - Rakefile
 - bin/localtunnel
+- hsume2-localtunnel.gemspec
 - lib/localtunnel.rb
 - lib/localtunnel/net_ssh_gateway_patch.rb
 - lib/localtunnel/tunnel.rb
 - lib/localtunnel/tunnel_app.rb
 - server.py
-- hsume2-localtunnel.gemspec
 files: 
 - Manifest
 - README.rdoc
 - Rakefile
 - bin/localtunnel
+- hsume2-localtunnel.gemspec
 - lib/localtunnel.rb
 - lib/localtunnel/net_ssh_gateway_patch.rb
 - lib/localtunnel/tunnel.rb
 - lib/localtunnel/tunnel_app.rb
 - server.py
-- hsume2-localtunnel.gemspec
 has_rdoc: true
 homepage: http://github.com/hsume2/localtunnel
 licenses: []