kaya 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9d801b48a97d14560149426d8140912a8c7d9f
-  data.tar.gz: 177c500cad21cb0d3088c22516e499db5b81c29f
+  metadata.gz: 83632cfd5b464df4f14544e36b32a9dda02ea83a
+  data.tar.gz: f30ca5372f83fad1570ecc442e135578c9899e74
 SHA512:
-  metadata.gz: 772acf31863e217ce2df5333f620c9244d1cbec4bafab517384f5dc105595a2e61a11ad23d7d043e3928cb838791973f9bdfaeb018110dc0f0e6136b370148b5
-  data.tar.gz: fcc29674b853670b1020d905287428479925d1766b04ad57b226d1ae329f31b4587c925e50f3e6e0ee4e2c88cca485e49ba92d03fcc881bc59240edf3ad3d3dd
+  metadata.gz: f2aee180b4b8f49fc4e7ad5d089ba9c0530ea584e7dfcf173afffb5dbe2157ed0f7f5f0df17ca38ee0c7a2a488776bcb7f7b138ed40547d6ca9e17f2fb008a4e
+  data.tar.gz: 881a684e0676f6a000449f6fa7fd16489288acde990117daad5888019daa6b1057b2229645744fc2f21e228073414946785905d70a4aad34d5f5eb3b0b8ab651

data/lib/kaya/API/suites.rb

@@ -15,18 +15,25 @@ module Kaya
         }
         suites = if options[:running]
           response["request"] = "Running Suites"
-          Kaya::Suites.all_running_suites
+          Kaya::Suites.running_suites
         else
           response["request"] = options[:active] ? "Active Suites" : "Suites"
-          Kaya::Suites.suite_ids options[:active]
+          Kaya::Suites.suites options[:active]
         end
 
 
         if suites.size.zero?
-          response["message"] = options[:running] ? "No running suites found" : "No suites found"
+          response["message"] = options[:running] ? "Running suites not found" : "Suites not found"
         else
           # Gets the executions for given ip
-          suites = suites.map{|suite_id| Kaya::Suites::Suite.get(suite_id).api_response}
+          suites = suites.map do |suite|
+            results_for_suite = Kaya::Results.results_ids_for suite["_id"]
+            suite["results"]={
+              "size" => results_for_suite.size,
+              "ids" => results_for_suite
+            }
+            suite
+          end
 
           suites = suites.map do |suite|
             unless Kaya::Results.results_for_suite_id_and_ip(suite["_id"], options[:ip]).empty?

data/lib/kaya/background_jobs/sidekiq.rb

@@ -5,7 +5,7 @@ module Kaya
 
         workers_dir = workers_dir = __FILE__.split("/")[0..-2].join("/")+ "/workers"
 
-        output = Kaya::Support::Console.execute "sidekiq -r #{workers_dir}/execution_performer.rb -d -L kaya/sidekiq_log -P kaya/sidekiq_pid"
+        Kaya::Support::Console.execute "sidekiq -r #{workers_dir}/execution_performer.rb -d -L kaya/sidekiq_log -P kaya/sidekiq_pid"
 
         print "\n* Sidekiq:"
         raise "Could not start Sidekiq correctly. Read kaya/sidekiq_log file for more information" if not started?

data/lib/kaya/commands/start.rb

@@ -97,7 +97,7 @@ or set HEADLESS active value as false if you do not use browser in your tests."
 
       rescue => e
         $K_LOG.error "Error starting Kaya: #{e}#{e.backtrace}" if $K_LOG
-        puts "An error ocurred while starting Kaya. See kaya log for more information.".red
+        puts "An error ocurred while starting Kaya. See kaya log for more information.#{e} #{e.backtrace}".red
       end
     end
   end

data/lib/kaya/cuba.rb

@@ -8,8 +8,7 @@ Cuba.define do
 
   request = Kaya::Support::Request.new(req)
 
-  $K_LOG.debug "REQUEST '#{request.path}#{request.path_info}' FROM IP: '#{request.ip}'" if $K_LOG
-
+  $K_LOG.debug "REQUEST '#{request.path}#{request.path_info}' => : '#{request.x_uow}'" if $K_LOG
   begin
 
 
@@ -93,19 +92,16 @@ Cuba.define do
       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, request.ip
-
+        suite_name.gsub!("%20"," ")
         path = "/#{HOSTNAME}/kaya/suites"
         path += "?msg=#{result['message']}. " if result["message"]
         path += "Execution id=#{result["execution_id"]}" if result["execution_id"]
-
         res.status= result["status"]
         res.redirect path
       end
 
       on "#{HOSTNAME}/kaya/suites/:suite_name" do |suite_name|
         query_string = Kaya::Support::QueryString.new req
-        (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, :ip])
         res.write template.call(section:"Test Suites", query_string:query_string, suite_name:suite_name, log_name:nil, ip:request.ip)

data/lib/kaya/database/mongo_connector.rb

