kaname 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 15b28f025e86bd66760143c6f4746ea38e43be3c
-  data.tar.gz: bf491e308de8a2b16f34469d7d80dab03289ac80
+SHA256:
+  metadata.gz: 670ec8c0c2f974a1d43bab32bf55cabdc0a3ce9160f4e9e4f6161c2e9d52749c
+  data.tar.gz: ecec1d85344a9c03b6adaebf55ca18f06a48893e5db688d6376dd22f734129ca
 SHA512:
-  metadata.gz: 84717d072d821c76d99f9a3f9f2b3f24256354f643a37feda0228e5d6965dc7e26ce610fa4a1e4b864deb53cb58ede620f8dd26c50a5f7e4fc99b3f9194bffc0
-  data.tar.gz: 4422dac3de3308fad2ea4747cd1c951ee7db77239406307da565f3bb6a9dd7a88be5a5fa8772cc1239bf5450b358840ad9e048233b9fbdb3b51e6a3c74010e8c
+  metadata.gz: e4542d0669ab3ebfb97e65b028f5637ae5299c0db65bdc27ce3be49adc0927172f0a49b0d16c34a52514b2daf5a0c3ca516944100b648f91e36a24b2a66e7e8c
+  data.tar.gz: 4ce6e27c259e7ec7afbf9b3ecac776e9986adf2e9468cd2b946f5a509a63650ac2bf59e5e458a75dab944ea11012147b9772655ed29c10f1ad3d903813492bce

data/README.md

@@ -43,7 +43,6 @@ auth_url: "http://your-openstack-auth-endpoint/v2.0"
 username: "admin"
 tenant: "admin"
 password: "admin-no-password"
-management_url: "http://your-openstack-management-endpoint/v2.0"
 ```
 
 also, you can set some options.

data/lib/kaname/adapter/read_and_write.rb

@@ -17,25 +17,17 @@ module Kaname
       end
 
       def update_user_password(old_password, new_password)
-        unless Kaname::Config.management_url
-          raise 'management_url is missing. Check the configuration file.'
-        end
-
         if old_password && new_password
-          token = Yao::Auth.try_new.token
           me    = Yao::User.get_by_name(Kaname::Config.username)
-          endpoint = Kaname::Config.management_url
-
-          url = URI.parse("#{endpoint}/OS-KSCRUD/users/#{me.id}")
+          client= Yao.default_client.pool['identity']
 
-          req = Net::HTTP::Patch.new(url.path)
-          req["Content-type"] = "application/json"
-          req["X-Auth-Token"] = token
-          req.body = JSON.generate({'user' => {'password' => new_password, 'original_password' => old_password}})
-
-          res = Net::HTTP.start(url.host, url.port) {|http| http.request(req) }
+          params = JSON.generate({'user' => {'password' => new_password, 'original_password' => old_password}})
+          res = client.patch("./OS-KSCRUD/users/#{me.id}") do |req|
+            req.body = params
+            req.headers['Content-Type'] = 'application/json'
+          end
 
-          if res.code == "200"
+          if res.status == 200
             puts "Your password is updated. Please update your ~/.kaname configuration too."
           else
             raise "password updating is failed"

data/lib/kaname/config.rb

@@ -3,12 +3,10 @@ require 'yaml'
 
 module Kaname
   class Config
-    %w[username management_url].each do |m|
-      self.class_variable_set(:"@@#{m}", String.new)
-    end
+    @@username = String.new
 
     def self.setup
-      load_config
+      load_config unless envs_exist?
       setup_yao
     end
 
@@ -16,12 +14,12 @@ module Kaname
       @@username
     end
 
-    def self.management_url
-      @@management_url
-    end
-
     private
 
+    def self.envs_exist?
+      %w[OS_AUTH_URL OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_CERT OS_KEY OS_REGION_NAME].any?{|k|ENV[k]}
+    end
+
     def self.load_config
       config_file = File.join(Dir.home, '.kaname')
       raise '~/.kaname is missing' unless File.exists?(config_file)
@@ -36,7 +34,6 @@ module Kaname
       @@tenant         = config['tenant']
       @@username       = config['username']
       @@password       = config['password']
-      @@management_url = config['management_url']
       @@client_cert    = config['client_cert']
       @@client_key     = config['client_key']
       @@region_name    = config['region_name']
@@ -45,13 +42,13 @@ module Kaname
 
     def self.setup_yao
       Yao.configure do
-        auth_url    @@auth_url
-        tenant_name @@tenant
-        username    @@username
-        password    @@password
-        client_cert @@client_cert
-        client_key  @@client_key
-        region_name @@region_name
+        auth_url    (ENV['OS_AUTH_URL']    || @@auth_url)
+        tenant_name (ENV['OS_TENANT_NAME'] || @@tenant)
+        username    (ENV['OS_USERNAME']    || @@username)
+        password    (ENV['OS_PASSWORD']    || @@password)
+        client_cert (ENV['OS_CERT']        || @@client_cert)
+        client_key  (ENV['OS_KEY']         || @@client_key)
+        region_name (ENV['OS_REGION_NAME'] || @@region_name)
       end
     end
   end

data/lib/kaname/resource.rb

@@ -4,7 +4,7 @@ module Kaname
   class Resource
     class << self
       def yaml(filename = 'keystone.yml')
-        if File.exists?(filename)
+        if File.exist?(filename)
           @_yaml ||= expand_all_tenants(YAML.load_file(filename))
         end
       end

data/lib/kaname/version.rb

@@ -1,3 +1,3 @@
 module Kaname
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
@@ -197,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Identity configuration tool for OpenStack.