kaya 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fb23083e90ae0fe6d348d780f292c8b10745028
-  data.tar.gz: cc47368d259ff5177c4be752f77fec5af118edef
+  metadata.gz: 8c3297f1d73f1e546c0332257f9844b1e5744e2a
+  data.tar.gz: 9bc15c57ac5916db0ac45abf286820624eb83dc5
 SHA512:
-  metadata.gz: f9f7b1a0b39d08a48fdafeeeeca136223d9516369265ec7e760adcb4baa3267d878e138ed09cbb4fce968671df6b7d038fddf7d740b93f5d166934d25c7ae5e6
-  data.tar.gz: 5defd6811dd0bf791c251bb76893414ebf05a233f0716ec296261bf467ca88be6534e7319f517555c98fc4f8872f775c21b05d56be33af521f76cf5fba9d4784
+  metadata.gz: 81215d73a2e5768c6cf9883da57d729180a2a969d3bbcca611c3ef2b5ee1a101d5541b9ff7b33476fcc117484ecc40742f1f3893888121cdd9430ef338aafa4a
+  data.tar.gz: a773c5717f0db26358b3bede1f9b9fd38f7f3a82721b880e16225b3dc97dcaa01dbd24b02610fc0ccfaa684c69f8e3772408076451c4761bea9ddb66486b02e2

data/lib/kaya/API/execution.rb

@@ -1,7 +1,7 @@
 module Kaya
   module API
     class Execution
-      def self.start suite_name, query_string
+      def self.start suite_name, query_string, ip
         $K_LOG.debug "Starting suite #{suite_name}" if $K_LOG
 
         suite_name.gsub!("%20", " ")
@@ -29,7 +29,9 @@ module Kaya
 
           suite = Kaya::Suites::Suite.get_suite_with(suite_name)
 
-          if suite.is_ready?
+          suite_is_ready_for_ip = !Kaya::Results.running_for_suite_id_and_ip?(suite.id, ip)
+
+          if suite_is_ready_for_ip
 
             $K_LOG.debug "Suite #{suite_name} is ready to run" if $K_LOG
 
@@ -38,7 +40,8 @@ module Kaya
               "suite"           => {"id" => suite.id, "name" => suite.name},
               "execution_name"  => execution_name,
               "custom_params"   => custom_params,
-              "git_log"         => git_log
+              "git_log"         => git_log,
+              "ip"              => ip
             }
 
             suite.last_result = Kaya::Execution.run!(execution_request_data) # Returns result_id
@@ -91,7 +94,7 @@ module Kaya
       # Kill associated process to the running execution
       # Sets as finished the result and associated suite as READY
       #
-      def self.reset(result_id)
+      def self.reset(result_id, ip)
 
         $K_LOG.debug "Reset execution request for #{result_id}"
 
@@ -99,35 +102,40 @@ module Kaya
 
         suite = Kaya::Suites::Suite.get(result.suite_id)
 
-        if result.process_running? or !result.finished? or !result.stopped?
-
-          begin
-            Kaya::Support::Processes.kill_by_result_id(result.id)
-            killed = true
-            $K_LOG.debug "Execution (id=#{results.id}) killed"
-          rescue => e
-            $K_LOG.error "#{e}#{e.backtrace}"
-          end
-
-          begin
-            Kaya::Support::FilesCleanner.delete_report_which_has(result.id)
-            $K_LOG.debug "Execution files(id=#{result.id}) cleanned"
-            cleanned = true
-          rescue
-          end
-
-          result.append_result_to_console_output!
-          result.save_report!
-          result.reset!("forced"); $K_LOG.debug "Execution stopped! Kaya restarted"
-          result.show_as = "pending"
-          result.save!
-          # Reset if suite is setted as "RUNNING" and its result_id value corresponds to the result reset request
-          suite.set_ready! if suite.last_result == result.id
-          if killed and cleanned
-            {"message" => "Execution stopped"}
-          else
-            {"message" => "Could not stop execution. Process killing: #{filled}. Files cleanned: #{celanned}"}
+        #
+        if result.ip == ip # is the owner of execution
+
+          if result.process_running? or !result.finished? or !result.stopped?
+            begin
+              Kaya::Support::Processes.kill_by_result_id(result.id)
+              killed = true
+              $K_LOG.debug "Execution (id=#{results.id}) killed"
+            rescue => e
+              $K_LOG.error "#{e}#{e.backtrace}"
+            end
+
+            begin
+              Kaya::Support::FilesCleanner.delete_report_which_has(result.id)
+              $K_LOG.debug "Execution files(id=#{result.id}) cleanned"
+              cleanned = true
+            rescue
+            end
+
+            result.append_result_to_console_output!
+            result.save_report!
+            result.reset!("forced"); $K_LOG.debug "Execution stopped! Kaya restarted"
+            result.show_as = "pending"
+            result.save!
+            # Reset if suite is setted as "RUNNING" and its result_id value corresponds to the result reset request
+            suite.set_ready! if suite.last_result == result.id
+            if killed and cleanned
+              {"message" => "Execution stopped"}
+            else
+              {"message" => "Could not stop execution. Process killing: #{filled}. Files cleanned: #{celanned}"}
+            end
           end
+        else
+          {"message" => "You are not the owner of this execution"}
         end
       end
 

data/lib/kaya/API/suites.rb

@@ -2,9 +2,11 @@ module Kaya
   module API
     module Suites
 
-      # @param [hash] options = {:running, :active}
+      # @param [hash] options = {:running, :active, :ip}
       def self.list(options ={})
 
+        start = Time.now.to_f
+
         response = {
           "project_name" => Dir.pwd.split("/").last,
           "size" => 0,
@@ -23,8 +25,19 @@ module Kaya
         if suites.size.zero?
           response["message"] = options[:running] ? "No running suites found" : "No suites found"
         else
-          start = Time.now.to_f
-          response["suites"] = suites.map{|suite_id| Kaya::Suites::Suite.get(suite_id).api_response}
+          # Gets the executions for given ip
+          suites = suites.map{|suite_id| Kaya::Suites::Suite.get(suite_id).api_response}
+
+          suites = suites.map do |suite|
+            unless Kaya::Results.results_for_suite_id_and_ip(suite["_id"], options[:ip]).empty?
+              suite["status"]="RUNNING"
+              suite
+            else
+              suite
+            end
+          end
+
+          response["suites"] = suites
           $K_LOG.debug "#{suites.size} retrieved in (#{Time.now.to_f - start} s)" if $K_LOG
 
           response["size"] = suites.size

data/lib/kaya/background_jobs/workers/execution_checker.rb

@@ -12,7 +12,7 @@ module Kaya
           suite = Kaya::Suites::Suite.get(suite_id)
           begin
             suite.check_last_result!
-            sleep 5
+            sleep 2
           end while not suite.is_ready?
         end
     end

data/lib/kaya/cuba.rb

@@ -49,8 +49,8 @@ Cuba.define do
         result = Kaya::Results::Result.get(result_id)
         res.redirect "/#{HOSTNAME}/kaya/404/There%20is%20no%20result%20for%20id=#{result_id}" if result.nil?
         result.mark_as_saw! if (result.finished? or result.stopped?)
-        template = Mote.parse(File.read("#{Kaya::View.path}/results/console.mote"),self, [:result])
-        res.write template.call(result:result)
+        template = Mote.parse(File.read("#{Kaya::View.path}/results/console.mote"),self, [:result, :ip])
+        res.write template.call(result:result, ip:request.ip)
       end
 
 
@@ -67,32 +67,32 @@ Cuba.define do
       end
 
       on "#{HOSTNAME}/kaya/results/:result_id/reset" do |result_id|
-        result = Kaya::API::Execution.reset(result_id)
+        result = Kaya::API::Execution.reset(result_id, request.ip)
         res.redirect "/#{HOSTNAME}/kaya/results?msg=#{result['message']}"
       end
 
       on "#{HOSTNAME}/kaya/results/suite/:suite_name" do |suite_name|
         query_string = Kaya::Support::QueryString.new req
         suite_name.gsub!("%20"," ")
-        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name])
-        res.write template.call(section:"Results", query_string:query_string, suite_name:suite_name, log_name:nil)
+        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name, :ip])
+        res.write template.call(section:"Results", query_string:query_string, suite_name:suite_name, log_name:nil, ip:request.ip)
       end
 
       on "#{HOSTNAME}/kaya/results/all" do
         query_string = Kaya::Support::QueryString.new req
