heroku-forward 0.1.0 → 0.2.0

data/README.md

@@ -1,14 +1,14 @@
 Heroku::Forward [![Build Status](https://travis-ci.org/dblock/heroku-forward.png?branch=master)](https://travis-ci.org/dblock/heroku-forward)
 ===============
 
-Beat Heroku's 60 seconds timeout with a forward proxy.
+Beat Heroku's 60 seconds timeout with a proxy.
 
 What's this?
 ------------
 
 [Heroku](http://www.heroku.com/) will report an application crashing and yield an `R10 Boot Timeout` error when a web process took longer than 60 seconds to bind to its assigned `$PORT`. This error is often caused by a process being unable to reach an external resource, such as a database or because Heroku is pretty slow and you have a lot of gems in your `Gemfile`.
 
-This gem implements a forward proxy using [em-proxy](https://github.com/igrigorik/em-proxy). This proxy is booted almost immediately, binding to the port assigned by Heroku. Heroku now reports the dyno up. The proxy then spawns your application's web server and establishes a connection over a unix domain socket (a file) between the proxy and the application. Once the application is ready, it will be able to serve HTTP requests normally. Until then requests may queue and some may timeout depending on how long it actually takes to start.
+This gem implements a proxy using [em-proxy](https://github.com/igrigorik/em-proxy). This proxy is booted almost immediately, binding to the port assigned by Heroku. Heroku now reports the dyno up. The proxy then spawns your application's web server and establishes a connection over a unix domain socket (a file) between the proxy and the application. Once the application is ready, it will be able to serve HTTP requests normally. Until then requests may queue and some may timeout depending on how long it actually takes to start.
 
 Usage
 -----
@@ -16,8 +16,8 @@ Usage
 Add `heroku-forward` and `em-proxy` to your `Gemfile`. Curently requires HEAD of `em-proxy` because of [this pull request](https://github.com/igrigorik/em-proxy/pull/31).
 
 ``` ruby
-gem "heroku-forward", :git => "https://github.com/dblock/heroku-forward.git"
-gem "em-proxy", :git => "https://github.com/igrigorik/em-proxy.git"
+gem "heroku-forward", "~> 0.1"
+gem "em-proxy", ">= 0.1.8"
 ```
 
 Create an application rackup file, eg. `my_app.ru` that boots your application. Under Rails, this is the file that calls `run`.
@@ -90,6 +90,35 @@ Proxy Forwarding Options
 
 * `delay`: number of seconds to sleep before launching the proxy, eg. `proxy.forward!(delay: 15)`. This prevents queuing of requests or reporting invalid `up` status to Heroku. It's recommended to set this value to as close as possible to the boot time of your application and less than the Heroku's 60s boot limit.
 
+SSL
+---
+Heroku-forward has SSL support by forwarding SSL arguments to Thin. Know more about Thin & SSL:
+
+```sh
+thin -h
+SSL options:
+        --ssl                        Enables SSL
+        --ssl-key-file PATH          Path to private key
+        --ssl-cert-file PATH         Path to certificate
+        --ssl-verify                 Enables SSL certificate verification
+```
+
+In order to forward SSL arguments to thin update your config.ru
+
+```ruby
+options = { application: File.expand_path('../my_app.ru', __FILE__) }
+
+# branch to desable SSL depending of your environment
+if ENV['THIN_SSL_ENABLED']
+  options[:ssl] = true
+  options[:ssl_verify] = true
+  options[:ssl_cert_file] = ENV['THIN_SSL_CERT_FILE']
+  options[:ssl_key_file] = ENV['THIN_SSL_KEY_FILE']
+end
+
+backend = Heroku::Forward::Backends::Thin.new(options)
+```
+
 Fail-Safe
 ---------
 
@@ -103,6 +132,7 @@ Reading Materials
 * [Fighting the Unicorns: Becoming a Thin Wizard on Heroku](http://jgwmaxwell.com/fighting-the-unicorns-becoming-a-thin-wizard-on-heroku/) by JGW Maxwell
 * [eventmachine](https://github.com/eventmachine/eventmachine)
 * [em-proxy](https://github.com/igrigorik/em-proxy)
+* [Setup rails 3.2 & heroku-forward with SSL](https://gist.github.com/4540602)
 
 Contributing
 ------------

data/lib/heroku-forward.rb

@@ -1,7 +1,8 @@
 require 'i18n'
 require 'tempfile'
 require 'em-proxy'
-require 'posix/spawn'
+require 'ffi'
+require 'spoon'
 
 I18n.load_path << File.join(File.dirname(__FILE__), "heroku", "forward", "config", "locales", "en.yml")
 

data/lib/heroku/forward/backends/thin.rb

@@ -2,27 +2,50 @@ module Heroku
   module Forward
     module Backends
       class Thin
-        include POSIX::Spawn
-
         attr_accessor :application
         attr_accessor :socket
         attr_accessor :environment
         attr_accessor :pid
 
+        attr_accessor :ssl
+        attr_accessor :ssl_key_file
+        attr_accessor :ssl_cert_file
+        attr_accessor :ssl_verify
+
         # options:
-        #  application: passed with -R, eg. app.ru
-        #  socket: passed with --socket, eg. /tmp/thin.sock
-        #  env: passed with -e, defaults to 'development'
+        #  application:   passed with     -R, eg. app.ru
+        #  socket:        passed with     --socket, eg. /tmp/thin.sock
+        #  env:           passed with     -e, defaults to 'development'
+        #  ssl:           activated with  --ssl
+        #  ssl_key_file:  passed with     ssl_key_file PATH
+        #  ssl_cert_file: passed with     ssl_cert_file PATH
+        #  ssl_verify:    activated with  ssl_verify
         def initialize(options = {})
           @application = options[:application]
           @socket = options[:socket] || new_socket
           @env = options[:env] || :development
+
+          @ssl = options[:ssl] || false
+          @ssl_key_file = options[:ssl_key_file] || false
+          @ssl_cert_file = options[:ssl_cert_file] || false
+          @ssl_verify = options[:ssl_verify] || false
         end
 
         def spawn!
           return false if spawned?
           check!
-          @pid = spawn("thin start -R #{@application} --socket #{@socket} -e #{@env}")
+
+          spawn_with = [ "thin" ]
+          spawn_with.push "start"
+          spawn_with.push "-R", @application
+          spawn_with.push "--socket", @socket
+          spawn_with.push "-e", @env.to_s
+          spawn_with.push "--ssl" if @ssl
+          spawn_with.push " --ssl-key-file", @ssl_key_file if @ssl_key_file
+          spawn_with.push "--ssl-cert-file", @ssl_cert_file if @ssl_cert_file
+          spawn_with.push "--ssl-verify" if @ssl_verify
+
+          @pid = Spoon.spawnp(* spawn_with)
           @spawned = true
         end
 

data/lib/heroku/forward/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Forward
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-forward
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-proxy
@@ -44,13 +44,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: posix-spawn
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: spoon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +171,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: dblock@dblock.org
 executables: []
@@ -193,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 394519437
+      hash: -1460208060339317613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: