kaya 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80a49a5c4d6f014f5bdfee76811c843e15e9338
-  data.tar.gz: b142503bb3327a2f5eee7e0e1d0e4ab9b7a3f013
+  metadata.gz: d29907ccd295eb6282d151db7296cd801742ea59
+  data.tar.gz: 2620c3ea5a35f56a1c3715ea2fc453ff4d965755
 SHA512:
-  metadata.gz: 1f020b7f10921c7d11278384a3605dd91d51f24d4a9b77295dbc1179df506d27c8265b68271df05aaf52e7a3e26b848e8960a231fa8e538a092a90f5123db1ae
-  data.tar.gz: 8a0288ba9892532ac35007af66932beb361ef95ca7f34f985ab22320c4be7361c2d409d1a6e996de34a088a4d883f444feac4a8df8301ca28d3e077aa0b4c849
+  metadata.gz: 2d3dca0cff9cf94737eb7267ce398e188010fea1fc799c558cc744538db7ddbb7ef7131cdd73b3e2e7f0097216f7af3cbac8220d23d5aaf7e79ca530097018cb
+  data.tar.gz: 09e4a1b26dd6022c8c79596a83b1edb212fe47874c378346fbdd6566e3ea3bd51c3ad3e85fb35fab05ace92a6e5d709e38c7985791b4bace4d422c1395a7507a

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

@@ -0,0 +1,59 @@
+require 'kaya'
+
+module Kaya
+  module Workers
+    class ExecutionPerformer
+      include Sidekiq::Worker
+        def perform(result_id)
+
+          puts result_id
+
+          Kaya::Support::Configuration.get
+          Kaya::Database::MongoConnector.new Kaya::Support::Configuration.db_connection_data
+
+          result = Kaya::Results::Result.get(result_id)
+
+          p result
+
+          result.kaya_report_file_name= "kaya_report_#{result_id}.html"
+
+          begin
+            File.delete("#{Dir.pwd}/Gemfile.lock")
+          rescue
+          end
+
+          if !Kaya::Support::ChangeInspector.is_there_gemfile_lock?
+            bundle_output = Kaya::Support::Console.execute "bundle install"
+            $K_LOG.debug "[result:#{result.id}] Bundle install performed" if $K_LOG
+          elsif Kaya::Support::ChangeInspector.is_there_a_change?
+            bundle_output = Kaya::Support::Console.execute "bundle update"
+            $K_LOG.debug "[result:#{result.id}] Bundle update performed" if $K_LOG
+          end
+          if bundle_output
+            result.save_to_bundle_output bundle_output
+            raise "An error ocurred installing gem" if bundle_output.include? "Could not find"
+          end
+
+          # Adding _id=result.id to use inside execution the posiibility to add information to the result
+          result.kaya_command= "#{Kaya::Support::Configuration.headless?} cucumber #{result.command} -f pretty -f html -o kaya/temp/#{result.kaya_report_file_name} #{result.custom_params_values} _id=#{result.id} "
+
+          result.console_output_file_name= "kaya_co_#{result.id}.out"
+
+          result.save!
+
+          command = "#{result.kaya_command} 2>&1 | tee -a kaya/temp/#{result.console_output_file_name}"
+
+          $K_LOG.debug "[result:#{result.id}] Running in headless mode" if $K_LOG and Kaya::Support::Configuration.headless?
+
+          Dir.mkdir "#{Dir.pwd}/kaya/temp" unless Dir.exist? "#{Dir.pwd}/kaya/temp"
+
+          $K_LOG.debug "[result:#{result.id}] Creating process" if $K_LOG
+          result.pid= Kaya::Support::Processes.fork_this command
+          result.running!
+          result.save!
+          $K_LOG.debug "[result:#{result.id}] Process => #{result.pid}(PID) | command => saved | result as => running" if $K_LOG
+
+        end
+    end
+  end
+end

data/lib/kaya/cucumber/task.rb

@@ -1,4 +1,4 @@
-  require 'yaml'
+  # require 'yaml'
 
 require 'tempfile'
 
@@ -9,47 +9,8 @@ module Kaya
 
       def self.run result
 
-        result.kaya_report_file_name= "kaya_report_#{result.id}.html"
+        Kaya::Workers::ExecutionPerformer.perform_async(result.id)
 
