unicorn 0.1.0 → 0.2.1

data/CHANGELOG

@@ -1,19 +1,25 @@
+v0.2.1 - Fix broken Manifest that cause unicorn_rails to not be bundled
+
+v0.2.0 - unicorn_rails launcher script.
+
 v0.1.0 - Unicorn - UNIX-only fork of Mongrel free of threading
 
-v2.0. (WIP) Rack support.
+  -- old Mongrel changelog --
+
+  v2.0. (WIP) Rack support.
 
-v1.1.4. Fix camping handler. Correct treatment of @throttle parameter.
+  v1.1.4. Fix camping handler. Correct treatment of @throttle parameter.
 
-v1.1.3. Fix security flaw of DirHandler; reported on mailing list.
+  v1.1.3. Fix security flaw of DirHandler; reported on mailing list.
 
-v1.1.2. Fix worker termination bug; fix JRuby 1.0.3 load order issue; fix require issue on systems without Rubygems.
+  v1.1.2. Fix worker termination bug; fix JRuby 1.0.3 load order issue; fix require issue on systems without Rubygems.
 
-v1.1.1. Fix mongrel_rails restart bug; fix bug with Rack status codes.
+  v1.1.1. Fix mongrel_rails restart bug; fix bug with Rack status codes.
 
-v1.1. Pure Ruby URIClassifier. More modular architecture. JRuby support. Move C URIClassifier into mongrel_experimental project.
+  v1.1. Pure Ruby URIClassifier. More modular architecture. JRuby support. Move C URIClassifier into mongrel_experimental project.
 
-v1.0.4. Backport fixes for versioning inconsistency, mongrel_rails bug, and DirHandler bug.
+  v1.0.4. Backport fixes for versioning inconsistency, mongrel_rails bug, and DirHandler bug.
 
-v1.0.3. Fix user-switching bug; make people upgrade to the latest from the RC.
+  v1.0.3. Fix user-switching bug; make people upgrade to the latest from the RC.
 
-v1.0.2. Signed gem; many minor bugfixes and patches.
+  v1.0.2. Signed gem; many minor bugfixes and patches.

data/CONTRIBUTORS

@@ -1,20 +1,29 @@
-Unicorn would not be possible without Zed and all the contributors to Mongrel.
+Unicorn developers:
+* Eric Wong
+* ... (help wanted)
 
-Eric Wong
-Ezra Zygmuntowicz
-Zed A. Shaw
-Luis Lavena
-Wilson Bilkovich
-Why the Lucky Stiff
-Dan Kubb
-MenTaLguY
-Filipe Lautert
-Rick Olson
-Wayne E. Seguin
-Kirk Haines
-Bradley Taylor
-Matt Pelletier
-Ry Dahl
-Nick Sieger
-Evan Weaver
-Marc-André Cournoyer
+We would like to thank following folks for helping make Unicorn possible:
+
+* Ezra Zygmuntowicz - for helping Eric decide on a sane configuration
+  format and reasonable defaults.
+* Christian Neukirchen - for Rack, which let us put more focus on the server
+  and drastically cut down on the amount of code we have to maintain.
+* Zed A. Shaw - for Mongrel, without which Unicorn would not be possible
+
+The original Mongrel contributors:
+
+* Luis Lavena
+* Wilson Bilkovich
+* Why the Lucky Stiff
+* Dan Kubb
+* MenTaLguY
+* Filipe Lautert
+* Rick Olson
+* Wayne E. Seguin
+* Kirk Haines
+* Bradley Taylor
+* Matt Pelletier
+* Ry Dahl
+* Nick Sieger
+* Evan Weaver
+* Marc-André Cournoyer

data/DESIGN

@@ -32,7 +32,8 @@
   Rack application itself is called only within the worker process (but
   can be loaded within the master).  A copy-on-write friendly garbage
   collector like Ruby Enterprise Edition can be used to minimize memory
-  usage along with the "preload_app true" directive.
+  usage along with the "preload_app true" directive (see
+  Unicorn::Configurator).
 
 * The number of worker processes should be scaled to the number of
   CPUs, memory or even spindles you have.  If you have an existing

data/Manifest

@@ -11,6 +11,7 @@ Rakefile
 SIGNALS
 TODO
 bin/unicorn
+bin/unicorn_rails
 ext/unicorn/http11/ext_help.h
 ext/unicorn/http11/extconf.rb
 ext/unicorn/http11/http11.c

data/README

@@ -35,7 +35,7 @@ proxy we know of that meets this requirement.
 == License
 
 Unicorn is copyright 2009 Eric Wong and contributors.
-It is based on Mongrel:
+It is based on Mongrel and carries the same license:
 
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed
 under the Ruby license and the GPL2. See the include LICENSE file for
@@ -46,28 +46,82 @@ details.
 The library consists of a C extension so you'll need a C compiler or at
 least a friend who can build it for you.
 
-Finally, the source includes a setup.rb for those who hate RubyGems.
+You may download the tarball from the Mongrel project page on Rubyforge
+and run setup.rb after unpacking it:
 
-You can get the source via git via the following locations:
+  http://rubyforge.org/frs/?group_id=1306
 
-  git://git.bogomips.org/unicorn.git
+You may also install it via Rubygems on Rubyforge:
+
+  gem install unicorn
+
+You can get the latest source via git from the following locations
+(these versions may not be stable):
 
+  git://git.bogomips.org/unicorn.git
   http://git.bogomips.org/unicorn.git
+  git://repo.or.cz/unicorn.git (mirror)
+  http://repo.or.cz/r/unicorn.git (mirror)
+
+If you have web browser software for the World Wide Web
+(on the Information Superhighway), you may browse the code from
+your web browser and download the latest snapshot tarballs here:
+
+* http://git.bogomips.org/cgit/unicorn.git
+* http://repo.or.cz/w/unicorn.git (gitweb mirror)
 
 == Usage
 
+=== non-Rails Rack applications
+
 Unicorn will look for the config.ru file used by rackup in APP_ROOT.
-Optionally, it can use a config file specified by the --config-file/-c
-command-line switch.
+Optionally, it can use a config file for unicorn-specific options
+specified by the --config-file/-c command-line switch.  See
+Unicorn::Configurator for the syntax of the unicorn-specific
+config options.
+
+In APP_ROOT, just run:
+
+  unicorn
 
-Unicorn should be capable of running all Rack applications.  Since this
+Unicorn should be capable of running most Rack applications.  Since this
 is a preforking webserver, you do not have to worry about thread-safety
 of your application or libraries. However, your Rack application may use
 threads internally (and should even be able to continue running threads
 after the request is complete).
 
