bake-toolkit 2.37.0 → 2.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b5d02b50a49b9fe736175a016c46db97ae6e02
-  data.tar.gz: 32adc905319f5e567b4571fff3e0d22315cdecee
+  metadata.gz: 4231ba10a8dbc7711dac892e7b932faf30050404
+  data.tar.gz: 4cf03457745cf2bfe3521db89d7847607e160820
 SHA512:
-  metadata.gz: 16a1135b69cb94a02c4e15f8c3bb31d36f2ae293872ae3834a1d7dc3e6427cad1c1a2106840bf102db4113a305852002be8ef30ca9db62b4d344408a4b4d1946
-  data.tar.gz: ef5156a0c490148bab91dd25d14ef687b1a59c0b0c7ee210602c7c8592a817eb74ae6bb0c16aea01cef94e14e439935f747b7ae0161aa55258ed2bf030831f04
+  metadata.gz: b900fde5e96ff7eadb477bf6856bcd45a4eb4c2c57aa2399b95eaa6060a19dbb53af56ec8bd6ea05b53521662681fb5eabe6d87b04d7efa90e12ec678ec03280
+  data.tar.gz: a572d8d68f5cd1761db7f46af0222cdc3412fd73ee4d4284d21df66ad422394184313964c1dddaf4a7e32b897e9778dd33fbe5a5c4127c7aa4311d1af6220452

data/bin/bakeqac

@@ -42,12 +42,15 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
   qacDaemonError = false
   consoleOutput = ""
   success = false
+  processTimeout = false
 
   loop do
     FileUtils.rm_rf @options.qacdata if adminStepAndImmediateOutput
-    success, consoleOutput = ProcessHelper.run(cmd, adminStepAndImmediateOutput)
+    # admin step should not take longer than 30 seconds
+    success, consoleOutput = ProcessHelper.run(cmd, adminStepAndImmediateOutput, true, nil, [0], Dir.pwd, adminStepAndImmediateOutput ? 60 : 0)
     licenseError = false
     qacDaemonError = false
+    processTimeout = false
 
     consoleOutput.each_line do |line|
       if (line.include?("License Refused") && !line.include?("License Refused: C:"))
@@ -60,14 +63,19 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
         puts "Unable to connect to QAX Daemon!"
         break
       end
+      if (line.include?("Process timeout"))
+        puts "Process takes too long!"
+        processTimeout = true
+        break
+      end
     end
 
     cSizeCheck = checkCipSize()
 
-    break unless ((@options.qacretry >= (Time.now - timeStart)) && (!cSizeCheck || licenseError || qacDaemonError))
+    break unless ((@options.qacretry >= (Time.now - timeStart)) && (!cSizeCheck || licenseError || qacDaemonError || processTimeout))
     puts "Retry seconds left: %d" % (@options.qacretry - (Time.now - timeStart))
   end
-  checkError = !cSizeCheck || licenseError || qacDaemonError
+  checkError = !cSizeCheck || licenseError || qacDaemonError || processTimeout
   if @options.qacretry > 0 && checkError
     puts "Retry timeout over: %d -> failure." % (@options.qacretry - (Time.now - timeStart))
   end

data/lib/common/process.rb

@@ -1,10 +1,12 @@
+require 'timeout'
+
 module Bake
 
   class ProcessHelper
     @@pid = nil
     @@rd = nil
 
-    def self.run(cmdLineArray, immediateOutput=false, force=true, outpipe=nil, exitCodeArray = [0], dir = Dir.pwd)
+    def self.run(cmdLineArray, immediateOutput=false, force=true, outpipe=nil, exitCodeArray = [0], dir = Dir.pwd, timeout = 0)
       rd, wr = IO.pipe
       @@rd = force ? rd : nil
       duppedCmdLineArray = cmdLineArray.dup
@@ -18,16 +20,27 @@ module Bake
       wr.close
       output = ""
       begin
-        while not rd.eof?
-          tmp = rd.read(1)
-          if (tmp != nil)
-            tmp.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
-            tmp.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
-            output << tmp
+        begin
+          Timeout::timeout(timeout) {
+          while not rd.eof?
+            tmp = rd.read(1)
+            if (tmp != nil)
+              tmp.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
+              tmp.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
+              output << tmp
 
-            print tmp if immediateOutput
+              print tmp if immediateOutput
+            end
           end
+          }
+        rescue Timeout::Error
+          @@rd = rd
+          @@pid = pid
+          ProcessHelper::killProcess(true)
+          output << "Process timeout (#{timeout} seconds).\n"
+          return [false, output]
         end
+
       rescue
         # Seems to be a bug in ruby: sometimes there is a bad file descriptor on Windows instead of eof, which causes
         # an exception on read(). However, this happens not before everything is read, so there is no practical difference
@@ -40,6 +53,7 @@ module Bake
       rescue
       end
       pid, status = Process.wait2(pid)
+
       @@pid = nil
       @@rd = nil
 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.37.0"
+      "2.37.1"
     end
 
     def self.printBakeVersion(ry = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.37.0
+  version: 2.37.1
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext