autodesk_backburner_client 0.2.2 → 0.3.0

data/lib/backburner.rb

@@ -1,9 +1,11 @@
 require "backburner/version"
 require "backburner/connection"
+require "backburner/backburner_object"
 require "backburner/job"
+require "backburner/job_server"
 require "backburner/server"
 require "backburner/client"
 require "backburner/string/string_operations"
 require "backburner/data_object"
-require "backburner/backburner_object"
-require "backburner/remote_command"
+require "backburner/remote_command"
+require "backburner/errors/connection_error"

data/lib/backburner/backburner_object.rb

@@ -2,20 +2,20 @@ module Backburner
 
   class BackburnerObject
 
-    attr_reader :data, :client, :handler
+    attr_reader :handler
 
-    def method_missing name, *args
-      @data.search name
+    def method_missing name
+      @raw_data.try :search, name
     end
 
-    def initialize handler, client
+    def initialize handler, connection
       @handler = handler
-      @client = client
+      @connection = connection
       reload
     end
 
     def reload
-      @data = reloader
+      @raw_data = load_raw_data if respond_to?(:load_raw_data)
     end
 
   end

data/lib/backburner/client.rb

@@ -1,8 +1,8 @@
 module Backburner
 
-  class Client
+  class Client < BackburnerObject
 
-    attr_reader :data
+    attr_reader :raw_data
 
     def initialize host, port=3234
       @host = host
@@ -21,44 +21,20 @@ module Backburner
     end
 
     def jobs
-      job_handlers = @connection.get_jobhlist.jobh_list.job
+      response = @connection.jobhlist.get
+      return [] if @connection.empty?
+      job_handlers = response.jobh_list.job
       job_handlers = [job_handlers] unless job_handlers.kind_of?(Array)
       job_handlers.map do |job_data|
-        Job.new job_data.handle, self
+        Job.new job_data.handle, @connection
       end
     end
 
-    def job handler
-      job_data = job! handler
-      Job.new job_data, self
-    end
-
-    def job! handler
-      @connection.get_job handler
-    end
-
-    def servers
-      server_handlers = @connection.get_srvlist.server_list.server
-      server_handlers = [server_handlers] unless server_handlers.kind_of?(Array)
-      server_handlers.map do |server_data|
-        Server.new server_data.handle, self
-      end
-    end
-
-    def server handler
-      server_data = server! handler
-      Server.new server_data, self
-    end
-
-    def server! handler
-      @connection.get_server handler
-    end
-
     private
 
     def generate_client_info