-== Contact
+=== Rack-enabled versions of Rails (v2.3.2+)
+
+In RAILS_ROOT, run:
+
+  unicorn_rails
+
+Most command-line options for other Rack applications (above) are also
+supported.  The unicorn_rails launcher attempts to combine the best
+features of the Rails-bundled "script/server" with the "rackup"-like
+functionality of the `unicorn' launcher.
+
+== Disclaimer
 
-Newsgroup and mailing list coming, or it'll be a part of the Mongrel project...
+There are no known production instances of unicorn deployed
+anywhere in the world.  The original author of unicorn only has
+one, internal, low-traffic Sinatra application deployed with it.
+Maybe you'll be the first guinea pig to test it in production.
+Of course there is NO WARRANTY whatsoever if anything goes wrong,
+but let us know and we'll try our best to fix it.
+
+== Known Issues
+
+* WONTFIX: code reloading with Sinatra 0.3.2 (and likely older
+  versions) apps is broken.  The workaround is to force production
+  mode to disable code reloading in your Sinatra application:
+    set :env, :production
+  Since this is no longer an issue with Sinatra 0.9.x apps and only
+  affected non-production instances, this will not be fixed on our end.
+  Also remember we're capable of replacing the running binary without
+  dropping any connections regardless of framework :)
+
+== Contact
 
+Newsgroup and mailing list maybe coming...
 Email Eric Wong at normalperson@yhbt.net for now.

data/SIGNALS

@@ -7,6 +7,8 @@ processes are documented here as well.
 === Master Process
 
  * HUP - reload config file and gracefully restart all workers
+   If preload_app is false (the default), the application code
+   will be reloaded when workers are restarted as well.
 
  * INT/TERM - quick shutdown, kills all workers immediately
 

data/bin/unicorn_rails

@@ -0,0 +1,238 @@
+#!/home/ew/bin/ruby
+$stdin.sync = $stdout.sync = $stderr.sync = true
+require 'unicorn' # require this first to populate Unicorn::DEFAULT_START_CTX
+require 'optparse'
+require 'fileutils'
+
+rails_pid = File.join(Unicorn::HttpServer::DEFAULT_START_CTX[:cwd],
+                      "/tmp/pids/unicorn.pid")
+cmd = File.basename($0)
+daemonize = false
+listeners = []
+options = { :listeners => listeners }
+host, port = Unicorn::Const::DEFAULT_HOST, 3000
+ENV['RAILS_ENV'] ||= "development"
+map_path = ENV['RAILS_RELATIVE_URL_ROOT']
+
+opts = OptionParser.new("", 24, '  ') do |opts|
+  opts.banner = "Usage: #{cmd} " \
+                "[ruby options] [#{cmd} options] [rackup config file]"
+  opts.separator "Ruby options:"
+
+  lineno = 1
+  opts.on("-e", "--eval LINE", "evaluate a LINE of code") do |line|
+    eval line, TOPLEVEL_BINDING, "-e", lineno
+    lineno += 1
+  end
+
+  opts.on("-d", "--debug", "set debugging flags (set $DEBUG to true)") do
+    $DEBUG = true
+  end
+
+  opts.on("-w", "--warn", "turn warnings on for your script") do
+    $-w = true
+  end
+
+  opts.on("-I", "--include PATH",
+          "specify $LOAD_PATH (may be used more than once)") do |path|
+    $LOAD_PATH.unshift(*path.split(/:/))
+  end
+
+  opts.on("-r", "--require LIBRARY",
+          "require the library, before executing your script") do |library|
+    require library
+  end
+
+  opts.separator "#{cmd} options:"
+
+  # some of these switches exist for rackup command-line compatibility,
+
+  opts.on("-o", "--host HOST",
+          "listen on HOST (default: #{Unicorn::Const::DEFAULT_HOST})") do |h|
+    host = h
+  end
+
+  opts.on("-p", "--port PORT", "use PORT (default: #{port})") do |p|
+    port = p.to_i
+  end
+
+  opts.on("-E", "--env ENVIRONMENT",
+          "use ENVIRONMENT for defaults (default: development)") do |e|
+    ENV['RAILS_ENV'] = e
+  end
+
+  opts.on("-D", "--daemonize", "run daemonized in the background") do |d|
+    daemonize = d ? true : false
+  end
+
+  # Unicorn-specific stuff
+  opts.on("-l", "--listen {HOST:PORT|PATH}",
+          "listen on HOST:PORT or PATH",
+          "this may be specified multiple times",
+          "(default: #{Unicorn::Const::DEFAULT_LISTEN})") do |address|
+    listeners << address
+  end
+
+  opts.on("-c", "--config-file FILE", "Unicorn-specific config file") do |f|
+    options[:config_file] = File.expand_path(f)
+  end
+
+  opts.on("-P", "--path PATH", "Runs Rails app mounted at a specific path.",
+          "(default: /") do |v|
+    map_path = v
+  end
+
+  # I'm avoiding Unicorn-specific config options on the command-line.
+  # IMNSHO, config options on the command-line are redundant given
+  # config files and make things unnecessarily complicated with multiple
+  # places to look for a config option.
+
+  opts.separator "Common options:"
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("-v", "--version", "Show version") do
+    puts " v#{Unicorn::Const::UNICORN_VERSION}"
+    exit
+  end
+
+  opts.parse! ARGV
+end
+
+require 'pp' if $DEBUG
+
+# Loads Rails and the private version of Rack it bundles. Returns a
+# lambda of arity==0 that will return *another* lambda of arity==1
+# suitable for using inside Rack::Builder.new block.
+rails_loader = lambda do ||
+  begin
+    require 'config/boot'
+    defined?(::RAILS_ROOT) or abort "RAILS_ROOT not defined by config/boot"
+    defined?(::RAILS_ENV) or abort "RAILS_ENV not defined by config/boot"
+    defined?(::Rails::VERSION::STRING) or
+      abort "Rails::VERSION::STRING not defined by config/boot"
+  rescue LoadError
+    abort "#$0 must be run inside RAILS_ROOT (#{::RAILS_ROOT})"
+  end
+
+  if ENV['UNICORN_RAILS_USE_SYSTEM_RACK'].to_i == 0
+    rails_ver = Rails::VERSION::STRING
+
+    # maps Rails versions to the vendorized Rack version they bundle
+    version_map = {
+      '2.3.2' => '1.0',
+      # 3.0.0 => false, # assuming 3.0.0 doesn't need vendorized Rack anymore
+    }
+    rack_ver = version_map[rails_ver] or
+      warn "Possibly unsupported Rails version: v#{rails_ver}"
+
+    rack_path = nil
+    case rack_ver
+    when String, NilClass
+      version_map.values.find_all { |v| String === v }.sort.each do |v|
+        $LOAD_PATH.grep(%r{/actionpack-[\d\.]+/lib/?\z}).each do |path|
+          rack_path = File.join(path, "action_controller/vendor/rack-#{v}")
+          File.directory?(rack_path) and break
+          rack_path = nil
+        end
+        break if rack_path
+      end
+      rack_path or abort(
+        "Unable to find Rails-vendorized Rack library.\n" \
+        "Perhaps this script is no longer with your" \
+        "Rails version (#{rails_ver}).\n")
+      puts "vendorized Rack load path #{rack_path}"
+      $LOAD_PATH.unshift(rack_path)
+    when FalseClass
+      # using non-vendorized rack library (most likely via gems)
+    end
+  end # Vendorized Rack LOAD_PATH finder
+
+  # require Rack as late as possible in case $LOAD_PATH is modified
+  # in config.ru or command-line
+  require 'rack'
+
+  # return the lambda
+  config = ::ARGV[0] || (File.exist?('config.ru') ? 'config.ru' : nil)
+  case config
+  when nil
+    lambda do ||
+      require "#{RAILS_ROOT}/config/environment"
+      ActionController::Dispatcher.new
+    end
+  when /\.ru$/
+    raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
+    # parse embedded command-line options in config.ru comments
+    if raw[/^#\\(.*)/]
+      opts.parse! $1.split(/\s+/)
+      require 'pp' if $DEBUG
+    end
+    lambda { || eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config) }
+  else
+    lambda do ||
+      require config
+      Object.const_get(File.basename(config, '.rb').capitalize)
+    end
+  end
+end
+
+# this won't run until after forking if preload_app is false
+app = lambda do ||
+  inner_app = rails_loader.call
+  require 'active_support'
+  require 'action_controller'
+  ActionController::Base.relative_url_root = map_path if map_path
+  Rack::Builder.new do
+    use Rails::Rack::LogTailer unless daemonize
+    use Rails::Rack::Debugger if $DEBUG
+    map(map_path || '/') do
+      use Rails::Rack::Static
+      run inner_app.call
+    end
+  end.to_app
+end
+
+if listeners.empty?
+  listener = "#{host}:#{port}"
+  listeners << listener
+end
+
+if $DEBUG
+  pp({
+    :unicorn_options => options,
+    :app => app,
+    :daemonize => daemonize,
+  })
+end
+
+# only daemonize if we're not inheriting file descriptors from our parent
+if daemonize
+  options[:pid] = rails_pid
+  $stdin.reopen("/dev/null")
+  unless ENV['UNICORN_FD']
+    exit if fork
+    Process.setsid
+    exit if fork
+  end
+
+  # We don't do a lot of standard daemonization stuff:
+  #   * $stderr/$stderr can/will be redirected separately
+  #   * umask is whatever was set by the parent process at startup
+  #     and can be set in config.ru and config_file, so making it
+  #     0000 and potentially exposing sensitive log data can be bad
+  #     policy.
+  #   * Don't bother to chdir here since Unicorn is designed to
+  #     run inside APP_ROOT.  Unicorn will also re-chdir() to
+  #     the directory it was started in when being re-executed
+  #     to pickup code changes if the original deployment directory
+  #     is a symlink or otherwise got replaced.
+end
+
+# ensure Rails standard tmp paths exist
+%w(cache pids sessions sockets).each do |dir|
+  FileUtils.mkdir_p("tmp/#{dir}")
+end
+Unicorn.run(app, options)

data/lib/unicorn.rb

@@ -53,7 +53,7 @@ module Unicorn
       @start_ctx = DEFAULT_START_CTX.dup
       @start_ctx.merge!(start_ctx) if start_ctx
       @app = app
-      @mode = :idle
+      @sig_queue = []
       @master_pid = $$
       @workers = Hash.new
       @io_purgatory = [] # prevents IO objects in here from being GC-ed
@@ -160,15 +160,17 @@ module Unicorn
       # are trapped.  See trap_deferred
       @rd_sig, @wr_sig = IO.pipe unless (@rd_sig && @wr_sig)
       @rd_sig.nonblock = @wr_sig.nonblock = true
+      ready = mode = nil
 
-      reset_master
+      QUEUE_SIGS.each { |sig| trap_deferred(sig) }
+      trap('CHLD') { |sig_nr| awaken_master }
       $0 = "unicorn master"
-      logger.info "master process ready" # test relies on this message
+      logger.info "master process ready" # test_exec.rb relies on this message
       begin
         loop do
           reap_all_workers
-          case @mode
-          when :idle
+          case (mode = @sig_queue.shift)
+          when nil
             murder_lazy_workers
             spawn_missing_workers
           when 'QUIT' # graceful shutdown
@@ -176,17 +178,14 @@ module Unicorn
           when 'TERM', 'INT' # immediate shutdown
             stop(false)
             break
-          when 'USR1' # user-defined (probably something like log reopening)
+          when 'USR1' # rotate logs
             kill_each_worker('USR1')
             Unicorn::Util.reopen_logs
-            reset_master
           when 'USR2' # exec binary, stay alive in case something went wrong
             reexec
-            reset_master
           when 'HUP'
             if @config.config_file
               load_config!
-              reset_master
               redo # immediate reaping since we may have QUIT workers
             else # exec binary and exit if there's no config file
               logger.info "config_file not present, reexecuting binary"
@@ -194,8 +193,7 @@ module Unicorn
               break
             end
           else
-            logger.error "master process in unknown mode: #{@mode}, resetting"
-            reset_master
+            logger.error "master process in unknown mode: #{mode}"
           end
           reap_all_workers
 
@@ -204,9 +202,10 @@ module Unicorn
           rescue Errno::EINTR # next
           end
           ready[0] && ready[0][0] or next
-          begin # just consume the pipe when we're awakened, @mode is set
-            loop { @rd_sig.sysread(Const::CHUNK_SIZE) }
-          rescue Errno::EAGAIN, Errno::EINTR # next
+          begin
+            @rd_sig.sysread(1)
+          rescue Errno::EAGAIN, Errno::EINTR
+            # spurious wakeup? ignore it
           end
         end
       rescue Errno::EINTR
@@ -214,7 +213,6 @@ module Unicorn
       rescue Object => e
         logger.error "Unhandled master loop exception #{e.inspect}."
         logger.error e.backtrace.join("\n")
-        reset_master
         retry
       end
       stop # gracefully shutdown all workers on our way out
@@ -241,31 +239,27 @@ module Unicorn
     private
 
     # list of signals we care about and trap in master.
-    TRAP_SIGS = %w(QUIT INT TERM USR1 USR2 HUP).map { |x| x.freeze }.freeze
+    QUEUE_SIGS = %w(QUIT INT TERM USR1 USR2 HUP).map { |x| x.freeze }.freeze
 
     # defer a signal for later processing in #join (master process)
     def trap_deferred(signal)
       trap(signal) do |sig_nr|
-        # we only handle/defer one signal at a time and ignore all others
-        # until we're ready again.  Queueing signals can lead to more bugs,
-        # and simplicity is the most important thing
-        TRAP_SIGS.each { |sig| trap(sig, 'IGNORE') }
-        if Symbol === @mode
-          @mode = signal
-          begin
-            @wr_sig.syswrite('.') # wakeup master process from IO.select
-          rescue Errno::EAGAIN
-          rescue Errno::EINTR
-            retry
-          end
+        if @sig_queue.size < 5
+          @sig_queue << signal
+          awaken_master
+        else
+          logger.error "ignoring SIG#{signal}, queue=#{@sig_queue.inspect}"
         end
       end
     end
 
-
-    def reset_master
-      @mode = :idle
-      TRAP_SIGS.each { |sig| trap_deferred(sig) }
+    def awaken_master
+      begin
+        @wr_sig.syswrite('.') # wakeup master process from IO.select
+      rescue Errno::EAGAIN # pipe is full, master should wake up anyways
+      rescue Errno::EINTR
+        retry
+      end
     end
 
     # reaps all unreaped workers
@@ -352,6 +346,13 @@ module Unicorn
       return if @workers.size == @worker_processes
       (0...@worker_processes).each do |worker_nr|
         @workers.values.include?(worker_nr) and next
+        begin
+          Dir.chdir(@start_ctx[:cwd])
+        rescue Errno::ENOENT => err
+          logger.fatal "#{err.inspect} (#{@start_ctx[:cwd]})"
+          @sig_queue << 'QUIT' # forcibly emulate SIGQUIT
+          return
+        end
         tempfile = Tempfile.new('') # as short as possible to save dir space
         tempfile.unlink # don't allow other processes to find or see it
         tempfile.sync = true
@@ -389,7 +390,8 @@ module Unicorn
     # by the user.
     def init_worker_process(worker)
       build_app! unless @preload_app
-      TRAP_SIGS.each { |sig| trap(sig, 'IGNORE') }
+      @sig_queue.clear
+      QUEUE_SIGS.each { |sig| trap(sig, 'IGNORE') }
       trap('CHLD', 'DEFAULT')
       trap('USR1') do
         @logger.info "worker=#{worker.nr} rotating logs..."
@@ -403,7 +405,7 @@ module Unicorn
       @workers.values.each { |other| other.tempfile.close rescue nil }
       @workers.clear
       @start_ctx.clear
-      @mode = @start_ctx = @workers = @rd_sig = @wr_sig = nil
+      @start_ctx = @workers = @rd_sig = @wr_sig = nil
       @listeners.each { |sock| set_cloexec(sock) }
       ENV.delete('UNICORN_FD')
       @after_fork.call(self, worker.nr) if @after_fork

data/lib/unicorn/configurator.rb

@@ -194,6 +194,10 @@ module Unicorn
     # properly close/reopen sockets.  Files opened for logging do not
     # have to be reopened as (unbuffered-in-userspace) files opened with
     # the File::APPEND flag are written to atomically on UNIX.
+    #
+    # In addition to reloading the unicorn-specific config settings,
+    # SIGHUP will reload application code in the working
+    # directory/symlink when workers are gracefully restarted.
     def preload_app(bool)
       case bool
       when TrueClass, FalseClass

data/lib/unicorn/const.rb

@@ -68,7 +68,7 @@ module Unicorn
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
     
-    UNICORN_VERSION="0.1.0".freeze
+    UNICORN_VERSION="0.2.1".freeze
 
     UNICORN_TMP_BASE="unicorn".freeze
 

data/lib/unicorn/socket.rb

@@ -75,6 +75,7 @@ module Unicorn
     def bind_listen(address = '0.0.0.0:8080', backlog = 1024)
       return address unless String === address
 
+      address = File.expand_path(address) if address[0..0] == "~"
       domain, bind_addr = if address[0..0] == "/"
         if File.exist?(address)
           if File.socket?(address)

data/test/exec/test_exec.rb

@@ -283,6 +283,7 @@ end
     results = retry_hit(["http://#{@addr}:#{@port}/"])
     assert_equal String, results[0].class
     wait_master_ready(COMMON_TMP.path)
+    wait_workers_ready(COMMON_TMP.path, 4)
     bf = File.readlines(COMMON_TMP.path).grep(/\bbefore_fork: worker=/)
     assert_equal 4, bf.size
     rotate = Tempfile.new('unicorn_rotate')
@@ -496,6 +497,21 @@ end
       assert status.success?, "exited successfully"
     end
 
+    def wait_workers_ready(path, nr_workers)
+      tries = DEFAULT_TRIES
+      lines = []
+      while (tries -= 1) > 0
+        begin
+          lines = File.readlines(path).grep(/worker=\d+ spawned/)
+          lines.size == nr_workers and return
+        rescue Errno::ENOENT
+        end
+        sleep DEFAULT_RES
+      end
+      raise "#{nr_workers} workers never became ready:" \
+            "\n\t#{lines.join("\n\t")}\n"
+    end
+
     def wait_master_ready(master_log)
       tries = DEFAULT_TRIES
       while (tries -= 1) > 0
@@ -555,7 +571,7 @@ end
       while (tries -= 1) > 0 && ! File.exist?(path)
         sleep DEFAULT_RES
       end
-      assert File.exist?(path), "path=#{path} exists"
+      assert File.exist?(path), "path=#{path} exists #{caller.inspect}"
     end
 
     def xfork(&block)

data/test/test_helper.rb

@@ -41,7 +41,18 @@ def redirect_test_io
     STDOUT.reopen(orig_out)
   end
 end
-    
+
+# which(1) exit codes cannot be trusted on some systems
+# We use UNIX shell utilities in some tests because we don't trust
+# ourselves to write Ruby 100% correctly :)
+def which(bin)
+  ex = ENV['PATH'].split(/:/).detect do |x|
+    x << "/#{bin}"
+    File.executable?(x)
+  end or warn "`#{bin}' not found in PATH=#{ENV['PATH']}"
+  ex
+end
+
 # Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
 # HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
 def hit(uris)

data/test/unit/test_upload.rb

@@ -135,6 +135,34 @@ class UploadTest < Test::Unit::TestCase
     assert_equal resp[:size], new_tmp.stat.size
   end
 
+  # Despite reading numerous articles and inspecting the 1.9.1-p0 C
+  # source, Eric Wong will never trust that we're always handling
+  # encoding-aware IO objects correctly.  Thus this test uses shell
+  # utilities that should always operate on files/sockets on a
+  # byte-level.
+  def test_uncomfortable_with_onenine_encodings
+    # POSIX doesn't require all of these to be present on a system
+    which('curl') or return
+    which('sha1sum') or return
+    which('dd') or return
+
+    start_server(@sha1_app)
+
+    tmp = Tempfile.new('dd_dest')
+    assert(system("dd", "if=#{@random.path}", "of=#{tmp.path}",
+                        "bs=#{@bs}", "count=#{@count}"),
+           "dd #@random to #{tmp}")
+    sha1_re = %r!\b([a-f0-9]{40})\b!
+    sha1_out = `sha1sum #{tmp.path}`
+    assert $?.success?, 'sha1sum ran OK'
+
+    assert_match(sha1_re, sha1_out)
+    sha1 = sha1_re.match(sha1_out)[1]
+    resp = `curl -isSfN -T#{tmp.path} http://#@addr:#@port/`
+    assert $?.success?, 'curl ran OK'
+    assert_match(%r!\b#{sha1}\b!, resp)
+  end
+
   private
 
   def length

data/unicorn.gemspec

@@ -2,18 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Wong"]
-  s.date = %q{2009-03-10}
-  s.default_executable = %q{unicorn}
+  s.date = %q{2009-03-18}
   s.description = %q{A small fast HTTP library and server for Rack applications.}
   s.email = %q{normalperson@yhbt.net}
-  s.executables = ["unicorn"]
+  s.executables = ["unicorn", "unicorn_rails"]
   s.extensions = ["ext/unicorn/http11/extconf.rb"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "bin/unicorn", "ext/unicorn/http11/ext_help.h", "ext/unicorn/http11/extconf.rb", "ext/unicorn/http11/http11.c", "ext/unicorn/http11/http11_parser.c", "ext/unicorn/http11/http11_parser.h", "ext/unicorn/http11/http11_parser.rl", "ext/unicorn/http11/http11_parser_common.rl", "lib/unicorn.rb", "lib/unicorn/configurator.rb", "lib/unicorn/const.rb", "lib/unicorn/http_request.rb", "lib/unicorn/http_response.rb", "lib/unicorn/socket.rb", "lib/unicorn/util.rb"]
-  s.files = [".document", ".gitignore", "CHANGELOG", "CONTRIBUTORS", "DESIGN", "GNUmakefile", "LICENSE", "Manifest", "README", "Rakefile", "SIGNALS", "TODO", "bin/unicorn", "ext/unicorn/http11/ext_help.h", "ext/unicorn/http11/extconf.rb", "ext/unicorn/http11/http11.c", "ext/unicorn/http11/http11_parser.c", "ext/unicorn/http11/http11_parser.h", "ext/unicorn/http11/http11_parser.rl", "ext/unicorn/http11/http11_parser_common.rl", "lib/unicorn.rb", "lib/unicorn/configurator.rb", "lib/unicorn/const.rb", "lib/unicorn/http_request.rb", "lib/unicorn/http_response.rb", "lib/unicorn/socket.rb", "lib/unicorn/util.rb", "setup.rb", "test/aggregate.rb", "test/benchmark/previous.rb", "test/benchmark/simple.rb", "test/benchmark/utils.rb", "test/exec/README", "test/exec/test_exec.rb", "test/test_helper.rb", "test/tools/trickletest.rb", "test/unit/test_configurator.rb", "test/unit/test_http_parser.rb", "test/unit/test_response.rb", "test/unit/test_server.rb", "test/unit/test_upload.rb", "unicorn.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "bin/unicorn", "bin/unicorn_rails", "ext/unicorn/http11/ext_help.h", "ext/unicorn/http11/extconf.rb", "ext/unicorn/http11/http11.c", "ext/unicorn/http11/http11_parser.c", "ext/unicorn/http11/http11_parser.h", "ext/unicorn/http11/http11_parser.rl", "ext/unicorn/http11/http11_parser_common.rl", "lib/unicorn.rb", "lib/unicorn/configurator.rb", "lib/unicorn/const.rb", "lib/unicorn/http_request.rb", "lib/unicorn/http_response.rb", "lib/unicorn/socket.rb", "lib/unicorn/util.rb"]
+  s.files = [".document", ".gitignore", "CHANGELOG", "CONTRIBUTORS", "DESIGN", "GNUmakefile", "LICENSE", "Manifest", "README", "Rakefile", "SIGNALS", "TODO", "bin/unicorn", "bin/unicorn_rails", "ext/unicorn/http11/ext_help.h", "ext/unicorn/http11/extconf.rb", "ext/unicorn/http11/http11.c", "ext/unicorn/http11/http11_parser.c", "ext/unicorn/http11/http11_parser.h", "ext/unicorn/http11/http11_parser.rl", "ext/unicorn/http11/http11_parser_common.rl", "lib/unicorn.rb", "lib/unicorn/configurator.rb", "lib/unicorn/const.rb", "lib/unicorn/http_request.rb", "lib/unicorn/http_response.rb", "lib/unicorn/socket.rb", "lib/unicorn/util.rb", "setup.rb", "test/aggregate.rb", "test/benchmark/previous.rb", "test/benchmark/simple.rb", "test/benchmark/utils.rb", "test/exec/README", "test/exec/test_exec.rb", "test/test_helper.rb", "test/tools/trickletest.rb", "test/unit/test_configurator.rb", "test/unit/test_http_parser.rb", "test/unit/test_response.rb", "test/unit/test_server.rb", "test/unit/test_upload.rb", "unicorn.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://unicorn.bogomips.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Unicorn", "--main", "README"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-10 00:00:00 -07:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -17,6 +17,7 @@ description: A small fast HTTP library and server for Rack applications.
 email: normalperson@yhbt.net
 executables: 
 - unicorn
+- unicorn_rails
 extensions: 
 - ext/unicorn/http11/extconf.rb
 extra_rdoc_files: 
@@ -25,6 +26,7 @@ extra_rdoc_files:
 - README
 - TODO
 - bin/unicorn
+- bin/unicorn_rails
 - ext/unicorn/http11/ext_help.h
 - ext/unicorn/http11/extconf.rb
 - ext/unicorn/http11/http11.c
@@ -53,6 +55,7 @@ files:
 - SIGNALS
 - TODO
 - bin/unicorn
+- bin/unicorn_rails
 - ext/unicorn/http11/ext_help.h
 - ext/unicorn/http11/extconf.rb
 - ext/unicorn/http11/http11.c