forward 0.0.11 → 0.0.12

data/lib/forward.rb

@@ -40,34 +40,34 @@ module Forward
   end
 
   def self.client=(client)
-    @@client = client
+    @client = client
   end
 
   def self.client
-    defined?(@@client) && @@client
+    @client
   end
 
   def self.debug!
-    @@debug      = true
+    @debug       = true
     logger.level = Logger::DEBUG
   end
 
   def self.debug?
-    defined?(@@debug) && @@debug
+    @debug
   end
 
   def self.stringio_log
-    @@stringio_log ||= StringIO.new
+    @stringio_log ||= StringIO.new
   end
 
   def self.debug_remotely!
     logger(stringio_log)
     debug!
-    @@debug_remotely = true
+    @debug_remotely = true
   end
 
   def self.debug_remotely?
-    defined?(@@debug_remotely) && @@debug_remotely
+    @debug_remotely
   end
 
   def self.log(level, message)
@@ -75,7 +75,7 @@ module Forward
   end
 
   def self.logger(logdev = STDOUT)
-    @@logger ||= Logger.new(logdev)
+    @logger ||= Logger.new(logdev)
   end
 
   # Returns a string representing a detailed client version.

data/lib/forward/api/tunnel.rb

@@ -7,6 +7,7 @@ module Forward
         resource.uri = '/api/tunnels'
         params       = {
           :hostport => options[:port],
+          :vhost    => options[:host],
           :client   => Forward.client_string,
         }
 

data/lib/forward/client.rb

@@ -22,6 +22,8 @@ module Forward
       else
         cleanup_and_exit!('Unable to create a tunnel. If this continues contact support@forwardhq.com')
       end
+
+      @tunnel
     end
 
     # The options Hash used by Net::SSH.
@@ -51,17 +53,15 @@ module Forward
       trap(:INT) { cleanup_and_exit!('closing tunnel and exiting...') }
 
       @client = Client.new(options)
+      @tunnel = @client.setup_tunnel
 
-      @client.setup_tunnel
-
-      Forward.log(:debug, "Starting remote forward on https://#{@client.tunnel.subdomain}.fwd.wf on port #{@client.tunnel.port}")
-      puts "Forwarding port #{@client.options[:port]} at \033[04mhttps://#{@client.tunnel.subdomain}.fwd.wf\033[m\nCtrl-C to stop forwarding"
-      Net::SSH.start(@client.tunnel.tunneler, Forward.ssh_user, @client.ssh_options) do |session|
-        session.forward.remote(@client.options[:port], @client.options[:host], @client.tunnel.port)
+      Forward.log(:debug, "Starting remote forward at #{@tunnel.subdomain}.fwd.wf on port #{@tunnel.port}")
+      puts "Forwarding port #{@tunnel.hostport} at \033[04mhttps://#{@tunnel.subdomain}.fwd.wf\033[m\nCtrl-C to stop forwarding"
+      Net::SSH.start(@tunnel.tunneler, Forward.ssh_user, @client.ssh_options) do |session|
+        session.forward.remote(@tunnel.hostport, @tunnel.host, @tunnel.port)
         session.loop { watch_session(session) }
       end
 
-      # cleanup_and_exit!
     rescue Net::SSH::AuthenticationFailed => e
       Forward.log(:fatal, "SSH Auth failed `#{e}'")
       cleanup_and_exit!("Authentication failed, try deleting `#{Forward::Config::CONFIG_PATH}' and giving it another go. If the problem continues, contact support@forwardhq.com")

data/lib/forward/tunnel.rb

@@ -6,6 +6,12 @@ module Forward
     attr_reader :id
     # The domain for the Tunnel.
     attr_reader :subdomain
+    # The host
+    attr_reader :host
+    # The vhost
+    attr_reader :vhost
+    # The hostport (local port)
+    attr_reader :hostport
     # The remote port.
     attr_reader :port
     # The tunneler host.
@@ -18,9 +24,12 @@ module Forward
     #
     # client - The Client instance.
     def initialize(options = {})
+      @host         = options[:host]
       @response     = Forward::Api::Tunnel.create(options)
       @id           = @response[:_id]
       @subdomain    = @response[:subdomain]
+      @vhost        = @response[:vhost]
+      @hostport     = @response[:hostport]
       @port         = @response[:port]
       @tunneler     = @response[:tunneler_public]
       @timeout      = @response[:timeout]

data/lib/forward/version.rb

@@ -1,3 +1,3 @@
 module Forward
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forward
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json