cf-uaac 2.0.0 → 2.0.1

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.rspec
 Gemfile.lock
 pkg/
 doc/

data/cf-uaac.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "cf-uaac"
 
+  s.license       = "Apache 2.0"
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -34,6 +35,7 @@ Gem::Specification.new do |s|
   # dependencies
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
+  s.add_development_dependency "rack"
   s.add_development_dependency "rspec"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-rcov"

data/lib/cli/base.rb

@@ -244,7 +244,9 @@ class BaseCli
     @option_defs, @parser, orig = {}, OptionParser.new, args
     opts = @topics.each_with_object({}) do |tpc, o|
       tpc.option_defs.each do |k, optdef|
-        @parser.on(*optdef) { |v| o[k] = v }
+        @parser.on(*optdef) do |v|
+          o[k] = (o[k] ? Array(o[k]).push(v) : v )
+        end
         @option_defs[k] = optdef
       end
     end

data/lib/cli/common.rb

@@ -187,7 +187,7 @@ class MiscCli < CommonCli
         splat = sv[:current] && v[:current]? '*' : ' '
         sv.delete(:current)
         pp "[#{si}]#{splat}[#{sk}]", 2
-        pp sv, 4
+        pp sv, 4, 0
       end
     end
     say ""

data/lib/cli/curl.rb

@@ -0,0 +1,83 @@
+require 'cli/common'
+require 'rack'
+require 'net/http'
+require 'uaa/http'
+require 'json'
+
+module CF::UAA
+  class CurlCli < CommonCli
+    include Http
+
+    topic "CURL"
+
+    define_option :request, "-X", "--request <method>", "request method type, defaults to GET"
+    define_option :data, "-d", "--data <data>", "data included in request body"
+    define_option :header, "-H", "--header <header>", "header to be included in the request"
+    define_option :insecure, "-k", "--insecure", "makes request without verifying SSL certificates"
+
+    desc "curl [path]", "CURL to a UAA endpoint", :request, :data, :header, :insecure do |path|
+      return say_command_help(["curl"]) unless path
+
+      uri = parse_uri(path)
+      opts[:request] ||= "GET"
+      print_request(opts[:request], uri, opts[:data], opts[:header])
+      response = make_request(uri, opts)
+      print_response(response)
+    end
+
+    def parse_uri(path)
+      uri = URI.parse(path)
+      unless uri.host
+        uri = URI.parse("#{Config.target}#{path}")
+      end
+      uri
+    end
+
+    def print_request(request, uri, data, header)
+      say "#{request} #{uri.to_s}"
+      say "REQUEST BODY: \"#{data}\"" if data
+      if header
+        say "REQUEST HEADERS:"
+        Array(header).each do |h|
+          say "  #{h}"
+        end
+      end
+      say ""
+    end
+
+    def make_request(uri, options)
+      http = Net::HTTP.new(uri.host, uri.port)
+      if uri.scheme == "https"
+        http.use_ssl = true
+        if options[:insecure]
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+      end
+      request_class = Net::HTTP.const_get("#{options[:request][0]}#{options[:request][1..-1].downcase}")
+      req = request_class.new(uri.request_uri)
+      req["Authorization"] = "Bearer #{Config.value(:access_token)}"
+      Array(options[:header]).each do |h|
+        key, value = h.split(":")
+        req[key] = value
+      end
+      http.request(req, options[:data])
+    end
+
+    def print_response(response)
+      say "#{response.code} #{response.message}"
+      say "RESPONSE HEADERS:"
+      response.each_capitalized do |key, value|
+        say "  #{key}: #{value}"
+      end
+
+      say "RESPONSE BODY:"
+      if response['Content-Type'].include?('application/json')
+        parsed = JSON.parse(response.body)
+        formatted = JSON.pretty_generate(parsed)
+        say formatted
+      else
+        say response.body
+      end
+    end
+  end
+end

data/lib/cli/runner.rb

@@ -17,12 +17,13 @@ require 'cli/user'
 require 'cli/group'
 require 'cli/info'
 require 'cli/client_reg'
+require 'cli/curl'
 
 module CF::UAA
 
 class Cli < BaseCli
   @overview = "UAA Command Line Interface"
-  @topics = [MiscCli, InfoCli, TokenCli, UserCli, GroupCli, ClientCli]
+  @topics = [MiscCli, InfoCli, TokenCli, UserCli, GroupCli, ClientCli, CurlCli]
   @global_options = [:help, :version, :debug, :trace, :config]
 
   def self.configure(config_file = "", input = $stdin, output = $stdout,

data/lib/cli/token.rb

@@ -73,9 +73,14 @@ class TokenCli < CommonCli
     return gripe "attempt to get token failed\n" unless token_info && token_info["access_token"]
     contents = TokenCoder.decode(token_info["access_token"], verify: false)
     Config.context = contents["user_name"] || contents["client_id"] || "bad_token"
-    Config.add_opts(user_id: contents["user_id"]) if contents["user_id"]
-    Config.add_opts(client_id: contents["client_id"]) if contents["client_id"]
-    Config.add_opts token_info
+    did_save = true
+    (did_save &= Config.add_opts(user_id: contents["user_id"])) if contents["user_id"]
+    (did_save &= Config.add_opts(client_id: contents["client_id"])) if contents["client_id"]
+    jti = token_info.delete("jti") if token_info.has_key? "jti"
+    did_save &= Config.add_opts token_info
+    (did_save &= Config.add_opts(scope: contents["scope"])) if contents["scope"]
+    (did_save &= Config.add_opts(jti: jti)) if jti
+    did_save
   end
 
   def issuer_request(client_id, secret = nil)
@@ -91,7 +96,7 @@ class TokenCli < CommonCli
   desc "token get [credentials...]",
       "Gets a token by posting user credentials with an implicit grant request",
       :client, :scope do |*args|
-    client_name = opts[:client] || "vmc"
+    client_name = opts[:client] || "cf"
     reply = issuer_request(client_name, "") { |ti|
       prompts = ti.prompts
       creds = {}
@@ -135,8 +140,8 @@ class TokenCli < CommonCli
     say_success "refresh" if set_context(reply)
   end
 
-  VMC_TOKEN_FILE = File.join ENV["HOME"], ".vmc_token"
-  VMC_TARGET_FILE = File.join ENV["HOME"], ".vmc_target"
+  CF_TOKEN_FILE = File.join ENV["HOME"], ".cf_token"
+  CF_TARGET_FILE = File.join ENV["HOME"], ".cf_target"
 
   def use_browser(client_id, secret = nil)
     catcher = Stub::Server.new(TokenCatcher,
@@ -156,26 +161,26 @@ class TokenCli < CommonCli
       print "."
     end
     say_success(secret ? "authorization code" : "implicit") if set_context(catcher.info[:token_info])
-    return unless opts[:vmc]
+    return unless opts[:cf]
     begin
-      vmc_target = File.open(VMC_TARGET_FILE, 'r') { |f| f.read.strip }
-      tok_json = File.open(VMC_TOKEN_FILE, 'r') { |f| f.read } if File.exists?(VMC_TOKEN_FILE)
-      vmc_tokens = Util.json_parse(tok_json, :none) || {}
-      vmc_tokens[vmc_target] = auth_header
-      File.open(VMC_TOKEN_FILE, 'w') { |f| f.write(vmc_tokens.to_json) }
+      cf_target = File.open(CF_TARGET_FILE, 'r') { |f| f.read.strip }
+      tok_json = File.open(CF_TOKEN_FILE, 'r') { |f| f.read } if File.exists?(CF_TOKEN_FILE)
+      cf_tokens = Util.json_parse(tok_json, :none) || {}
+      cf_tokens[cf_target] = auth_header
+      File.open(CF_TOKEN_FILE, 'w') { |f| f.write(cf_tokens.to_json) }
     rescue Exception => e
-      gripe "\nUnable to save token to vmc token file"
+      gripe "\nUnable to save token to cf token file"
       complain e
     end
   end
 
   define_option :port, "--port <number>", "pin internal server to specific port"
-  define_option :vmc, "--[no-]vmc", "save token in the ~/.vmc_tokens file"
+  define_option :cf, "--[no-]cf", "save token in the ~/.cf_tokens file"
   desc "token authcode get", "Gets a token using the authcode flow with browser",
-      :client, :secret, :scope, :vmc, :port do use_browser(clientname, clientsecret) end
+      :client, :secret, :scope, :cf, :port do use_browser(clientname, clientsecret) end
 
   desc "token implicit get", "Gets a token using the implicit flow with browser",
-      :client, :scope, :vmc, :port do use_browser opts[:client] || "vmc" end
+      :client, :scope, :cf, :port do use_browser opts[:client] || "cf" end
 
   define_option :key, "--key <key>", "Token validation key"
   desc "token decode [token] [tokentype]", "Show token contents as parsed locally or by the UAA. " +

data/lib/cli/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = "2.0.0"
+    CLI_VERSION = "2.0.1"
   end
 end

data/lib/stub/server.rb

@@ -17,6 +17,7 @@ require 'logger'
 require 'pp'
 require 'erb'
 require 'multi_json'
+require 'rack'
 
 module Stub
 
@@ -88,7 +89,8 @@ class Reply
   attr_accessor :status, :headers, :body
   def initialize(status = 200) @status, @headers, @cookies, @body = status, {}, [], "" end
   def to_s
-    reply = "HTTP/1.1 #{@status} OK\r\n"
+    message = Rack::Utils::HTTP_STATUS_CODES[@status]
+    reply = "HTTP/1.1 #{@status} #{message.upcase if message}\r\n"
     headers["server"], headers["date"] = "stub server", DateTime.now.httpdate
     headers["content-length"] = body.bytesize
     headers.each { |k, v| reply << "#{k}: #{v}\r\n" }

data/lib/stub/uaa.rb

@@ -68,6 +68,17 @@ class StubUAAConn < Stub::Base
     reply.body = File.read File.expand_path(File.join(__FILE__, '..', '..', 'lib', 'cli', 'favicon.ico'))
   end
 
+  route :put, '/another-fake-endpoint' do
+    return unless valid_token("clients.read")
+    parsed = JSON.parse(request.body)
+    reply_in_kind(202, parsed.merge(:updated => 42))
+  end
+
+  route :get, '/my-fake-endpoint' do
+    return unless valid_token("clients.read")
+    reply_in_kind(200, "some fake response text")
+  end
+
   route :get, '/' do reply_in_kind "welcome to stub UAA, version #{VERSION}" end
   route :get, '/varz' do reply_in_kind(mem: 0, type: 'UAA', app: { version: VERSION } ) end
   route :get, '/token_key' do reply_in_kind(alg: "none", value: "none") end
@@ -222,7 +233,9 @@ class StubUAAConn < Stub::Base
         return redir_err_f(cburi, state, "invalid_scope")
       end
       # TODO: how to stub any remaining scopes that are not auto-approve?
-      return redir_with_fragment(cburi, token_reply_info(client, granted_scope, user, query["state"]))
+      token_reply_info = token_reply_info(client, granted_scope, user, query["state"])
+      token_reply_info.delete(:scope) if query["scope"]
+      return redir_with_fragment(cburi, token_reply_info)
     end
     return redir_err_q(cburi, state, "invalid_request") unless request.method == "get"
     return redir_err_q(cburi, state, "unsupported_response_type") unless query["response_type"] == 'code'
@@ -493,7 +506,7 @@ class StubUAA < Stub::Server
     @scim.add(:client, 'client_id' => client, 'client_secret' => secret,
         'authorized_grant_types' => ["client_credentials"], 'authorities' => gids,
         'access_token_validity' => 60 * 60 * 24 * 7)
-    @scim.add(:client, 'client_id' => "vmc", 'authorized_grant_types' => ["implicit"],
+    @scim.add(:client, 'client_id' => "cf", 'authorized_grant_types' => ["implicit"],
         'scope' => [@scim.id("openid", :group), @scim.id("password.write", :group)],
         'access_token_validity' => 5 * 60 )
     info = { commit_id: "not implemented",

data/spec/client_reg_spec.rb

@@ -22,7 +22,8 @@ describe ClientCli do
 
   before :all do
     #Util.default_logger(:trace)
-    Cli.configure("", nil, StringIO.new, true)
+    @output = StringIO.new
+    Cli.configure("", nil, @output, true)
     setup_target(authorities: "scim.read,clients.secret", grant_types: "client_credentials")
     @test_user, @test_pwd = "sam_#{Time.now.to_i}", "correcthorsebatterystaple"
   end
@@ -51,7 +52,15 @@ describe ClientCli do
 
     it "logs in as test client" do
       Cli.run("context").should be # login was in before :all block
-      Cli.output.string.should include "access_token", @test_client
+      Cli.output.string.should include @test_client
+      Cli.output.string.should match /access_token: \S+?\s+token_type/m
+    end
+
+    it "does not wrap the output of the access token in the terminal" do
+      @output.stub(:tty?) { true }
+      HighLine::SystemExtensions.stub(:terminal_size) { [80] }
+      Cli.run("context").should be
+      Cli.output.string.should match /access_token: \S+?\s+token_type/m
     end
 
     it "changes it's client secret" do

data/spec/curl_spec.rb

@@ -0,0 +1,94 @@
+#--
+# Cloud Foundry 2012.02.03 Beta
+# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
+require 'spec_helper'
+require 'cli'
+
+module CF::UAA
+  describe CurlCli do
+    include SpecHelper
+
+    before :all do
+      Cli.configure("", nil, StringIO.new, true)
+      setup_target(authorities: "clients.read,scim.read,scim.write")
+      Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
+      Config.yaml.should include("access_token")
+    end
+
+    after :all do
+      cleanup_target
+    end
+
+    it "prints usage when the path argument is not specified" do
+      Cli.run("curl")
+
+      Cli.output.string.should include "curl [path]"
+      Cli.output.string.should include "-X | --request <method>"
+      Cli.output.string.should include "-d | --data <data>"
+    end
+
+    it "hits the URL on the UAA target" do
+      Cli.run("curl /my-fake-endpoint")
+
+      Cli.output.string.should include "GET #{@target}/my-fake-endpoint"
+      Cli.output.string.should_not include "REQUEST BODY"
+      Cli.output.string.should_not include "REQUEST HEADERS"
+      Cli.output.string.should include "200 OK"
+      Cli.output.string.should include "RESPONSE BODY:"
+      Cli.output.string.should include "some fake response text"
+    end
+
+    it "displays the correct response text when we include a body in the request" do
+      Cli.run("curl -X PUT -d '{\"fake\": true}' -H 'Accept: application/json' /another-fake-endpoint")
+
+      Cli.output.string.should include "PUT #{@target}/another-fake-endpoint"
+      Cli.output.string.should include "REQUEST BODY: \"{\"fake\": true}\""
+      Cli.output.string.should include "Accept: application/json"
+      Cli.output.string.should include "202 ACCEPTED"
+      Cli.output.string.should include "RESPONSE BODY:"
+      Cli.output.string.should include "\"fake\": true"
+      Cli.output.string.should include "\"updated\": 42"
+    end
+
+    it "uses headers passed from the command line" do
+      Cli.run("curl -H \"X-Something: non-standard header\" -H \"X-Another: something\" /my-fake-endpoint")
+
+      Cli.output.string.should include "GET #{@target}/my-fake-endpoint"
+      Cli.output.string.should include "REQUEST HEADERS:"
+      Cli.output.string.should include "  X-Something: non-standard header"
+      Cli.output.string.should include "  X-Another: something"
+      Cli.output.string.should include "RESPONSE HEADERS:"
+      Cli.output.string.should include "  Content-Type: text/plain"
+    end
+
+    it "hits an external server when a request host is specified in the command" do
+      Cli.run("curl http://example.com/something")
+
+      Cli.output.string.should include "GET http://example.com/something"
+      Cli.output.string.should include "404 Not Found"
+    end
+
+    it "prints non-JSON responses" do
+      Cli.run("curl http://example.com/something")
+
+      Cli.output.string.should_not include "JSON::ParserError"
+    end
+
+    it "makes insecure requests with the -k flag" do
+      Cli.run("curl https://example.com/ -k")
+
+      Cli.output.string.should_not include "ECONNRESET"
+      Cli.output.string.should include "200 OK"
+    end
+  end
+end

data/spec/token_spec.rb

@@ -43,6 +43,17 @@ describe TokenCli do
   it "logs in with implicit grant & posted credentials as a user" do
     Cli.run("token get #{@test_user} #{@test_pwd}").should be
     Cli.output.string.should include("Successfully fetched token")
+    Cli.run("context")
+    Cli.output.string.should match /scope: password\.write openid$/
+  end
+
+  it "can request a specific scope" do
+    Cli.run("token delete")
+    Cli.output.truncate 0
+    Cli.run("token get --scope password.write #{@test_user} #{@test_pwd}").should be
+    Cli.output.string.should include("Successfully fetched token")
+    Cli.run("context")
+    Cli.output.string.should match /scope: password\.write$/
   end
 
   it "decodes the token" do
@@ -55,6 +66,7 @@ describe TokenCli do
   end
 
   it "gets authenticated user information" do
+    Cli.run("token get #{@test_user} #{@test_pwd}").should be
     Cli.run("me").should be
     Cli.output.string.should include(@test_user)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78561150 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78561150
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &78560760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +41,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78560760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78560280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,10 +73,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78560280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &78521020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +89,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78521020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &78520540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +105,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78520540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &78520100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,10 +121,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78520100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
-  requirement: &78519640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +137,15 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *78519640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &78519290 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,10 +153,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78519290
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &78518950 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -113,10 +169,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78518950
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &78518610 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,10 +185,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78518610
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &78518160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -135,10 +201,15 @@ dependencies:
         version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
-  version_requirements: *78518160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta.3
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &78517240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -146,7 +217,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78517240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client command line tools for interacting with the CloudFoundry User
   Account and Authorization (UAA) server.  The UAA is an OAuth2 Authorization Server
   so it can be used by webapps and command line apps to obtain access tokens to act
@@ -185,6 +261,7 @@ files:
 - lib/cli/client_reg.rb
 - lib/cli/common.rb
 - lib/cli/config.rb
+- lib/cli/curl.rb
 - lib/cli/favicon.ico
 - lib/cli/group.rb
 - lib/cli/info.rb
@@ -197,6 +274,7 @@ files:
 - lib/stub/uaa.rb
 - spec/client_reg_spec.rb
 - spec/common_spec.rb
+- spec/curl_spec.rb
 - spec/group_spec.rb
 - spec/http_spec.rb
 - spec/info_spec.rb
@@ -205,7 +283,8 @@ files:
 - spec/token_spec.rb
 - spec/user_spec.rb
 homepage: https://github.com/cloudfoundry/cf-uaac
-licenses: []
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -224,8 +303,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cf-uaac
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Command line interface for CloudFoundry UAA
-test_files: []
+test_files:
+- spec/client_reg_spec.rb
+- spec/common_spec.rb
+- spec/curl_spec.rb
+- spec/group_spec.rb
+- spec/http_spec.rb
+- spec/info_spec.rb
+- spec/setup_helper.rb
+- spec/spec_helper.rb
+- spec/token_spec.rb
+- spec/user_spec.rb