From d8755d1cc55f6c06aba069689abf35118c1c5141 Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Thu, 28 Mar 2013 08:46:40 +0100 Subject: [PATCH 1/3] link against same openssl library as event machine (and ruby) --- ext/extconf.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/extconf.rb b/ext/extconf.rb index d9240fd..07ea2d0 100644 --- a/ext/extconf.rb +++ b/ext/extconf.rb @@ -64,7 +64,7 @@ flags << '-D OS_SOLARIS8' flags << '-D BUILD_FOR_RUBY' - dir_config('ssl') + pkg_config('openssl') || dir_config('ssl') if have_library('ssl') and have_library('crypto') and have_header('openssl/ssl.h') and @@ -81,7 +81,7 @@ flags << '-DOS_UNIX' flags << '-DBUILD_FOR_RUBY' - dir_config('ssl') + pkg_config('openssl') || dir_config('ssl') if have_library('ssl') and have_library('crypto') and have_library('C') and @@ -103,7 +103,7 @@ flags << '-DOS_UNIX' flags << '-DBUILD_FOR_RUBY' - dir_config('ssl') + pkg_config('openssl') || dir_config('ssl') if have_library('ssl') and have_library('crypto') and have_header('openssl/ssl.h') and From a45773c02bd75d51a03c8c604f67764e2135debb Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Thu, 28 Mar 2013 08:51:15 +0100 Subject: [PATCH 2/3] added gem dependencies and bumped version --- eventmachine_httpserver.gemspec | 23 ++++++++++++++--------- eventmachine_httpserver.gemspec.tmpl | 8 ++++++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/eventmachine_httpserver.gemspec b/eventmachine_httpserver.gemspec index a5135a0..f8c1238 100644 --- a/eventmachine_httpserver.gemspec +++ b/eventmachine_httpserver.gemspec @@ -1,31 +1,36 @@ # -*- encoding: utf-8 -*- Gem::Specification.new do |s| - s.name = %q{eventmachine_httpserver} - s.version = "0.2.1" + s.name = "eventmachine_httpserver" + s.version = "0.3.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Francis Cianfrocca"] - s.date = %q{2007-03-16} - s.description = %q{} - s.email = %q{garbagecat10@gmail.com} + s.date = "2013-03-28" + s.description = "" + s.email = "garbagecat10@gmail.com" s.extensions = ["ext/extconf.rb"] s.extra_rdoc_files = ["docs/COPYING", "docs/README", "docs/RELEASE_NOTES"] s.files = ["README", "Rakefile", "docs/COPYING", "docs/README", "docs/RELEASE_NOTES", "eventmachine_httpserver.gemspec", "eventmachine_httpserver.gemspec.tmpl", "ext/extconf.rb", "ext/http.cpp", "ext/http.h", "ext/rubyhttp.cpp", "lib/evma_httpserver.rb", "lib/evma_httpserver/response.rb", "test/test_app.rb", "test/test_delegated.rb", "test/test_response.rb"] - s.homepage = %q{https://github.com/eventmachine/evma_httpserver} + s.homepage = "https://github.com/eventmachine/evma_httpserver" s.rdoc_options = ["--title", "EventMachine_HttpServer", "--main", "docs/README", "--line-numbers"] s.require_paths = ["lib"] s.required_ruby_version = Gem::Requirement.new("> 0.0.0") - s.rubygems_version = %q{1.3.7} - s.summary = %q{EventMachine HTTP Server} + s.rubygems_version = "1.8.25" + s.summary = "EventMachine HTTP Server" if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 1 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, [">= 0.12.6"]) + s.add_development_dependency(%q, [">= 0"]) else + s.add_dependency(%q, [">= 0.12.6"]) + s.add_dependency(%q, [">= 0"]) end else + s.add_dependency(%q, [">= 0.12.6"]) + s.add_dependency(%q, [">= 0"]) end end diff --git a/eventmachine_httpserver.gemspec.tmpl b/eventmachine_httpserver.gemspec.tmpl index 07adb07..2e2d08a 100644 --- a/eventmachine_httpserver.gemspec.tmpl +++ b/eventmachine_httpserver.gemspec.tmpl @@ -1,12 +1,12 @@ Gem::Specification.new do |s| s.name = %q{eventmachine_httpserver} - s.version = "0.2.1" + s.version = "0.3.0" s.specification_version = 1 if s.respond_to? :specification_version= s.required_rubygems_version = nil if s.respond_to? :required_rubygems_version= s.authors = ["Francis Cianfrocca"] - s.date = %q{2007-03-16} + s.date = Time.now.strftime('%Y-%m-%d') s.description = %q{} s.email = %q{garbagecat10@gmail.com} s.extensions = ["ext/extconf.rb"] @@ -19,4 +19,8 @@ Gem::Specification.new do |s| s.required_ruby_version = Gem::Requirement.new("> 0.0.0") s.rubygems_version = %q{1.3.1} s.summary = %q{EventMachine HTTP Server} + + s.add_runtime_dependency("eventmachine", '>= 0.12.6') + s.add_development_dependency("rake") + end From a0b534e1752678b4c08f1ff7c237600b1d60ef05 Mon Sep 17 00:00:00 2001 From: Stefan Kaes Date: Thu, 28 Mar 2013 08:51:29 +0100 Subject: [PATCH 3/3] added Gemfile --- .gitignore | 4 +++- Gemfile | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Gemfile diff --git a/.gitignore b/.gitignore index 823d4d9..71fd4c1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ ext/*.log ext/*.o ext/*.dll ext/*.bundle -ext/*.so \ No newline at end of file +ext/*.so +.rvmrc +Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..fa75df1 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gemspec