tunnels 1.1.0 → 1.2.0

data/README.md

@@ -1,7 +1,7 @@
 Tunnels
 =======
 
-![image](http://i.imgur.com/5F9tJ.png)
+![image](http://i.imgur.com/Ej5dz.png)
 
 Tunnels is a proxy to http from https.
 
@@ -17,15 +17,19 @@ Run
 
     $ sudo tunnels
 
+If you are using rvm:
+
+    $ rvmsudo tunnels
+
 By default, proxy to 80 port from 443 port.
 
-specify `http` port:
+specify "http" port and "https" port:
 
-    $ sudo tunnels 4567
+    $ sudo tunnels 443 3000
 
-specify `http` port and `https` port:
+or
 
-    $ sudo tunnels 4567 443
+    $ sudo tunnels 127.0.0.1:443 127.0.0.1:3000
 
 Copyright
 ---------

data/bin/tunnels

@@ -1,3 +1,16 @@
 #!/usr/bin/env ruby
 require 'tunnels'
-Tunnels.run!('127.0.0.1', *ARGV[0..1])
+unless ARGV.size == 0 || ARGV.size == 2
+  puts <<-D
+Usage:
+    tunnels [from to]
+
+Examples:
+    tunnels 443 3000
+    tunnels localhost:443 localhost:3000
+
+  D
+  exit!
+end
+
+Tunnels.run!(*ARGV)

data/lib/tunnels/version.rb

@@ -1,3 +1,3 @@
 module Tunnels
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/tunnels.rb

@@ -5,9 +5,13 @@ require "eventmachine"
 # Copyright © 2012, Thin::Glazed was a Rails Camp New Zealand project, and is developed and maintained by Pat Allan. It is released under the open MIT Licence.
 
 module Tunnels
-  def self.run!(host = '127.0.0.1', to = 80, from = 443)
+  def self.run!(from = '127.0.0.1:443', to = '127.0.0.1:80')
+    from_host, from_port = parse_host_str(from)
+    to_host, to_port = parse_host_str(to)
+    puts "#{from_host}:#{from_port} --(--)--> #{to_host}:#{to_port}"
+
     EventMachine.run do
-      EventMachine.start_server(host, from, HttpsProxy, to)
+      EventMachine.start_server(from_host, from_port, HttpsProxy, to_port)
       puts "Ready :)"
     end
   rescue => e
@@ -15,6 +19,16 @@ module Tunnels
     puts "Maybe you should run on `sudo`"
   end
 
+  def self.parse_host_str(str)
+    raise ArgumentError, 'arg must not be empty' if str.empty?
+    parts = str.split(':')
+    if parts.size == 1
+      ['127.0.0.1', parts[0].to_i]
+    else
+      [parts[0], parts[1].to_i]
+    end
+  end
+
   class HttpClient < EventMachine::Connection
     attr_reader :proxy
 

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rspec'
+require 'tunnels'
+
+RSpec.configure do |config|
+  config.mock_with :rr
+end

data/spec/tunnels_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+# to stub
+def EventMachine.run(&block)
+  block.call
+end
+
+describe Tunnels do
+  describe '.run!' do
+    context 'with no args' do
+      it 'works' do
+        mock(EventMachine).start_server('127.0.0.1', 443, Tunnels::HttpsProxy, 80)
+        Tunnels.run!
+      end
+    end
+
+    context 'with args' do
+      it 'works' do
+        mock(EventMachine).start_server('127.0.0.1', 443, Tunnels::HttpsProxy, 80)
+        Tunnels.run!('127.0.0.1:443', '127.0.0.1:80')
+      end
+    end
+  end
+end

data/tunnels.gemspec

@@ -20,5 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rr"
   s.add_runtime_dependency "eventmachine"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tunnels
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-08 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70272751148400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70272751148400
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70272751147980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70272751147980
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70342271897640 !ruby/object:Gem::Requirement
+  requirement: &70272751147480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70342271897640
+  version_requirements: *70272751147480
 description: This tunnels https to http.
 email:
 - jugyo.org@gmail.com
@@ -36,6 +58,8 @@ files:
 - bin/tunnels
 - lib/tunnels.rb
 - lib/tunnels/version.rb
+- spec/spec_helper.rb
+- spec/tunnels_spec.rb
 - tunnels.gemspec
 homepage: https://github.com/jugyo/tunnels
 licenses: []
@@ -61,4 +85,6 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: https --(--)--> http
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/tunnels_spec.rb