cf-uaac 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99547295a5faebfa3f711aca3078f7b09af3c0c5
-  data.tar.gz: 4edaa8921ff9e37db2b03e335dc99f7788f2726c
+  metadata.gz: 827ceb84606f676c8b5ed9ca4bcd21b83480bf8b
+  data.tar.gz: e4026f4b33775ecfdaa7c2aa0d41c23f394a989c
 SHA512:
-  metadata.gz: b5f26510821f4815e381e765ad71970dba95a9b11cb023b1a5f1f390dddedaa7cbc2b544cb291f40cea71368794430c2d7d9ec9ef6118e41eed31d9dcd208681
-  data.tar.gz: 7bdccc0fb5a696ca07d34a38351a1017a32e6ebb3ecd415ddc8424ac034a11deeda0b5fdc76312173bf6329d3b74b9f2e9deaade94d551cf21ef30572cf0b892
+  metadata.gz: f53de23a8a23d324eaa3979a81f73a077e001249c99ba1c407fcaeab2dde12a18f6b70d46ab43f56b551029872a7f1088a230ac19c7fd330763b6214d2d1551b
+  data.tar.gz: 15ff20c9f4ed4a3d787a0bfe4e52791f62f93bc1ef970b1c9271bdd44b058a02e791c7426f20045753ad72367e4078e5c7e8f77efcb089a792219c3100d6a13e

data/.travis.yml

@@ -1,5 +1,9 @@
 language: ruby
 
+before_install:
+  - gem update
+  - gem install bundler
+
 rvm:
   - 1.9.3
 

data/bin/uaas

@@ -14,9 +14,9 @@
 #++
 
 $:.unshift File.expand_path File.join __FILE__, '..', '..', 'lib'
-require 'stub/uaa'
-require 'cli/base'
-require 'cli/version'
+require 'uaa/stub/uaa'
+require 'uaa/cli/base'
+require 'uaa/cli/version'
 
 module CF::UAA
 

data/cf-uaac.gemspec

@@ -13,7 +13,7 @@
 #++
 
 $:.push File.expand_path("../lib", __FILE__)
-require "cli/version"
+require "uaa/cli/version"
 
 Gem::Specification.new do |s|
   s.name        = "cf-uaac"

data/curl_auth.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+token="$(uaac context | awk '/^ *access_token\: *([a-zA-Z0-9.\/+\-_]+) *$/ {print $2}' -)"
+curl -H"Authorization: bearer $token" "$@"

data/lib/{cli → uaa/cli}/client_reg.rb

@@ -11,7 +11,7 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'cli/common'
+require 'uaa/cli/common'
 
 module CF::UAA
 

data/lib/{cli → uaa/cli}/common.rb

@@ -11,8 +11,8 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'cli/base'
-require 'cli/config'
+require 'uaa/cli/base'
+require 'uaa/cli/config'
 require 'uaa'
 
 module CF::UAA

data/lib/{cli → uaa/cli}/curl.rb

@@ -11,7 +11,7 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'cli/common'
+require 'uaa/cli/common'
 require 'rack'
 require 'net/http'
 require 'uaa/http'

data/lib/{cli → uaa/cli}/group.rb

@@ -12,7 +12,7 @@
 #++
 
 require 'set'
-require 'cli/common'
+require 'uaa/cli/common'
 require 'uaa'
 
 module CF::UAA
@@ -52,9 +52,10 @@ class GroupCli < CommonCli
     response = scim_request { |scim| scim.list_group_mappings(start, count) }
 
     if response
-      grouped_group_mappings = []
+      grouped_group_mappings = {}
       response["resources"].each do |resource|
-        grouped_group_mappings << {resource['displayname'] => resource['externalgroup']}
+        grouped_group_mappings[resource['origin']] ||= Array.new
+        grouped_group_mappings[resource['origin']] << {resource['displayname'] => resource['externalgroup']}
       end
       response["resources"] = grouped_group_mappings
       pp response

data/lib/{cli → uaa/cli}/info.rb

@@ -11,7 +11,7 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'cli/common'
+require 'uaa/cli/common'
 require 'uaa'
 
 module CF::UAA

data/lib/{cli → uaa/cli}/runner.rb

@@ -11,13 +11,13 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'cli/common'
-require 'cli/token'
-require 'cli/user'
-require 'cli/group'
-require 'cli/info'
-require 'cli/client_reg'
-require 'cli/curl'
+require 'uaa/cli/common'
+require 'uaa/cli/token'
+require 'uaa/cli/user'
+require 'uaa/cli/group'
+require 'uaa/cli/info'
+require 'uaa/cli/client_reg'
+require 'uaa/cli/curl'
 
 module CF::UAA
 

data/lib/{cli → uaa/cli}/token.rb

@@ -11,10 +11,10 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'cli/common'
+require 'uaa/cli/common'
 require 'launchy'
 require 'uaa'
-require 'stub/server'
+require 'uaa/stub/server'
 
 module CF::UAA
 

data/lib/{cli → uaa/cli}/user.rb

@@ -11,7 +11,7 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require 'cli/common'
+require 'uaa/cli/common'
 
 module CF::UAA
 

data/lib/{cli → uaa/cli}/version.rb

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

data/lib/{stub → uaa/stub}/scim.rb

@@ -288,7 +288,7 @@ class StubScim
     group = group_id ? ref_by_id(group_id, :group) : ref_by_name(group_name, :group)
     return unless group
     (group[:external_groups] ||= Hash.new)
-    group[:external_groups][external_group] = 'ldap'
+    group[:external_groups][external_group] = origin
     group
   end
 
@@ -303,7 +303,7 @@ class StubScim
     @things_by_id.each do |id, thing|
       if thing[:rtype] == :group
         thing[:external_groups].each do |key, value|
-          group_mappings << { groupid: thing[:id], displayname: thing[:displayname], externalgroup: key }
+          group_mappings << { groupid: thing[:id], displayname: thing[:displayname], externalgroup: key, origin: value }
         end if thing[:external_groups]
       end
     end unless @things_by_id.empty?

data/lib/{stub → uaa/stub}/uaa.rb

@@ -12,9 +12,9 @@
 #++
 
 require 'uaa'
-require 'stub/server'
-require 'stub/scim'
-require 'cli/version'
+require 'uaa/stub/server'
+require 'uaa/stub/scim'
+require 'uaa/cli/version'
 require 'pp'
 
 module CF::UAA

data/lib/uaac_cli.rb

@@ -11,5 +11,5 @@
 # subcomponent's license, as noted in the LICENSE file.
 #++
 
-require "cli/version"
-require "cli/runner"
+require "uaa/cli/version"
+require "uaa/cli/runner"

data/spec/group_spec.rb

@@ -172,10 +172,11 @@ describe GroupCli do
   it "lists all the mappings between uaa scopes and external groups" do
     Cli.run "context #{@test_client}"
     Cli.run "group map ldap-id --name #{@test_group}"
-    Cli.output.string.should include "Successfully mapped #{@test_group} to ldap-id"
-
+    Cli.output.string.should include("Successfully mapped")
+    Cli.run "group map ldap-id-2 --name #{@test_group}"
+    Cli.output.string.should include("Successfully mapped")
     Cli.run "group mappings"
-    Cli.output.string.should include("#{@test_group}: ldap-id")
+    Cli.output.string.should include("ldap: \n    -\n      #{@test_group}: ldap-id\n    -\n      #{@test_group}: ldap-id-2")
   end
 
   it "lists mappings between uaa scopes and external groups with pagination" do
@@ -192,10 +193,15 @@ describe GroupCli do
     Cli.output.string.should include "Successfully mapped #{@test_group} to ldap-id"
 
     Cli.run "group mappings"
-    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3", "#{@test_group}: ldap-id-4")
+    Cli.output.string.should include("#{@test_group}: ldap-id")
+    Cli.output.string.should include("#{@test_group}: ldap-id-2")
+    Cli.output.string.should include("#{@test_group}: ldap-id-3")
+    Cli.output.string.should include("#{@test_group}: ldap-id-4")
 
     Cli.run "group mappings --start 1 --count 3"
-    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3")
+    Cli.output.string.should include("#{@test_group}: ldap-id")
+    Cli.output.string.should include("#{@test_group}: ldap-id-2")
+    Cli.output.string.should include("#{@test_group}: ldap-id-3")
     Cli.output.string.should_not include("ldap-id-4")
 
     Cli.run "group mappings --start 1 --count -3"
@@ -207,17 +213,22 @@ describe GroupCli do
     Cli.output.string.should include("Please enter a valid count")
 
     Cli.run "group mappings --start -1 --count 5"
-    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3")
+    Cli.output.string.should include("#{@test_group}: ldap-id")
+    Cli.output.string.should include("#{@test_group}: ldap-id-2")
+    Cli.output.string.should include("#{@test_group}: ldap-id-3")
 
     Cli.run "group mappings --start a --count 1"
     Cli.output.string.should_not include("ldap-id", "ldap-id-2", "ldap-id-3")
     Cli.output.string.should include("Please enter a valid start index")
 
     Cli.run "group mappings --start 2"
-    Cli.output.string.should include("#{@test_group}: ldap-id-2", "#{@test_group}: ldap-id-3", "#{@test_group}: ldap-id-4")
+    Cli.output.string.should include("#{@test_group}: ldap-id-2")
+    Cli.output.string.should include("#{@test_group}: ldap-id-3")
+    Cli.output.string.should include("#{@test_group}: ldap-id-4")
 
     Cli.run "group mappings --count 2"
-    Cli.output.string.should include("#{@test_group}: ldap-id", "#{@test_group}: ldap-id-2")
+    Cli.output.string.should include("#{@test_group}: ldap-id")
+    Cli.output.string.should include("#{@test_group}: ldap-id-2")
   end
 
   it "maps a uaa scope to an external group" do

data/spec/http_spec.rb

@@ -16,8 +16,8 @@ require 'fiber'
 require 'net/http'
 require 'em-http'
 require 'uaa/http'
-require 'cli/version'
-require 'stub/server'
+require 'uaa/cli/version'
+require 'uaa/stub/server'
 
 module CF::UAA
 

data/spec/info_spec.rb

@@ -13,7 +13,7 @@
 
 require 'spec_helper'
 require 'uaac_cli'
-require 'stub/uaa'
+require 'uaa/stub/uaa'
 
 module CF::UAA
 

data/spec/spec_helper.rb

@@ -24,7 +24,7 @@ end
 
 require 'rspec'
 require 'eventmachine'
-require 'stub/uaa'
+require 'uaa/stub/uaa'
 
 module CF::UAA
 

data/spec/ssl_integration_spec.rb

@@ -15,7 +15,7 @@ require 'spec_helper'
 require 'fiber'
 require 'em-http'
 require 'uaac_cli'
-require 'stub/server'
+require 'uaa/stub/server'
 
 module CF::UAA
 
@@ -99,4 +99,4 @@ module CF::UAA
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,21 +229,22 @@ files:
 - bin/uaac-completion.sh
 - bin/uaas
 - cf-uaac.gemspec
-- lib/cli/base.rb
-- 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
-- lib/cli/runner.rb
-- lib/cli/token.rb
-- lib/cli/user.rb
-- lib/cli/version.rb
-- lib/stub/scim.rb
-- lib/stub/server.rb
-- lib/stub/uaa.rb
+- curl_auth.sh
+- lib/uaa/cli/base.rb
+- lib/uaa/cli/client_reg.rb
+- lib/uaa/cli/common.rb
+- lib/uaa/cli/config.rb
+- lib/uaa/cli/curl.rb
+- lib/uaa/cli/favicon.ico
+- lib/uaa/cli/group.rb
+- lib/uaa/cli/info.rb
+- lib/uaa/cli/runner.rb
+- lib/uaa/cli/token.rb
+- lib/uaa/cli/user.rb
+- lib/uaa/cli/version.rb
+- lib/uaa/stub/scim.rb
+- lib/uaa/stub/server.rb
+- lib/uaa/stub/uaa.rb
 - lib/uaac_cli.rb
 - spec/client_reg_spec.rb
 - spec/common_spec.rb
@@ -276,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cf-uaac
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Command line interface for CloudFoundry UAA