diff --git a/.rvmrc b/.rvmrc index 4602e0fb05..5734e7e045 100644 --- a/.rvmrc +++ b/.rvmrc @@ -1 +1 @@ -rvm use 1.9.2@RestKit \ No newline at end of file +rvm use 1.9.3@RestKit \ No newline at end of file diff --git a/Gemfile b/Gemfile index c61e70c5a1..7f40cb41b7 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem "sinatra", :git => "git://github.com/sinatra/sinatra.git" gem "thin", "~> 1.3.1" gem 'xcoder', :git => "git://github.com/rayh/xcoder.git" gem 'restkit', :git => 'git://github.com/RestKit/RestKit-Gem.git' -gem 'ruby-debug19' +gem 'debugger', '1.2.0' gem 'faker', '1.0.1' ## OAuth stuff diff --git a/Gemfile.lock b/Gemfile.lock index 1a70d42182..29baecca95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,13 +45,19 @@ GIT GEM remote: http://rubygems.org/ specs: - archive-tar-minitar (0.5.2) bson (1.6.2) bson_ext (1.6.2) bson (~> 1.6.2) builder (3.0.0) columnize (0.3.6) daemons (1.1.8) + debugger (1.2.0) + columnize (>= 0.3.1) + debugger-linecache (~> 1.1.1) + debugger-ruby_core_source (~> 1.1.3) + debugger-linecache (1.1.2) + debugger-ruby_core_source (>= 1.1.1) + debugger-ruby_core_source (1.1.3) diff-lcs (1.1.3) eventmachine (0.12.10) faker (1.0.1) @@ -60,8 +66,6 @@ GEM json (1.7.3) jwt (0.1.4) json (>= 1.2.4) - linecache19 (0.5.12) - ruby_core_source (>= 0.1.4) mime-types (1.18) mongo (1.6.2) bson (~> 1.6.2) @@ -83,16 +87,6 @@ GEM rspec-expectations (2.10.0) diff-lcs (~> 1.1.3) rspec-mocks (2.10.1) - ruby-debug-base19 (0.11.25) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby_core_source (>= 0.1.4) - ruby-debug19 (0.11.6) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby-debug-base19 (>= 0.11.19) - ruby_core_source (0.1.5) - archive-tar-minitar (>= 0.5.2) thin (1.3.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) @@ -104,6 +98,7 @@ PLATFORMS DEPENDENCIES bundler (~> 1.1.0) + debugger (= 1.2.0) faker (= 1.0.1) mongo rack-oauth2-server! @@ -111,7 +106,6 @@ DEPENDENCIES rake (~> 0.9.0) restkit! rspec - ruby-debug19 simple_oauth! sinatra! thin (~> 1.3.1)