cf-uaac 1.3.9 → 2.0.0

data/cf-uaac.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-rcov"
   s.add_development_dependency "ci_reporter"
-  s.add_runtime_dependency "cf-uaa-lib", ">= 1.3.6", "<= 1.3.7"
+  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"

data/lib/cli/common.rb

@@ -74,7 +74,7 @@ class CommonCli < Topic
 
   def update_target_info(info = nil)
     return if !info && Config.target_value(:prompts)
-    info ||= Misc.server(Config.target)
+    info ||= @cli_class.uaa_info_client.server
     Config.target_opts(prompts: info['prompts'])
     Config.target_opts(token_endpoint: info['token_endpoint']) if info['token_endpoint']
     info
@@ -136,7 +136,7 @@ class MiscCli < CommonCli
   end
 
   def bad_uaa_url(url, info)
-    info.replace(Misc.server(url.to_s))
+    info.replace(@cli_class.uaa_info_client(url.to_s).server)
     nil
   rescue Exception => e
     "failed to access #{url}: #{e.message}"

data/lib/cli/info.rb

@@ -23,20 +23,24 @@ class InfoCli < CommonCli
   def misc_request(&blk) Config.target ? handle_request(&blk) : gripe("target not set") end
 
   desc "info", "get information about current target" do
-    pp misc_request { update_target_info(Misc.server(Config.target)) }
+    pp misc_request { update_target_info(@cli_class.uaa_info_client.server) }
   end
 
   desc "me", "get authenticated user information" do
-    pp misc_request { Misc.whoami Config.target, auth_header }
+    pp misc_request { @cli_class.uaa_info_client.whoami(auth_header) }
   end
 
   desc "prompts", "Show prompts for credentials required for implicit grant post" do
-    pp misc_request { update_target_info(Misc.server(Config.target))['prompts'] }
+    pp misc_request { update_target_info(@cli_class.uaa_info_client.server)['prompts'] }
   end
 
   desc "signing key", "get the UAA's token signing key(s)", :client, :secret do
-    info = misc_request { Misc.validation_key(Config.target, 
-        (clientname if opts.key?(:client)), (clientsecret if opts.key?(:client))) }
+    info = misc_request {
+      @cli_class.uaa_info_client.validation_key(
+          (clientname if opts.key?(:client)),
+          (clientsecret if opts.key?(:client))
+      )
+    }
     if info && info['value']
       Config.target_opts(signing_alg: info['alg'], signing_key: info['value'])
     end
@@ -44,11 +48,11 @@ class InfoCli < CommonCli
   end
 
   desc "stats", "Show UAA's current usage statistics", :client, :secret do
-    pp misc_request { Misc.varz(Config.target, clientname, clientsecret) }
+    pp misc_request { @cli_class.uaa_info_client.varz(clientname, clientsecret) }
   end
 
   desc "password strength [password]", "calculate strength score of a password" do |pwd|
-    pp misc_request { Misc.password_strength(Config.target, userpwd(pwd)) }
+    pp misc_request { @cli_class.uaa_info_client.password_strength(userpwd(pwd)) }
   end
 
 end

data/lib/cli/runner.rb

@@ -45,7 +45,14 @@ class Cli < BaseCli
     [:trace, :debug].each do |k|
       opts[k] = true if !opts.key?(k) && Config.target && Config.context && Config.value(k)
     end
-    Misc.logger = Util.default_logger(opts[:trace]? :trace: opts[:debug]? :debug: :warn, @output)
+
+    @uaa_logger = Util.default_logger(opts[:trace]? :trace: opts[:debug]? :debug: :warn, @output)
+  end
+
+  def self.uaa_info_client(url = Config.target)
+    client = Info.new(url)
+    client.logger = @uaa_logger
+    client
   end
 
 end

data/lib/cli/token.rb

@@ -187,7 +187,7 @@ class TokenCli < CommonCli
     return say "no token to decode" unless token && ttype
     handle_request do
       if opts[:client] && opts[:secret]
-        pp Misc.decode_token(Config.target, opts[:client], opts[:secret], token, ttype)
+        pp @cli_class.uaa_info_client.decode_token(opts[:client], opts[:secret], token, ttype)
       else
         seckey = opts[:key] || (Config.target_value(:signing_key) if Config.target_value(:signing_alg) !~ /rsa$/i)
         pubkey = opts[:key] || (Config.target_value(:signing_key) if Config.target_value(:signing_alg) =~ /rsa$/i)

data/lib/cli/version.rb

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

data/spec/group_spec.rb

@@ -118,6 +118,7 @@ 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
     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
@@ -125,7 +126,7 @@ describe GroupCli do
   end
 
   it "can't write members as a reader" do
-    pending "real uaa can't search for groups by name by scim.me/readers" unless @stub_uaa
+    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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78561150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,15 +25,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78561150
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78560760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -41,15 +36,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78560760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78560280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,15 +47,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78560280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78521020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,15 +58,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78521020
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78520540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,15 +69,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78520540
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78520100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -105,37 +80,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78520100
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78519640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.3.7
+  version_requirements: *78519640
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78519290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,15 +102,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78519290
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78518950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,15 +113,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78518950
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78518610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,15 +124,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78518610
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78518160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -191,15 +135,10 @@ dependencies:
         version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+  version_requirements: *78518160
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &78517240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -207,12 +146,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *78517240
 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
@@ -282,21 +216,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1864592994044069234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1864592994044069234
 requirements: []
 rubyforge_project: cf-uaac
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Command line interface for CloudFoundry UAA