cf-uaac 4.8.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfab7f0414642214e580afa77f1a5cbc25a792156fe6c16ed77fbf43b39c9f7c
-  data.tar.gz: cf59b55d4321dbf3fb209182499e0bef77932aba57d318144d375daed5b569e6
+  metadata.gz: 980e72cf51fa122f913bafb404bedf16131cacda6a1c5ddbe8007ce7a1cc5dc2
+  data.tar.gz: e85fcf56ea708436f032cfe018a2bc01a5108a15d7695bf25f337db33c1670c4
 SHA512:
-  metadata.gz: f01c96261a58648ef0c09f5daacf1585116859a9c1f36e4d4480c87c9b52fa5ffdd3c413abc813cb4c6786c370c0749014b0b09510847352328492ee85d1e59e
-  data.tar.gz: 578efd3d797f294e1983b4ce297dd3461e96a6bd3167575ef28ec4531ff24d195e76b2bd95335f1d35c5f00d7136cad26e6b3cf3d133c40678441bfae15aa94a
+  metadata.gz: cb967dcbf5f5bf0d86aef886d2b1656f45599f5518669929b146b8f5893c6c1f890cd4e4dea7cda431ee81330c2a281ec8e5ef2d4de0e2ff80aba3855472c085
+  data.tar.gz: bb528d120273c6a7c7040e807a2001933ac7402f0e044242f7f0ae38464eb116e2ada6e8d62dae221dbe4c6c2a1c21cadb9c9046064ee56b94ae3f60fa851075

data/.github/dependabot.yml

@@ -9,3 +9,9 @@ updates:
   allow:
   - dependency-type: direct
   - dependency-type: indirect
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 10

data/.github/workflows/ruby.yml

@@ -2,9 +2,9 @@ name: Ruby
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
@@ -13,10 +13,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.5', '2.7', '3.0', '3.1']
+        ruby-version: ['2.5', '2.7', '3.0', '3.1', '3.2']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/Gemfile

@@ -13,5 +13,5 @@
 
 source 'http://rubygems.org'
 
-# Specify your gem's dependencies in uaa.gemspec
+# Specify your gem's dependencies in cf-uaac.gemspec
 gemspec

data/cf-uaac.gemspec

@@ -32,16 +32,16 @@ Gem::Specification.new do |s|
 
   # dependencies
   s.add_runtime_dependency 'cf-uaa-lib', '~> 4.0'
-  s.add_development_dependency 'rake', '>= 10.3.1', '~> 13.0'
-  s.add_development_dependency 'rspec', '>= 2.14.1', '~> 3.9'
-  s.add_development_dependency 'simplecov', '~> 0.21.2'
-  s.add_development_dependency 'simplecov-rcov', '~> 0.3.0'
-  s.add_development_dependency 'ci_reporter', '>= 1.9.2', '~> 2.0'
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rspec', '~> 3.12'
+  s.add_development_dependency 'simplecov', '~> 0.22.0'
+  s.add_development_dependency 'simplecov-rcov', '~> 0.3.1'
+  s.add_development_dependency 'ci_reporter', '~> 2.0'
   s.add_development_dependency 'ci_reporter_rspec', '~> 1.0'
   s.add_runtime_dependency 'highline', '~> 2.0'
-  s.add_runtime_dependency 'eventmachine', '~> 1.0', '>= 1.0.3'
-  s.add_runtime_dependency 'launchy', '~> 2.4', '>= 2.4.2'
+  s.add_runtime_dependency 'eventmachine', '~> 1.2'
+  s.add_runtime_dependency 'launchy', '~> 2.5'
   s.add_runtime_dependency 'em-http-request', '~> 1.1', '>= 1.1.2'
-  s.add_runtime_dependency 'json_pure', '>= 1.8.1', '< 3.0'
-  s.add_runtime_dependency 'rack', '>= 1.5.2', '< 4.0'
+  s.add_runtime_dependency 'json_pure', '~>2.6'
+  s.add_runtime_dependency 'rack', '~>3.0'
 end

data/lib/uaa/cli/config.rb

@@ -34,7 +34,7 @@ class Config
     if config =~ /^---/ || config == ""
       @config = config == "" ? {} : YAML.load(config)
       @config_file = nil
-    elsif File.exists?(@config_file = config)
+    elsif File.exist?(@config_file = config)
       if (@config = YAML.load_file(@config_file)) && @config.is_a?(Hash)
         @config.each { |k, v| break @config = nil if k.to_s =~ / / }
       end

data/lib/uaa/cli/curl.rb

@@ -27,15 +27,16 @@ module CF::UAA
     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"
+    define_option :bodyonly, "-b", "--bodyonly", "show body only in response"
 
-    desc "curl [path]", "CURL to a UAA endpoint", :request, :data, :header, :insecure do |path|
+    desc "curl [path]", "CURL to a UAA endpoint", :request, :data, :header, :insecure , :bodyonly 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])
+      print_request(opts[:request], uri, opts[:data], opts[:header], opts[:bodyonly])
       response = make_request(uri, opts)
-      print_response(response)
+      print_response(response, opts[:bodyonly])
     end
 
     def parse_uri(path)
@@ -46,16 +47,16 @@ module CF::UAA
       uri
     end
 
-    def print_request(request, uri, data, header)
-      say "#{request} #{uri.to_s}"
-      say "REQUEST BODY: \"#{data}\"" if data
+    def print_request(request, uri, data, header, bodyonly)
+      say_it("#{request} #{uri.to_s}", bodyonly)
+      say_it("REQUEST BODY: \"#{data}\"", bodyonly) if data
       if header
-        say "REQUEST HEADERS:"
+        say_it("REQUEST HEADERS:", bodyonly)
         Array(header).each do |h|
-          say "  #{h}"
+          say_it("  #{h}", bodyonly)
         end
       end
-      say ""
+      say_it("", bodyonly)
     end
 
     def make_request(uri, options)
@@ -76,20 +77,26 @@ module CF::UAA
       http.request(req, options[:data])
     end
 
-    def print_response(response)
-      say "#{response.code} #{response.message}"
-      say "RESPONSE HEADERS:"
+    def print_response(response, bodyonly)
+      say_it("#{response.code} #{response.message}", bodyonly)
+      say_it("RESPONSE HEADERS:", bodyonly)
       response.each_capitalized do |key, value|
-        say "  #{key}: #{value}"
+        say_it("  #{key}: #{value}", bodyonly)
       end
 
-      say "RESPONSE BODY:"
+      say_it("RESPONSE BODY:", bodyonly)
       if !response['Content-Type'].nil? && response['Content-Type'].include?('application/json')
         parsed = JSON.parse(response.body)
         formatted = JSON.pretty_generate(parsed)
-        say formatted
+        say(formatted)
       else
-        say response.body
+        say(response.body)
+      end
+    end
+
+    def say_it(text, bodyonly)
+      if !bodyonly
+        say text
       end
     end
   end

data/lib/uaa/cli/token.rb

@@ -180,7 +180,7 @@ class TokenCli < CommonCli
     return unless opts[:cf]
     begin
       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)
+      tok_json = File.open(CF_TOKEN_FILE, 'r') { |f| f.read } if File.exist?(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) }

data/spec/curl_spec.rb

@@ -35,6 +35,8 @@ module CF::UAA
       Cli.output.string.should include "curl [path]"
       Cli.output.string.should include "-X | --request <method>"
       Cli.output.string.should include "-d | --data <data>"
+      Cli.output.string.should include "-k | --insecure"
+      Cli.output.string.should include "-b | --bodyonly"
     end
 
     it "hits the URL on the UAA target" do

data/version.txt

@@ -1 +1 @@
-4.8.0
+4.14.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.14.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
@@ -32,9 +32,6 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.3.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
@@ -42,9 +39,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.3.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
@@ -52,57 +46,48 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.2
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -110,9 +95,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.9.2
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -150,40 +132,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
@@ -208,42 +178,30 @@ dependencies:
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.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