-        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name])
-        res.write template.call(section:"All Results", query_string:query_string, suite_name:nil, log_name:nil)
+        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name, :ip])
+        res.write template.call(section:"All Results", query_string:query_string, suite_name:nil, log_name:nil, ip:request.ip)
       end
 
       on "#{HOSTNAME}/kaya/results" do
         query_string = Kaya::Support::QueryString.new req
-        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name])
-        res.write template.call(section:"Results", query_string:query_string, suite_name:nil, log_name:nil)
+        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name, :ip])
+        res.write template.call(section:"Results", query_string:query_string, suite_name:nil, log_name:nil, ip:request.ip)
       end
 
       on "#{HOSTNAME}/kaya/suites/:suite/run" do |suite_name|
         query_string = Kaya::Support::QueryString.new req
-        result = Kaya::API::Execution.start suite_name, query_string.values
+        result = Kaya::API::Execution.start suite_name, query_string.values, request.ip
 
         path = "/#{HOSTNAME}/kaya/suites"
         path += "?msg=#{result['message']}. " if result["message"]
@@ -107,21 +107,21 @@ Cuba.define do
         (Kaya::Support::Git.reset_hard and Kaya::Support::Git.pull) if Kaya::Support::Configuration.use_git?
         Kaya::Suites.update_suites
         suite_name.gsub!("%20"," ")
-        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name])
-        res.write template.call(section:"Test Suites", query_string:query_string, suite_name:suite_name, log_name:nil)
+        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name, :ip])
+        res.write template.call(section:"Test Suites", query_string:query_string, suite_name:suite_name, log_name:nil, ip:request.ip)
       end
 
       on "#{HOSTNAME}/kaya/suites" do
         query_string = Kaya::Support::QueryString.new req
         Kaya::Suites.update_suites
-        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name])
-        res.write template.call(section:"Test Suites", query_string:query_string, suite_name:nil, log_name:nil)
+        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name, :ip])
+        res.write template.call(section:"Test Suites", query_string:query_string, suite_name:nil, log_name:nil, ip:request.ip)
       end
 
       on "#{HOSTNAME}/kaya/logs/:log_name" do |log_name|
         query_string = Kaya::Support::QueryString.new req
-        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name])
-        res.write template.call(section:"Logs", query_string:query_string, suite_name:nil, log_name:log_name)
+        template = Mote.parse(File.read("#{Kaya::View.path}/body.mote"),self, [:section, :query_string, :suite_name, :log_name, :ip])
+        res.write template.call(section:"Logs", query_string:query_string, suite_name:nil, log_name:log_name, ip:request.ip)
       end
 
 # ========================================================================
@@ -178,13 +178,13 @@ Cuba.define do
       end
 
       on "#{HOSTNAME}/kaya/api/results/:id/reset" do |result_id|
-        result = Kaya::API::Execution.reset(result_id)
+        result = Kaya::API::Execution.reset(result_id, request.ip)
         res.write result.to_json
       end
 
       on "#{HOSTNAME}/kaya/api/suites/:suite/run" do |suite_name|
         query_string = Kaya::Support::QueryString.new req
-        result = Kaya::API::Execution.start suite_name, query_string.values
+        result = Kaya::API::Execution.start suite_name, query_string.values, request.ip
         res.write result.to_json
       end
 
