Skip to content

Commit

Permalink
Using multi_json instead of json_pure
Browse files Browse the repository at this point in the history
  • Loading branch information
rwz committed Dec 5, 2012
1 parent 629a038 commit e29cb1b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion engineyard.gemspec
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |s|

s.add_dependency('rest-client', '~>1.6.0')
s.add_dependency('highline', '~>1.6.1')
s.add_dependency('json_pure')
s.add_dependency('multi_json')
s.add_dependency('escape', '~>0.0.4')
s.add_dependency('engineyard-serverside-adapter', '=2.0.4') # This line maintained by rake; edits may be stomped on
s.add_dependency('engineyard-cloud-client', '~>1.0.7')
Expand Down
2 changes: 1 addition & 1 deletion spec/ey/deploy_spec.rb
Expand Up @@ -350,7 +350,7 @@ def config_options
if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
# the echo strips off the layer of shell escaping, leaving us
# with pristine JSON
JSON.parse `echo #{$1}`
MultiJson.load `echo #{$1}`
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/ey/rollback_spec.rb
Expand Up @@ -36,7 +36,7 @@ def config_options
if @ssh_commands.last =~ /--config (.*?)(?: -|$)/
# the echo strips off the layer of shell escaping, leaving us
# with pristine JSON
JSON.parse `echo #{$1}`
MultiJson.load `echo #{$1}`
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Expand Up @@ -17,7 +17,7 @@
require 'fakeweb'
require 'fakeweb_matcher'

require 'json'
require 'multi_json'

# Engineyard gem
$LOAD_PATH.unshift(File.join(EY_ROOT, "lib"))
Expand Down

0 comments on commit e29cb1b

Please sign in to comment.