@@ -197,6 +197,10 @@ module Kaya
         @@suites.find({"active" => true}).to_a
       end
 
+      def self.running_suites
+        @@suites.find({"status" => "RUNNING"}).to_a
+      end
+
       def self.active_suites
         self.suites true
       end

data/lib/kaya/results/result.rb

@@ -33,9 +33,9 @@ module Kaya
 
 
       #  data_for_result = {
-      #      :suite_name,
-      #      :execution_name,
-      #      :type:}
+      #      "suite" => {"name":String, "id":Fixnum},
+      #      "execution_name" => String
+      #      "type" => String}
       def initialize data_for_result
 
         if data_for_result["_id"]
@@ -274,16 +274,11 @@ module Kaya
         $K_LOG.debug "without changes #{self.seconds_without_changes}" if $K_LOG
         if is_there_console_output_file?
           begin
-            output = []
-            open_console_output_file.each_line do |line|
-              output << line
-            end
-            text = output.join "\n"
-            if (text.size > @console_output.size )
-              save_console_output(text)
-              @last_check_time = now_in_seconds
-              self.save!
+            text = ""
+            console_output_content.each_line do |line|
+              text += line + "\n"
             end
+            save_console_output(text) if (text.size > @console_output.size)
             true
           rescue
             false
@@ -291,16 +286,11 @@ module Kaya
         end
       end
 
-
       def is_there_console_output_file?
-        begin
-          open_console_output_file and true
-        rescue
-          false
-        end
+        File.exist? "#{Dir.pwd}/kaya/temp/#{console_output_file_name}"
       end
 
-      def open_console_output_file
+      def console_output_content
         begin
           FileUtils.cp("#{Dir.pwd}/kaya/temp/#{console_output_file_name}", "#{Dir.pwd}/kaya/temp/#{console_output_file_name}~")
           file_content = File.open "#{Dir.pwd}/kaya/temp/#{console_output_file_name}~", "r"
@@ -315,6 +305,7 @@ module Kaya
       # @param [String] text = the text to be appended
       def append_to_console_output text
         @console_output += text
+        @last_check_time = now_in_seconds
         self.save!
       end
 

data/lib/kaya/suites/suites.rb

@@ -56,7 +56,7 @@ module Kaya
 
     def self.update!
       $K_LOG.debug "Updating suites" if $K_LOG
-      existing_suites_ids = self.suite_ids
+      existing_suites_ids = self.suites.map{|suite| suite["_id"]}
 
       self.cucumber_yml.each do |suite_data|
         # If is there a suite for the given name suite_id will be setted
@@ -94,11 +94,9 @@ module Kaya
     # Returns a list of suites id
     # @param [Boolean] actives or not
     # @return [Array] a list of suite ids
-    def self.suite_ids active=nil
+    def self.suites active=nil
       $K_LOG.debug "Suites:Getting all suites ids" if $K_LOG
-      Kaya::Database::MongoConnector.suites(active).map do |suite_data|
-        suite_data["_id"]
-      end
+      Kaya::Database::MongoConnector.suites(active)
     end
 
     # Returns the id for given suite name
@@ -111,17 +109,18 @@ module Kaya
 
     # Returns the ids for running suites
     # @return [Array] of suite ids
-    def self.all_running_suites
+    def self.running_suites
       $K_LOG.debug "Suites: Getting all runnnig suites" if $K_LOG
-      Kaya::Database::MongoConnector.all_suites.select do |suite|
-        suite["status"] == "RUNNING"
-      end.map{|suite| suite["_id"]}
+      # Kaya::Database::MongoConnector.all_suites.select do |suite|
+      #   suite["status"] == "RUNNING"
+      # end.map{|suite| suite["_id"]}
+      Kaya::Database::MongoConnector.running_suites
     end
 
     def self.reset_statuses
       $K_LOG.debug "Resetting suites status" if $K_LOG
-      self.all_running_suites.each do |suite_id|
-        if suite = Kaya::Suites::Suite.get(suite_id)
+      self.running_suites.each do |suite|
+        if suite = Kaya::Suites::Suite.get(suite["_id"])
           if result = Kaya::Results::Result.get(suite.last_result)
             result.update_values! # update_values! true means result got finished status
           end

data/lib/kaya/support/request.rb

@@ -18,6 +18,10 @@ module Kaya
         @req.env["REMOTE_ADDR"]
       end
 
+      def x_uow
+        @req.env["HTTP_X_UOW"]
+      end
+
       def method_missing(method_name, *args, &block)
         begin
           send("@req.#{method_name}", *args)

data/lib/kaya/version.rb

@@ -1,3 +1,3 @@
 module Kaya
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/kaya/view/javascript.mote

@@ -8,7 +8,7 @@
     $('#myModal').modal('show');
   }
 
-  function startedAlert(title, text){
+  function startedAlert(title, text, suiteName){
     startedInfo(title,text);
     url = 'http://' + window.location.host + window.location.pathname;
     $('#startedModal').modal('show');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaya
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor