shotgun 0.7 → 0.8

data/bin/shotgun

@@ -4,6 +4,7 @@ require 'optparse'
 
 env = ENV['RACK_ENV'] || 'development'
 browse = false
+server = nil
 public_dir = 'public' if File.directory?('public')
 options = {:Port => 9393, :Host => '127.0.0.1', :AccessLog => [], :Path => '/'}
 
@@ -110,7 +111,9 @@ require 'rack/showexceptions'
 
 require 'shotgun'
 
+require 'thin' if server.to_s.downcase == 'thin'
 server = Rack::Handler.get(server) || Rack::Handler.default
+
 app =
   Rack::Builder.new do
     # these middleware run in the master process.
@@ -145,6 +148,9 @@ downward = false
   end
 end
 
+# load shotgun.rb in current working directory if it exists
+Shotgun.preload
+
 base_url = "http://#{options[:Host]}:#{options[:Port]}#{options[:Path]}"
 puts "== Shotgun/#{server.to_s.sub(/Rack::Handler::/, '')} on #{base_url}"
 server.run app, options do |inst|

data/lib/shotgun.rb

@@ -12,4 +12,33 @@ module Shotgun
   def self.enable_copy_on_write
     GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
   end
+
+  def self.preload(files=%w[./config/shotgun.rb ./shotgun.rb])
+    files.each do |preload_file|
+      if File.exist?(preload_file)
+        module_eval File.read(preload_file), preload_file
+        return preload_file
+      end
+    end
+  end
+
+  def self.before_fork(&block)
+    @before_fork ||= []
+    @before_fork << block if block
+    @before_fork
+  end
+
+  def self.after_fork(&block)
+    @after_fork ||= []
+    @after_fork << block if block
+    @after_fork
+  end
+
+  def self.before_fork!
+    before_fork.each { |block| block.call }
+  end
+
+  def self.after_fork!
+    after_fork.each { |block| block.call }
+  end
 end

data/lib/shotgun/loader.rb

@@ -22,9 +22,12 @@ module Shotgun
       @env = env
       @reader, @writer = IO.pipe
 
+      Shotgun.before_fork!
+
       if @child = fork
         proceed_as_parent
       else
+        Shotgun.after_fork!
         proceed_as_child
       end
     end

data/man/shotgun.1

