kakine 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6d5e3e95d3be988ee9de202354581f560e6851
-  data.tar.gz: e27e67a5788ff219fec2cdda39d7f15f26dec8bc
+  metadata.gz: 80e1aa602140b89d7cd15e4a2ea72b190c8335f9
+  data.tar.gz: 2aed69944134c29efb2e658f94a68db73613cd32
 SHA512:
-  metadata.gz: 5eea18b91ec4aeca9c81b90ddfd1e95152a4a6f8d68a813e1fed0c73f5d470c27df5a814d30deca06f5b2364dcc79a84c8a867cd0575180b0a49158e7f618b44
-  data.tar.gz: ff43d0438657fa5bd130f1c987881285ec485ff6af6bb5fe649f4dc2471d7044e8e4f3af7db5a17e214b799a11ac3717d64d187f308bc9b1eb0dad04ea1d960c
+  metadata.gz: d2520a4581e6bc9e9a059e9c0f11d3cbad3799d15c909aa68f7a0ef93bf3b39adfa672576558003af8e1f65a73d33e5f69d8d571855d910d3f0816cf3f3b442f
+  data.tar.gz: 82040f0cc6169a4d52819cc0849840f323e82d772ca57ae7157e32265b2cf18f8d3a3e9eff48b62ff3118be748713352af40df4f4f2c58f2d90db63b199e2472

data/README.md

@@ -91,6 +91,14 @@ username: "admin"
 password: "admin"
 ```
 
+also, you can set some options.
+
+```
+client_cert: "/path/to/cert.pem"
+client_key: "/path/to/key.pem"
+region_name: "YourRegion"
+```
+
 ### Commands
 
 run following command.

data/kakine.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yao", ">= 0.2.12"
+  spec.add_dependency "yao", ">= 0.3.3"
   spec.add_dependency 'thor'
 
   spec.add_development_dependency "bundler"

data/lib/kakine/builder.rb

@@ -1,5 +1,5 @@
 module Kakine
-  class Builder 
+  class Builder
     class << self
       def create_security_group(sg)
         attributes = { name: sg.name, description: sg.description, tenant_id: sg.tenant_id }
@@ -26,7 +26,7 @@ module Kakine
       end
 
       def convergence_security_group(new_sg, current_sg)
-        if new_sg.description != current_sg.description
+        if new_sg.name != 'default' && new_sg.description != current_sg.description
           delete_security_group(current_sg)
           first_create_security_group(new_sg)
         else
@@ -34,11 +34,11 @@ module Kakine
           first_create_rule(new_sg, current_sg)
         end
       end
-      
+
       def already_setup_security_group(new_sg, current_sgs)
         current_sgs.find { |current_sg| current_sg.name == new_sg.name }
       end
-      
+
       def create_security_rule(tenant_name, sg_name, rule)
         sg = Kakine::Resource.get(:openstack).security_group(tenant_name, sg_name)
         security_group_id =  Kakine::Option.dryrun? && sg.nil? ? Kakine::Adapter.instance.id(sg_name) : sg.id
@@ -58,7 +58,7 @@ module Kakine
           delete_security_rule(tenant_name, sg_name, rule)
         end if target_sg
       end
-      
+
       def first_create_rule(new_sg, current_sg)
         new_sg.rules.map do |rule|
           unless current_sg.find_by_rule(rule)
@@ -81,12 +81,12 @@ module Kakine
       def delete_id_column(sgs)
         case sgs
         when Array
-          sgs.map { |sg| delete_id_column(sg) } 
+          sgs.map { |sg| delete_id_column(sg) }
         when Hash
           sgs.inject({}) do |hash, (k, v)|
-            hash[k] = delete_id_column(v) if k != "id" 
+            hash[k] = delete_id_column(v) if k != "id"
             hash
-          end 
+          end
         else
           sgs
         end

data/lib/kakine/config.rb

@@ -48,6 +48,9 @@ module Kakine
         tenant_name Kakine::Option.tenant_name
         username    @@config['username']
         password    @@config['password']
+        client_cert @@config['client_cert']
+        client_key  @@config['client_key']
+        region_name @@config['region_name']
       end
     end
   end

data/lib/kakine/resource/yaml.rb

@@ -34,7 +34,7 @@ module Kakine
             raise(Kakine::ConfigureError, "#{sg_name}:rules and description is required")
           when !sg[1].key?("rules")
             raise(Kakine::ConfigureError, "#{sg_name}:rules is required")
-          when !sg[1].key?("description")
+          when sg_name != 'default' && !sg[1].key?("description")
             raise(Kakine::ConfigureError, "#{sg_name}:description is required")
           end
         end

data/lib/kakine/version.rb

@@ -1,3 +1,3 @@
 module Kakine
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kakine
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Security Group configuration tool for OpenStack.