thin 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4541fb4ab6d2f90d8ca0053e41103ba2faed4f83
-  data.tar.gz: 0e68ce58e93e07f3bd93a51ab180bc1c64b2757c
+  metadata.gz: 31c955b827052e1932230bf04e3818d77ea20a06
+  data.tar.gz: 4f21bb96c7a098ea400d5d788b900912e78e2231
 SHA512:
-  metadata.gz: be8f1c6914e4f6ae498718595841ee682bc7c41590e0c8128ff2f5233621932e242542502bd4881b24b617b37503c98bb619fdd8c2dec0a0cc5a6b2c3a7de561
-  data.tar.gz: 5f86ca62b6088e2a778fa8d9b777e7e60ceeea6bd7dfc21a6420e04ded91b03f03dc11c9a988099e11cab9d30e2a809330129b6ae74e974815348c55398c9989
+  metadata.gz: 4eb0b26d8523233a49ae1f68c63f765173f8f96d73066a53574aab352e1ccc9b89e4949399fd3e45bab13de08587232c05f7e91565b7ab9ac8fa4ca9f43d98fd
+  data.tar.gz: cd0fe1693ed40ec399ca882ca33fecf7c7c14b4925ad462be7df16db89db380f03657e2dec026b0fd2bd0f9eaea8e7e4c7fc1e3484249ff1f43ca28100936030

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.7.1 Muffin Mode
+ * Ruby 2.4 support (Fixnum deprecation) [nimish-mehta]
+ * Allow ERB templates in config files [markets]
+
 == 1.7.0 Dunder Mifflin
  * Rack 2 support
  * Ensure Response body.close is called in the same thread
@@ -13,7 +17,6 @@
  * Check for empty PID files [z1dane]
  * Update Event Machine version to 1.0.4, Ruby 2.2.0 fix [freemanoid]
 
-
 == 1.6.3 Protein Powder
  * Add HTTP 422 status code [rajcybage]
  * Add warning about EM reactor still running when stopping.

data/README.md

@@ -1,35 +1,17 @@
-Thin
-====
+# Thin
 
-Tiny, fast & funny HTTP server
-
-Thin is a Ruby web server that glues together 3 of the best Ruby libraries in web history:
-
-  * The Mongrel parser: the root of Mongrel speed and security
-  * Event Machine: a network I/O library with extremely high scalability, performance and stability
-  * Rack: a minimal interface between webservers and Ruby frameworks
-
-Which makes it, with all humility, the most secure, stable, fast and extensible Ruby web server
-bundled in an easy to use gem for your own pleasure.
-
-    Site:  http://code.macournoyer.com/thin/
-    Group: http://groups.google.com/group/thin-ruby/topics
-    Bugs:  http://github.com/macournoyer/thin/issues
-    Code:  http://github.com/macournoyer/thin
-    IRC:   #thin on freenode
+A small and fast Ruby web server
 
 ## Installation
 
-For the latest stable version:
-
-`gem install thin`
+```
+gem install thin
+```
 
-Or from source:
+Or add `thin` to your `Gemfile`:
 
-```
-git clone git://github.com/macournoyer/thin.git
-cd thin
-rake install
+```ruby
+gem 'thin'
 ```
 
 ## Usage
@@ -37,18 +19,30 @@ rake install
 A +thin+ script offers an easy way to start your Rack application:
 
 ```
-cd to/your/app
 thin start
 ```
 
-When using with Rails and Bundler, make sure to add `gem 'thin'`
-to your Gemfile.
+Browse the `example` directory for sample applications.
+
+## Usage with Rails Action Cable
+
+To use Thin with Action Cable, add the following to your `Gemfile`:
+
+```ruby
+gem 'faye-websocket'
+gem 'thin' # If not already done
+```
+
+Create a `config/initializers/thin_action_cable.rb`:
 
-See example directory for samples.
+```ruby
+Rails.application.config.action_cable.use_faye = true
+Faye::WebSocket.load_adapter 'thin'
+```
 
-### Command Line Examples
+### CLI
 
-Use a rackup file and bind to localhost port 8080:
+Use a rackup (config.ru) file and bind to localhost port 8080:
 
 ```
 thin -R config.ru -a 127.0.0.1 -p 8080 start
@@ -60,11 +54,15 @@ Store the server process ID, log to a file and daemonize:
 thin -p 9292 -P tmp/pids/thin.pid -l logs/thin.log -d start
 ```
 
-Thin is quite flexible in that many options can be specified at the command line (see below for usage).
+Thin is quite flexible in that many options can be specified at the command line (see `thin -h` for more).
 
 ### Configuration files
 
-You can create configuration files in yaml format and feed them to thin using `thin start -C config.yml`.  Here is an example config file:
+You can create a configuration file using `thin config -C config/thin.yml`.
+
+You can then use it with all commands, such as: `thin start -C config/thin.yml`.
+
+Here is an example config file:
 
 ```yaml
 --- 
