devproxy 0.2.0 → 0.3.0

data/lib/devproxy/connection.rb

@@ -1,32 +1,25 @@
-require 'net/ssh'
-require 'devproxy/net-ssh-patch'
+require 'devproxy/session'
 
 module Devproxy
-  class Connection
-    class Error                 < StandardError; end
-    class Error::Authentication < Error        ; end
-    HEARTBEAT = "HEARTBEAT"
+  class Connection < Struct.new(:options)
+    MAX_DOTS  = 60
 
-    attr_reader :options, :ssh
-
-    MAX_DOTS = 60
-
-    def initialize options, ssh
-      @options, @ssh, @halt = options, ssh, false
+    def initialize options
+      super
       reset_dots!
     end
 
     def loop!
-      @ssh.loop { !halt? }
+      @session.shutdown! if @session
+      @session = Session.create(options,self)
+      @session.loop!
     rescue Errno::ECONNREFUSED
       on_stderr "CONNECTION REFUSED.  Is there anything listening on port #{options.port}?"
       retry
     end
+
     def stop!
-      @halt = true
-    end
-    def halt?
-      @halt
+      @session.stop! if @session
     end
 
     def on_connected
@@ -61,39 +54,11 @@ module Devproxy
     def reset_dots!
       @dotno = 0
     end
-
     def self.loop!(options)
       create(options).loop!
     end
-
     def self.create(options)
-      ssh        = open_ssh(options)
-      connection = new(options,ssh)
-      ssh.forward.remote(options.port,options.listen,0,'0.0.0.0')
-      channel    = ssh.exec(options.proxy) do |ch,stream,data|
-        if stream == :stdout
-          if data.start_with?(HEARTBEAT)
-            connection.on_heartbeat(data)
-          else
-            connection.on_stdout(data)
-          end
-        else
-          connection.on_stderr(data)
-        end
-      end
-      channel.on_close do
-        connection.on_close
-      end
-      connection.on_connected
-      connection
-    rescue Net::SSH::AuthenticationFailed
-      raise Error::Authentication, "Authentication Failed: Invalid username or SSH key"
-    end
-    def self.open_ssh(options)
-      Net::SSH.start(options.host, options.username,{
-        :port => options.remote_port,
-        :user_known_hosts_file => "/dev/null",
-      })
+      new(options)
     end
   end
 end

data/lib/devproxy/session.rb

@@ -0,0 +1,52 @@
+require 'net/ssh'
+require 'devproxy/net-ssh-patch'
+
+module Devproxy
+  class Session < Struct.new(:ssh)
+    class Error                 < StandardError; end
+    class Error::Authentication < Error        ; end
+
+    HEARTBEAT = "HEARTBEAT"
+
+    def shutdown!
+      ssh.shutdown!
+    end
+
+    def loop!
+      ssh.loop { !@halt }
+    end
+
+    def stop!
+      @halt = true
+    end
+
+    def self.create(options,connection)
+      ssh        = open_ssh(options)
+      ssh.forward.remote(options.port,options.listen,0,'0.0.0.0')
+      channel    = ssh.exec(options.proxy) do |ch,stream,data|
+        if stream == :stdout
+          if data.start_with?(HEARTBEAT)
+            connection.on_heartbeat(data)
+          else
+            connection.on_stdout(data)
+          end
+        else
+          connection.on_stderr(data)
+        end
+      end
+      channel.on_close do
+        connection.on_close
+      end
+      connection.on_connected
+      new(ssh)
+    rescue Net::SSH::AuthenticationFailed
+      raise Error::Authentication, "Authentication Failed: Invalid username or SSH key"
+    end
+    def self.open_ssh(options)
+      Net::SSH.start(options.host, options.username,{
+        :port => options.remote_port,
+        :user_known_hosts_file => "/dev/null",
+      })
+    end
+  end
+end

data/lib/devproxy/version.rb

@@ -1,3 +1,3 @@
 module Devproxy
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/readme.md

@@ -16,25 +16,29 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install devproxy --source https://github.com/boz/devproxy.git
+    $ gem install devproxy -v '~> 0.2.0'
 
 ## Usage
 
 Create an account on [devproxy.io](https://devproxy.io) and upload
 your ssh public key.
 
-To tunnel connections for `example.devproxy.io` to port 3000 on your local machine, run:
+To tunnel connections for `username.devproxy.io` to port 3000 on your local machine, run:
 
-    $ devproxy example
+    $ devproxy username
 
 You can specify the local port with `-p`:
 
-    $ devproxy example -p 3000
+    $ devproxy username -p 5000
 
 If the host that you want to tunnel is not the same as your [devproxy.io](https://devproxy.io)
 username, specify the hostname as the second argument:
 
-    $ devproxy example test
+    $ devproxy username proxyname
+
+`devproxy` comes with a server for testing.  enable it with the `--test-server` flag:
+
+    $ devproxy username proxyname -p 5000 --test-server
 
 ### Rails
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devproxy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -65,6 +65,7 @@ files:
 - lib/devproxy/connection.rb
 - lib/devproxy/net-ssh-patch.rb
 - lib/devproxy/options.rb
+- lib/devproxy/session.rb
 - lib/devproxy/version.rb
 - readme.md
 - spec/cli_spec.rb
@@ -85,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -760381207862352631
+      hash: 1889482144132428415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -760381207862352631
+      hash: 1889482144132428415
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25