@@ -216,7 +216,7 @@ Cuba.define do
       on "#{HOSTNAME}/kaya/api/suites" do
         (Kaya::Support::Git.reset_hard and Kaya::Support::Git.pull) if Kaya::Support::Configuration.use_git?
         Kaya::Suites.update_suites
-        output = Kaya::API::Suites.list({"active" => true})
+        output = Kaya::API::Suites.list({active:true, ip:request.ip})
         res.write output.to_json
       end
 

data/lib/kaya/database/mongo_connector.rb

@@ -243,6 +243,15 @@ module Kaya
         end
       end
 
+      def self.results_for_suite_id_and_ip suite_id, ip
+        results = self.find_results_for_ip(ip)
+        if results
+          results.select{|result| result["suite"]["id"]==suite_id}
+        else
+          []
+        end
+      end
+
       def self.result_data_for_id(result_id)
         @@results.find({"_id" => ensure_int(result_id)}).to_a.first
       end
@@ -280,6 +289,10 @@ module Kaya
         end
       end
 
+      def self.find_results_for_ip ip
+        @@results.find({"ip" => ip}, :sort =>["started_at", -1]).to_a
+      end
+
       def self.find_results_for_status status
         all_actual_results = self.all_results
         if !all_actual_results.empty?

data/lib/kaya/results/result.rb

@@ -26,7 +26,8 @@ module Kaya
         :pid,
         :last_check_time,
         :configuration_values,
-        :timeout
+        :timeout,
+        :ip
 
       attr_reader :console_output
 
@@ -65,6 +66,7 @@ module Kaya
           @last_check_time          = now_in_seconds
           @execution_data           = {}
           @configuration_values     = Kaya::Support::Configuration.pretty_configuration_values
+          @ip                       = data_for_result["ip"]
         end
       end
 
@@ -106,7 +108,8 @@ module Kaya
           "pid"                       => pid,
           "last_check_time"           => last_check_time,
           "execution_data"            => execution_data,
-          "configuration_values"      => configuration_values
+          "configuration_values"      => configuration_values,
+          "ip"                        => ip
         }
       end
 
@@ -167,7 +170,6 @@ module Kaya
           self.finished!
           $K_LOG.debug "[#{@id}] Values updated" if $K_LOG
           finished = true
-
         elsif (self.seconds_without_changes > Kaya::Support::Configuration.execution_time_to_live)
           self.finished_by_timeout!
           finished = true
@@ -268,6 +270,8 @@ module Kaya
       end
 
       def append_result_to_console_output!
+        $K_LOG.debug "console retrived #{Time.now.to_i}" if $K_LOG
+        $K_LOG.debug "without changes #{self.seconds_without_changes}" if $K_LOG
         if is_there_console_output_file?
           begin
             output = []
@@ -278,6 +282,7 @@ module Kaya
             if (text.size > @console_output.size )
               save_console_output(text)
               @last_check_time = now_in_seconds
+              self.save!
             end
             true
           rescue
@@ -445,7 +450,7 @@ module Kaya
       end
 
       # Returns the seconds that there is no console output changes only if it is not finished, else returns 0
-      # This is aimed to help to detect if execution is freezed (or may have a debugger statement)
+      # This is aimed to help to detect if execution is freezed (or has a debugger statement)
       def seconds_without_changes
         (self.finished? or self.stopped?) ? 0 : (now_in_seconds - @last_check_time)
       end

data/lib/kaya/results/results.rb

@@ -31,6 +31,21 @@ module Kaya
       Kaya::Database::MongoConnector.find_results_for_key key
     end
 
+    def self.all_results_for_ip ip_address
+      Kaya::Database::MongoConnector.find_results_for_ip ip_address
+    end
+
+    def self.results_for_suite_id_and_ip suite_id, ip
+      Kaya::Database::MongoConnector.results_for_suite_id_and_ip suite_id, ip
+    end
+
+    def self.running_for_suite_id_and_ip? suite_id, ip
+      results = self.results_for_suite_id_and_ip suite_id, ip
+      not results.select do |res|
+        res["status"]=="running"
+      end.empty?
+    end
+
     # Resets all results with running status
     def self.reset_defuncts
       Kaya::Database::MongoConnector.all_results.select do |result|

data/lib/kaya/version.rb

@@ -1,3 +1,3 @@
 module Kaya
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/kaya/view/body.mote

@@ -4,9 +4,6 @@
 
 % title = h1 = section.split.map{|w| w.capitalize}.join " "
 
-
-<!--partials -->
-
 % javascript = Mote.parse(File.read("#{Kaya::View.path}/javascript.mote"), self, []).call()
 
 % styles = Mote.parse(File.read("#{Kaya::View.path}/styles.mote"), self, []).call()
@@ -20,7 +17,7 @@
 
 % template_file_path = File.read("#{Kaya::View.path}/#{Kaya::View::Sections.path_for(section)}.mote")
 
-% content = Mote.parse(template_file_path, self, [:query_string, :suite_name, :log_name]).call(query_string:query_string, suite_name:suite_name, log_name:log_name)
+% content = Mote.parse(template_file_path, self, [:query_string, :suite_name, :log_name, :ip]).call(query_string:query_string, suite_name:suite_name, log_name:log_name, ip:ip)
 
 % section = section.gsub(" ","_").downcase
 

data/lib/kaya/view/git_information.mote

@@ -13,13 +13,4 @@
     </h4>
 
 % end
-    % if section.downcase == "all results"
-    <div class='btn-group pull-right' role='group'>
-      <button type='button' class='btn btn-default' aria-label='Left Align' title='Toggle collapse' onclick="autoCollapse()" title='collapse all panels'>
-        <div id='collapse_icon'>
-          <span class='glyphicon glyphicon-minus' aria-hidden='true' style='font-size:18px;'></span>
-        </div>
-      </button>
-    </div>
-    % end
 </div>

data/lib/kaya/view/results/all.mote

@@ -1,6 +1,7 @@
 <?
   key = query_string.keyword if (query_string.keyword and !query_string.keyword.empty?)
   status = query_string.status if (query_string.status and !query_string.status.empty?)
+  mine = query_string.mine if query_string.mine
 
   results = Kaya::API::Results.show()
   results_list = results["results"]
@@ -21,7 +22,22 @@
 
   if status
     results_list.select! do |res|
-      res["status"].downcase==status.downcase or (res["summary"].split("step").first.downcase.include? status.downcase and res["summary"].split("step").first.scan(/\(\d.+\)/).first.scan(/[a-z]+/).first == status )
+      by_status = res["status"].downcase==status.downcase
+      by_first_part_summary = res["summary"].split("step").first.downcase.include? status.downcase
+      first_part = res["summary"].split("step").first
+      if first_part
+        scenarios = first_part.scan(/\(\d.+\)/).first
+        if scenarios
+          by_partial_summary = scenarios.scan(/[a-z]+/).first == status
+        end
+      end
+      by_status or (by_first_part_summary and by_partial_summary)
+    end
+  end
+
+  if mine
+    results_list.select! do |res|
+      res["ip"] == ip
     end
   end
 
@@ -50,14 +66,24 @@
   % if key or status
     <a class='btn btn-danger' href='/{{Kaya::Support::Configuration.hostname}}/kaya/results/all' role='button'>Clear</a>
   % end
+    <input type='checkbox' {{'checked="checked"' if mine=="on"}} name="mine" onclick="form.submit();" /><label>&nbsp;Only mine</label>
+
+  <div class='btn-group pull-right' role='group'>
+    <button type='button' class='btn btn-default' aria-label='Left Align' title='Toggle collapse' onclick="autoCollapse()" title='collapse all panels'>
+      <div id='collapse_icon'>
+        <span class='glyphicon glyphicon-minus' aria-hidden='true' style='font-size:18px;'></span>
+      </div>
+    </button>
+  </div>
   </form>
+
   <br>
   <p style='text-align:right'>{{results_size_text}}</p>
 </div>
 
 % if results_list.size > 0