@@ -0,0 +1,197 @@
+.\" generated with Ronn/v0.6.42
+.\" http://github.com/rtomayko/ronn/tree/0.6.6-36-gb67d494
+.
+.TH "SHOTGUN" "1" "June 2010" "Shotgun 0.8" ""
+.
+.SH "NAME"
+\fBshotgun\fR \- reloading rack development server
+.
+.SH "SYNOPSIS"
+\fBshotgun\fR [\fIoptions\fR] [\fIrackup\-file\fR]
+.
+.SH "DESCRIPTION"
+\fBShotgun\fR is a simple process\-per\-request Rack \fIhttp://rack\.rubyforge\.org/doc/README\.html\fR server designed for use in development environments\. Each time a request is received, \fBshotgun\fR forks, loads the \fIrackup\-file\fR, processes a single request and exits\. The result is application\-wide reloading of all configuration, source files, and templates without the need for complex application\-level reloading logic\.
+.
+.P
+When no \fIrackup\-file\fR is given, \fBshotgun\fR uses the \fBconfig\.ru\fR file in the current working directory\.
+.
+.SH "OPTIONS"
+Shotgun runs at \fBhttp://127\.0\.0\.1:9393\fR by default\. The following options control server behavior:
+.
+.TP
+\fB\-E\fR, \fB\-\-env\fR=\fIenvironment\fR
+Sets the \fBRACK_ENV\fR environment variable to \fIenvironment\fR and selects the default set of utility middleware\. When \fIenvironment\fR is \'development\', shotgun inserts the \fBRack::Lint\fR and \fBRack::CommonLogger\fR middleware components; when \fIenvironment\fR is \'production\' or \'deployed\', \fBRack::CommonLogger\fR is inserted; otherwise, no utility middleware are inserted\.
+.
+.TP
+\fB\-P\fR, \fB\-\-public\fR=\fIpath\fR
+Serve requests for static files that exist under \fIpath\fR from the shotgun master process without forking a worker process\. This option is automatically enabled when a \fB\./public\fR directory is detected, but can be configured explicitly for non\-conventional static file directory locations\.
+.
+.IP
+Setting this option appropriately can severely improve overall page load times for applications with many static assets\.
+.
+.TP
+\fB\-s\fR, \fB\-\-server\fR=\fImongrel\fR|\fIwebrick\fR|\fIthin\fR|\fIother\fR
+The Rack server handler implementation used to serve requests\. Supported values include: \fBmongrel\fR, \fBwebrick\fR, and \fBthin\fR\. By default, shotgun first tries to use \fBmongrel\fR and falls back to \fBwebrick\fR if mongrel is not available\.
+.
+.TP
+\fB\-o\fR, \fB\-\-host\fR=\fIaddr\fR
+The hostname or address of the interface the HTTP server should bind to\. Default: \fB127\.0\.0\.1\fR\.
+.
+.TP
+\fB\-p\fR, \fB\-\-port\fR=\fIport\fR
+The port the HTTP server should bind to\. Default: \fB9393\fR\.
+.
+.TP
+\fB\-O\fR, \fB\-\-browse\fR
+Open browser at http://\fIhost\fR:\fIport\fR/ immediately after the server is started\.
+.
+.P
+Ruby environment related options:
+.
+.TP
+\fB\-r\fR, \fB\-\-require\fR \fIlibrary\fR
+Require \fIlibrary\fR before loading the application and starting the server\. This can be used to load a portion of the application code in the master process so it doesn\'t need to be loaded in the child\. See \fIPRELOADING\fR][] for more information on this approach\.
+.
+.TP
+\fB\-e\fR, \fB\-\-eval\fR \fIcommand\fR
+Evaluate arbitrary \fIcommand\fR within the shotgun master Ruby interpreter\. \fIcommand\fR is evaluated as program arguments are parsed\. Multiple \fB\-e\fR arguments are allowed\.
+.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+Turns on debug mode\. \fB$DEBUG\fR will be set \fBtrue\fR\.
+.
+.TP
+\fB\-w\fR, \fB\-\-warn\fR
+Enable verbose mode without printing version message at the beginning\. It sets the \fB$VERBOSE\fR variable to true\.
+.
+.TP
+\fB\-I\fR, \fB\-\-include\fR \fIpath\fR
+Add \fIpath\fR to the Ruby load path (\fB$LOAD_PATH\fR)\. May be used more than once\.
+.
+.P
+Miscellaneous:
+.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show usage message and exit\.
+.
+.TP
+\fB\-\-version\fR
+Show the Rack version and exit\.
+.
+.SH "PRELOADING"
+It\'s possible to load support libraries and portions of the application in the shotgun master process to reduce the amount of work that needs to be done for each request in worker processes\. There\'s two ways of accomplishing this: either by specifying one or more \fB\-\-require\fR (\fB\-r\fR) arguments or through the use of a \fBshotgun\.rb\fR file\.
+.
+.P
+During start up, shotgun looks for a \fBshotgun\.rb\fR or \fBconfig/shotgun\.rb\fR file\. If either file is found, it\'s loaded into the shotgun master process\. Code at the top\-level of the \fBshotgun\.rb\fR is run once on startup, so just require whatever you want to preload\. It\'s also possible to register callbacks to run before each request in either the master or child worker process:
+.
+.TP
+\fBafter_fork {\fR \fIstuff\fR \fB}\fR
+Run \fIstuff\fR in the shotgun child worker process immediately after forking\. Any files or socket connections opened in the master process should be closed / re\-established by an \fBafter_fork\fR block\.
+.
+.TP
+\fBbefore_fork {\fR \fIstuff\fR \fB}\fR
+Run \fIstuff\fR in the shotgun master process on each request before forking the child worker process\. This is typically less useful than \fBafter_fork\fR, but provided for completeness\.
+.
+.P
+Example \fBconfig/shotgun\.rb\fR file from the main github\.com rails project:
+.
+.IP "" 4
+.
+.nf
+
+# make sure the load path includes RAILS_ROOT
+ENV[\'RAILS_ROOT\'] ||= File\.expand_path(\'\.\./\.\.\', __FILE__)
+$:\.unshift ENV[\'RAILS_ROOT\']
+
+# bring in the base rails environment and some libraries
+require \'config/environment\'
+require \'google\-charts\'
+require \'aws\-s3\'
+
+# disable Rails\'s built in class reloading
+Rails\.configuration\.cache_classes = true
+
+# reset database and redis connections in workers
+after_fork do
+  ActiveRecord::Base\.establish_connection
+  CHIMNEY\.client = $redis
+end
+.
+.fi
+.
+.IP "" 0
+.
+.SH "INSTALLING"
+Shotgun is distributed as a gem package at rubygems\.org:
+.
+.P
+\fIhttp://rubygems\.org/gems/shotgun\fR
+.
+.br
+\fBgem install shotgun\fR
+.
+.P
+The \fBrack\fR package is required\. The \fBmongrel\fR package is recommended\.
+.
+.SH "CONTRIBUTING"
+Fork and report issues at github\.com:
+.
+.P
+\fIhttp://github\.com/rtomayko/shotgun/\fR
+.
+.br
+\fBgit clone git://github\.com/rtomayko/shotgun\.git\fR
+.
+.SH "VERSION HISTORY"
+.
+.SS "Version 0\.8 (2010 June 24)"
+.
+.IP "\(bu" 4
+\fIhttp://github\.com/rtomayko/shotgun/compare/0\.7\.\.\.0\.8\fR
+.
+.IP "\(bu" 4
+Preloading support\. The \fBshotgun\.rb\fR or \fBconfig/shotgun\.rb\fR file is loaded at startup and may require libraries and register callbacks for fork events\. See the section on \fIPRELOADING\fR\.
+.
+.IP "\(bu" 4
+Fix starting with the Thin handler (\fBshotgun \-s thin\fR)
+.
+.IP "\(bu" 4
+Actually include the shotgun(1) roff manual\.
+.
+.IP "" 0
+.
+.SS "Version 0\.7 (2010 June 22)"
+.
+.IP "\(bu" 4
+\fIhttp://github\.com/rtomayko/shotgun/compare/0\.6\.\.\.0\.7\fR
+.
+.IP "\(bu" 4
+Static files now served from the shotgun master process, making shotgun tolerable for apps with many/unbundled static assets\.
+.
+.IP "\(bu" 4
+Added \fB\-\-public\fR (\fB\-P\fR) for specifying a non\-standard root / public directory\.
+.
+.IP "\(bu" 4
+Response bodies are now streamed over the master < worker pipe instead of being marshalled\. Improves performance with large response bodies, and reduces shotgun master process RES usage\.
+.
+.IP "\(bu" 4
+GET /favicon\.ico requests are served an empty response by the shotgun master process\. Prevents the need to fork a worker process\.
+.
+.IP "\(bu" 4
+\fBINT\fR, \fBTERM\fR, \fBQUIT\fR now properly trigger server shutdown\. The second \fBINT\fR, \fBTERM\fR, \fBQUIT\fR causes the master process to exit hard\.
+.
+.IP "\(bu" 4
+Non \fB\.ru\fR config files (e\.g\., sinatra app files) may now define command line options in the same way as \fB\.ru\fR files: by including a \fB#\e \-p 5555 \.\.\.\fR line\.
+.
+.IP "" 0
+.
+.SS "Versions < 0\.7 (2009\-2010)"
+.
+.IP "\(bu" 4
+\fIhttp://github\.com/rtomayko/shotgun/commits/0\.6\fR
+.
+.IP "" 0
+.
+.SH "SEE ALSO"
+ruby(1)

data/man/shotgun.1.ronn

@@ -57,10 +57,16 @@ control server behavior:
 
 Ruby environment related options:
 
+ * `-r`, `--require` <library>:
+   Require <library> before loading the application and starting the server.
+   This can be used to load a portion of the application code in the master
+   process so it doesn't need to be loaded in the child. See [PRELOADING]][]
+   for more information on this approach.
+
  * `-e`, `--eval` <command>:
-   Evaluate arbitrary <command> within the Ruby interpreter. <command> is
-   evaluated as program arguments are parsed. Multiple `-e` arguments are
-   allowed.
+   Evaluate arbitrary <command> within the shotgun master Ruby interpreter.
+   <command> is evaluated as program arguments are parsed. Multiple `-e`
+   arguments are allowed.
 
  * `-d`, `--debug`:
    Turns on debug mode. `$DEBUG` will be set `true`.
@@ -72,9 +78,6 @@ Ruby environment related options:
  * `-I`, `--include` <path>:
    Add <path> to the Ruby load path (`$LOAD_PATH`). May be used more than once.
 
- * `-r`, `--require` <library>:
-   Require <library> before loading the application and starting the server.
-
 Miscellaneous:
 
  * `-h`, `--help`:
@@ -83,6 +86,50 @@ Miscellaneous:
  * `--version`:
    Show the Rack version and exit.
 
+## PRELOADING
+
+It's possible to load support libraries and portions of the application in the
+shotgun master process to reduce the amount of work that needs to be done for
+each request in worker processes. There's two ways of accomplishing this: either
+by specifying one or more `--require` (`-r`) arguments or through the use of a
+`shotgun.rb` file.
+
+During start up, shotgun looks for a `shotgun.rb` or `config/shotgun.rb` file.
+If either file is found, it's loaded into the shotgun master process. Code at
+the top-level of the `shotgun.rb` is run once on startup, so just require
+whatever you want to preload. It's also possible to register callbacks to run
+before each request in either the master or child worker process:
+
+  * `after_fork {` <stuff> `}`:
+    Run <stuff> in the shotgun child worker process immediately after forking.
+    Any files or socket connections opened in the master process should be
+    closed / re-established by an `after_fork` block.
+
+  * `before_fork {` <stuff> `}`:
+    Run <stuff> in the shotgun master process on each request before forking
+    the child worker process. This is typically less useful than `after_fork`,
+    but provided for completeness.
+
+Example `config/shotgun.rb` file from the main github.com rails project:
+
+    # make sure the load path includes RAILS_ROOT
+    ENV['RAILS_ROOT'] ||= File.expand_path('../..', __FILE__)
+    $:.unshift ENV['RAILS_ROOT']
+
+    # bring in the base rails environment and some libraries
+    require 'config/environment'
+    require 'google-charts'
+    require 'aws-s3'
+
+    # disable Rails's built in class reloading
+    Rails.configuration.cache_classes = true
+
+    # reset database and redis connections in workers
+    after_fork do
+      ActiveRecord::Base.establish_connection
+      CHIMNEY.client = $redis
+    end
+
 ## INSTALLING
 
 Shotgun is distributed as a gem package at rubygems.org:
@@ -101,9 +148,21 @@ Fork and report issues at github.com:
 
 ## VERSION HISTORY
 
-### Version 0.7 (unreleased)
+### Version 0.8 (2010 June 24)
+
+ * <http://github.com/rtomayko/shotgun/compare/0.7...0.8>
+
+ * Preloading support. The `shotgun.rb` or `config/shotgun.rb` file is
+   loaded at startup and may require libraries and register callbacks
+   for fork events. See the section on [PRELOADING][].
+
+ * Fix starting with the Thin handler (`shotgun -s thin`)
+
+ * Actually include the shotgun(1) roff manual.
+
+### Version 0.7 (2010 June 22)
 
- * <http://github.com/rtomayko/shotgun/compare/0.6...master>
+ * <http://github.com/rtomayko/shotgun/compare/0.6...0.7>
 
  * Static files now served from the shotgun master process, making
    shotgun tolerable for apps with many/unbundled static assets.

data/shotgun.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'shotgun'
-  s.version = '0.7'
-  s.date = '2010-06-22'
+  s.version = '0.8'
+  s.date = '2010-06-23'
 
   s.description = "reloading rack development server"
   s.summary     = s.description
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     lib/shotgun/loader.rb
     lib/shotgun/static.rb
     man/index.txt
+    man/shotgun.1
     man/shotgun.1.ronn
     shotgun.gemspec
     test/big.ru

data/test/slow.ru

@@ -6,7 +6,7 @@ class SlowResponse
   def each
     yield "<pre>"
     10.times do
-      yield('.' * 10) + "\n")
+      yield(('.' * 10) + "\n")
       sleep 0.5
     end
     yield "</pre>"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: shotgun
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 7
-  version: "0.7"
+  - 8
+  version: "0.8"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - lib/shotgun/loader.rb
 - lib/shotgun/static.rb
 - man/index.txt
+- man/shotgun.1
 - man/shotgun.1.ronn
 - shotgun.gemspec
 - test/big.ru