cf-uaac 1.3.8 → 1.3.9

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+
+
+

data/lib/cli/common.rb

@@ -83,9 +83,12 @@ class CommonCli < Topic
   def scim_common_list(type, filter)
     pp scim_request { |sr|
       query = { attributes: opts[:attrs], filter: filter }
-      opts[:start] || opts[:count] ?
+      info = opts[:start] || opts[:count] ?
         sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count])):
         sr.all_pages(type, query)
+      nattr = sr.name_attr(type).downcase
+      info.is_a?(Array) && info.length > 0 && info[0][nattr] ?
+          info.each_with_object({}) { |v, h| h[v.delete(nattr)] = v } : info
     }
   end
 
@@ -94,7 +97,9 @@ class CommonCli < Topic
     info = scim.all_pages(type, query)
     raise BadResponse unless info.is_a?(Array) && info.length < 2
     raise NotFound if info.length == 0
-    info[0]
+    info = info[0]
+    # when getting whole object, handle case of UAA < 1.3 which did not return meta attr from query
+    attrs || !info["id"] || info["meta"]? info : scim.get(type, info["id"])
   end
 end
 

data/lib/cli/version.rb

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

data/spec/group_spec.rb

@@ -54,7 +54,6 @@ describe GroupCli do
     Cli.output.string.should include @test_group
     Cli.run("group get #{@test_group.upcase}").should be
     Cli.output.string.should include @test_group
-    pending "real uaa can't add members to scim.read group yet" unless @stub_uaa
     Cli.run("member add scim.read #{@test_user}w").should be
   end
 
@@ -109,7 +108,6 @@ describe GroupCli do
 
   it "adds one writer to the group" do
     Cli.run("group writer add #{@test_group} #{@test_user}w").should be
-    Cli.run("group reader add #{@test_group} #{@test_user}w").should be
     Cli.output.string.should include "success"
   end
 

data/spec/setup_helper.rb

@@ -18,7 +18,7 @@ require 'cli'
 
 client = ENV["UAA_CLIENT_ID"] || "admin"
 secret = ENV["UAA_CLIENT_SECRET"] || "adminsecret"
-abort("UAA_CLIENT_TARGET is not set") unless target = ENV["UAA_CLIENT_TARGET"]
+target = ENV["UAA_CLIENT_TARGET"] || "http://localhost:8080/uaa"
 
 [
   "target #{target}",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,6 +234,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE.TXT
@@ -283,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1602838962021256721
+      hash: -1864592994044069234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -292,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1602838962021256721
+      hash: -1864592994044069234
 requirements: []
 rubyforge_project: cf-uaac
 rubygems_version: 1.8.23