devproxy 0.4.0 → 0.5.0

data/lib/devproxy/cli.rb

@@ -55,7 +55,7 @@ module Devproxy
       opts.separator ""
       opts.separator "    user: \tDevproxy username."
       opts.separator "    proxy:\tThe name of the proxy you want to connect to (without the domain)."
-      opts.separator "          \tDefaults to `user`."
+      opts.separator "          \tDefaults to the user's default proxy."
       opts.separator "          \texample: 'foo' for tunneling 'foo.devproxy.io'"
 
       opts.separator ""
@@ -99,7 +99,7 @@ module Devproxy
       end
       opts.parse!(argv)
       options.user  = argv[0]
-      options.proxy = argv[1] || argv[0]
+      options.proxy = argv[1]
       unless options.valid?
         puts opts
         exit

data/lib/devproxy/connection.rb

@@ -22,8 +22,8 @@ module Devproxy
       @session.stop! if @session
     end
 
-    def on_connected
-      $stdout.puts "Tunneling requests from https://#{options.proxy}.devproxy.io to #{options.listen} port #{options.port}"
+    def on_connected(proxy)
+      $stdout.puts "Tunneling requests from https://#{proxy}.#{options.host} to #{options.listen} port #{options.port}"
     end
 
     def on_heartbeat data

data/lib/devproxy/options.rb

@@ -5,7 +5,6 @@ module Devproxy
     end
     def valid?
       !( user.nil?  || user.empty?      ||
-         proxy.nil? || proxy.empty?     ||
          port.nil?  || remote_port.nil? ||
          host.nil?  || host.empty?       )
     end

data/lib/devproxy/session.rb

@@ -7,6 +7,7 @@ module Devproxy
     class Error::Authentication < Error        ; end
 
     HEARTBEAT = "HEARTBEAT"
+    CONNECT   = "CONNECT:"
 
     def shutdown!
       ssh.shutdown!
@@ -27,6 +28,8 @@ module Devproxy
         if stream == :stdout
           if data.start_with?(HEARTBEAT)
             connection.on_heartbeat(data)
+          elsif data.start_with?(CONNECT)
+            connection.on_connected(data[(CONNECT.size)..-1].chomp)
           else
             connection.on_stdout(data)
           end
@@ -37,7 +40,6 @@ module Devproxy
       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"

data/lib/devproxy/version.rb

@@ -1,3 +1,3 @@
 module Devproxy
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/cli_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 describe Devproxy::CLI do
   describe "#parse" do
-    it "should default the proxy to the given name" do
+    it "should not have a default name" do
       options = parse("foo")
       expect(options.user).to  eq("foo")
-      expect(options.proxy).to eq("foo")
+      expect(options.proxy).to be_nil
     end
     it "should accept a different proxy name" do
       options = parse("foo","bar")

data/spec/options_spec.rb

@@ -17,11 +17,11 @@ describe Devproxy::Options do
   end
 
   describe "valid?" do
-    it "should require a username" do
-      expect(default_options(:proxy => "foo")).to_not be_valid
+    it "should not require a proxy" do
+      expect(default_options(:user => "foo")).to be_valid
     end
     it "should require a username" do
-      expect(default_options(:user => "bar")).to_not be_valid
+      expect(default_options(:proxy => "bar")).to_not be_valid
     end
     it "should only need a username and proxy" do
       expect(default_options(:proxy => "foo", :user => "bar")).to be_valid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devproxy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -86,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3518926803873574523
+      hash: -2796530892309419750
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3518926803873574523
+      hash: -2796530892309419750
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25