thin 0.5.4 → 0.6.0

data/tasks/announce.rake

@@ -0,0 +1,18 @@
+require 'erb'
+
+MSG_TEMPLATE = File.dirname(__FILE__) + '/email.erb'
+SEND_TO      = %w(thin-ruby@googlegroups.com eventmachine-talk@rubyforge.org Rubymtl@lists.artengine.ca ruby-talk@ruby-lang.org)
+
+desc 'Generate a template for the new version annoucement'
+task :ann do
+  msg = ERB.new(File.read(MSG_TEMPLATE)).result(binding)
+    
+  body = <<END_OF_MESSAGE
+To: #{SEND_TO.join(', ')}
+Subject: [ANN] Thin #{Thin::VERSION::STRING} #{Thin::VERSION::CODENAME} released
+
+#{msg}
+END_OF_MESSAGE
+
+  puts body
+end

data/tasks/deploy.rake

@@ -0,0 +1,16 @@
+namespace :deploy do
+  task :site => %w(site:upload rdoc:upload)
+  
+  desc 'Deploy on code.macournoyer.com'
+  task :alpha => %w(gem:upload deploy:site)
+  
+  desc 'Deploy on rubyforge'
+  task :public => %w(gem:upload_rubyforge deploy:site)  
+end
+desc 'Deploy on all servers'
+task :deploy => %w(deploy:alpha deploy:public)
+
+def upload(file, to, options={})
+  sh %{ssh macournoyer@macournoyer.com "rm -rf code.macournoyer.com/#{to}"} if options[:replace]
+  sh %{scp -rq #{file} macournoyer@macournoyer.com:code.macournoyer.com/#{to}}
+end

data/tasks/email.erb

@@ -0,0 +1,46 @@
+Hey all,
+
+Version <%= Thin::VERSION::STRING %> (codename <%= Thin::VERSION::CODENAME %>) of the fastest Ruby server is out!
+
+http://code.macournoyer.com/thin/
+
+== What's new?
+
+Bug fix in daemon mode and speed boost for all!
+
+* Don't read the full body, use direct streaming when sending response.
+  See: Response#each
+  As a result, the Content-Length can not be calculated anymore.
+  You have to do set this in your adapter. All frameworks do it anyway.
+  It improve memory usage and boost speed for low concurrency.
+  Thanks to Kent Sibilev and Ezra for their help on that one.
+* Add 'Server' response header
+* Fix --user and --group option not changing daemon process privileges
+
+== Get it!
+
+ sudo gem install thin
+ 
+Might take some time for the gem mirrors to be updated, try adding
+--source http://code.macournoyer.com to the command if it doesn't work
+
+If you installed a previous alpha version (if you have <%= Thin::VERSION::STRING %> already installed)
+uninstall it before: sudo gem uninstall thin
+
+WARNING:
+Thin is still alpha software, if you use it on your server you understand the
+risks that are involved.
+ 
+== Contribute
+
+If you're using Thin, let me know and I'll put your site on http://code.macournoyer.com/thin/users/
+
+Thin is driven by an active community of passionate coders and benchmarkers. Please join us, contribute
+or share some ideas in Thin Google Group: http://groups.google.com/group/thin-ruby/topics
+
+Also on IRC: #thin on freenode
+
+Thanks to all the people who contributed to Thin, EventMachine, Rack and Mongrel.
+
+Marc-Andre Cournoyer
+http://macournoyer.com/

data/tasks/ext.rake

@@ -0,0 +1,38 @@
+CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM)
+
+EXT_DIR    = 'ext/thin_parser'
+EXT_BUNDLE = "#{EXT_DIR}/thin_parser.#{Config::CONFIG['DLEXT']}"
+EXT_FILES  = FileList[
+  "#{EXT_DIR}/*.c",
+  "#{EXT_DIR}/*.h",
+  "#{EXT_DIR}/*.rl",
+  "#{EXT_DIR}/extconf.rb",
+  "#{EXT_DIR}/Makefile",
+  "lib"
+]
+
+desc "Compile the Ragel state machines"
+task :ragel do
+  Dir.chdir EXT_DIR do
+    target = "parser.c"
+    File.unlink target if File.exist? target
+    sh "ragel parser.rl | rlgen-cd -G2 -o #{target}"
+    raise "Failed to compile Ragel state machine" unless File.exist? target
+  end
+end
+  
+desc "Compile the extensions"
+task :compile => ["#{EXT_DIR}/Makefile", EXT_BUNDLE]
+
+task :package => :compile
+
+file "#{EXT_DIR}/Makefile" => ["#{EXT_DIR}/extconf.rb"] do
+  cd(EXT_DIR) { ruby "extconf.rb" }
+end
+
+file EXT_BUNDLE => EXT_FILES do
+  cd EXT_DIR do
+    sh(WIN ? 'nmake' : 'make')
+  end
+  cp EXT_BUNDLE, 'lib/'
+end

data/tasks/gem.rake

@@ -0,0 +1,97 @@
+require 'rake/gempackagetask'
+
+task :clean => :clobber_package
+
+spec = Gem::Specification.new do |s|
+  s.name                  = Thin::NAME
+  s.version               = Thin::VERSION::STRING
+  s.platform              = WIN ? Gem::Platform::CURRENT : Gem::Platform::RUBY
+  s.summary               = 
+  s.description           = "A thin and fast web server"
+  s.author                = "Marc-Andre Cournoyer"
+  s.email                 = 'macournoyer@gmail.com'
+  s.homepage              = 'http://code.macournoyer.com/thin/'
+  s.executables           = %w(thin)
+
+  s.required_ruby_version = '>= 1.8.6' # Makes sure the CGI eof fix is there
+  
+  s.add_dependency        'rack',         '>= 0.2.0'
+  s.add_dependency        'eventmachine', '>= 0.8.1'
+  unless WIN
+    s.add_dependency        'daemons',      '>= 1.0.9'
+  end
+
+  s.files                 = %w(COPYING CHANGELOG README Rakefile) +
+                            Dir.glob("{benchmark,bin,doc,example,lib,spec,tasks}/**/*") + 
+                            Dir.glob("ext/**/*.{h,c,rb,rl}")
+  
+  if WIN
+    s.files              += ["lib/thin_parser.#{Config::CONFIG['DLEXT']}"]
+  else
+    s.extensions          = FileList["ext/**/extconf.rb"].to_a
+  end
+  
+  s.require_path          = "lib"
+  s.bindir                = "bin"
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+end
+
+task :tag_warn do
+  puts "*" * 40
+  puts "Don't forget to tag the release:"
+  puts
+  puts "  git tag -m 'Tagging #{Thin::SERVER}' -a v#{Thin::VERSION::STRING}"
+  puts
+  puts "or run rake tag"
+  puts "*" * 40
+end
+task :tag do
+  sh "git tag -m 'Tagging #{Thin::SERVER}' -a v#{Thin::VERSION::STRING}"
+end
+task :gem => :tag_warn
+
+namespace :gem do
+  desc 'Upload gem to code.macournoyer.com'
+  task :upload => :gem do
+    upload "pkg/#{spec.full_name}.gem", 'gems'
+    system 'ssh macournoyer@macournoyer.com "cd code.macournoyer.com && gem generate_index"'
+  end
+  
+  namespace :upload do
+    desc 'Upload the precompiled win32 gem to code.macournoyer.com'
+    task :win do
+      upload "pkg/#{spec.full_name}-x86-mswin32-60.gem", 'gems'
+      system 'ssh macournoyer@macournoyer.com "cd code.macournoyer.com && gem generate_index"'
+    end    
+
+    desc 'Upload gem to rubyforge.org'
+    task :rubyforge => :gem do
+      sh 'rubyforge login'
+      sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
+      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"    
+    end
+
+    desc 'Upload the precompiled win32 gem to rubyforge.org'
+    task 'rubyforge:win' do
+      sh 'rubyforge login'
+      sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-x86-mswin32-60.gem"
+      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-x86-mswin32-60.gem"
+    end
+  end  
+end
+
+task :install => [:clobber, :compile, :package] do
+  sh "#{SUDO} #{gem} install pkg/#{spec.full_name}.gem"
+end
+
+task :uninstall => :clean do
+  sh "#{SUDO} #{gem} uninstall -v #{Thin::VERSION::STRING} -x #{Thin::NAME}"
+end
+
+
+def gem
+  RUBY_1_9 ? 'gem19' : 'gem'
+end

data/tasks/rdoc.rake

