From 7b9efe3f638a1c96acda71601ef3a04dd629895a Mon Sep 17 00:00:00 2001 From: Evan Phoenix Date: Tue, 22 Nov 2011 15:18:42 -0800 Subject: [PATCH] Bump to version 0.8.2 --- Manifest.txt | 11 +++++++---- README.txt | 1 - lib/puma/const.rb | 2 +- puma.gemspec | 14 +++++++------- tasks/gem.rake | 2 +- tasks/native.rake | 8 ++++++++ 6 files changed, 24 insertions(+), 14 deletions(-) delete mode 120000 README.txt diff --git a/Manifest.txt b/Manifest.txt index 0ebe2afa..e201f60c 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -1,4 +1,5 @@ COPYING +Gemfile History.txt LICENSE Manifest.txt @@ -17,23 +18,24 @@ examples/monitrc examples/random_thrash.rb examples/simpletest.rb examples/webrick_compare.rb -ext/puma_http11/Http11Service.java +ext/puma_http11/PumaHttp11Service.java ext/puma_http11/ext_help.h ext/puma_http11/extconf.rb -ext/puma_http11/puma_http11.c ext/puma_http11/http11_parser.c ext/puma_http11/http11_parser.h ext/puma_http11/http11_parser.java.rl ext/puma_http11/http11_parser.rl ext/puma_http11/http11_parser_common.rl -ext/puma_http11/org/jruby/mongrel/Http11.java -ext/puma_http11/org/jruby/mongrel/Http11Parser.java +ext/puma_http11/org/jruby/puma/Http11.java +ext/puma_http11/org/jruby/puma/Http11Parser.java +ext/puma_http11/puma_http11.c lib/puma.rb lib/puma/cli.rb lib/puma/const.rb lib/puma/events.rb lib/puma/gems.rb lib/puma/mime_types.yml +lib/puma/rack_patch.rb lib/puma/server.rb lib/puma/thread_pool.rb lib/puma/utils.rb @@ -45,6 +47,7 @@ tasks/native.rake tasks/ragel.rake test/lobster.ru test/mime.yaml +test/test_cli.rb test/test_http10.rb test/test_http11.rb test/test_persistent.rb diff --git a/README.txt b/README.txt deleted file mode 120000 index 42061c01..00000000 --- a/README.txt +++ /dev/null @@ -1 +0,0 @@ -README.md \ No newline at end of file diff --git a/lib/puma/const.rb b/lib/puma/const.rb index 6cf23a5b..ef3fb73c 100644 --- a/lib/puma/const.rb +++ b/lib/puma/const.rb @@ -71,7 +71,7 @@ module Puma PATH_INFO = 'PATH_INFO'.freeze - PUMA_VERSION = VERSION = "0.8.1".freeze + PUMA_VERSION = VERSION = "0.8.2".freeze PUMA_TMP_BASE = "puma".freeze diff --git a/puma.gemspec b/puma.gemspec index c7b9c836..21d68d5c 100644 --- a/puma.gemspec +++ b/puma.gemspec @@ -2,38 +2,38 @@ Gem::Specification.new do |s| s.name = "puma" - s.version = "0.8.1" + s.version = "0.8.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Evan Phoenix"] - s.date = "2011-10-25" + s.date = "2011-11-22" s.description = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications. It is designed for running rack apps only.\n\nWhat makes Puma so fast is the careful use of an Ragel extension to provide fast, accurate HTTP 1.1 protocol parsing. This makes the server scream without too many portability issues." s.email = ["evan@phx.io"] s.executables = ["puma"] s.extensions = ["ext/puma_http11/extconf.rb"] s.extra_rdoc_files = ["History.txt", "Manifest.txt"] - s.files = ["COPYING", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "examples/builder.rb", "examples/camping/README", "examples/camping/blog.rb", "examples/camping/tepee.rb", "examples/httpd.conf", "examples/mime.yaml", "examples/mongrel.conf", "examples/monitrc", "examples/random_thrash.rb", "examples/simpletest.rb", "examples/webrick_compare.rb", "ext/puma_http11/Http11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/puma_http11.c", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/mongrel/Http11.java", "ext/puma_http11/org/jruby/mongrel/Http11Parser.java", "lib/puma.rb", "lib/puma/cli.rb", "lib/puma/const.rb", "lib/puma/events.rb", "lib/puma/gems.rb", "lib/puma/mime_types.yml", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/utils.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tasks/gem.rake", "tasks/java.rake", "tasks/native.rake", "tasks/ragel.rake", "test/lobster.ru", "test/mime.yaml", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb", ".gemtest"] + s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "examples/builder.rb", "examples/camping/README", "examples/camping/blog.rb", "examples/camping/tepee.rb", "examples/httpd.conf", "examples/mime.yaml", "examples/mongrel.conf", "examples/monitrc", "examples/random_thrash.rb", "examples/simpletest.rb", "examples/webrick_compare.rb", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/cli.rb", "lib/puma/const.rb", "lib/puma/events.rb", "lib/puma/gems.rb", "lib/puma/mime_types.yml", "lib/puma/rack_patch.rb", "lib/puma/server.rb", "lib/puma/thread_pool.rb", "lib/puma/utils.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tasks/gem.rake", "tasks/java.rake", "tasks/native.rake", "tasks/ragel.rake", "test/lobster.ru", "test/mime.yaml", "test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb", "test/testhelp.rb", "tools/trickletest.rb", ".gemtest"] s.rdoc_options = ["--main", "README.md"] s.require_paths = ["lib"] s.rubyforge_project = "puma" s.rubygems_version = "1.8.10" s.summary = "Puma is a small library that provides a very fast and concurrent HTTP 1.1 server for Ruby web applications" - s.test_files = ["test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"] + s.test_files = ["test/test_cli.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_persistent.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"] if s.respond_to? :specification_version then s.specification_version = 3 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, ["~> 1.3"]) + s.add_runtime_dependency(%q, ["~> 1.2"]) s.add_development_dependency(%q, ["~> 0.7.0"]) s.add_development_dependency(%q, ["~> 2.10"]) else - s.add_dependency(%q, ["~> 1.3"]) + s.add_dependency(%q, ["~> 1.2"]) s.add_dependency(%q, ["~> 0.7.0"]) s.add_dependency(%q, ["~> 2.10"]) end else - s.add_dependency(%q, ["~> 1.3"]) + s.add_dependency(%q, ["~> 1.2"]) s.add_dependency(%q, ["~> 0.7.0"]) s.add_dependency(%q, ["~> 2.10"]) end diff --git a/tasks/gem.rake b/tasks/gem.rake index faecd58d..fe0f6760 100644 --- a/tasks/gem.rake +++ b/tasks/gem.rake @@ -8,7 +8,7 @@ HOE = Hoe.spec 'puma' do spec_extras[:extensions] = ["ext/puma_http11/extconf.rb"] spec_extras[:executables] = ['puma'] - dependency 'rack', '~> 1.3' + dependency 'rack', '~> 1.2' extra_dev_deps << ['rake-compiler', "~> 0.7.0"] diff --git a/tasks/native.rake b/tasks/native.rake index 290c28fe..9cd4d69b 100644 --- a/tasks/native.rake +++ b/tasks/native.rake @@ -24,5 +24,13 @@ unless IS_JRUBY end end +task :ext_clean do + sh "rm -rf lib/puma_http11.bundle" + sh "rm -rf lib/puma_http11.jar" + sh "rm -rf lib/puma_http11.so" +end + # ensure things are built prior testing task :test => [:compile] + +task :clean => :ext_clean