aboutsummaryrefslogtreecommitdiff
path: root/lib/leap_cli.rb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-10-22 01:27:08 -0700
committerelijah <elijah@riseup.net>2014-10-22 01:27:08 -0700
commite44e2085f1e186264692096db1b7d426849ab7d7 (patch)
tree89a80a4df3e72d53c51532006498a7582a691df5 /lib/leap_cli.rb
parenta6b4ff1c21915475655a4a28c163904687d1035e (diff)
downloadleap_cli-e44e2085f1e186264692096db1b7d426849ab7d7.tar.gz
leap_cli-e44e2085f1e186264692096db1b7d426849ab7d7.tar.bz2
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.
Diffstat (limited to 'lib/leap_cli.rb')
-rw-r--r--lib/leap_cli.rb4
1 files changed, 4 insertions, 0 deletions
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'