-  % result_info = Mote.parse(File.read("#{Kaya::View.path}/results/detailed_info.mote"), self, [:result])
+  % result_info = Mote.parse(File.read("#{Kaya::View.path}/results/detailed_info.mote"), self, [:result, :ip])
   % results_list.each do |result_data|
-    {{result_info.call(result:result_data)}}
+    {{result_info.call(result:result_data, ip:ip)}}
   % end
 % end

data/lib/kaya/view/results/console.mote

@@ -67,8 +67,10 @@ javascript = Mote.parse(File.read("#{Kaya::View.path}/javascript.mote"), self, [
             <a href='#' class='label label-warning' onclick="window.open('/{{Kaya::Support::Configuration.hostname}}/kaya/api/results/{{result.id}}/data', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
               Execution Data</a>
           % unless result.status =~ /finished|stopped/
-            <a href='#' onclick="getAndClose('/{{Kaya::Support::Configuration.hostname}}/kaya/results/{{result.id}}/reset');" class='label label-danger'>
-              Stop execution</a>
+            % if result.ip == ip
+              <a href='#' onclick="getAndClose('/{{Kaya::Support::Configuration.hostname}}/kaya/results/{{result.id}}/reset');" class='label label-danger'>
+                Stop execution</a>
+            % end
           % end
           </div>
         </h6>

data/lib/kaya/view/results/detailed_info.mote

@@ -5,13 +5,6 @@
       <div class='panel-heading' data-toggle='collapse' data-target='#{{result["_id"]}}'>
       <h4><small>Execution name &nbsp; <b>{{result["execution_name"]}}</b>&nbsp;(Result id: {{result["_id"]}})</small></h4></div>
       <div class='panel-body collapse in' id='{{result["_id"]}}'>
-        % unless result["status"] =~ /finished|stopped/
-          <div class='pull-right' title='It seems that the execution gone wrong. Click here to force execution stop'>
-            <a href='/{{Kaya::Support::Configuration.hostname}}/kaya/results/{{result["_id"]}}/reset' class='label label-danger'>
-              Stop execution
-            </a>
-          </div>
-        % end
 
         <table class="table">
           <tbody>
@@ -105,6 +98,16 @@
           Raw
         </a>
 
+        % unless result["status"] =~ /finished|stopped/
+          % if result["ip"]==ip
+
+              <a href='/{{Kaya::Support::Configuration.hostname}}/kaya/results/{{result["_id"]}}/reset' class='btn btn-danger'>
+                Stop execution
+              </a>
+
+          % end
+        % end
+
 
       </div>
     </div>

data/lib/kaya/view/suites/suite.mote

@@ -1,8 +1,19 @@
-  <div class='starter-template'>
-    <div class='panel panel-{{Kaya::View.color(suite["status"])}}'>
+<?
+last_result_for_ip = Kaya::Results.results_for_suite_id_and_ip(suite["_id"], ip).first
+status = if last_result_for_ip
+   last_result_for_ip["status"]=="running" ? "running" : "finished"
+else
+  "READY"
+end
+
+color = Kaya::View.color(status)
+
+?>
+<div class='starter-template'>
+    <div class='panel panel-{{color}}'>
       <div class='panel-heading' data-toggle='collapse' data-target='#{{suite["name"].gsub(' ','')}}'>
         <h4 class='panel-title'>{{suite["name"]}}</h4>
-    % unless suite["status"]=="READY"
+    % if status=="running"
         <div class="spinner">
         <div class="bounce1"></div>
         <div class="bounce2"></div>
@@ -16,19 +27,19 @@
         <li class='list-group-item'>
           Command: {{suite["command"]}}
         </li>
-  % if suite["last_result"]
-      % unless suite["status"] == "RUNNING"
+  % if last_result_for_ip
+      % unless status == "running"
         <li class='list-group-item'>
-          Last result:&nbsp;{{Kaya::View.label_color_for_result_id suite["last_result"]}}
+          Last result:&nbsp;{{Kaya::View.label_color_for_result_id last_result_for_ip["_id"]}}
         </li>
         <li class='list-group-item'>
-          Started on:&nbsp;{{Kaya::Support::TimeHelper.formatted_time_for(Kaya::Results::Result.get(suite["last_result"]).started_at)}}
+          Started on:&nbsp;{{Kaya::Support::TimeHelper.formatted_time_for(Kaya::Results::Result.get(last_result_for_ip["_id"]).started_at)}}
         </li>
       % end
   % end
-    % if suite["status"] == "RUNNING"
+    % if status == "running"
         <li class='list-group-item'>
-          <a href='#' class='btn btn-info' onclick="refreshAndOpen('/{{Kaya::Support::Configuration.hostname}}/kaya/results/log/{{suite['last_result']}}');">
+          <a href='#' class='btn btn-info' onclick="refreshAndOpen('/{{Kaya::Support::Configuration.hostname}}/kaya/results/log/{{last_result_for_ip["_id"]}}');">
             See progress
           </a>
         </li>

data/lib/kaya/view/suites/suite_item.mote

@@ -1,10 +1,25 @@
-  <div class='starter-template'>
-    <div class='panel panel-{{Kaya::View.color(suite["status"])}}'>
+<?
+last_result_for_ip = Kaya::Results.results_for_suite_id_and_ip(suite["_id"], ip).first
+status = if last_result_for_ip
+  if last_result_for_ip["status"]=="running"
+    "running"
+  else
+    "finished"
+  end
+else
+  "READY"
+end
+
+color = Kaya::View.color(status)
+
+?>
+<div class='starter-template'>
+    <div class='panel panel-{{color}}'>
       <div class='panel-heading'">
         <h3 class='panel-title' onclick="goClean('/{{Kaya::Support::Configuration.hostname}}/kaya/suites/{{suite["name"].gsub(' ','%20')}}');">
           {{suite["name"]}}
         </h3>
-    % unless suite["status"]=="READY"
+    % if status=="running"
         <div class="spinner">
         <div class="bounce1"></div>
         <div class="bounce2"></div>
@@ -21,8 +36,8 @@
         <a href='#' title='{{suite["info"]}}' class='label label-default' aria-hidden='true' data-toggle='modal' data-target='#myModal' onclick="javascript:info('Information about {{suite["name"]}}','{{suite["info"].gsub('\n','<br>')}}', null);">
           Information</a>
       % end
-      % if suite["status"]=="RUNNING"
-        <a href='#' title='See execution progress' class='label label-warning' onclick="refreshAndOpen('/{{Kaya::Support::Configuration.hostname}}/kaya/results/log/{{suite['last_result']}}');">
+      % if status=="running"
+        <a href='#' title='See execution progress' class='label label-warning' onclick="refreshAndOpen('/{{Kaya::Support::Configuration.hostname}}/kaya/results/log/{{last_result_for_ip["_id"]}}');">
           See progress</a>
       % end
       </div>

data/lib/kaya/view/suites/suites.mote

@@ -8,13 +8,13 @@
 % end
 % if number_of_suites > 0
   % if suite_name
-    % suite_template = Mote.parse(File.read("#{Kaya::View.path}/suites/suite.mote"), self, [:suite])
+    % suite_template = Mote.parse(File.read("#{Kaya::View.path}/suites/suite.mote"), self, [:suite, :ip])
   % else
-    % suite_template = Mote.parse(File.read("#{Kaya::View.path}/suites/suite_item.mote"), self, [:suite])
+    % suite_template = Mote.parse(File.read("#{Kaya::View.path}/suites/suite_item.mote"), self, [:suite, :ip])
   % end
   % suites_list = suites_list["suites"]
   % suites_list.select!{|suite| suite["name"]==suite_name} if suite_name
   % suites_list.each do |suite_data|
-    {{suite_template.call(suite:suite_data)}}
+    {{suite_template.call(suite:suite_data, ip:ip)}}
   % end
 % end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaya
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor