yao 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd6c10a9f17a721d151c633f1668bc518c01fb51
-  data.tar.gz: e520c0d5a5a3eff1dfbd796c883af865747f0882
+  metadata.gz: 5f5e910f9f7616e6e9e7402416b818e366d718e1
+  data.tar.gz: 392f0c4b9ba85c8c5fed0939c3dc07c457611a3e
 SHA512:
-  metadata.gz: eff49cbc10c33dffc702372092d7af9196a9dda99af850f61531e592a3b1ffaa0601cfedcdd0872a98e35b70a1a38226f3cbf3fc852c6db192933f5546317c03
-  data.tar.gz: dac64ca02915c373496db975899f53e44b3b489f81f558207449796d9644cc51c29ceeee0dba4cee5e1141514c4b04dc5e0137c53c00fccb8e0aa0f24a749f39
+  metadata.gz: 9432f815b9ec8e394f85764827537d2dcdc646823201f2cba83cd3b830177ce59f738675c61b4bcd18603e61b934ba31d46400c27f29b3abf022566d536c533d
+  data.tar.gz: 9d035450f40b5672afdffc7c8e43d0f8567ae47ddabcf3db0d6534da324b5987288bf53adc5bdd4b889e7e2c0cbc99b17be0c27492069117304a649c5b17a4b8

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 
 rvm:
-  - 2.1.7
-  - 2.2.3
-  - 2.3.0-preview1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - ruby-head
 
 install: bundle install --path vendor/bundle
 

data/README.md

@@ -30,6 +30,13 @@ Yao.configure do
   tenant_name "fooproject"
   username    "udzura"
   password    "tonk0tsu-r@men"
+
+  # timeout is optional
+  timeout     300
+  
+  # If your endpoint requires cert & key
+  client_cert "/path/to/my.pem"
+  client_key "/path/to/my.key"
 end
 
 Yao::Network.list # list up networks...
@@ -67,8 +74,6 @@ OpenStack.configure do
   tenant_name "fooproject"
   username    "udzura"
   password    "tonk0tsu-r@men"
-  # timeout is optional
-  timeout     300
 end
 
 OpenStack::Server.list_detail # And let's go on

data/lib/yao/auth.rb

@@ -4,7 +4,7 @@ require 'time'
 require 'yao/token'
 
 module Yao
-  %i(tenant_name username password timeout).each do |name|
+  %i(tenant_name username password timeout client_cert client_key).each do |name|
     Yao.config.param name, nil
   end
 

data/lib/yao/client.rb

@@ -65,6 +65,15 @@ module Yao
       def client_options
         opt = {}
         opt.merge!({ request: { timeout: Yao.config.timeout }}) if Yao.config.timeout
+        if Yao.config.client_cert && Yao.config.client_key
+          require 'openssl'
+          cert = OpenSSL::X509::Certificate.new(File.read(Yao.config.client_cert))
+          key  = OpenSSL::PKey.read(File.read(Yao.config.client_key))
+          opt.merge!(ssl: {
+            client_cert: cert,
+            client_key:  key,
+          })
+        end
         opt
       end
     end

data/lib/yao/version.rb

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

data/test/fixtures/dummy.key

@@ -0,0 +1 @@
+"OK"

data/test/fixtures/dummy.pem

@@ -0,0 +1 @@
+"OK"

data/test/yao/test_client.rb

@@ -55,4 +55,16 @@ class TestClient < Test::Unit::TestCase
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
     assert { cli.options.timeout == 300 }
   end
+
+  def test_cert_key
+    stub(Yao.config).client_cert { File.expand_path("../../fixtures/dummy.pem", __FILE__) }
+    stub(Yao.config).client_key  { File.expand_path("../../fixtures/dummy.key", __FILE__) }
+    stub(OpenSSL::X509::Certificate).new { "DummyCert" }
+    stub(OpenSSL::PKey).read { "DummyKey" }
+
+    cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
+    ssl = cli.ssl
+    assert { ssl[:client_cert] == "DummyCert" }
+    assert { ssl[:client_key] == "DummyKey" }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -205,6 +205,8 @@ files:
 - lib/yao/token.rb
 - lib/yao/version.rb
 - test/config.rb
+- test/fixtures/dummy.key
+- test/fixtures/dummy.pem
 - test/support/auth_stub.rb
 - test/yao/resources/test_role.rb
 - test/yao/resources/test_security_group.rb
@@ -245,6 +247,8 @@ specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
 test_files:
 - test/config.rb
+- test/fixtures/dummy.key
+- test/fixtures/dummy.pem
 - test/support/auth_stub.rb
 - test/yao/resources/test_role.rb
 - test/yao/resources/test_security_group.rb