From 0efd142a0e2f73b0d794685c402d1107dc4da966 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Mon, 27 Mar 2017 01:00:48 +1300 Subject: [PATCH] Fixes for celluloid head. --- .rspec | 2 + .simplecov | 15 ---- Gemfile | 3 + Gemfile.lock | 83 +++++++++++++++++++ celluloid-dns.gemspec | 4 +- spec/celluloid/dns/resolver_spec.rb | 3 - spec/celluloid/dns/server_performance_spec.rb | 10 +-- spec/celluloid/dns/system_spec.rb | 5 -- spec/spec_helper.rb | 39 +++++++++ 9 files changed, 131 insertions(+), 33 deletions(-) delete mode 100644 .simplecov create mode 100644 Gemfile.lock create mode 100644 spec/spec_helper.rb diff --git a/.rspec b/.rspec index 6a08889..37a2e8b 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1,4 @@ --color --format documentation +--warnings +--require spec_helper \ No newline at end of file diff --git a/.simplecov b/.simplecov deleted file mode 100644 index 9fc93f4..0000000 --- a/.simplecov +++ /dev/null @@ -1,15 +0,0 @@ - -SimpleCov.start do - add_filter "/spec/" -end - -# Work correctly across forks: -pid = Process.pid -SimpleCov.at_exit do - SimpleCov.result.format! if Process.pid == pid -end - -if ENV['TRAVIS'] - require 'coveralls' - Coveralls.wear! -end diff --git a/Gemfile b/Gemfile index 4529117..0764b58 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,9 @@ source 'https://rubygems.org' gemspec +gem "celluloid", github: 'celluloid/celluloid' +# gem "celluloid-io", github: 'celluloid/celluloid-io' + group :test do gem 'simplecov' gem 'coveralls', require: false diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..b42e5c2 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,83 @@ +GIT + remote: git://github.com/celluloid/celluloid.git + revision: a635787672fb0789af1b402c603af135557c31aa + specs: + celluloid (0.18.0.pre) + celluloid-pool (~> 0.20) + celluloid-supervision (~> 0.20) + timers (~> 4) + +PATH + remote: . + specs: + celluloid-dns (0.17.3) + celluloid (~> 0.17) + celluloid-io (~> 0.17) + timers (~> 4.1.0) + +GEM + remote: https://rubygems.org/ + specs: + celluloid-io (0.17.3) + celluloid (>= 0.17.2) + nio4r (>= 1.1) + timers (>= 4.1.1) + celluloid-pool (0.20.5) + timers (>= 4.1.1) + celluloid-supervision (0.20.6) + timers (>= 4.1.1) + coveralls (0.8.19) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + tins (~> 1.6) + diff-lcs (1.3) + docile (1.1.5) + hitimes (1.2.4) + json (2.0.3) + nio4r (2.0.0) + process-daemon (1.0.1) + rainbow (~> 2.0) + rainbow (2.2.1) + rake (12.0.0) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.4) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-mocks (3.4.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + simplecov (0.12.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + term-ansicolor (1.4.1) + tins (~> 1.0) + thor (0.19.4) + timers (4.1.2) + hitimes + tins (1.13.2) + +PLATFORMS + ruby + +DEPENDENCIES + bundler (~> 1.3) + celluloid! + celluloid-dns! + coveralls + process-daemon (~> 1.0.0) + rake + rspec (~> 3.4.0) + simplecov + +BUNDLED WITH + 1.14.6 diff --git a/celluloid-dns.gemspec b/celluloid-dns.gemspec index 33908e9..d9fd0b2 100644 --- a/celluloid-dns.gemspec +++ b/celluloid-dns.gemspec @@ -23,8 +23,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.0.0' - spec.add_dependency("celluloid", "~> 0.17.3") - spec.add_dependency("celluloid-io", "~> 0.17.3") + spec.add_dependency("celluloid", "~> 0.17") + spec.add_dependency("celluloid-io", "~> 0.17") spec.add_dependency("timers", "~> 4.1.0") spec.add_development_dependency "bundler", "~> 1.3" diff --git a/spec/celluloid/dns/resolver_spec.rb b/spec/celluloid/dns/resolver_spec.rb index 63a9edc..05fe0d1 100755 --- a/spec/celluloid/dns/resolver_spec.rb +++ b/spec/celluloid/dns/resolver_spec.rb @@ -75,9 +75,6 @@ def handle_connection(socket) end before(:all) do - Celluloid.shutdown - Celluloid.boot - JunkUDPServer.supervise JunkTCPServer.supervise end diff --git a/spec/celluloid/dns/server_performance_spec.rb b/spec/celluloid/dns/server_performance_spec.rb index 1ccee84..5547d97 100755 --- a/spec/celluloid/dns/server_performance_spec.rb +++ b/spec/celluloid/dns/server_performance_spec.rb @@ -83,8 +83,6 @@ def self.named_executable end before(:all) do - Celluloid.shutdown - @servers = [] @servers << ["Celluloid::DNS::Server", 5300] @@ -98,10 +96,6 @@ def self.named_executable Bind9ServerDaemon.start @servers << ["Bind9", 5400] end - - sleep 2 - - Celluloid.boot end after(:all) do @@ -113,8 +107,8 @@ def self.named_executable end it 'takes time' do - # Celluloid.logger.level = Logger::ERROR - + Celluloid.logger.level = Logger::ERROR + Benchmark.bm(30) do |x| @servers.each do |name, port| resolver = Celluloid::DNS::Resolver.new([[:udp, '127.0.0.1', port]]) diff --git a/spec/celluloid/dns/system_spec.rb b/spec/celluloid/dns/system_spec.rb index eb94154..52f05ed 100755 --- a/spec/celluloid/dns/system_spec.rb +++ b/spec/celluloid/dns/system_spec.rb @@ -25,11 +25,6 @@ module Celluloid::DNS::SystemSpec describe Celluloid::DNS::System do - before(:all) do - Celluloid.shutdown - Celluloid.boot - end - it "should have at least one namesever" do expect(Celluloid::DNS::System::nameservers.length).to be > 0 end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb new file mode 100644 index 0000000..3b7397f --- /dev/null +++ b/spec/spec_helper.rb @@ -0,0 +1,39 @@ + +if ENV['COVERAGE'] || ENV['TRAVIS'] + begin + require 'simplecov' + + SimpleCov.start do + add_filter "/spec/" + end + + # Work correctly across forks: + pid = Process.pid + SimpleCov.at_exit do + SimpleCov.result.format! if Process.pid == pid + end + + if ENV['TRAVIS'] + require 'coveralls' + Coveralls.wear! + end + rescue LoadError + warn "Could not load simplecov: #{$!}" + end +end + +require "bundler/setup" +require "celluloid/dns" + +abort "Warning, ulimit is too low!" if `ulimit -n`.to_i < 10000 + +require 'celluloid/autostart' + +RSpec.configure do |config| + # Enable flags like --only-failures and --next-failure + config.example_status_persistence_file_path = ".rspec_status" + + config.expect_with :rspec do |c| + c.syntax = :expect + end +end