@@ -87,79 +85,13 @@ chdir: /path/to/your/apps/root
 tag: a-name-to-show-up-in-ps aux
 ```
 
-### Command Line Options
-
-This is the usage for the thin command which can be obtained by running `thin -h` at the command line.
-
-```sh
-Usage: thin [options] start|stop|restart|config|install
-
-Server options:
-    -a, --address HOST               bind to HOST address (default: 0.0.0.0)
-    -p, --port PORT                  use PORT (default: 3000)
-    -S, --socket FILE                bind to unix domain socket
-    -y, --swiftiply [KEY]            Run using swiftiply
-    -A, --adapter NAME               Rack adapter to use (default: autodetect)
-                                     (rack, rails, ramaze, merb, file)
-    -R, --rackup FILE                Load a Rack config file instead of Rack adapter
-    -c, --chdir DIR                  Change to dir before starting
-        --stats PATH                 Mount the Stats adapter under PATH
-
-SSL options:
-        --ssl                        Enables SSL
-        --ssl-key-file PATH          Path to private key
-        --ssl-cert-file PATH         Path to certificate
-        --ssl-disable-verify         Disables (optional) client cert requests
-
-Adapter options:
-    -e, --environment ENV            Framework environment (default: development)
-        --prefix PATH                Mount the app under PATH (start with /)
-
-Daemon options:
-    -d, --daemonize                  Run daemonized in the background
-    -l, --log FILE                   File to redirect output (default: /home/robert/log/thin.log)
-    -P, --pid FILE                   File to store PID (default: tmp/pids/thin.pid)
-    -u, --user NAME                  User to run daemon as (use with -g)
-    -g, --group NAME                 Group to run daemon as (use with -u)
-        --tag NAME                   Additional text to display in process listing
-
-Cluster options:
-    -s, --servers NUM                Number of servers to start
-    -o, --only NUM                   Send command to only one server of the cluster
-    -C, --config FILE                Load options from config file
-        --all [DIR]                  Send command to each config files in DIR
-    -O, --onebyone                   Restart the cluster one by one (only works with restart command)
-    -w, --wait NUM                   Maximum wait time for server to be started in seconds (use with -O)
-
-Tuning options:
-    -b, --backend CLASS              Backend to use, full classname
-    -t, --timeout SEC                Request or command timeout in sec (default: 30)
-    -f, --force                      Force the execution of the command
-        --max-conns NUM              Maximum number of open file descriptors (default: 1024)
-                                     Might require sudo to set higher than 1024
-        --max-persistent-conns NUM   Maximum number of persistent connections
-                                     (default: 100)
-        --threaded                   Call the Rack application in threads [experimental]
-        --threadpool-size NUM        Sets the size of the EventMachine threadpool.
-                                     (default: 20)
-        --no-epoll                   Disable the use of epoll
-
-Common options:
-    -r, --require FILE               require the library
-    -q, --quiet                      Silence all logging
-    -D, --debug                      Enable debug logging
-    -V, --trace                      Set tracing on (log raw request/response)
-    -h, --help                       Show this message
-    -v, --version                    Show version
-```
-
 ## License
 
 Ruby License, http://www.ruby-lang.org/en/LICENSE.txt.
 
 ## Credits
 
-The parser was stolen from Mongrel http://mongrel.rubyforge.org by Zed Shaw.
+The parser was originally from Mongrel http://mongrel.rubyforge.org by Zed Shaw.
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed under
 the Ruby license and the GPL2.
 
@@ -167,4 +99,4 @@ Thin is copyright Marc-Andre Cournoyer <macournoyer@gmail.com>
 
 Get help at http://groups.google.com/group/thin-ruby/
 Report bugs at https://github.com/macournoyer/thin/issues
-and major security issues directly to me macournoyer@gmail.com.
+and major security issues directly to me at macournoyer@gmail.com.

data/lib/thin/runner.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'optparse'
 require 'yaml'
+require 'erb'
 
 module Thin
   # CLI runner.
@@ -219,7 +220,7 @@ module Thin
     private
       def load_options_from_config_file!
         if file = @options.delete(:config)
-          YAML.load_file(file).each { |key, value| @options[key.to_sym] = value }
+          YAML.load(ERB.new(File.read(file)).result).each { |key, value| @options[key.to_sym] = value }
         end
       end
 

data/lib/thin/server.rb

@@ -104,9 +104,9 @@ module Thin
       # received in any order.
       args.each do |arg|
         case arg
-        when Fixnum, /^\d+$/ then port    = arg.to_i
-        when String          then host    = arg
-        when Hash            then options = arg
+        when 0.class, /^\d+$/ then port    = arg.to_i
+        when String           then host    = arg
+        when Hash             then options = arg
         else
           @app = arg if arg.respond_to?(:call)
         end

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 7
-    TINY     = 0
+    TINY     = 1
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Dunder Mifflin".freeze
+    CODENAME = "Muffin Mode".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thin
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thin
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A thin and fast web server