kanmon 0.9.0 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd9e1d8a755e41165434ffa463b63985f11d472198afc132c3d6c32ad962196
-  data.tar.gz: cf18367379ee2bd8bf97844cdcba1f0cd49f0103b64c66f5124373218c7de991
+  metadata.gz: 52bccffc21d7485294aecb6abef58e06de89eaf296651b6de99304f3bc2d8b73
+  data.tar.gz: a611fb9b45b435db1c816742af63d0e960d8cb940b91f0b753c7f6f48d2efe5e
 SHA512:
-  metadata.gz: 252463b76b73e7df45e78d08dae7cf93594d0e3e8df629d9d0270473b0f5e837b63836f7d7412da111400ddd9948b3ec71e8c9c05fa505223a2ca9afba5c2a30
-  data.tar.gz: 7511a1468e453590f321400a699ccc704627f00eb2efd96040f32fa39fc737385abba27b9fa044939b5541dab0faa97d5002ae54972dbc62b5ad60f1583056d3
+  metadata.gz: 98b9652b51bf873ebce07e1a23a6b33aab153dd36b166a21222dffb423b45e9f64a26019b7ef7ed6089b95a04289d5d2075d6a55e7dfdd889f17dcd8ee295fdf
+  data.tar.gz: 1d0d35a465a2e180b43f6517bbec1d50664b3d1baa4f45ee33f49704e6708a2f289858f026bceae439925a9ce984d933a6b6d198c687752629cc95dc266d95c4

data/kanmon.gemspec

@@ -20,10 +20,10 @@ 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.12.0"
+  spec.add_dependency "yao", ">= 0.13.3"
   spec.add_dependency "thor", ">= 0.20.0"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/kanmon.rb

@@ -11,6 +11,7 @@ module Kanmon
       tenant_name          ENV['OS_TENANT_NAME']
       username             ENV['OS_USERNAME']
       password             ENV['OS_PASSWORD']
+      ca_cert              ENV['OS_CACERT']
       client_cert          ENV['OS_CERT']
       client_key           ENV['OS_KEY']
       region_name          ENV['OS_REGION_NAME']

data/lib/kanmon/cli.rb

@@ -42,7 +42,7 @@ module Kanmon
 
     desc "ssh [args]", "Commands about exec ssh"
     def ssh(*args)
-      ssh_args = args.unshift("ssh", config.target)
+      ssh_args = args.unshift("ssh", options[:target])
       invoke :exec, ssh_args
     end
 

data/lib/kanmon/config.rb

@@ -23,6 +23,9 @@ module Kanmon
     end
 
     def set(target)
+      unless @data.keys.include?(target)
+        raise TargetNotFoundError.new("#{target} is not found.")
+      end
       @target = target
     end
 

data/lib/kanmon/error.rb

@@ -5,4 +5,6 @@ module Kanmon
       super
     end
   end
+
+  class TargetNotFoundError < StandardError; end
 end

data/lib/kanmon/server.rb

@@ -6,6 +6,7 @@ require "kanmon/error"
 module Kanmon
   class Server
     attr_reader :ip
+    attr_accessor :user_name
 
     def initialize(id, port, ip = nil)
       @id = id
@@ -13,6 +14,7 @@ module Kanmon
       @ip = ip || Kanmon::MyIP.get
       @tenant_id = Yao.current_tenant_id
       @server = Yao::Server.get(id)
+      @user_name = ENV['OS_USERNAME']
     end
 
     def create_sg
@@ -63,9 +65,14 @@ module Kanmon
 
     def close
       begin
-        result = Yao::SecurityGroup.find_by_name(sg_name)
-        if @sg = result.first
-          remove_sg
+        results = Yao::SecurityGroup.find_by_name(sg_name)
+        results.each do |result|
+          @sg = result
+          begin
+            remove_sg
+          rescue Yao::ItemNotFound
+            puts "instance not found"
+          end
           delete_sg
         end
       rescue => e
@@ -88,7 +95,7 @@ module Kanmon
     end
 
     def sg_name
-      "kanmon-server:#{@server.id}-user:#{ENV['OS_USERNAME']}"
+      "kanmon-server:#{@server.id}-user:#{user_name}"
     end
   end
 end

data/lib/kanmon/version.rb

@@ -1,3 +1,3 @@
 module Kanmon
-  VERSION = "0.9.0"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanmon
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.5
 platform: ruby
 authors:
 - Yuki Koya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +42,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency