envoy-proxy 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b37ea6c959f8c114427789454f1b57839190d78f
-  data.tar.gz: 5160742eaafd4c19c7dc7d5dae52ea9f778840f1
+  metadata.gz: 2ed79185e2aad87adb4349b67cc291736ba715e0
+  data.tar.gz: b4c8f976611a606f40cc4cad0b4242f0e1f8b3ee
 SHA512:
-  metadata.gz: 7278fc984cc99dfb7761bcaf94a2a2fcef994e468ba46ea53a36976b43c5a2a57c3ad74da662cd2b0e03bf019c5dfed11f149d24e5eb19dc43056916ec9140d0
-  data.tar.gz: fa1f633ac93d12a3a72fe71f21ef9767f80aef9677f263ce839fd24da2030c0b13fdb567a5af8add464566484a424635992f81212590a226315357149af6b24b
+  metadata.gz: c0041100f109dbee5cfd0d33a5eb8bffd88acda65fa810bba1c8f3ac1c184d5bcbbae50bc6bf9f535bd9ac9485a4a1a9f28b3e0a886f5b2dced6944aef5bb622
+  data.tar.gz: d9a0a9017b0dc3457385c9717db2ff3acf72c549cfc76a23eb43b7e8caeca06af98b8ac67ea94b07c139b47ef3379e7e5d48e832c2b27fd8e19348c5e1ab7394

data/lib/envoy/client/command.rb

@@ -33,7 +33,7 @@ def load_config
       conf["dir"] = File.expand_path(conf["dir"], path + "/..") if conf["dir"]
     end
   else
-    [{"local_port" => "80"}]
+    [{}]
   end
 end
 
@@ -42,8 +42,8 @@ options = parse_options
 unless EM.reactor_running?
   EM.run do
     load_config.each do |config|
-      config = options.merge(config)
-      config["local_port"] ||= rand(16383) + 49152
+      config = config.merge(options)
+      config["local_port"] ||= config["command"] ? rand(16383) + 49152 : 80
       config["hosts"] ||= [config.delete("host")] if config["host"]
       config = config.each_with_object({}) do |(k, v), h|
         h[k.to_sym] = v
@@ -51,4 +51,4 @@ unless EM.reactor_running?
       Envoy::Client::Trunk.start config
     end
   end
-end
+end

data/lib/envoy/client/option_parser.rb

@@ -16,41 +16,39 @@ end
 def parse_options
   options = default_options
   OptionParser.new do |op|
-    op.banner = "Usage: #{$0} [options] [[HOST:]PORT]"
-    op.on "--host HOST", "Allocate this domain label on the proxy" do |v|
+    op.banner = "Usage: #{$0} [options] [[HOST:]PORT] [LABEL]"
+    op.on "-l LABEL", "--label", "--host", "Allocate this domain label on the proxy" do |v|
       options["hosts"] ||= []
       options["hosts"] << v
     end
-    op.on "-k", "--key KEY" do |v|
+    op.on "-k KEY", "--key", "Secure access to the label with this key" do |v|
       options["key"] = v
     end
-    op.on "-t", "--[no-]tls", "Encrypt communications with the envoy server" do |v|
-      options["tls"] = v
-    end
-    op.on "-s", "--server SERVER", "Specify envoy/proxylocal server" do |v|
+    op.on "-s SERVER", "--server", "Specify envoy server" do |v|
       host, port = v.split(":")
       options["server_host"] = host
       options["server_port"] ||= port
     end
-    op.on "-v", "--[no-]verbose", "Be noisy about what's happening" do |v|
-      options["verbose"] = v
-    end
-    op.on "--no-log", "Don't show HTTP log" do |v|
-      options["log"] = false
-    end
-    op.on "l", "--log FILE", "Write HTTP log to this file" do |v|
-      options["log"] = v
+    op.on "-c COMMAND", "Run this command" do |v|
+      options["command"] = v
     end
     op.on "-h", "--help", "Show this message" do
       puts op
       exit
     end
-    op.on "--version" do
+    op.on "-V", "--version", "Show version number" do
       puts Envoy::VERSION
       exit
     end
     op.parse!
     case ARGV[0]
+    when "rails"
+      options["pidfile"] = "tmp/pids/server.pid"
+      options["command"] = "rails s -p %{local_port}"
+      options["delay"] = 10
+    when "rackup"
+      options["command"] = "rackup -p %{local_port}"
+      options["delay"] = 10
     when /^(\d+)$/
       options["local_port"] = $1
     when /^(\[[^\]+]\]|[^:]+):(\d+)$/x
@@ -59,6 +57,10 @@ def parse_options
     when /^(.*)$/
       options["local_host"] = $1
     end
+    if ARGV[1]
+      options["hosts"] ||= []
+      options["hosts"] << ARGV[1]
+    end
   end
   options
 end

data/lib/envoy/server/trunk.rb

@@ -77,6 +77,8 @@ module Envoy
         end
         if version? "< #{Envoy::VERSION}"
           send_object :message, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
+        elsif version? "> #{Envoy::VERSION}"
+          send_object :message, "Your client is from the future. The server is expecting #{Envoy::VERSION}."
         end
         if @key and @key != @options[:key]
           halt "Key is invalid"
@@ -85,14 +87,14 @@ module Envoy
         hosts = @options[:hosts] || []
         hosts.any? do |label|
           if label == "s"
-            send_object :message, "#{label}: label is reserved"
+            send_object :message, "label is reserved: `#{label}'"
             true
           elsif label =~ /\./
-            send_object :message, "#{label}: labels may not contain dots"
+            send_object :message, "label is invalid: `#{label}'"
             true
           elsif other_trunk = Trunk.trunks[label][0]
             unless other_trunk.key == key
-              send_object :message, "#{label}: label in use, and you don't have the key"
+              send_object :message, "label is protected with a key: `#{label}'"
               true
             end
           end
@@ -101,12 +103,11 @@ module Envoy
         m = ["#{options[:local_host]}:#{options[:local_port]} now available at:"]
         @hosts = hosts.each do |host|
           Trunk.trunks[host] << self
-          m << "http://#{host}.#{$zone}/"
+          send_object :message, "host: #{host}.#{$zone}"
         end
-        send_object :message, m.join(" ")
         unless @options[:key]
           @options[:key] ||= SecureRandom.hex(8)
-          send_object :message, "Your key is #{@options[:key]}"
+          send_object :message, "key: #{@options[:key]}"
         end
       end
       

data/lib/envoy/server/web.rb

@@ -11,17 +11,24 @@ module Envoy
         @connection = "close"
       end
       
-      def send_page status, message
+      def send_page status, title, message
         send_data "HTTP/1.0 #{status} Message\r\n"
-        send_data "Content-Type: text/plain\r\n"
+        send_data "Content-Type: text/html\r\n"
         send_data "\r\n"
-        send_data "#{message}\r\n"
+        send_data "<title>#{title}</title>\r\n"
+        send_data "<h1>#{title}</h1>\r\n"
+        send_data "<p>#{message}\r\n"
+      end
+      
+      def fail (status, title, message)
+        send_page(500, title, message)
+        close_connection true
       end
       
       def close code
         case code
         when 502
-          send_page code, "The service isn't running, and couldn't be started." 
+          send_page 502, "Bad Gateway", "The service isn't running, and couldn't be started." 
         end
         close_connection(true)
       end
@@ -33,7 +40,7 @@ module Envoy
       def receive_line line
         @first_line ||= line
         if line == ""
-          trunk = Trunk.trunks[@host].sample || raise("No trunk for #{@host}.#{$zone}")
+          trunk = Trunk.trunks[@host].sample || (return fail(404, "Not Found", "No trunk for #{@host}.#{$zone}"))
           @header << "Connection: #{@connection}\r\n\r\n"
           @channel = Channel.new(trunk, self, @header)
           @channel.message "%s %s" % [Socket.unpack_sockaddr_in(get_peername)[1], @first_line]
@@ -48,12 +55,12 @@ module Envoy
           @host = @host.split(".").last
           @header << line + "\r\n"
         elsif @header.size > 4096
-          raise "Header's too long for my liking"
+          return fail(400, "Bad Request", "Header's too long for my liking")
         else
           @header << line + "\r\n"
         end
       rescue RuntimeError => e
-        send_page 500, e.inspect
+        send_page 500, "Internal Server Error", e.inspect
         close_connection true
       end
       

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2014-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bert
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -75,7 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -103,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Proxy your local web-server and make it publicly available over the internet