tasks/cpp.rake_example @@ -29,7 +29,6 @@ require 'rubygems' unless defined?(Gem) require 'rake' unless defined?(Rake) -require 'rake/gempackagetask' Package = false # Build zips and tarballs? Dir.glob('tasks/*.rake').each { |r| Rake.application.add_import r } @@ -44,17 +43,8 @@ else 'make' end -# If running under rubygems... -__DIR__ ||= File.expand_path(File.dirname(__FILE__)) -if Gem.path.map{|path| Dir.chdir(path){ Dir.pwd } rescue path }.any? {|path| %r(^#{Regexp.escape path}) =~ __DIR__} - task :default => :gem_build -else - desc "Build gemspec, then build eventmachine, then run tests." - task :default => [:build, :test] -end - -desc ":default build when running under rubygems." -task :gem_build => :build +desc "Build gemspec, then build eventmachine, then run tests." +task :default => [:build, :test] desc "Build extension (or EVENTMACHINE_LIBRARY) and place in lib" build_task = 'ext:build' @@ -68,6 +58,12 @@ end task :dummy_build +require 'rake/testtask' +Rake::TestTask.new(:test) do |t| + t.pattern = 'tests/**/test_*.rb' + t.warning = true +end + # Basic clean definition, this is enhanced by imports aswell. task :clean do chdir 'ext' do @@ -211,18 +207,15 @@ namespace :ext do desc "Build C++ extension" task :build => [:make] - desc "make extensions" task :make => ext_libname task :make => ffr_libname - desc 'Compile the makefile' file 'ext/Makefile' => ext_extconf do chdir 'ext' do ruby 'extconf.rb' end end - desc 'Compile fastfilereader makefile' file 'ext/fastfilereader/Makefile' => ffr_extconf do chdir 'ext/fastfilereader' do ruby 'extconf.rb' @@ -238,7 +231,6 @@ namespace :java do mv 'java/em_reactor.jar', 'lib/' end - desc "compile .java to .class" task :compile do chdir('java') do mkdir_p "build" @@ -246,7 +238,6 @@ namespace :java do end end - desc "compile .classes to .jar" task :jar => [:compile] do chdir('java/build') do sh "jar -cf ../em_reactor.jar com/rubyeventmachine/*.class" @@ -275,8 +266,81 @@ namespace :osx do end end -task :gemspec => :clobber do - open("eventmachine.gemspec", 'w') { |f| f.write Spec.to_ruby } +require 'rake/clean' + +rdoc_task_type = begin + require 'rdoc/task' + RDoc::Task +rescue LoadError + require 'rake/rdoctask' + Rake::RDocTask +end +df = begin; require 'rdoc/generator/darkfish'; true; rescue LoadError; end +rdtask = rdoc_task_type.new do |rd| + rd.title = Spec.name + rd.rdoc_dir = 'rdoc' + rd.main = "README" + rd.rdoc_files.include("lib/**/*.rb", *Spec.extra_rdoc_files) + rd.rdoc_files.exclude(*%w(lib/em/version lib/emva lib/evma/ lib/pr_eventmachine lib/jeventmachine)) + rd.template = 'darkfish' if df +end +Rake::Task[:clean].enhance [:clobber_rdoc] + +desc 'Generate and open documentation' +task :docs => :rdoc do + case RUBY_PLATFORM + when /darwin/ ; sh 'open rdoc/index.html' + when /mswin|mingw/ ; sh 'start rdoc\index.html' + else + sh 'firefox rdoc/index.html' + end +end + +def windows?; RUBY_PLATFORM =~ /mswin|mingw/; end +def sudo(cmd) + if windows? || (require 'etc'; Etc.getpwuid.uid == 0) + sh cmd + else + sh "sudo #{cmd}" + end +end +def gem_cmd(action, name, *args) + rb = Gem.ruby rescue nil + rb ||= (require 'rbconfig'; File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])) + sudo "#{rb} -r rubygems -e 'require %{rubygems/gem_runner}; Gem::GemRunner.new.run(%w{#{action} #{name} #{args.join(' ')}})'" +end + +@gem_package_task_type = begin + require 'rubygems/package_task' + Gem::PackageTask +rescue LoadError + require 'rake/gempackagetask' + Rake::GemPackageTask +end +def gem_task + @gem_task ||= @gem_package_task_type.new(Spec) do |pkg| + pkg.need_tar, pkg.need_tar_gz, pkg.need_zip = true, true, true if Package + pkg.gem_spec = Spec + end +end +gem_task.define +Rake::Task[:clean].enhance [:clobber_package] + +namespace :gem do + desc 'Install gem (and sudo if required)' + task :install => :package do + gem_cmd(:install, "pkg/#{Spec.name}-#{Spec.version}.gem") + end + + desc 'Uninstall gem (and sudo if required)' + task :uninstall do + gem_cmd(:uninstall, "#{Spec.name}", "-v=#{Spec.version}") + end + + desc "Generate new gemspec" + task :spec => :clobber do + open("eventmachine.gemspec", 'w') { |f| f.write Spec.to_ruby } + end end task :clobber => :clean Rakefile @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Francis Cianfrocca"] - s.date = %q{2009-05-22} + s.date = %q{2009-10-05} s.description = %q{EventMachine implements a fast, single-threaded engine for arbitrary network communications. It's extremely easy to use in Ruby. EventMachine wraps all interactions with IP sockets, allowing programs to concentrate on the @@ -20,13 +20,12 @@ using TCP/IP, especially if custom protocols are required. } s.email = %q{garbagecat10@gmail.com} s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"] - s.has_rdoc = true - s.files = [".gitignore", "README", "Rakefile", "docs/COPYING", "docs/ChangeLog", "docs/DEFERRABLES", "docs/EPOLL", "docs/GNU", "docs/INSTALL", "docs/KEYBOARD", "docs/LEGAL", "docs/LIGHTWEIGHT_CONCURRENCY", "docs/PURE_RUBY", "docs/RELEASE_NOTES", "docs/SMTP", "docs/SPAWNED_PROCESSES", "docs/TODO", "eventmachine.gemspec", "examples/ex_channel.rb", "examples/ex_queue.rb", "examples/helper.rb", "ext/binder.cpp", "ext/binder.h", "ext/cmain.cpp", "ext/cplusplus.cpp", "ext/ed.cpp", "ext/ed.h", "ext/em.cpp", "ext/em.h", "ext/emwin.cpp", "ext/emwin.h", "ext/epoll.cpp", "ext/epoll.h", "ext/eventmachine.h", "ext/eventmachine_cpp.h", "ext/extconf.rb", "ext/fastfilereader/extconf.rb", "ext/fastfilereader/mapper.cpp", "ext/fastfilereader/mapper.h", "ext/fastfilereader/rubymain.cpp", "ext/files.cpp", "ext/files.h", "ext/kb.cpp", "ext/page.cpp", "ext/page.h", "ext/pipe.cpp", "ext/project.h", "ext/rubymain.cpp", "ext/sigs.cpp", "ext/sigs.h", "ext/ssl.cpp", "ext/ssl.h", "java/.classpath", "java/.project", "java/src/com/rubyeventmachine/Application.java", "java/src/com/rubyeventmachine/Connection.java", "java/src/com/rubyeventmachine/ConnectionFactory.java", "java/src/com/rubyeventmachine/DefaultConnectionFactory.java", "java/src/com/rubyeventmachine/EmReactor.java", "java/src/com/rubyeventmachine/EmReactorException.java", "java/src/com/rubyeventmachine/EventableChannel.java", "java/src/com/rubyeventmachine/EventableDatagramChannel.java", "java/src/com/rubyeventmachine/EventableSocketChannel.java", "java/src/com/rubyeventmachine/PeriodicTimer.java", "java/src/com/rubyeventmachine/Timer.java", "java/src/com/rubyeventmachine/tests/ApplicationTest.java", "java/src/com/rubyeventmachine/tests/ConnectTest.java", "java/src/com/rubyeventmachine/tests/EMTest.java", "java/src/com/rubyeventmachine/tests/TestDatagrams.java", "java/src/com/rubyeventmachine/tests/TestServers.java", "java/src/com/rubyeventmachine/tests/TestTimers.java", "lib/em/buftok.rb", "lib/em/callback.rb", "lib/em/channel.rb", "lib/em/connection.rb", "lib/em/deferrable.rb", "lib/em/file_watch.rb", "lib/em/future.rb", "lib/em/messages.rb", "lib/em/process_watch.rb", "lib/em/processes.rb", "lib/em/protocols.rb", "lib/em/protocols/header_and_content.rb", "lib/em/protocols/httpclient.rb", "lib/em/protocols/httpclient2.rb", "lib/em/protocols/line_and_text.rb", "lib/em/protocols/linetext2.rb", "lib/em/protocols/memcache.rb", "lib/em/protocols/object_protocol.rb", "lib/em/protocols/postgres3.rb", "lib/em/protocols/saslauth.rb", "lib/em/protocols/smtpclient.rb", "lib/em/protocols/smtpserver.rb", "lib/em/protocols/stomp.rb", "lib/em/protocols/tcptest.rb", "lib/em/queue.rb", "lib/em/spawnable.rb", "lib/em/streamer.rb", "lib/em/timers.rb", "lib/em/version.rb", "lib/eventmachine.rb", "lib/evma.rb", "lib/evma/callback.rb", "lib/evma/container.rb", "lib/evma/factory.rb", "lib/evma/protocol.rb", "lib/evma/reactor.rb", "lib/jeventmachine.rb", "lib/pr_eventmachine.rb", "setup.rb", "tasks/cpp.rake", "tasks/project.rake", "tasks/tests.rake", "tests/client.crt", "tests/client.key", "tests/test_attach.rb", "tests/test_basic.rb", "tests/test_channel.rb", "tests/test_connection_count.rb", "tests/test_defer.rb", "tests/test_epoll.rb", "tests/test_error_handler.rb", "tests/test_errors.rb", "tests/test_exc.rb", "tests/test_file_watch.rb", "tests/test_futures.rb", "tests/test_handler_check.rb", "tests/test_hc.rb", "tests/test_httpclient.rb", "tests/test_httpclient2.rb", "tests/test_inactivity_timeout.rb", "tests/test_kb.rb", "tests/test_ltp.rb", "tests/test_ltp2.rb", "tests/test_next_tick.rb", "tests/test_object_protocol.rb", "tests/test_process_watch.rb", "tests/test_processes.rb", "tests/test_proxy_connection.rb", "tests/test_pure.rb", "tests/test_queue.rb", "tests/test_running.rb", "tests/test_sasl.rb", "tests/test_send_file.rb", "tests/test_servers.rb", "tests/test_smtpclient.rb", "tests/test_smtpserver.rb", "tests/test_spawn.rb", "tests/test_ssl_args.rb", "tests/test_ssl_methods.rb", "tests/test_ssl_verify.rb", "tests/test_timers.rb", "tests/test_ud.rb", "tests/testem.rb", "web/whatis"] + s.files = [".gitignore", "README", "Rakefile", "docs/COPYING", "docs/ChangeLog", "docs/DEFERRABLES", "docs/EPOLL", "docs/GNU", "docs/INSTALL", "docs/KEYBOARD", "docs/LEGAL", "docs/LIGHTWEIGHT_CONCURRENCY", "docs/PURE_RUBY", "docs/RELEASE_NOTES", "docs/SMTP", "docs/SPAWNED_PROCESSES", "docs/TODO", "eventmachine.gemspec", "examples/ex_channel.rb", "examples/ex_queue.rb", "examples/helper.rb", "ext/binder.cpp", "ext/binder.h", "ext/cmain.cpp", "ext/cplusplus.cpp", "ext/ed.cpp", "ext/ed.h", "ext/em.cpp", "ext/em.h", "ext/emwin.cpp", "ext/emwin.h", "ext/epoll.cpp", "ext/epoll.h", "ext/eventmachine.h", "ext/eventmachine_cpp.h", "ext/extconf.rb", "ext/fastfilereader/extconf.rb", "ext/fastfilereader/mapper.cpp", "ext/fastfilereader/mapper.h", "ext/fastfilereader/rubymain.cpp", "ext/files.cpp", "ext/files.h", "ext/kb.cpp", "ext/page.cpp", "ext/page.h", "ext/pipe.cpp", "ext/project.h", "ext/rubymain.cpp", "ext/sigs.cpp", "ext/sigs.h", "ext/ssl.cpp", "ext/ssl.h", "java/.classpath", "java/.project", "java/src/com/rubyeventmachine/Application.java", "java/src/com/rubyeventmachine/Connection.java", "java/src/com/rubyeventmachine/ConnectionFactory.java", "java/src/com/rubyeventmachine/DefaultConnectionFactory.java", "java/src/com/rubyeventmachine/EmReactor.java", "java/src/com/rubyeventmachine/EmReactorException.java", "java/src/com/rubyeventmachine/EventableChannel.java", "java/src/com/rubyeventmachine/EventableDatagramChannel.java", "java/src/com/rubyeventmachine/EventableSocketChannel.java", "java/src/com/rubyeventmachine/PeriodicTimer.java", "java/src/com/rubyeventmachine/Timer.java", "java/src/com/rubyeventmachine/tests/ApplicationTest.java", "java/src/com/rubyeventmachine/tests/ConnectTest.java", "java/src/com/rubyeventmachine/tests/EMTest.java", "java/src/com/rubyeventmachine/tests/TestDatagrams.java", "java/src/com/rubyeventmachine/tests/TestServers.java", "java/src/com/rubyeventmachine/tests/TestTimers.java", "lib/em/buftok.rb", "lib/em/callback.rb", "lib/em/channel.rb", "lib/em/connection.rb", "lib/em/deferrable.rb", "lib/em/delegate_connection.rb", "lib/em/file_watch.rb", "lib/em/future.rb", "lib/em/messages.rb", "lib/em/process_watch.rb", "lib/em/processes.rb", "lib/em/protocols.rb", "lib/em/protocols/header_and_content.rb", "lib/em/protocols/httpclient.rb", "lib/em/protocols/httpclient2.rb", "lib/em/protocols/line_and_text.rb", "lib/em/protocols/linetext2.rb", "lib/em/protocols/memcache.rb", "lib/em/protocols/object_protocol.rb", "lib/em/protocols/postgres3.rb", "lib/em/protocols/saslauth.rb", "lib/em/protocols/smtpclient.rb", "lib/em/protocols/smtpserver.rb", "lib/em/protocols/stomp.rb", "lib/em/protocols/tcptest.rb", "lib/em/queue.rb", "lib/em/server.rb", "lib/em/spawnable.rb", "lib/em/streamer.rb", "lib/em/test.rb", "lib/em/timers.rb", "lib/em/version.rb", "lib/eventmachine.rb", "lib/evma.rb", "lib/evma/callback.rb", "lib/evma/container.rb", "lib/evma/factory.rb", "lib/evma/protocol.rb", "lib/evma/reactor.rb", "lib/jeventmachine.rb", "lib/pr_eventmachine.rb", "setup.rb", "tasks/cpp.rake_example", "tasks/project.rake", "tests/client.crt", "tests/client.key", "tests/test_attach.rb", "tests/test_basic.rb", "tests/test_channel.rb", "tests/test_connection_count.rb", "tests/test_defer.rb", "tests/test_delegate_connection.rb", "tests/test_epoll.rb", "tests/test_error_handler.rb", "tests/test_errors.rb", "tests/test_exc.rb", "tests/test_file_watch.rb", "tests/test_futures.rb", "tests/test_get_sock_opt.rb", "tests/test_handler_check.rb", "tests/test_hc.rb", "tests/test_httpclient.rb", "tests/test_httpclient2.rb", "tests/test_inactivity_timeout.rb", "tests/test_kb.rb", "tests/test_ltp.rb", "tests/test_ltp2.rb", "tests/test_next_tick.rb", "tests/test_object_protocol.rb", "tests/test_pause.rb", "tests/test_pending_connect_timeout.rb", "tests/test_process_watch.rb", "tests/test_processes.rb", "tests/test_proxy_connection.rb", "tests/test_pure.rb", "tests/test_queue.rb", "tests/test_running.rb", "tests/test_sasl.rb", "tests/test_send_file.rb", "tests/test_server.rb", "tests/test_servers.rb", "tests/test_smtpclient.rb", "tests/test_smtpserver.rb", "tests/test_spawn.rb", "tests/test_ssl_args.rb", "tests/test_ssl_methods.rb", "tests/test_ssl_verify.rb", "tests/test_timers.rb", "tests/test_ud.rb", "tests/testem.rb", "web/whatis"] s.homepage = %q{http://rubyeventmachine.com} s.rdoc_options = ["--title", "EventMachine", "--main", "README", "--line-numbers", "-x", "lib/em/version", "-x", "lib/emva", "-x", "lib/evma/", "-x", "lib/pr_eventmachine", "-x", "lib/jeventmachine"] s.require_paths = ["lib"] s.rubyforge_project = %q{eventmachine} - s.rubygems_version = %q{1.3.3} + s.rubygems_version = %q{1.3.5} s.summary = %q{Ruby/EventMachine library} if s.respond_to? :specification_version then eventmachine.gemspec @@ -80,7 +80,7 @@ class TestHttpClient2 < Test::Unit::TestCase def test_get content = nil EM.run { - http = EM::P::HttpClient2.connect "www.bayshorenetworks.com", 80 + http = EM::P::HttpClient2.connect "google.com", 80 d = http.get "/" d.callback { content = d.content @@ -96,7 +96,7 @@ class TestHttpClient2 < Test::Unit::TestCase def _test_get_multiple content = nil EM.run { - http = EM::P::HttpClient2.connect "www.bayshorenetworks.com", 80 + http = EM::P::HttpClient2.connect "google.com", 80 d = http.get "/" d.callback { e = http.get "/" @@ -112,7 +112,7 @@ class TestHttpClient2 < Test::Unit::TestCase def test_get_pipeline headers, headers2 = nil, nil EM.run { - http = EM::P::HttpClient2.connect "www.microsoft.com", 80 + http = EM::P::HttpClient2.connect "google.com", 80 d = http.get("/") d.callback { headers = d.headers tests/test_httpclient2.rb tasks/cpp.rake tasks/project.rake tasks/tests.rake 766b201aae9d9c38c30c2e9f834d207776bdb7f7 raggi jftucker@gmail.com http://github.com/eventmachine/eventmachine/commit/90533578430bbfd2f464944b75cfbb106baa6b93 90533578430bbfd2f464944b75cfbb106baa6b93 2009-10-04T16:50:41-07:00 2009-10-04T16:50:41-07:00 more rakefile cleaning. bayshore servers returning errors again, switch to google 4b9250653211bd2e25cae55f1ea29a9a6b316034 raggi jftucker@gmail.com