kaname 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd4973d77de467ed9668e6d15e86509302057bb
-  data.tar.gz: f44b64c9f188ccb3ace24c014ee1ee88db3ef9ef
+  metadata.gz: be1e620440f78831c258b41e66ae936e201ece6c
+  data.tar.gz: 64973a8f8d6d7ffae2708abcda6bfc852eb737df
 SHA512:
-  metadata.gz: 322e5458c83ad0d0a0be29401be176f5d3861e6d21b0a9df889bfdef1063d57bf861c3a78708a9e7de5b9603ec0172d5135517ec410b3d4e2f60bc43022ff0a3
-  data.tar.gz: 245c0a7dfbb4a3c9776420cd71c342dd529be6c4a7d23bc119cebef435fd7d2daba0b363bc7e12bd7d45c19d35d2b7c0bc4c0f1ed2fb799a66281d710bbd17bd
+  metadata.gz: 39ffc1e2bdca3ee64481c51c2829546b9a7819882d7bc7295436051ba4cf6abde01df333792832f1d878dea30ad7c8e96d3902815ef7de58840765d3efa6eb9e
+  data.tar.gz: d382133865ab5aae602a950d13df65a31f95fecb32e00a43016d1e9526786b03f6ba67985758648fd2a8d894fb06ed5db64a91f9e2be6154c6d4b2bcde7db3a1

data/README.md

@@ -26,6 +26,15 @@ hsbt:
     production: "member"
 ```
 
+You can also define `all_tenants` for config all tenants' authority.  
+If both tenants and all_tenants are setting, tenants is preferred.
+
+```yaml
+suzupy:
+  email: suzupy@example.com
+  all_tenants: member
+```
+
 You need to put a configuration file to home directory.
 
 ```sh

data/lib/kaname/resource.rb

@@ -4,11 +4,22 @@ module Kaname
   class Resource
     class << self
       def yaml(filename = 'keystone.yml')
-        @_yaml = if File.exists?(filename)
-                   YAML.load_file(filename)
-                 else
-                   nil
-                 end
+        if File.exists?(filename)
+          @_yaml ||= expand_all_tenants(YAML.load_file(filename))
+        end
+      end
+
+      private
+
+      def expand_all_tenants _yaml
+        list_tenants = Kaname::Adapter::ReadOnly.new.list_tenants
+
+        _yaml.each do |username, config|
+          next unless config['all_tenants']
+          tenants = list_tenants.map{|tenant| [tenant.name, config['all_tenants']]}
+          config['tenants'] = Hash[*tenants.flatten].merge(config['tenants'] || {})
+          config.delete('all_tenants')
+        end
       end
     end
   end

data/lib/kaname/version.rb

@@ -1,3 +1,3 @@
 module Kaname
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Identity configuration tool for OpenStack.