unicorn 2.0.0pre2.1.ge991 → 2.0.0pre2.4.gf202

data/GNUmakefile

@@ -24,14 +24,11 @@ endif
 
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 
-isolate_libs := tmp/isolate/.$(RUBY_ENGINE)-$(RUBY_VERSION).libs
-MYLIBS = $(RUBYLIB):$(shell cat $(isolate_libs) 2>/dev/null || \
-                      (test -f ./script/isolate_for_tests  && \
-                       $(RUBY) ./script/isolate_for_tests >/dev/null && \
-                       cat $(isolate_libs) 2>/dev/null))
-
-echo:
-	@echo $(MYLIBS)
+isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION).mk
+$(isolate_libs): script/isolate_for_tests
+	@$(RUBY) script/isolate_for_tests
+-include $(isolate_libs)
+MYLIBS = $(RUBYLIB):$(ISOLATE_LIBS)
 
 # dunno how to implement this as concisely in Ruby, and hell, I love awk
 awk_slow := awk '/def test_/{print FILENAME"--"$$2".n"}' 2>/dev/null

data/script/isolate_for_tests

@@ -17,16 +17,18 @@ opts = {
 pid = fork do
   Isolate.now!(opts) do
     gem 'sqlite3-ruby', '1.2.5'
-    gem 'kgio', '1.2.0'
+    gem 'kgio', '1.3.0'
     gem 'rack', '1.1.0'
   end
 end
 _, status = Process.waitpid2(pid)
 status.success? or abort status.inspect
 lib_paths = Dir["#{opts[:path]}/gems/*-*/lib"].map { |x| File.expand_path(x) }
-libs = "tmp/isolate/.#{ruby_engine}-#{RUBY_VERSION}.libs"
-File.open("#{libs}.#$$", "w") { |fp| fp.puts lib_paths.join(':') }
-File.rename("#{libs}.#$$", libs)
+dst = "tmp/isolate/#{ruby_engine}-#{RUBY_VERSION}.mk"
+File.open("#{dst}.#$$", "w") do |fp|
+  fp.puts "ISOLATE_LIBS=#{lib_paths.join(':')}"
+end
+File.rename("#{dst}.#$$", dst)
 
 # pure Ruby gems can be shared across all Rubies
 %w(3.0.0).each do |rails_ver|

data/t/GNUmakefile

@@ -17,12 +17,11 @@ endif
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 export RUBY_ENGINE
 
-isolate_libs := ../tmp/isolate/.$(RUBY_ENGINE)-$(RUBY_VERSION).libs
-MYLIBS := $(shell cat $(isolate_libs))
-ifeq ($(MY_LIBS),)
-  ignore := $(shell cd .. && $(RUBY) ./script/isolate_for_tests)
-  MYLIBS := $(shell cat $(isolate_libs))
-endif
+isolate_libs := ../tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION).mk
+$(isolate_libs): ../script/isolate_for_tests
+	@cd .. && $(RUBY) script/isolate_for_tests
+-include $(isolate_libs)
+MYLIBS := $(RUBYLIB):$(ISOLATE_LIBS)
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 

data/unicorn.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   # commented out.  Nevertheless, upgrading to Rails 2.3.4 or later is
   # *strongly* recommended for security reasons.
   s.add_dependency(%q<rack>)
-  s.add_dependency(%q<kgio>, '~> 1.2.0')
+  s.add_dependency(%q<kgio>, '~> 1.3.0')
 
   s.add_development_dependency('isolate', '~> 2.1.2')
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 12487189
+  hash: 1058687251
   prerelease: true
   segments: 
   - 2
   - 0
   - 0pre2
-  - 1
-  - ge991
-  version: 2.0.0pre2.1.ge991
+  - 4
+  - gf202
+  version: 2.0.0pre2.4.gf202
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +00:00
+date: 2010-10-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 27
         segments: 
         - 1
-        - 2
+        - 3
         - 0
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency