Fix for #2234: test fails with old Rack version

5 files changed, 28 insertions, 6 deletions

diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb
index 7c0f241c1..747468f74 100644
--- a/lib/puppet/feature/base.rb
+++ b/lib/puppet/feature/base.rb
@@ -29,5 +29,3 @@ Puppet.features.add(:augeas, :libs => ["augeas"])
 # We have RRD available
 Puppet.features.add(:rrd, :libs => ["RRDtool"])
 
-# We have rack available, an HTTP Application Stack
-Puppet.features.add(:rack, :libs => ["rack"])
diff --git a/lib/puppet/feature/rack.rb b/lib/puppet/feature/rack.rb
new file mode 100644
index 000000000..081b9e9fb
--- /dev/null
+++ b/lib/puppet/feature/rack.rb
@@ -0,0 +1,24 @@
+require 'puppet/util/feature'
+
+# See if we have rack available, an HTTP Application Stack
+# Explicitly depend on rack library version >= 1.0.0
+Puppet.features.add(:rack) do
+    begin
+        require 'rack'
+    rescue LoadError => detail
+        require 'rubygems'
+        require 'rack'
+    end
+
+    if ! (defined?(::Rack) and defined?(::Rack.release))
+        false
+    else
+        major_version = ::Rack.release().split('.')[0].to_i
+        if major_version >= 1
+            true
+        else
+            false
+        end
+    end
+end
+
diff --git a/spec/unit/network/http/rack.rb b/spec/unit/network/http/rack.rb
index f639b2d4a..cd2961a3a 100755
--- a/spec/unit/network/http/rack.rb
+++ b/spec/unit/network/http/rack.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
-require 'puppet/network/http/rack'
+require 'puppet/network/http/rack' if Puppet.features.rack?
 
 describe "Puppet::Network::HTTP::Rack" do
     confine "Rack is not available" => Puppet.features.rack?
diff --git a/spec/unit/network/http/rack/rest.rb b/spec/unit/network/http/rack/rest.rb
index 873483782..1e3efe9ca 100755
--- a/spec/unit/network/http/rack/rest.rb
+++ b/spec/unit/network/http/rack/rest.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../../spec_helper'
-require 'puppet/network/http/rack'
+require 'puppet/network/http/rack' if Puppet.features.rack?
 require 'puppet/network/http/rack/rest'
 
 describe "Puppet::Network::HTTP::RackREST" do
diff --git a/spec/unit/network/http/rack/xmlrpc.rb b/spec/unit/network/http/rack/xmlrpc.rb
index 38316d8bf..abfe84ba6 100755
--- a/spec/unit/network/http/rack/xmlrpc.rb
+++ b/spec/unit/network/http/rack/xmlrpc.rb
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../../spec_helper'
-require 'puppet/network/http/rack'
-require 'puppet/network/http/rack/xmlrpc'
+require 'puppet/network/http/rack' if Puppet.features.rack?
+require 'puppet/network/http/rack/xmlrpc' if Puppet.features.rack?
 
 describe "Puppet::Network::HTTP::RackXMLRPC" do
     confine "Rack is not available" => Puppet.features.rack?