-      @data = DataObject.new
-      @data.client_info = {
+      @raw_data = DataObject.new
+      @raw_data.client_info = {
           version: 300,
           udp_port: 0,
           controler: 0,
@@ -69,7 +45,7 @@ module Backburner
               platform: platform,
               user: user,
               computer_name: computer_name,
-              mac: '00E052B9A2F20000',
+              mac: '00E052B9A2F20000', # TODO: change to dynamic
               work_disk_space: 0,
               i_p_address: '172.50.0.170'
           }
@@ -77,9 +53,9 @@ module Backburner
     end
 
     def send_client_info
-      generate_client_info unless @data
-      xml = @data.to_xml
-      @connection.set_clientinfo xml.bytesize
+      generate_client_info
+      xml = @raw_data.to_xml
+      @connection.clientinfo.set xml
     end
 
     def total_memory

data/lib/backburner/connection.rb

@@ -6,7 +6,7 @@ module Backburner
   class Connection
 
     STATUS_REGEXP = /(\d+) ([0-9A-z ]+)$/
-    PROMPT_REGEXP = /\nbackburner(\(controller\))?>/i
+    PROMPT_REGEXP = /\n?backburner(\(controller\))?>/i
     XML_COMMENT_REGEXP = /<!--.+-->/
 
     attr_reader :last_message, :last_size, :last_status, :last_body, :last_response
@@ -49,15 +49,34 @@ module Backburner
       DataObject.new xml_string
     end
 
-    def send_data data
-      @session.cmd 'String' => data
+    def send_data
     end
 
-    def send_text data
+    def cmd data
       @last_response = @session.cmd data
       parse_response
     end
 
+    def send_text command_data, data=nil
+      request = "#{command_data}"
+      request_hash = {}
+      if data
+        request_hash['Match'] = STATUS_REGEXP
+        request += "  #{data.bytesize+14}"
+      end
+      request_hash['String'] = request
+      @last_response = @session.cmd request_hash
+      parse_status
+      @last_response = @session.puts data
+      @last_response = @session.waitfor('Match' => STATUS_REGEXP)
+      @session.waitfor 'Match' => PROMPT_REGEXP
+      parse_status
+    end
+
+    def ready?
+      (@last_status||0) == 251
+    end
+
     def proceed?
       @last_status < 200 || @last_status > 299
     end
@@ -66,6 +85,14 @@ module Backburner
       @last_status == 250
     end
 
+    def error?
+      (@last_status||0) > 399
+    end
+
+    def empty?
+      @last_size == 0
+    end
+
     private
 
       def parse_response
@@ -75,10 +102,12 @@ module Backburner
       end
 
       def parse_status
+        #TODO: add exception from wrong status codes
         @last_response.scan STATUS_REGEXP
         @last_status = $1.to_i
         @last_size = $2.to_i
         @last_message = $2
+        raise(ConnectionError.new, @last_message) if error?
       end
 
       def parse_body

data/lib/backburner/data_object.rb

@@ -7,7 +7,7 @@ module Backburner
 
     TIME_REGEXP = /(^\d{4}\/\d{2}\/\d{2}-\d{2}:\d{2}:\d{2}:\d{4})(-\d{2})$/
 
-    def initialize h, args={recurse_over_arrays: true}
+    def initialize h={}, args={recurse_over_arrays: true}
       super
     end
 
@@ -75,7 +75,7 @@ module Backburner
       document = builder.doc
       root_element = document.children[0]
       xml = xml_dig root_element, @table.values.first, document
-      document.to_xml
+      document.to_xml + "\n"
     end
 
     private

data/lib/backburner/errors/connection_error.rb

@@ -0,0 +1,4 @@
+module Backburner
+  class ConnectionError < StandardError
+  end
+end

data/lib/backburner/job.rb

@@ -1,15 +1,27 @@
-require 'backburner/backburner_object'
-
 module Backburner
 
   class Job < BackburnerObject
 
-    def reloader
-      @client.job!(@handler)
+    def load_raw_data
+      @connection.job.get(handler)
+    end
+
+    def servers
+      return [] if !@raw_data || !@raw_data.job.servers || !@raw_data.job.servers.server
+      servers = @raw_data.job.servers.server.is_a?(Array) ? @raw_data.job.servers.server : [@raw_data.job.servers.server]
+      servers.map do |server|
+        JobServer.new server, @connection
+      end
     end
 
-    def create name, file_path, *parameters
+    def server_time
+      servers.inject(0.0) do |sum, server|
+        sum += server.time
+      end
+    end
 
+    def name
+      @raw_data.job.job_info.name
     end
 
   end

data/lib/backburner/job_server.rb

@@ -0,0 +1,14 @@
+module Backburner
+  class JobServer < BackburnerObject
+
+    def initialize raw_data, connection
+      @raw_data = raw_data
+      @connection = connection
+    end
+
+    def time
+      @raw_data.srv_task_time
+    end
+
+  end
+end

data/lib/backburner/remote_command.rb

@@ -22,8 +22,16 @@ module Backburner
         request_array = []
         request_array << method_name
         request_array << flatten
-        request_array += args||[]
-        @connection.send_text request_array.join(' ')
+        case method_name
+          when 'get' then
+            request_array += args||[]
+            @connection.cmd request_array.join(' ')
+          when 'set' then
+            @connection.send_text request_array.join(' '), args[0]
+          when 'new' then
+            request_array += args||[]
+            @connection.cmd request_array.join(' ')
+        end
       end
 
     end

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autodesk_backburner_client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -94,7 +94,9 @@ files:
 - lib/backburner/client.rb
 - lib/backburner/connection.rb
 - lib/backburner/data_object.rb
+- lib/backburner/errors/connection_error.rb
 - lib/backburner/job.rb
+- lib/backburner/job_server.rb
 - lib/backburner/open_struct_data.rb
 - lib/backburner/remote_command.rb
 - lib/backburner/server.rb