heroku-forward 0.3.1 → 0.4.0

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012 Daniel Doubrovkine, Art.sy Inc.
+Copyright (c) 2012-2013 Daniel Doubrovkine, Artsy Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,4 @@
-Heroku::Forward [![Build Status](https://travis-ci.org/dblock/heroku-forward.png?branch=master)](https://travis-ci.org/dblock/heroku-forward)
+Heroku::Forward [![Build Status](https://travis-ci.org/dblock/heroku-forward.png?branch=master)](https://travis-ci.org/dblock/heroku-forward) [![Code Climate](https://codeclimate.com/repos/51fa634ec7f3a32cbd015aea/badges/f526a1ee8e357011f8af/gpa.png)](https://codeclimate.com/repos/51fa634ec7f3a32cbd015aea/feed)
 ===============
 
 Beat Heroku's 60 seconds timeout with a proxy.
@@ -52,6 +52,12 @@ proxy.forward!
 
 This sets up a proxy on the port requested by Heroku and runs your application with [Thin](http://code.macournoyer.com/thin). Other back-ends are also supported, see below.
 
+Add the following line to `config/development.rb` to see Rails logger output on `STDOUT`:
+
+```ruby
+config.middleware.use Rails::Rack::LogTailer
+```
+
 Foreman
 -------
 
@@ -153,6 +159,30 @@ proxy = Heroku::Forward::Proxy::Server.new(backend, host: '0.0.0.0', port: port)
 proxy.forward!
 ```
 
+### Puma
+
+For more information about Puma see [http://puma.io](http://puma.io/).
+
+The Puma back-end supports the following options.
+
+* **application**: application to load
+* **env**: environment, eg. `:development`
+* **socket**: socket, eg. `/tmp/puma.sock`
+* **config_file**: Puma configuration file
+
+```ruby
+require 'heroku-forward'
+require 'heroku/forward/backends/puma'
+
+application = File.expand_path('../my_app.ru', __FILE__)
+config_file = File.expand_path('../config/puma.rb', __FILE__)
+backend = Heroku::Forward::Backends::Puma.new(application: application, env: env, config_file: config_file)
+proxy = Heroku::Forward::Proxy::Server.new(backend, host: '0.0.0.0', port: port)
+proxy.forward!
+```
+
+Note that heroku-forward does not currently run on JRuby, see [em-proxy#39](https://github.com/igrigorik/em-proxy/issues/39) for details.
+
 Fail-Safe
 ---------
 
@@ -178,4 +208,4 @@ Copyright and License
 
 MIT License, see [LICENSE](http://github.com/dblock/heroku-forward/raw/master/LICENSE.md) for details.
 
-(c) 2012 [Daniel Doubrovkine](http://github.com/dblock), [Art.sy](http://artsy.github.com)
+(c) 2012-2013 [Daniel Doubrovkine](http://github.com/dblock), [Artsy](http://artsy.github.com)

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

@@ -0,0 +1,27 @@
+module Heroku
+  module Forward
+    module Backends
+      class Base
+        attr_accessor :application, :socket, :environment, :pid
+
+        def terminate!
+          return false unless spawned?
+          Process.kill 'QUIT', @pid
+          @spawned = false
+          true
+        end
+
+        def spawned?
+          !!@spawned
+        end
+
+        private
+
+        def check!
+          raise Heroku::Forward::Errors::MissingBackendOptionError.new('application') unless @application && @application.length > 0
+          raise Heroku::Forward::Errors::MissingBackendApplicationError.new(@application) unless File.exists?(@application)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+require 'heroku/forward/backends/base'
+
+module Heroku
+  module Forward
+    module Backends
+      class Puma < Base
+        attr_accessor :config_file
+
+        def initialize(options = {})
+          @application = options[:application]
+          @socket = options[:socket] || Heroku::Forward::Utils::Dir.tmp_filename('puma-', '.sock')
+          @env = options[:env] || 'development'
+          @config_file = options[:config_file]
+        end
+
+        def spawn!
+          return false if spawned?
+          check!
+
+          args = ['puma']
+          args.push '--environment', @env
+          args.push '--config', @config_file if @config_file
+          args.push '--bind', "unix://#{@socket}"
+          args.push @application
+
+          @pid = Spoon.spawnp(*args)
+          @spawned = true
+        end
+
+        def terminate!
+          return false unless spawned?
+          Process.kill 'QUIT', @pid
+          @spawned = false
+          true
+        end
+
+        def spawned?
+          !!@spawned
+        end
+
+        private
+
+        def check!
+          raise Heroku::Forward::Errors::MissingBackendOptionError.new('application') unless @application && @application.length > 0
+          raise Heroku::Forward::Errors::MissingBackendApplicationError.new(@application) unless File.exists?(@application)
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,9 @@
+require 'heroku/forward/backends/base'
+
 module Heroku
   module Forward
     module Backends
-      class Thin
-        attr_accessor :application
-        attr_accessor :socket
-        attr_accessor :environment
-        attr_accessor :pid
-
+      class Thin < Base
         attr_accessor :ssl
         attr_accessor :ssl_key_file
         attr_accessor :ssl_cert_file
@@ -48,25 +45,6 @@ module Heroku
           @pid = Spoon.spawnp(* spawn_with)
           @spawned = true
         end
-
-        def terminate!
-          return false unless spawned?
-          Process.kill 'QUIT', @pid
-          @spawned = false
-          true
-        end
-
-        def spawned?
-          !! @spawned
-        end
-
-        private
-
-        def check!
-          raise Heroku::Forward::Errors::MissingBackendOptionError.new('application') unless @application && @application.length > 0
-          raise Heroku::Forward::Errors::MissingBackendApplicationError.new(@application) unless File.exists?(@application)
-        end
-
       end
     end
   end

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

@@ -1,8 +1,10 @@
+require 'heroku/forward/backends/base'
+
 module Heroku
   module Forward
     module Backends
-      class Unicorn
-        attr_accessor :application, :socket, :environment, :pid, :config_file
+      class Unicorn < Base
+        attr_accessor :config_file
 
         def initialize(options = {})
           @application = options[:application]
@@ -24,25 +26,6 @@ module Heroku
           @pid = Spoon.spawnp(*args)
           @spawned = true
         end
-
-        def terminate!
-          return false unless spawned?
-          Process.kill 'QUIT', @pid
-          @spawned = false
-          true
-        end
-
-        def spawned?
-          !!@spawned
-        end
-
-        private
-
-        def check!
-          raise Heroku::Forward::Errors::MissingBackendOptionError.new('application') unless @application && @application.length > 0
-          raise Heroku::Forward::Errors::MissingBackendApplicationError.new(@application) unless File.exists?(@application)
-        end
-
       end
     end
   end

data/lib/heroku/forward/proxy/server.rb

@@ -84,7 +84,7 @@ module Heroku
                 @start = nil
               end
             rescue RuntimeError => e
-              raise BackendFailedToStartError.new if @retries <= 0
+              raise Heroku::Forward::Errors::BackendFailedToStartError.new if @retries <= 0
               logger.warn "#{e.message}, #{retries} #{retries == 1 ? 'retry' : 'retries'} left." if logger
               @retries -= 1
             end

data/lib/heroku/forward/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Forward
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-forward
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-proxy
@@ -171,6 +171,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.5'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +214,8 @@ files:
 - lib/heroku-forward.rb
 - lib/heroku/forward.rb
 - lib/heroku/forward/backends.rb
+- lib/heroku/forward/backends/base.rb
+- lib/heroku/forward/backends/puma.rb
 - lib/heroku/forward/backends/thin.rb
 - lib/heroku/forward/backends/unicorn.rb
 - lib/heroku/forward/config/locales/en.yml
@@ -227,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 669463106192419404
+      hash: 470077483543450957
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -236,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Beat Heroku's 60s boot timeout with a forward proxy.