ruboty-niftycloud 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5afa3cf305d41677d68c153ac5bae57ca1dad2
-  data.tar.gz: 56f2612995b3a6864d215164175cfd453c18306d
+  metadata.gz: e2fbaea4da6186886970574cccbe543fdcbd5bd0
+  data.tar.gz: 5f4de5c82986028326b02500b786cdb9bb773b03
 SHA512:
-  metadata.gz: 154297170fdede2cf6050d27dd811f99ed312880f02876f5ecd8439fbdeeffee6797004ed428adb783323d31ffd8b69359119645609d701951659899192bd1de
-  data.tar.gz: a20509044adafb99623764caa38067d8bce01a912a3ac1e49de00eb508af7da414b3d5015390f230622c09b4f55465bc53f7694fa2e898e0077497318bebfdf5
+  metadata.gz: d38adba0d69534049f5b9660e7c97907407ff11477de024e3e92ef156cc96f3c666a8151818c990daae1e2b9e550bd1086c083aa4b8cd084cb6c5d25bbad549b
+  data.tar.gz: 33f7218e3c80464c30a033e9b6e4bcff4798a152a248676cec8004ba85ae6e9dfbce674a1ca4cc599df6278d65765a5cd8098adf457d1361cf1b87fb162c1fd0

data/README.md

@@ -14,6 +14,8 @@ gem "ruboty-niftycloud"
 ```
 @ruboty niftycloud account list                                      - list accounts
 @ruboty niftycloud account use <account or number>                   - use account
+@ruboty niftycloud event watch                                       - watch events
+@ruboty niftycloud event unwatch                                     - unwatch events
 @ruboty niftycloud computing region list                             - list computing regions
 @ruboty niftycloud computing region use                              - use computing region
 @ruboty niftycloud computing availability zone list                  - list computing availability zones

data/lib/ruboty/handlers/niftycloud.rb

@@ -1,3 +1,4 @@
+# coding:utf-8
 module Ruboty
   module Handlers
     class Niftycloud < Base
@@ -261,6 +262,7 @@ module Ruboty
 
       def event_watch(message)
         return if @thread
+        message.reply "started to watch events"
         @thread = Thread.new do
           base = Ruboty::Niftycloud::Actions::Base.new(message)
           loop do
@@ -271,30 +273,50 @@ module Ruboty
                 base.current_region(region['regionName'])
 
                 resources = {
-                  'volumes' => 'volumeId',
-                  'key_pairs' => 'keyName',
-                  'images' => 'imageId',
-                  'ssl_certificates' => 'fqdnId',
-                  'addresses' => ['publicIp', 'privateIpAddress'],
-                  'uploads' => ['conversionTaskId'],
-                  'instances' => ['instanceId'],
+                  %w(computing volumes) => {id: 'volumeId', label: 'ディスク'},
+                  %w(computing key_pairs) => {id: 'keyName', label: 'SSH キー'},
+                  %w(computing images) => {id: 'imageId', label: 'イメージ'},
+                  %w(computing ssl_certificates) => {id: 'fqdnId', label: 'SSL 証明書'},
+                  %w(computing addresses) => {id: ['publicIp', 'privateIpAddress'], label: '付替 IP アドレス'},
+                  %w(computing uploads) => {id: 'conversionTaskId', label: 'アップロード'},
+                  %w(computing instances) => {id: 'instanceId', label: 'サーバー'},
+                  %w(rdb db_instances) => {id: 'DBInstanceIdentifier', label: 'DB サーバー'},
+                  %w(rdb db_snapshots) => {id: 'instanceId', label: 'DB スナップショット'},
+                  %w(computing security_groups) => {id: 'groupName', ignore: 'ipPermissions', label: 'ファイアウォールグループ'},
+                  %w(rdb db_security_groups) => {id: 'DBSecurityGroupName', ignore: ['EC2SecurityGroups', 'IPRanges'], label: 'DB ファイアウォールグループ'},
+                  %w(rdb db_parameter_groups) => {id: 'DBParameterGroupName', label: 'DB パラメーターグループ'},
                 }
-                resources.each do |resource, id|
-                  key = [account[:name], region['regionName'], resource].join(':')
-                  prev = @prev[key]
-                  curr = base.computing.send(resource)
-                  if prev
-                    events = D2E.new(id: id).d2e(prev, curr) 
-                    events.each do |event|
-                      robot.say body: "#{account[:name]}(#{account[:description]}) の #{region['regionName']} で下記 #{resource} が #{event['type']} されました"
-                      if event['type'] == 'create' || event['type'] == 'delete'
-                        robot.say body: event['item']
-                      else
-                        robot.say body: event
+                resources.each do |options, d2e|
+                  begin
+                    service, resource = options
+                    key = [account[:name], region['regionName'], resource].join(':')
+                    prev = @prev[key]
+                    curr = base.send(service).send(resource)
+                    if prev
+                      events = D2E.new(d2e).d2e(prev, curr) 
+                      events.each do |event|
+                        ja = case event['type']
+                        when 'create'; '作成'
+                        when 'delete'; '削除'
+                        when 'update'; '更新'
+                        end
+                        if event['type'] == 'create' || event['type'] == 'delete'
+                          robot.say body: "#{account[:name]} (#{account[:description]}) の #{region['regionName']} で下記#{d2e[:label]}が#{ja}されました"
+                          table = Table(event['item'].keys)
+                          table << event['item'].values
+                          robot.say body: table.to_s
+                        else
+                          robot.say body: "#{account[:name]} (#{account[:description]}) の #{region['regionName']} で下記#{d2e[:label]}(#{event['id']})が#{ja}されました"
+                          table = Table(event['diff'].keys)
+                          table << event['diff'].values.map {|val| "#{val[0]} -> #{val[1]}" }
+                          robot.say body: table.to_s
+                        end
                       end
                     end
+                    @prev[key] = curr
+                  rescue StandardError => e
+                    robot.say "Error: #{e}"
                   end
-                  @prev[key] = curr
                 end
               end
             end
@@ -305,7 +327,10 @@ module Ruboty
     end
 
     def event_unwatch(message)
-      @thread.kill if @thread
+      return if @thread.nil
+      @thread.kill
+      @thread = nil
+      message.reply "stopped to watch events"
     end
   end
 end

data/lib/ruboty/niftycloud.rb

@@ -25,4 +25,5 @@ require "ruboty/niftycloud/version"
 require "ruboty/handlers/niftycloud"
 
 require 'd2e'
+require 'ruport'
 require "ace-client"

data/lib/ruboty/niftycloud/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Niftycloud
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/ruboty-niftycloud.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ace-client"
   spec.add_dependency "ace-client-ext"
   spec.add_dependency "d2e"
+  spec.add_dependency "ruport"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-niftycloud
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - tily
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage NIFTYCloud via Ruboty
 email:
 - tily05@gmail.com