diff --git a/Gemfile b/Gemfile index 6a4e2a368..ab8d38ff9 100644 --- a/Gemfile +++ b/Gemfile @@ -107,6 +107,6 @@ group :test do gem 'rspec-instafail', '>= 0.1.7', :require => false gem 'fuubar' - gem 'diaspora-client', :path => "~/workspace/diaspora-client" #:git => 'git@github.com:diaspora/diaspora-client.git' + gem 'diaspora-client', :git => 'git@github.com:diaspora/diaspora-client.git' end diff --git a/Gemfile.lock b/Gemfile.lock index beb878e24..90f7606dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,14 +46,8 @@ GIT eventmachine (>= 0.12.9) GIT - remote: https://github.com/zhitomirskiyi/ruby-jwt - revision: fa7f46b5ac3653e30cf60abc78de9ffb3319dc0c - specs: - jwt (0.1.3) - json (>= 1.2.4) - -PATH - remote: ~/workspace/diaspora-client + remote: git@github.com:diaspora/diaspora-client.git + revision: 7924e3cc576e54b5ade4014caea8b79e9f1d6343 specs: diaspora-client (0.0.0) activerecord @@ -62,6 +56,13 @@ PATH oauth2 sinatra +GIT + remote: https://github.com/zhitomirskiyi/ruby-jwt + revision: fa7f46b5ac3653e30cf60abc78de9ffb3319dc0c + specs: + jwt (0.1.3) + json (>= 1.2.4) + GEM remote: http://rubygems.org/ specs: diff --git a/spec/chubbies/Gemfile b/spec/chubbies/Gemfile index 45cf891a1..4499e5e1e 100644 --- a/spec/chubbies/Gemfile +++ b/spec/chubbies/Gemfile @@ -7,6 +7,6 @@ gem 'json' gem 'shotgun' gem 'sqlite3' gem 'activerecord', '3.0.3' -gem 'diaspora-client', :path => "~/workspace/diaspora-client" #:git => 'git@github.com:diaspora/diaspora-client.git' - - +gem 'diaspora-client', :git => 'git@github.com:diaspora/diaspora-client.git' + + diff --git a/spec/chubbies/Gemfile.lock b/spec/chubbies/Gemfile.lock index b9370ee7c..1616fc3c5 100644 --- a/spec/chubbies/Gemfile.lock +++ b/spec/chubbies/Gemfile.lock @@ -1,5 +1,6 @@ -PATH - remote: ~/workspace/diaspora-client +GIT + remote: git@github.com:diaspora/diaspora-client.git + revision: 7924e3cc576e54b5ade4014caea8b79e9f1d6343 specs: diaspora-client (0.0.0) activerecord @@ -27,7 +28,7 @@ GEM faraday (0.6.1) addressable (~> 2.2.4) multipart-post (~> 1.1.0) - rack (< 2, >= 1.1.0) + rack (>= 1.1.0, < 2) haml (3.1.2) i18n (0.6.0) json (1.5.3)