From 64de4e6968e7cb269f497946700645ae41e67fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20R=C3=B6der?= <no-spam-github@sebroeder.de>
Date: Mon, 18 May 2015 14:47:54 +0200
Subject: [PATCH] Upgrade RubyMine with bundled JDK to 7.1.2

Also add conflicts_with stanza for RubyMine without bundled JDK
---
 Casks/rubymine-bundled-jdk.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Casks/rubymine-bundled-jdk.rb b/Casks/rubymine-bundled-jdk.rb
index 2a8616e5c..e0adc5563 100644
--- a/Casks/rubymine-bundled-jdk.rb
+++ b/Casks/rubymine-bundled-jdk.rb
@@ -1,6 +1,6 @@
 cask :v1 => 'rubymine-bundled-jdk' do
-  version '7.1'
-  sha256 '2e9fced43c8e14ffbc82a72a8f6cde1cbab50861db079162ca5ff34c668ba57c'
+  version '7.1.2'
+  sha256 '8d96d6b0484039055335618939a50b25a97cf13c93c2137dbafe5e4986725095'
 
   url "https://download.jetbrains.com/ruby/RubyMine-#{version}-custom-jdk-bundled.dmg"
   name 'RubyMine'
@@ -17,4 +17,6 @@ cask :v1 => 'rubymine-bundled-jdk' do
                   '~/Library/Logs/RubyMine70',
                   '/usr/local/bin/mine',
                  ]
+
+  conflicts_with :cask => 'rubymine'
 end