@@ -0,0 +1,25 @@
+require 'rake/rdoctask'
+
+CLEAN.include %w(doc/rdoc)
+
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'doc/rdoc'
+  rdoc.options += ['--quiet', '--title', Thin::NAME,
+             	     "--opname", "index.html",
+            	     "--line-numbers",
+            	     "--main", "README",
+            	     "--inline-source"]
+  rdoc.template = "site/rdoc.rb"
+  rdoc.main = "README"
+  rdoc.title = Thin::NAME
+  rdoc.rdoc_files.add %w(README) +
+                      FileList['lib/**/*.rb'] +
+                      FileList['bin/*']
+end
+
+namespace :rdoc do
+  desc 'Upload rdoc to code.macournoyer.com'
+  task :upload => :rdoc do
+    upload "doc/rdoc", 'thin/doc', :replace => true
+  end
+end

data/tasks/site.rake

@@ -0,0 +1,15 @@
+namespace :site do
+  task :build do
+    mkdir_p 'tmp/site/images'
+    cd 'tmp/site' do
+      sh "SITE_ROOT='/thin' ruby ../../site/thin.rb --dump"
+    end
+    cp 'site/style.css', 'tmp/site'
+    cp_r Dir['site/images/*'], 'tmp/site/images'
+  end
+  
+  desc 'Upload website to code.macournoyer.com'
+  task :upload => 'site:build' do
+    upload 'tmp/site/*', 'thin'
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,26 @@
+CLEAN.include %w(coverage tmp log)
+
+if RUBY_1_9
+  task :spec do
+    warn 'RSpec not yet supporting Ruby 1.9, so cannot run the specs :('
+  end
+else
+  # RSpec not yet working w/ Ruby 1.9
+  require 'spec/rake/spectask'
+  
+  desc "Run all examples"
+  Spec::Rake::SpecTask.new('spec') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+  
+  task :check_spec_gems do
+    begin
+      require 'spec'
+      require 'benchmark_unit'
+    rescue LoadError
+      abort "To run specs, install rspec and benchmark_unit gems"
+    end
+  end
+  
+  task :spec => [:check_spec_gems, :compile]
+end

data/tasks/stats.rake

@@ -0,0 +1,15 @@
+desc 'Show some stats about the code'
+task :stats do
+  line_count = proc do |path|
+    Dir[path].collect { |f| File.open(f).readlines.reject { |l| l =~ /(^\s*(\#|\/\*))|^\s*$/ }.size }.inject(0){ |sum,n| sum += n }
+  end
+  lib = line_count['lib/**/*.rb']
+  ext = line_count['ext/**/*.{c,h}'] 
+  spec = line_count['spec/**/*.rb']
+  ratio = '%1.2f' % (spec.to_f / lib.to_f)
+  
+  puts "#{lib.to_s.rjust(6)} LOC of lib"
+  puts "#{ext.to_s.rjust(6)} LOC of ext"
+  puts "#{spec.to_s.rjust(6)} LOC of spec"
+  puts "#{ratio.to_s.rjust(6)} ratio lib/spec"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-19 00:00:00 -05:00
+date: 2008-01-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ files:
 - benchmark/utils.rb
 - bin/thin
 - doc/benchmarks.txt
+- example/adapter.rb
 - example/config.ru
 - example/thin.god
 - lib/rack
@@ -73,9 +74,11 @@ files:
 - lib/thin/request.rb
 - lib/thin/response.rb
 - lib/thin/server.rb
+- lib/thin/stats.rb
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
+- lib/thin_parser.bundle
 - spec/cluster_spec.rb
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
@@ -101,6 +104,7 @@ files:
 - spec/rails_app/config/initializers/inflections.rb
 - spec/rails_app/config/initializers/mime_types.rb
 - spec/rails_app/config/routes.rb
+- spec/rails_app/log
 - spec/rails_app/public
 - spec/rails_app/public/404.html
 - spec/rails_app/public/422.html
@@ -135,10 +139,21 @@ files:
 - spec/rails_app/script/process/spawner
 - spec/rails_app/script/runner
 - spec/rails_app/script/server
+- spec/rails_app/tmp
+- spec/rails_app/tmp/pids
 - spec/request_spec.rb
 - spec/response_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
+- tasks/announce.rake
+- tasks/deploy.rake
+- tasks/email.erb
+- tasks/ext.rake
+- tasks/gem.rake
+- tasks/rdoc.rake
+- tasks/site.rake
+- tasks/spec.rake
+- tasks/stats.rake
 - ext/thin_parser/ext_help.h
 - ext/thin_parser/parser.h
 - ext/thin_parser/parser.c