tamashii-agent 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8087756c603d524bc1b497823924d2798f371f
-  data.tar.gz: eee16107c774b3de544e08ba344863bab03f4a2c
+  metadata.gz: 42ad217e36714e8f5c213ee488dc55547e8ae71b
+  data.tar.gz: 477b38f2a79c46ec5d0f5ea87bac344a3305e2b7
 SHA512:
-  metadata.gz: c462437309a0a0013b913ec6d2fd84da9a148b648351da78bb1083006e3e46519c2406b9aef43c0ee7788183fdd1dcc8762d4d218186687c203006e12eabedbd
-  data.tar.gz: 2693d9f80f0ea2c936c204fbc5cfbc8cd64214c222b14a1b206f42b244f61f61810405fbd96f18b7fffd8652c21f16904f29cf05feffa3a98cb655f4bcd831de
+  metadata.gz: 9d6f54b0f4ef53587091eefc0021c5339bdc0eabce96b6269823d9440ec31c95da3f8ab70ae71060452f507941af8c07815e7bdd596797e1337b1811539c1d65
+  data.tar.gz: 811d6f39e021edafe790d70ed0ac81368ed1aadbbf2d9ff594920931ef69840a3bdf0be81bbba55eb6eb4eaa22638e4e70ac8be5552cb90d8c85c2ff9a588f19

data/lib/tamashii/agent/connection.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'websocket/driver'
 require 'aasm'
+require 'openssl'
 
 require 'tamashii/common'
 
@@ -24,11 +25,11 @@ module Tamashii
         event :connect do
           transitions from: :init, to: :connecting, after: Proc.new { logger.info "Start connecting" }
         end
-        
+
         event :auth_request do
           transitions from: :connecting, to: :auth_pending, after: Proc.new { logger.info "Sending authentication request" }
         end
-        
+
         event :auth_success do
           transitions from: :auth_pending, to: :ready, after: Proc.new { logger.info "Authentication finished. Tag = #{@tag}" }
         end
@@ -47,16 +48,16 @@ module Tamashii
         @master = master
         @url = "#{Config.use_ssl ? "wss" : "ws"}://#{host}:#{port}/#{Config.entry_point}"
         self.reset
-        
+
         @host = host
         @port = port
         @tag = 0
-        
+
         @request_pool = RequestPool.new
         @request_pool.set_handler(:request_timedout, method(:handle_request_timedout))
         @request_pool.set_handler(:request_meet, method(:handle_request_meet))
         @request_pool.set_handler(:send_request, method(:handle_send_request))
-        
+
         env_data = {connection: self}
         Resolver.config do
           [Type::REBOOT, Type::POWEROFF, Type::RESTART, Type::UPDATE].each do |type|
@@ -118,18 +119,20 @@ module Tamashii
       end
 
       def send_auth_request
-        # TODO: other types of auth 
+        # TODO: other types of auth
         @driver.binary(Packet.new(Type::AUTH_TOKEN, 0, [Type::CLIENT[:agent], @master.serial_number,Config.token].join(",")).dump)
       end
 
       def start_web_driver
-        @driver = WebSocket::Driver.client(self)
-        @driver.on :open, proc { |e| 
+        # TODO: Improve below code
+        socket = Config.use_ssl ? OpenSSL::SSL::SSLSocket.new(self) : self
+        @driver = WebSocket::Driver.client(socket)
+        @driver.on :open, proc { |e|
           logger.info "Server opened"
           self.auth_request
           send_auth_request
         }
-        @driver.on :close, proc { |e| 
+        @driver.on :close, proc { |e|
           logger.info "Server closed"
           close_socket_io
           self.reset
@@ -201,7 +204,7 @@ module Tamashii
           end
         else
           if pkt.tag == @tag || pkt.tag == 0
-            Resolver.resolve(pkt) 
+            Resolver.resolve(pkt)
           else
             logger.debug "Tag mismatch packet: tag: #{pkt.tag}, type: #{pkt.type}"
           end

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The agent module for RubyConfTW checkin system.