cf-uaac 2.0.1 → 2.0.3

data/README.md

@@ -1,5 +1,7 @@
 # CloudFoundry UAA Command Line Client
 
+[![Build Status](https://travis-ci.org/cloudfoundry/cf-uaac.svg?branch=master)](https://travis-ci.org/cloudfoundry/cf-uaac)
+
 ## Build the gem
 
     $ bundle install
@@ -37,4 +39,4 @@ Run integration tests (on a server running on localhost:8080/uaa):
     $ export UAA_CLIENT_ID="admin"
     $ export UAA_CLIENT_SECRET="adminsecret"
     $ export UAA_CLIENT_TARGET="http://localhost:8080/uaa"
-    $ bundle exec rspec spec/integration_spec.rb
+    $ bundle exec rake test

data/cf-uaac.gemspec

@@ -35,15 +35,15 @@ 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"
-  s.add_development_dependency "ci_reporter"
+  s.add_development_dependency "ci_reporter", "~> 1.9.2"
   s.add_runtime_dependency "cf-uaa-lib", "~> 2.0.0"
   s.add_runtime_dependency "highline"
   s.add_runtime_dependency "eventmachine"
   s.add_runtime_dependency "launchy"
   s.add_runtime_dependency "em-http-request", ">= 1.0.0.beta.3"
   s.add_runtime_dependency "json_pure"
+  s.add_runtime_dependency "rack"
 end

data/lib/cli/client_reg.rb

@@ -19,10 +19,16 @@ class ClientCli < CommonCli
 
   topic "Client Application Registrations", "reg"
 
-  CLIENT_SCHEMA = { scope: "list", authorized_grant_types: "list",
-      authorities: "list", access_token_validity: "seconds",
-      refresh_token_validity: "seconds", redirect_uri: "list",
-      autoapprove: "list" }
+  CLIENT_SCHEMA = {
+      :scope => "list",
+      :authorized_grant_types => "list",
+      :authorities => "list",
+      :access_token_validity => "seconds",
+      :refresh_token_validity => "seconds",
+      :redirect_uri => "list",
+      :autoapprove => "list",
+      :'signup_redirect_url' => "url"
+  }
   CLIENT_SCHEMA.each { |k, v| define_option(k, "--#{k} <#{v}>") }
 
   def client_info(defaults)

data/lib/cli/version.rb

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

data/lib/stub/scim.rb

@@ -59,7 +59,8 @@ class StubScim
         :authorizations, :groups].to_set,
       client: [*COMMON_ATTRS, :client_id, :client_secret, :authorities,
         :authorized_grant_types, :scope, :autoapprove,
-        :access_token_validity, :refresh_token_validity, :redirect_uri].to_set,
+        :access_token_validity, :refresh_token_validity, :redirect_uri,
+        :'signup_redirect_url'].to_set,
       group: [*COMMON_ATTRS, :displayname, :members, :writers, :readers].to_set }
   VISIBLE_ATTRS = {user: Set.new(LEGAL_ATTRS[:user] - HIDDEN_ATTRS),
       client: Set.new(LEGAL_ATTRS[:client] - HIDDEN_ATTRS),

data/spec/curl_spec.rb

@@ -38,6 +38,8 @@ module CF::UAA
     end
 
     it "hits the URL on the UAA target" do
+      pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
+
       Cli.run("curl /my-fake-endpoint")
 
       Cli.output.string.should include "GET #{@target}/my-fake-endpoint"
@@ -49,6 +51,8 @@ module CF::UAA
     end
 
     it "displays the correct response text when we include a body in the request" do
+      pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
+
       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"
@@ -61,6 +65,8 @@ module CF::UAA
     end
 
     it "uses headers passed from the command line" do
+      pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
+
       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"

data/spec/group_spec.rb

@@ -118,7 +118,8 @@ describe GroupCli do
   end
 
   it "reads members as a reader" do
-    pending "real uaa can't search for groups by name with scim.me/readers" unless @stub_uaa
+    pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
+
     Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}r -p #{@test_pwd}").should be
     Cli.run("group get #{@test_group} -a memBers").should be
     ids = Cli.output.string.scan(/.*value:\s+([^\s]+)/).flatten
@@ -126,13 +127,14 @@ describe GroupCli do
   end
 
   it "can't write members as a reader" do
-    pending "real uaa can't search for groups by name with scim.me/readers" unless @stub_uaa
     Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}r -p #{@test_pwd}").should be
     Cli.run("member add #{@test_group} #{@test_user}z").should_not be
     Cli.output.string.should include "access_denied"
   end
 
   it "adds a member as a writer" do
+    pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
+
     Cli.run "context #{@test_client}"
     Cli.run("user add #{@test_user}z -p #{@test_pwd} --email sam@example.com").should be
     @users << "#{@test_user}z"

data/spec/spec_helper.rb

@@ -52,7 +52,8 @@ module SpecHelper
     opts = { authorities: "clients.read,scim.read,scim.write,uaa.resource",
       grant_types: "client_credentials,password,refresh_token",
       scope: "openid,password.write,scim.me,scim.read",
-      autoapprove: "openid,password.write,scim.me,scim.read"}.update(opts)
+      autoapprove: "openid,password.write,scim.me,scim.read",
+      signup_redirect_url: "home"}.update(opts)
     @admin_client = ENV["UAA_CLIENT_ID"] || "admin"
     @admin_secret = ENV["UAA_CLIENT_SECRET"] || "adminsecret"
     if ENV["UAA_CLIENT_TARGET"]
@@ -67,9 +68,11 @@ module SpecHelper
     test_client = "test_client_#{Time.now.to_i}"
     @test_secret = Shellwords.escape("+=tEsTsEcRet~!@--")
     Cli.run("client add #{test_client} -s #{@test_secret} " +
-        "--authorities #{opts[:authorities]} --scope #{opts[:scope]} " +
+        "--authorities #{opts[:authorities]} " +
+        "--scope #{opts[:scope]} " +
         "--authorized_grant_types #{opts[:grant_types]} " +
-        "--autoapprove #{opts[:autoapprove]}").should be
+        "--autoapprove #{opts[:autoapprove]} " +
+        "--signup_redirect_url #{opts[:signup_redirect_url]}").should be
     opts.each { |k, a| Util.arglist(a).each {|v| Cli.output.string.should include(v) }}
     @test_client = test_client
   end

data/spec/token_spec.rb

@@ -44,7 +44,7 @@ describe TokenCli 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$/
+    Cli.output.string.should match /scope:.+password\.write openid.*$/
   end
 
   it "can request a specific scope" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,22 +47,6 @@ dependencies:
     - - ! '>='
       - !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: !ruby/object:Gem::Requirement
@@ -116,17 +100,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +207,22 @@ dependencies:
     - - ! '>='
       - !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: :runtime
+  prerelease: false
+  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