From e44e2085f1e186264692096db1b7d426849ab7d7 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 22 Oct 2014 01:27:08 -0700 Subject: json bugfix: upgrading CertificateAuthority gem broke everything, since it depends on ActiveSupport, which in turn badly modifies how JSON works. This commit does some hacky stuff to prevent ActiveSupport from messing with JSON and allows us to mess with JSON. --- lib/leap_cli.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/leap_cli.rb') diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb index 6cd625e..baff32f 100644 --- a/lib/leap_cli.rb +++ b/lib/leap_cli.rb @@ -5,6 +5,10 @@ end $ruby_version = RUBY_VERSION.split('.').collect{ |i| i.to_i }.extend(Comparable) +# ensure leap_cli/lib/overrides has the highest priority +# (these files override bad behavior in gems that overrides JSON) +$:.unshift(File.expand_path('../override',__FILE__)) + require 'leap/platform' require 'leap_cli/version' -- cgit v1.2.3