Merge tag 'v1.2.2'

Version 1.2.2

Conflicts:
	.travis.yml
	lib/bundler.rb
	lib/bundler/psyched_yaml.rb
	lib/bundler/version.rb
	spec/bundler/psyched_yaml_spec.rb
	spec/other/clean_spec.rb

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/other/platform_spec.rb b/spec/other/platform_spec.rb
index 625c961c1d..e667ee37c3 100644
--- a/spec/other/platform_spec.rb
+++ b/spec/other/platform_spec.rb
@@ -158,6 +158,19 @@ G
 
       expect(exitstatus).not_to eq(0)
     end
+
+    it "should print if no ruby version is specified" do
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+
+        gem "foo"
+      G
+
+      bundle "platform --ruby"
+      puts err
+
+      out.should eq("No ruby version specified")
+    end
   end
 
   let(:ruby_version_correct) { "ruby \"#{RUBY_VERSION}\", :engine => \"#{local_ruby_engine}\", :engine_version => \"#{local_engine_version}\"" }