-        begin
-          File.delete("#{Dir.pwd}/Gemfile.lock")
-        rescue
-        end
-
-        if Kaya::Support::ChangeInspector.is_there_a_change? or not Kaya::Support::ChangeInspector.is_there_gemfile_lock?
-          bundle_output = Kaya::Support::Console.execute "bundle install"
-          $K_LOG.debug "[result:#{result.id}] Bundle install performed" if $K_LOG
-          result.save_to_bundle_output bundle_output
-          raise "An error ocurred installing gem" if bundle_output.include? "Could not find"
-        end
-
-
-
-        # Adding _id=result.id to use inside execution the posiibility to add information to the result
-        result.kaya_command= "#{Kaya::Support::Configuration.headless?} cucumber #{result.command} -f pretty -f html -o kaya/temp/#{result.kaya_report_file_name} #{result.custom_params_values} _id=#{result.id} "
-
-        result.console_output_file_name= "kaya_co_#{result.id}.out"
-
-        result.save!
-
-        command = "#{result.kaya_command} 2>&1 | tee -a kaya/temp/#{result.console_output_file_name}"
-
-        $K_LOG.debug "[result:#{result.id}] Running in headless mode" if $K_LOG and Kaya::Support::Configuration.headless?
-
-        Dir.mkdir "#{Dir.pwd}/kaya/temp" unless Dir.exist? "#{Dir.pwd}/kaya/temp"
-
-        $K_LOG.debug "[result:#{result.id}] Creating process" if $K_LOG
-        result.pid= Kaya::Support::Processes.fork_this command
-        result.running!
-        result.save!
-        $K_LOG.debug "[result:#{result.id}] Process => #{result.pid}(PID) | command => saved | result as => running" if $K_LOG
-
-        # Following actions are performed by background job
-
-        # result.append_result_to_console_output!
-        # result.save_report!
-        # result.save!
-        # result.append_result_to_console_output!
      end # end self.run
 
     end #end Task class

data/lib/kaya/execution.rb

@@ -16,6 +16,7 @@ module Kaya
         $K_LOG.debug "Result created with id => #{result.id}" if $K_LOG
 
         result_id = result.id
+        result.save!
 
       if execution_request_data["type"] == "cucumber"
         $K_LOG.debug "Execution type: Cucumber" if $K_LOG
@@ -23,21 +24,6 @@ module Kaya
 
         $K_LOG.debug "Task started" if $K_LOG
 
-
-        # Performed by background job
-        # if result = Results::Result.get(result_id)
-
-        #   result.append_result_to_console_output!
-
-        #   result.save_report!
-
-        #   result.get_summary!
-
-        #   result.get_status!
-
-        #   result =  nil
-        # end
-
         result_id
 
       else # ANOTHER TYPE OF EXECUTION

data/lib/kaya/support/git.rb

@@ -142,7 +142,6 @@ module Kaya
 
           def self.remote_log
             self.fetch
-            # Kaya::Support::Console.execute "git log HEAD origin"
             Kaya::Support::Console.execute "git log origin/#{self.actual_branch}"
           end
 

data/lib/kaya/support/logs.rb

@@ -21,11 +21,6 @@ module Kaya
           if File.exist?("#{path}")
             FileUtils.cp(path, "#{path}~")
             all_content = IO.read("#{path}~")
-            # content = if all_content.split("\n").size > 1000
-            #    all_content.split("\n")[-1000..-1].join("<br>")
-            # else
-            #   all_content.gsub("\n","<br>")
-            # end
             content = all_content.gsub("\n","<br>")
             File.delete("#{path}~")
           else

data/lib/kaya/support/notification.rb

@@ -92,23 +92,13 @@ module Kaya
         send_email message_subject, body, path_to_file
       end
 
-
-
-
-
       def execution_stopped result, additional_text=nil
         body = "Execution stopped \n#{additional_text}"
         message_subject = "Execution stopped (#{result.id})"
         send_email message_subject, body
       end
-
     end
 
-
-
-
-
-
     class NoEmail
 
       def initialize

data/lib/kaya/version.rb

@@ -1,3 +1,3 @@
 module Kaya
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

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

@@ -1,5 +1,8 @@
 
-<? text = result.bundle_output.split("\n").join("</p><p>") + result.console_output.split("\n").join("</p><p>") unless result.console_output.nil?
+<?
+text = ""
+text += result.bundle_output.split("\n").join("</p><p>") if result.bundle_output
+text += result.console_output.split("\n").join("</p><p>") if result.console_output
 if text.empty?
   lines = []
   begin
@@ -7,7 +10,7 @@ if text.empty?
       lines << line
     end
   rescue
-    lines << "Could not get console output"
+    lines << "Wait..."
   end
   text = lines.join("</small></p><p><small>")
 end

data/lib/kaya.rb

@@ -89,6 +89,7 @@ require_relative "kaya/support/change_inspector"
 
 # Background jobs
 require_relative "kaya/background_jobs/workers/execution_checker"
+require_relative "kaya/background_jobs/workers/execution_performer"
 require_relative "kaya/background_jobs/workers/garbage_cleaner"
 require_relative "kaya/background_jobs/sidekiq"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaya
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -277,6 +277,7 @@ files:
 - lib/kaya/API/suites.rb
 - lib/kaya/background_jobs/sidekiq.rb
 - lib/kaya/background_jobs/workers/execution_checker.rb
+- lib/kaya/background_jobs/workers/execution_performer.rb
 - lib/kaya/background_jobs/workers/garbage_cleaner.rb
 - lib/kaya/commands/bye.rb
 - lib/kaya/commands/help.rb