torigoya_kit 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb896dfb27fba5b772fb9c0b2562ca7e2dd2ccd4
-  data.tar.gz: 250b1853f23f08d132295b92888597d08b6af0a1
+  metadata.gz: 1cc3779077a6e9b51a8e4f428caff3c816c777f5
+  data.tar.gz: eaad88aa08265757ffbfef7afe3dbc1de4e4a163
 SHA512:
-  metadata.gz: 96ccd817a7fed70dadce93175d78deaacee4d87d9ed231b7aaa5de293f92241665043e464473d594e82bb17230390a4de56391b2b472e5109ca39ec9de359a54
-  data.tar.gz: 1048f3c0cf79e25fb4b3403b7f160722482999e76af44b41eaec7ce70ab75445bbb6474a81e5634537666960ab074b6175fb8bc1a4edca73206a28d53736575e
+  metadata.gz: 6728157a95a5897861e8112c2f6c10ed287e3b1dbff0e39788b64ce4f9413fa89a08c2e965380dcc8392dd4f08ce2fd17c9c63c77355ac47bb8704196891eeed
+  data.tar.gz: e92daf424ecd8b1e329d330ba641145b6e3c57c4e7ab9885388cbe1a2ff1f56e9c90c718c74193d0e3235c544f268031cf81aac8916706f5cff1954c4f8335da

data/lib/torigoya_kit/client.rb

@@ -8,33 +8,21 @@ module TorigoyaKit
     def initialize(host, port)
       @host = host
       @port = port
+      @session = new_session()
     end
 
     ####
     def exec_ticket(ticket)
-      return new_session().exec_ticket(ticket)
+      return @session.exec_ticket(ticket)
     end
 
     def exec_ticket_with_stream(ticket, &block)
-      return new_session().exec_ticket_with_stream(ticket, &block)
+      return @session.exec_ticket_with_stream(ticket, &block)
     end
 
     ####
     def update_packages()
-      return new_session().update_packages()
-    end
-
-    ####
-    def reload_proc_table()
-      return new_session().reload_proc_table()
-    end
-
-    def update_proc_table()
-      return new_session().update_proc_table()
-    end
-
-    def get_proc_table()
-      return new_session().get_proc_table()
+      return @session.update_packages()
     end
 
     private

data/lib/torigoya_kit/session.rb

@@ -73,8 +73,13 @@ module TorigoyaKit
 
         elsif res.is_a?(StreamSystemError)
           raise res.message
+
+        elsif res.is_a?(StreamExit)
+          break
+
         else
           raise "Unexpected error: unknown message was recieved (#{res.class})"
+
         end
       end
       return result
@@ -141,8 +146,9 @@ module TorigoyaKit
         obj = recv_frame_object()
         raise "object is empty" if obj.nil?
 
-        break if obj.is_a?(StreamExit)
+        will_terminate = obj.is_a?(StreamExit)
         block.call(obj) unless block.nil?
+        break if will_terminate
       end
     end
 

data/lib/torigoya_kit/stream_result.rb

@@ -12,8 +12,8 @@ module TorigoyaKit
 
   #
   class StreamOutput
-    StdoutFd    = 0
-    StderrFd    = 1
+    StdoutFd    = 1
+    StderrFd    = 2
 
     def initialize(fd, buffer)
       @fd = fd

data/lib/torigoya_kit/version.rb

@@ -1,3 +1,3 @@
 module TorigoyaKit
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/cases/session_spec.rb

@@ -3,7 +3,7 @@
 require_relative '../spec_helper'
 
 describe :session do
-  port = 23432
+  port = 23456
 
   it "session proc exec_ticket" do
     s = TorigoyaKit::Session.new("localhost", port)
@@ -18,8 +18,10 @@ describe :session do
     expect(t.link.result.exit_status).to eq 0
 
     expect(t.run[0].result.system_error_status).to eq 0
-    expect(t.run[0].result.exited).to eq true
-    expect(t.run[0].result.exit_status).to eq 0
+    expect(t.run[0].result.exited).to eq false
+    expect(t.run[0].result.signaled).to eq true
+    expect(t.run[0].result.signal).to eq 9
+    #expect(t.run[0].result.exit_status).to eq 0
   end
 
   it "session proc update_packages" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torigoya_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - yutopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler