rack-oauth2-server 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+2010-11-09 version 1.4.2
+
+Fix to commend line tool to properly do authentication.
+
+Added Sinatra as dependency.
+
+
 2010-11-09 version 1.4.1
 
 Fix to command line tool when accessing MongoDB with username/password.

data/Gemfile

@@ -2,7 +2,6 @@ source :rubygems
 gemspec
 
 group :development do
-  gem "sinatra"
   gem "thin"
   gem "yard"
 end
@@ -14,6 +13,5 @@ group :test do
   gem "rack-test"
   gem "rails", "~>2.3"
   gem "shoulda"
-  gem "sinatra"
   gem "timecop"
 end

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/bin/oauth2-server

@@ -9,10 +9,9 @@ if (i = ARGV.index("--db")) && ARGV[i+1]
   url = ARGV[i + 1]
   uri = URI.parse(url)
   uri = URI.parse("mongo://#{url}") if uri.opaque
-  db = uri.path.sub(/^\//, "")
-  conn = Mongo::Connection.new(uri.host, uri.port)
-  conn.add_auth db, uri.user, uri.password if uri.user
-  Server.database = conn[db]
+  db = Mongo::Connection.new(uri.host, uri.port)[uri.path.sub(/^\//, "")]
+  db.authenticate uri.user, uri.password if uri.user
+  Server.database = db
   ARGV[i,2] = []
 end
 
@@ -37,7 +36,7 @@ when "register"
     redirect_uri = $stdin.gets
     client = Server::Client.create(:display_name=>display_name, :link=>link, :redirect_uri=>redirect_uri)
   rescue
-    puts "\nFailed to register client: #{$1}"
+    puts "\nFailed to register client: #{$!}"
     exit -1
   end
   puts "Registered #{client.display_name}"
@@ -59,6 +58,10 @@ when "setup"
     exit -1
   end
   print <<-TEXT
+
+Next Steps
+==========
+
 Make sure you ONLY authorize administrators to use the oauth-admin scope.
 For example:
 

data/rack-oauth2-server.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rack", "~>1"
   spec.add_dependency "mongo", "~>1"
   spec.add_dependency "bson_ext"
+  spec.add_dependency "sinatra", "~>1"
 end