cf-uaac 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb3a16efbbbd2a3b0bff7ebab805279ace288798
-  data.tar.gz: 7a64f69585ad57c783213e13be0689caa03352dd
+  metadata.gz: 6736dcdfab81463608c3dede16c118c2ed06cc83
+  data.tar.gz: 424c951819105b0e41d422f81dec1ba75fd791e5
 SHA512:
-  metadata.gz: 6d0e17c6c6e7e1e75c595c7c40bd486941b05ad977437c6468e06647b43170befcb0b9f02b8e44918d37875a39cb65b42fc4782b7905f920b3fdd3d2249c44fa
-  data.tar.gz: e20e97f7510f41dd00fe7a79e1e231e20a19d9cdb6b20dc56788cecd0d5e6c26cf752e70415e9179a2e888e089786af630877bb8376fdd3769b5cfc6c54f7337
+  metadata.gz: 3b8f1aa2f4a4820cc844577a1bdac71ec80dabdf073aab63638a04b8138b1ce5492ff9c3f9927e30f00039eb05d4231170a9b627fada8ccb008eed29a5405ff9
+  data.tar.gz: bb291dfc11b15a31c98aa3510b76653c4cde56c2ab04b8cb2da462a3799c663722aa86cf805fe17f142cfdde53523094792b2ef8de1bcc6842ee8cbbb3d766ad

data/lib/uaa/cli/common.rb

@@ -88,11 +88,10 @@ class CommonCli < Topic
   def scim_common_list(type, filter)
     pp scim_request { |sr|
       query = { attributes: opts[:attrs], filter: filter }
-      info = nil
-      if type == :user
-        info = sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count]))
+      info = if type == :user
+        sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count]))
       else
-        info = opts[:start] || opts[:count] ?
+        opts[:start] || opts[:count] ?
                sr.query(type, query.merge!(startIndex: opts[:start], count: opts[:count])):
                sr.all_pages(type, query)
       end
@@ -109,21 +108,24 @@ class CommonCli < Topic
     info = scim.all_pages(type, query)
     raise BadResponse unless info.is_a?(Array)
     raise NotFound if info.length == 0
-    if info.length >= 2
+    chosen_info = if info.length >= 2
+      say 'Select an origin:'
       info.each_with_index do |i, idx|
+        say "#{idx + 1}. #{i['origin']}"
       end
 
       choice = @highline.ask("Select user:  ").to_i
       if choice > info.length || choice <= 0
-        raise ArgumentError 'bad input, klugscheisser'
+        raise ArgumentError.new('bad input')
       end
-      info = info[choice - 1]
+      info[choice - 1]
     else
-      info = info[0]
+      info[0]
     end
 
+
     # 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"])
+    attrs || !chosen_info["id"] || chosen_info["meta"] ? chosen_info : scim.get(type, chosen_info["id"])
   end
 
   def scim_get_object(scim, type, name, attrs = nil)

data/lib/uaa/cli/config.rb

@@ -46,14 +46,14 @@ class Config
           exit 1
       end
     else # file doesn't exist, make sure we can write it now
-      File.open(@config_file, 'w') { |f| f.write("--- {}\n\n") }
+      self.write_file(@config_file, "--- {}\n\n")
     end
     Util.hash_keys!(@config, :sym)
     @context = current_subhash(@config[@target][:contexts]) if @target = current_subhash(@config)
   end
 
   def self.save
-    File.open(@config_file, 'w') { |f| YAML.dump(Util.hash_keys(@config, :str), f) } if @config_file
+    self.write_file(@config_file, YAML.dump(Util.hash_keys(@config, :str))) if @config_file
     true
   end
 
@@ -134,6 +134,11 @@ class Config
   # methods below here are not intended to be part of the public interface
   private
 
+  def self.write_file(filename, content)
+    File.open(filename, 'w') { |f| f.write content }
+    File.chmod(0600, filename)
+  end
+
   def self.current_subhash(hash)
     return unless hash
     key = nil

data/lib/uaa/cli/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = '4.0.0'
+    CLI_VERSION = '4.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cf-uaac
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Command line interface for CloudFoundry UAA