remove conditional dependency installation code, and consequently, th…

…e rake dependency
southgate · May 26, 2011 · c3669b1 · c3669b1
1 parent 5e0b55e
commit c3669b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 28 deletions.
diff --git a/ext/mkrf_conf.rb b/ext/mkrf_conf.rb
diff --git a/lib/spork/run_strategy/magazine.rb b/lib/spork/run_strategy/magazine.rb
@@ -3,7 +3,14 @@
 # as they come in
 require 'drb'
 require 'rinda/ring'
-require 'win32/process' if RUBY_PLATFORM =~ /mswin|mingw/  and RUBY_VERSION < '1.9.1'
+if RUBY_PLATFORM =~ /mswin|mingw/  and RUBY_VERSION < '1.9.1'
+  begin
+    require 'win32/process'
+  rescue LoadError
+    puts "The 'win32-process' gem is required for windows Spork support with ruby 1.9.1 and lower. Install it, or if using bundler, add it to your Gemfile."
+  end
+end
+
 require 'rubygems' # used for Gem.ruby
 
 $:.unshift(File.dirname(__FILE__))

diff --git a/spork.gemspec b/spork.gemspec
@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
     "MIT-LICENSE",
      "README.rdoc"
   ]
-  s.extensions = 'ext/mkrf_conf.rb'
   s.files = ["Gemfile", "README.rdoc", "MIT-LICENSE"] + Dir["lib/**/*"] + Dir["assets/**/*"]
   s.homepage = %q{http://github.com/timcharper/spork}
   s.rdoc_options = ["--main", "README.rdoc"]