yao 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb8a0a2dadc975011f644129f9373df0ae5d361c
-  data.tar.gz: 193b029611bdd15bbd73e8e6eaf23b0b2ffa5284
+  metadata.gz: cd6c10a9f17a721d151c633f1668bc518c01fb51
+  data.tar.gz: e520c0d5a5a3eff1dfbd796c883af865747f0882
 SHA512:
-  metadata.gz: d596134cae2041930bb56177ce417dced0437c24d3589c8e6a1a0081a264b261c150bdc51360ecee5e8a340aea44cb1e79d4f989bcf7ecc5559acf55d33f3b4e
-  data.tar.gz: fd6c3d18fe67ea85a399f31919213eac3a69a50fa7bffa08e7984a0addaf3ae42c07c1fbee2a08eb394920274138504a0ed68b735cb46cdf7d1d0f8edd1cba31
+  metadata.gz: eff49cbc10c33dffc702372092d7af9196a9dda99af850f61531e592a3b1ffaa0601cfedcdd0872a98e35b70a1a38226f3cbf3fc852c6db192933f5546317c03
+  data.tar.gz: dac64ca02915c373496db975899f53e44b3b489f81f558207449796d9644cc51c29ceeee0dba4cee5e1141514c4b04dc5e0137c53c00fccb8e0aa0f24a749f39

data/README.md

@@ -36,6 +36,18 @@ Yao::Network.list # list up networks...
 Yao::Server.list_detail # list up instances...
 ```
 
+If you want to override some of endpoints by service, you can do:
+
+```ruby
+Yao.configure do
+  auth_url    "http://endpoint.example.com:12345"
+  tenant_name "example"
+  username    "udzura"
+  password    "XXXXXXXX"
+  endpoints   identity: { public: "http://override-endpoint.example.com:35357/v3.0" }
+end
+```
+
 ## Support policy
 
 YAO supports rubies which are supported by Ruby Core Team. Please look into [`.travis.yml`](./.travis.yml) 's directive.

data/lib/yao/client.rb

@@ -3,6 +3,8 @@ require 'faraday'
 require 'yao/plugins/default_client_generator'
 
 module Yao
+  Yao.config.param :endpoints, nil
+
   module Client
     class ClientSet
       def initialize
@@ -32,8 +34,11 @@ module Yao
             }.to_h
           end
 
-          self.pool[type]       = Yao::Client.gen_client(urls[:public_url], token: token) if urls[:public_url]
-          self.admin_pool[type] = Yao::Client.gen_client(urls[:admin_url],  token: token) if urls[:admin_url]
+          force_public_url = Yao.config.endpoints[type.to_sym][:public] rescue nil
+          force_admin_url = Yao.config.endpoints[type.to_sym][:admin] rescue nil
+
+          self.pool[type] = Yao::Client.gen_client(force_public_url || urls[:public_url], token: token) if force_public_url || urls[:public_url]
+          self.admin_pool[type] = Yao::Client.gen_client(force_admin_url || urls[:admin_url],  token: token) if force_admin_url || urls[:admin_url]
         end
       end
     end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/yao/test_auth.rb

@@ -14,6 +14,9 @@ class TestAuth < Test::Unit::TestCase
   end
 
   def teardown
+    Yao.configure do
+      endpoints nil
+    end
   end
 
   def test_auth_successful
@@ -57,4 +60,17 @@ class TestAuth < Test::Unit::TestCase
     end
     assert_received(auth) {|a| a.new }
   end
+
+  def test_override_endpoint
+    Yao.configure do
+      auth_url    "http://endpoint.example.com:12345"
+      tenant_name "example"
+      username    "udzura"
+      password    "XXXXXXXX"
+      endpoints ({ identity: { public: "http://override-endpoint.example.com:35357/v3.0" } })
+    end
+    assert(Yao.default_client.pool["identity"].url_prefix.to_s, "http://override-endpoint.example.com:35357/v3.0")
+  end
+
+
 end

data/test/yao/test_config.rb

@@ -56,7 +56,7 @@ class TestConfig < Test::Unit::TestCase
     mock(auth).try_new.times(count)
     Yao::Config::HOOK_RENEW_CLIENT_KEYS.each do |key|
       Yao.configure do
-        set key, "dummy"
+        set key, "http://dummy"
       end
     end
 

data/yao.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "json"
-  spec.add_dependency "faraday"
+  spec.add_dependency "faraday", "~> 0.12.0"
   spec.add_dependency "faraday_middleware"
 
   spec.add_development_dependency "bundler", ">= 1.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,16 +28,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!