torigoya_kit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d4f04b119248b9626c36d386acf2a58cbebf981
-  data.tar.gz: c7927f74006ab262a6a22170dae8cc7fa005e93a
+  metadata.gz: 0aa0f7efd0c88bda5d262a9f2c42ee3c3388f5b6
+  data.tar.gz: 2009f7b75e8a64d10dd2bda8cd5ff60194b29760
 SHA512:
-  metadata.gz: e437399ea10d5d32f3bfe18817d3496f12f03983156d081b36fcc677b8c489a60ccdc6cb67c9b7d487c296d579345b13a70f18e10fb0729a34d2464a077b151d
-  data.tar.gz: ed6c43ba3742d282910d534b2fa668bb4fcfdc885b0875f979cf2a075d1960e8918080697a10fa9f46238c162d70f58e5750d09772fa6d3e7d0b5ab5b6d2cb80
+  metadata.gz: ccd1fb54a675325055769b58e82e6eec137de1046e659920b204cded3ea4b772cc19e0e531039749dc44e268d19558cd3279587cb19752ce2ba09e2363e20afc
+  data.tar.gz: 604ba0afdd976e90bf39c39dc550603cc9d37d6158bc3cb98921b22343b7db4733e5be3b4240b4f123cfe7c9dfcb603bfa3e5446b74ce0898617fdf42e5e3cf4

data/lib/torigoya_kit/ticket.rb

@@ -30,20 +30,71 @@ module TorigoyaKit
     def to_msgpack(out = '')
       return to_tuple.to_msgpack(out)
     end
+
+    def ==(rhs)
+      return @name == rhs.name &&
+        @code == rhs.code &&
+        @is_compressed && rhs.is_compressed
+    end
+
+    private
+    def validate
+      raise InvalidFormatError.new("name must be String") unless @name.is_a?(String)
+      raise InvalidFormatError.new("code must be String") unless @code.is_a?(String)
+      raise InvalidFormatError.new("is_compressed must be Boolean") unless @is_compressed.is_a?(TrueClass) && @is_compressed.is_a?(FalseClass)
+    end
+  end
+
+  #
+  class Command
+    def initialize(key_or_value, value=nil)
+      unless value.nil?
+        @key = key_or_value
+        @value = value
+      else
+        @value = key_or_value
+      end
+
+      validate
+    end
+    attr_reader :key, :value
+
+    def to_tuple
+      unless @key.nil?
+        return [@key, @value]
+      else
+        return [@value]
+      end
+    end
+
+    def ==(rhs)
+      return @key == rhs.key && @value == rhs.value
+    end
+
+    private
+    def validate
+      unless @key.nil?
+        raise InvalidFormatError.new("key must be String") unless @key.is_a?(String)
+      end
+      raise InvalidFormatError.new("value must be String") unless @value.is_a?(String)
+    end
   end
 
   #
   class ExecutionSetting
     def initialize(command_line, structured_command, cpu_limit, memory_limit)
       @command_line = command_line              # String
-      @structured_command = structured_command  # Array!(Array!String)
+      @structured_command = structured_command  # Array!Command
       @cpu_limit = cpu_limit                    # uint64 / sec
       @memory_limit = memory_limit              # uint64 / bytes
+
+      validate
     end
+    attr_reader :command_line, :structured_command, :cpu_limit, :memory_limit
 
     def to_tuple
       return [@command_line,
-              @structured_command,
+              @structured_command.map {|x| x.to_tuple},
               @cpu_limit,
               @memory_limit
              ]
@@ -52,6 +103,34 @@ module TorigoyaKit
     def to_msgpack(out = '')
       return to_tuple.to_msgpack(out)
     end
+
+    def ==(rhs)
+      return @command_line == rhs.command_line &&
+        @structured_command == rhs.structured_command &&
+        @cpu_limit == rhs.cpu_limit &&
+        @memory_limit == rhs.memory_limit
+    end
+
+    private
+    def validate
+      unless @command_line.nil?
+        raise InvalidFormatError.new("type of command_line must be String") unless @command_line.is_a?(String)
+      else
+        @command_line = ""
+      end
+
+      unless @structured_command.nil?
+        raise InvalidFormatError.new("type of structured_command must be Array") unless @structured_command.is_a?(Array)
+        @structured_command.each do |e|
+          raise InvalidFormatError.new("type of element of structured_command must be Command") unless e.is_a?(Command)
+        end
+      else
+        @structured_command = []
+      end
+
+      raise InvalidFormatError.new("type of cpu_limit must be Integer") unless @cpu_limit.is_a?(Integer)
+      raise InvalidFormatError.new("type of memory_limit must be Integer") unless @memory_limit.is_a?(Integer)
+    end
   end
 
   #
@@ -59,7 +138,10 @@ module TorigoyaKit
     def initialize(compile_setting, link_setting)
       @compile_setting = compile_setting    # ExecutionSetting
       @link_setting = link_setting          # ExecutionSetting
+
+      validate
     end
+    attr_reader :compile_setting, :link_setting
 
     def to_tuple
       return [@compile_setting.to_tuple,
@@ -70,6 +152,17 @@ module TorigoyaKit
     def to_msgpack(out = '')
       return to_tuple.to_msgpack(out)
     end
+
+    def ==(rhs)
+      return @compile_setting == rhs.compile_setting &&
+        @link_setting == rhs.link_setting
+    end
+
+    private
+    def validate()
+      raise InvalidFormatError.new("type of compile_setting must be ExecutionSetting") unless @compile_setting.is_a?(ExecutionSetting)
+      raise InvalidFormatError.new("type of link_setting must be ExecutionSetting") unless @link_setting.is_a?(ExecutionSetting)
+    end
   end
 
   #
@@ -77,7 +170,10 @@ module TorigoyaKit
     def initialize(stdin, run_setting)
       @stdin = stdin                # SourceData
       @run_setting = run_setting    # ExecutionSetting
+
+      validate
     end
+    attr_reader :stdin, :run_setting
 
     def to_tuple
       return [@stdin, @run_setting]
@@ -86,13 +182,29 @@ module TorigoyaKit
     def to_msgpack(out = '')
       return to_tuple.to_msgpack(out)
     end
+
+    def ==(rhs)
+      return @stdin == rhs.stdin &&
+        @run_settings == rhs.run_settings
+    end
+
+    private
+    def validate()
+      unless @stdin.nil?
+        raise InvalidFormatError.new("type of stdin must be SourceData") unless @stdin.is_a?(SourceData)
+      end
+      raise InvalidFormatError.new("type of run_setting must be ExecutionSetting") unless @run_setting.is_a?(ExecutionSetting)
+    end
   end
 
   #
   class RunInstruction
     def initialize(inputs)
       @inputs = inputs      # Array!Input
+
+      validate
     end
+    attr_reader :inputs
 
     def to_tuple
       return [@inputs.map {|x| x.to_tuple}]
@@ -101,6 +213,18 @@ module TorigoyaKit
     def to_msgpack(out = '')
       return to_tuple.to_msgpack(out)
     end
+
+    def ==(rhs)
+      return @inputs == rhs.inputs
+    end
+
+    private
+    def validate()
+      raise InvalidFormatError.new("type of inputs must be Array") unless @inputs.is_a?(Array)
+      @inputs.each do |e|
+        raise InvalidFormatError.new("type of element of inputs must be Input") unless e.is_a?(Input)
+      end
+    end
   end
 
   #
@@ -112,7 +236,10 @@ module TorigoyaKit
       @source_codes = source_codes      # Array!SourceData
       @build_inst = build_inst          # BuildInstruction
       @run_inst = run_inst              # RunInstruction
+
+      validate
     end
+    attr_reader :base_name, :proc_id, :proc_version, :source_codes, :build_inst, :run_inst
 
     def to_tuple
       return [@base_name,
@@ -127,6 +254,34 @@ module TorigoyaKit
     def to_msgpack
       return to_tuple.to_msgpack()
     end
+
+    def ==(rhs)
+      return @base_name == rhs.base_name &&
+        @proc_id == rhs.proc_id &&
+        @proc_version == rhs.proc_version &&
+        @source_codes == rhs.source_codes &&
+        @build_inst == rhs.build_inst &&
+        @run_inst == rhs.run_inst
+    end
+
+    private
+    def validate()
+      raise InvalidFormatError.new("type of base_name must be String") unless @base_name.is_a?(String)
+      raise InvalidFormatError.new("type of proc_id must be Integer") unless @proc_id.is_a?(Integer)
+      raise InvalidFormatError.new("type of proc_version must be String") unless @proc_version.is_a?(String)
+      raise InvalidFormatError.new("type of source_codes must be Array") unless @source_codes.is_a?(Array)
+      @source_codes.each do |e|
+        raise InvalidFormatError.new("type of element of source_codes must be SourceData") unless e.is_a?(SourceData)
+      end
+      raise InvalidFormatError.new("type of build_inst must be BuildInstruction") unless @build_inst.is_a?(BuildInstruction)
+      raise InvalidFormatError.new("type of run_inst must be RunInstruction") unless @run_inst.is_a?(RunInstruction)
+    end
   end
 
+
+  class InvalidFormatError < StandardError
+    def initialize(*args)
+      super(*args)
+    end
+  end
 end # module TorigoyaKit

data/lib/torigoya_kit/version.rb

@@ -1,3 +1,3 @@
 module TorigoyaKit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/cases/session_spec.rb

@@ -5,7 +5,7 @@ require_relative '../spec_helper'
 describe :session do
   it "session proc exec_ticket" do
     s = TorigoyaKit::Session.new("localhost", 49800)
-    p s.exec_ticket(make_ticket())
+    # p s.exec_ticket(make_ticket())
   end
 
   it "session proc update_proc_table" do

data/spec/cases/ticket_spec.rb

@@ -6,10 +6,76 @@ describe :ticket do
   ticket = make_ticket()
 
   it "aaa" do
-    expect(ticket).not_to eq nil
+    expect(ticket).not_to be nil
   end
 
   it "aaa" do
     expect(ticket.to_msgpack).not_to eq nil
   end
+
+  #
+  dummy_es = TorigoyaKit::ExecutionSetting.new("", [], 0, 0)
+  dummy_bi = TorigoyaKit::BuildInstruction.new(dummy_es, dummy_es)
+  dummy_ri = TorigoyaKit::RunInstruction.new([])
+
+  it "construct ticket" do
+    expect do
+      TorigoyaKit::Ticket.new(nil, nil, nil, nil, nil, nil)
+    end.to raise_error(TorigoyaKit::InvalidFormatError)
+
+    expect do
+      TorigoyaKit::Ticket.new("", nil, nil, nil, nil, nil)
+    end.to raise_error(TorigoyaKit::InvalidFormatError)
+
+    expect do
+      TorigoyaKit::Ticket.new("", 0, nil, nil, nil, nil)
+    end.to raise_error(TorigoyaKit::InvalidFormatError)
+
+    expect do
+      TorigoyaKit::Ticket.new("", 0, "", nil, nil, nil)
+    end.to raise_error(TorigoyaKit::InvalidFormatError)
+
+    expect do
+      TorigoyaKit::Ticket.new("", 0, "", [], nil, nil)
+    end.to raise_error(TorigoyaKit::InvalidFormatError)
+
+    expect do
+      TorigoyaKit::Ticket.new("", 0, "", [], dummy_bi, nil)
+    end.to raise_error(TorigoyaKit::InvalidFormatError)
+
+    expect do
+      TorigoyaKit::Ticket.new("", 0, "", [], dummy_bi, dummy_ri)
+    end.to_not raise_error
+  end
+
+  it "construct execution setting" do
+    commands = [TorigoyaKit::Command.new("A=", "B"),
+                TorigoyaKit::Command.new("unit")
+               ]
+    expected = TorigoyaKit::ExecutionSetting.new("test command", commands, 100, 200)
+
+    commands_dummy = [TorigoyaKit::Command.new("A=", "B"),
+                      TorigoyaKit::Command.new("unit")
+                     ]
+    expected_dummy = TorigoyaKit::ExecutionSetting.new("test command", commands, 100, 200)
+
+    expect(expected).to eq expected_dummy
+  end
+
+  it "setting" do
+    expected_es = TorigoyaKit::ExecutionSetting.new("", [], 0, 0)
+    expect(expected_es).to eq dummy_es
+  end
+
+  it "build inst" do
+    expected_es = TorigoyaKit::ExecutionSetting.new("", [], 0, 0)
+    expected_bi = TorigoyaKit::BuildInstruction.new(expected_es, expected_es)
+
+    expect(expected_bi).to eq dummy_bi
+  end
+
+  it "run inst" do
+    expected_ri = TorigoyaKit::RunInstruction.new([])
+    expect(expected_ri).to eq dummy_ri
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torigoya_kit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - yutopp