Merge branch '1-1-stable'

Conflicts:
	CHANGELOG.md
	lib/bundler/dsl.rb
	lib/bundler/version.rb

2 files changed, 27 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bc436f93d..1d4db7b916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,12 @@ Documentation:
   - Add basic documentation for bin_path and bundle_path (@radar)
   - Add documentation for the run method in Bundler::Installer
 
+## 1.1.5 (Jul 17, 2012)
+
+Features:
+
+  - Special case `ruby` directive from 1.2.0, so you can install Gemfiles that use it
+
 ## 1.1.4 (May 27, 2012)
 
 Bugfixes:
diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
index 2bc0e40696..8afb28f11f 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -44,5 +44,26 @@ describe Bundler::Dsl do
       lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
         should raise_error(Bundler::GemfileError)
     end
+
+    it "should special case the ruby directive" do
+      gemfile <<-G
+        ruby "1.9.3"
+      G
+      lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
+        should_not raise_error(Bundler::GemfileError)
+    end
+
+    it "should special case the ruby directive and throws a warning" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+
+        ruby "1.9.3"
+
+        gem "foo"
+      G
+
+      out.should include("Ignoring `ruby` directive")
+      bundled_app("Gemfile.lock").should exist
+    end
   end
 end