Merge pull request #275 from dtan4/multi-gem

Remove native extension gems and use wrapper gem

.travis.yml

@@ -4,7 +4,13 @@ rvm:
 - 2.2.5
 - 2.1.10
 env:
-- secure: n0mxwnyjuXI4mJO4mp++2TnsPJ+XgCF/J1U2L5piE5j3xMhSU+5V0JrA1uFlS0Pemb44M7BjgmF9S4G35BwyAQpctpCYhqy9tFa6+Y6nxEv5hCv2cZz7BSAZM6eb+zq20409hxTHRaQOr1DBeE4R5S2PrmOXRqvYfTRv3LNSLFk=
+  global:
+    - secure: n0mxwnyjuXI4mJO4mp++2TnsPJ+XgCF/J1U2L5piE5j3xMhSU+5V0JrA1uFlS0Pemb44M7BjgmF9S4G35BwyAQpctpCYhqy9tFa6+Y6nxEv5hCv2cZz7BSAZM6eb+zq20409hxTHRaQOr1DBeE4R5S2PrmOXRqvYfTRv3LNSLFk=
+  matrix:
+    - OJ=0
+    - OJ=1
+before_script:
+  - if [[ $OJ -eq 1 ]]; then gem install oj; fi
 notifications:
   slack:
     secure: iTI8zpxXQJqf5e9ix4buLRsGlf9lJRZqA9Fawdqm41msBrC0Zsp31XzBS7ZPiTcdHhImtOC4lccTCW2C8kR6waaG5VOF0U2BwyKaNFKsXMaVk6yrNhYkvJ9YVicuU9hL+JKLyBrSDYQ7+vXcHqaz4H4dYpPThrv6sfq4jBOp+eM=

lib/terraforming.rb

@@ -1,16 +1,6 @@
-require "oj"
-
-begin
-  require "ox"
-rescue NameError => e
-  spec = Gem::Specification.stubs.find { |s| s.name == 'ox' }
-  raise e unless spec
-  require File.join(spec.gem_dir, "lib/ox")
-end
-
 require "aws-sdk-core"
 require "erb"
-require "json"
+require "multi_json"
 require "thor"
 require "zlib"
 

lib/terraforming/cli.rb

@@ -221,10 +221,10 @@ def tf(klass)
     end
 
     def tfstate(klass, tfstate_path)
-      tfstate = tfstate_path ? JSON.parse(open(tfstate_path).read) : tfstate_skeleton
+      tfstate = tfstate_path ? MultiJson.load(open(tfstate_path).read) : tfstate_skeleton
       tfstate["serial"] = tfstate["serial"] + 1
       tfstate["modules"][0]["resources"] = tfstate["modules"][0]["resources"].merge(klass.tfstate)
-      JSON.pretty_generate(tfstate)
+      MultiJson.encode(tfstate, pretty: true)
     end
 
     def tfstate_skeleton

terraforming.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-sdk", "~> 2.6.1"
-  spec.add_dependency "oj", "~> 2.17.1"
-  spec.add_dependency "ox", "~> 2.4.0"
+  spec.add_dependency "multi_json", "~> 1.12.1"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.7"