kaya 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45359e9ff9bad0618df21686ea9caddc36cda396
-  data.tar.gz: edf1cc2eb78c5329fd8c7d5ee1ee969362152940
+  metadata.gz: 033bb61efdc7cdbf0cb553692f82de5866d0f9ee
+  data.tar.gz: 0e3de5b65873b4dc50c8fff6507b491104b68933
 SHA512:
-  metadata.gz: b99f3101952241a2f6dffc3d9d32f63f4a31a92a4338d0dcbb55fddb2c5f1e618473bcf04e23f8c9181cec88396247c4b8157c8163322ce54b715a7160fdee80
-  data.tar.gz: fd96a85d144aba666260257ff6246bf14167f4df18caae840edd03033e8b2a49a54c4e8b82d75dd6057f5b93fd35965399c360d07e6d1861ba1a4f9f61d15567
+  metadata.gz: dcf6ebc5803f43e80141a161dfee26fe2f98b200de5088ffbf873cf17d77f75113fa1ef5f98c6e759db9fb94faa4c2f11be2eb3b16b643014902ea703735db51
+  data.tar.gz: 2bce3a33e7a01606acbba42641aeef6de7a398ba1225a17b1fb72137fdd606784a03cb5809e7003bdf3444ae5cdcb22789fb0d72ab62725acfb1b5b9974adeda

data/README.md

@@ -10,23 +10,28 @@ Kaya
 
   Before installing Kaya you should have installed:
 
-    - MongoDb (version >= 2.6) See http://www.mongodb.org/downloads
+  - MongoDb (version >= 2.6) See http://www.mongodb.org/downloads
 
     $ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
     $ sudo apt-get update
-    $ sudo apt-get install mongodb-org
+    $ sudo apt-get install mongodb
     $ sudo service mongodb start
 
-    - Redis (http://tosbourn.com/install-latest-version-redis-ubuntu/)
+  - Redis (http://tosbourn.com/install-latest-version-redis-ubuntu/)
 
     $ sudo apt-get install -y python-software-properties
     $ sudo add-apt-repository -y ppa:rwky/redis
     $ sudo apt-get update
     $ sudo apt-get install -y redis-server
 
-    - xvfb (if you want to run WebDriver in headless mode.)
+  - If you want to run GUI tests using WebDriver in headless mode you should install xvfb package
     $sudo apt-get intall xvfb
 
+  - While running in headless mode you may face an error like:
+    LIBDBUSMENU-GLIB-WARNING **: Unable to get session bus: Error spawning command line `dbus-launch --autolaunch
+  This coulb be solved by installing dbus-x11 package
+    $apt-get install dbus-x11
+
 
 
 ## Kaya Installation
@@ -238,7 +243,7 @@ Returns the data you've added to result from execution
 Contributing
 ---------------------
 
-1. Fork it (http://github.com/`<my-github-username>`/kaya/fork)
+1. Fork it (http://github.com/romgrod/kaya/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/kaya/API/execution.rb

@@ -41,21 +41,17 @@ module Kaya
               "git_log"         => git_log
             }
 
-
             suite.last_result = Kaya::Execution.run!(execution_request_data) # Returns result_id
 
             suite.set_running!
 
-            $K_LOG.debug "Suite #{suite_name} setted as running" if $K_LOG
-
             suite.save!
 
+            $K_LOG.debug "Suite #{suite_name} setted as running" if $K_LOG
+
             # Starts workers
             Kaya::Workers::ExecutionChecker.perform_async(suite.id) # Work until execution finish
 
-            # Kaya::Workers::GarbageCleaner.perform_async # Clean all zombies files
-
-            # suite_id = suite.id
             execution_id = suite.last_result
             started = true
             message = "Suite%20#{suite.name}%20started"
@@ -73,7 +69,6 @@ module Kaya
 
         else # No suite for  suite_name
           $K_LOG.error "Suite not found for name #{suite_name}" if $K_LOG
-          # suite_id = nil
           started = false
           execution_id = nil
           status = 404

data/lib/kaya/API/suites.rb

@@ -23,10 +23,10 @@ module Kaya
         if suites.size.zero?
           response["message"] = options[:running] ? "No running suites found" : "No suites found"
         else
-          suites.each do |suite_id|
-            suite = Kaya::Suites::Suite.get(suite_id)
-            response["suites"] << suite.api_response
-          end
+          start = Time.now.to_f
+          response["suites"] = suites.map{|suite_id| Kaya::Suites::Suite.get(suite_id).api_response}
+          $K_LOG.debug "#{suites.size} retrieved in (#{Time.now.to_f - start} s)" if $K_LOG
+
           response["size"] = suites.size
         end
         response

data/lib/kaya/commands/help.rb

@@ -3,11 +3,22 @@ module Kaya
     def self.help
       $K_LOG.debug "#{self}:#{__method__}" if $K_LOG
       puts "
-If you shutdown kaya and then you want to get it up and the port you are using is already in use you could use the following commands (Ubunutu OS):
 
-  $sudo netstat -tapen | grep :8080
+      Kaya has some commands:
 
-In this example we use the port 8080. This command will give you the app that is using the port. Then you could kill it getting its PID previously."
+        - install
+        - start
+        - stop
+        - restart
+        - reset
+
+      Note: If you stop kaya and then you want to get it up and the port you are using is already in use
+            you could use the following commands (Ubunutu OS):
+
+                $sudo netstat -tapen | grep :8080
+
+            In this example we use the port 8080. This command will give you the app that is using the port.
+            Then you could kill it getting its PID previously."
     end
   end
 end

data/lib/kaya/commands/start.rb

@@ -80,7 +80,7 @@ or set HEADLESS active value as false if you do not use browser in your tests."
 
         # Start kaya app
         $K_LOG.debug "Starting Kaya" if $K_LOG
-        kaya_start_output = Kaya::Support::Console.execute "unicorn -c #{Dir.pwd}/kaya/unicorn.rb -p #{Kaya::Support::Configuration.port} #{kaya_arg} kaya/config.ru"
+        Kaya::Support::Console.execute "unicorn -c #{Dir.pwd}/kaya/unicorn.rb -p #{Kaya::Support::Configuration.port} #{kaya_arg} kaya/config.ru"
 
         $K_LOG.debug "Kaya started" if $K_LOG
 

data/lib/kaya/cuba.rb

@@ -194,7 +194,7 @@ Cuba.define do
 
       on "#{HOSTNAME}/kaya/api/suites/running" do
         output = Kaya::API::Suites.list({running:true})
-        res.write output
+        res.write output.to_json
       end
 
       on "#{HOSTNAME}/kaya/api/suites/active" do

data/lib/kaya/cucumber/task.rb

@@ -16,48 +16,41 @@ module Kaya
         rescue
         end
 
-        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
-
-        unless bundle_output.include? "Could not find"
-
-          # Adding _id=result.id to use inside execution the posiibility to add information to the result
-          result.kaya_command= "#{Kaya::Support::Configuration.headless?} bundle exec 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"
+        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
 
 
-          $K_LOG.debug "[result:#{result.id}] Creating process" if $K_LOG
-          result.pid= Kaya::Support::Processes.fork_this command
-          $K_LOG.debug "[result:#{result.id}] Process (#{result.pid}) exec'in" if $K_LOG
 
-          $K_LOG.debug "[result:#{result.id}] Running saved command}" if $K_LOG
+        # Adding _id=result.id to use inside execution the posiibility to add information to the result
+        result.kaya_command= "#{Kaya::Support::Configuration.headless?} bundle exec cucumber #{result.command} -f pretty -f html -o kaya/temp/#{result.kaya_report_file_name} #{result.custom_params_values} _id=#{result.id} "
 
-          result.running!
+        result.console_output_file_name= "kaya_co_#{result.id}.out"
 
-          $K_LOG.debug "[result:#{result.id}] Result setted as running" if $K_LOG
+        result.save!
 
-          result.append_result_to_console_output!
+        command = "#{result.kaya_command} 2>&1 | tee -a kaya/temp/#{result.console_output_file_name}"
 
-          result.save_report!
+        $K_LOG.debug "[result:#{result.id}] Running in headless mode" if $K_LOG and Kaya::Support::Configuration.headless?
 
-          result.save!
+        Dir.mkdir "#{Dir.pwd}/kaya/temp" unless Dir.exist? "#{Dir.pwd}/kaya/temp"
 
-          result.append_result_to_console_output!
+        $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 # unless
+        # Following actions are performed by background job
 
-      end # end self.run
+        # 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
   end # enc Cucumber module

data/lib/kaya/database/mongo_connector.rb

@@ -149,58 +149,6 @@ module Kaya
       ##################################
       # SUITES
       #
-      #
-
-      # # Update suites collection with suites that comes from cucumber.yml file
-      # # All given suites will be active. Others will be deactivated
-      # # @param [Hash] cucumber_yml_suites
-      # def self.update_suites cucumber_yml_suites
-
-      #   existing_suites = self.suites
-
-      #   existing_suites_name_list = existing_suites.map{|suite| suite["name"]}
-
-      #   cucumber_yml_suites.each_with_index do |cucumber_suite, index|
-
-      #     suite_data = existing_suites.select{|suite| suite["name"]==cucumber_suite["name"]}.first
-
-      #     # if exist, so update it, else creates a new one
-      #     if suite_data
-      #       #Delete it from list and update it
-      #       existing_suites.delete(suite_data)
-      #       suite_data["command"]   = cucumber_suite["command"]
-      #       suite_data["custom"]   = cucumber_suite["custom"]
-      #       suite_data["active"]    = true
-      #       suite_data["index"]     = index
-
-      #       # Updates register with new data
-      #       self.update_suite(suite_data)
-      #       print "UPDATED: #{suite_data['_id']}\n\n"
-      #     else
-      #       # Creates a new one
-      #       suite_data = self.suite_data_structure
-      #       suite_data["name"]      = cucumber_suite["name"]
-      #       suite_data["command"]   = cucumber_suite["command"]
-      #       suite_data["custom"]   = cucumber_suite["custom"]
-      #       suite_data["branch"]    = Kaya::Support::Git.actual_branch
-
-      #       # Saves register with new data
-      #       id = self.insert_suite(suite_data)
-
-      #       print "INSERTED: #{id}\n\n"
-      #     end
-      #   end
-
-      #   # If at least one existing suite isn't con cucumber yml file, so deactivate them
-      #   unless existing_suites.empty?
-      #     existing_suites.each do |suite|
-
-      #       print "DEACTIVATED: #{suite['_id']}\n\n"
-      #       deactivate_suite(suite["_id"])
-      #     end
-      #   end
-      # end
-
 
       # Inserts a suite in suites collection
       # @param [Hash] suite_data (see suite_data_structure method)
@@ -336,11 +284,6 @@ module Kaya
           end.map{|result| result["_id"]}
         end
       end
-
-      def self.find_by criteria={}
-        search_criteria = {}
-      end
-
     end
   end
 end

data/lib/kaya/execution.rb

@@ -24,18 +24,19 @@ module Kaya
         $K_LOG.debug "Task started" if $K_LOG
 
 
-        if result = Results::Result.get(result_id)
+        # Performed by background job
+        # if result = Results::Result.get(result_id)
 
-          result.append_result_to_console_output!
+        #   result.append_result_to_console_output!
 
-          result.save_report!
+        #   result.save_report!
 
-          result.get_summary!
+        #   result.get_summary!
 
-          result.get_status!
+        #   result.get_status!
 
-          result =  nil
-        end
+        #   result =  nil
+        # end
 
         result_id
 

data/lib/kaya/suites/suites.rb

@@ -52,20 +52,18 @@ module Kaya
 
     def self.update_suites
 
-      if Kaya::Support::Configuration.use_git?
-        last_saved_commit = Kaya::Database::MongoConnector.last_commit
-        last_repo_commit  = Kaya::Support::Git.last_commit
-        if last_saved_commit.nil? or (last_saved_commit != last_repo_commit)
-          Kaya::Support::Git.reset_hard
-          Kaya::Support::Git.pull
-          self.update!
-          Kaya::Database::MongoConnector.insert_commit(last_repo_commit)
-        else
-          $K_LOG.debug "No git changes!"
-        end
-      else
-        self.update!
-      end
+      # if Kaya::Support::Configuration.use_git?
+      #   if Kaya::Database::MongoConnector.last_commit != (last_repo_commit  = Kaya::Support::Git.last_commit)
+      #     Kaya::Support::Git.reset_hard_and_pull
+      #     self.update!
+      #     Kaya::Database::MongoConnector.insert_commit(last_repo_commit)
+      #   else
+      #     $K_LOG.debug "No git changes!"
+      #   end
+      # else
+      #   self.update!
+      # end
+      self.update! if Kaya::Support::ChangeInspector.is_there_a_change?
     end
 
     def self.update!

data/lib/kaya/support/change_inspector.rb

@@ -0,0 +1,37 @@
+module Kaya
+  module Support
+    module ChangeInspector
+
+      # Evaluates if code has been changed. If yes, performs a git reset hard and git pull
+      # Update commit log into Database and return true
+      # Returns true if there is a change in code.
+      # Consider true if git usage is false
+      # @return [Boolean]
+
+      def self.is_there_a_change?
+        if Kaya::Support::Configuration.use_git?
+          if Kaya::Database::MongoConnector.last_commit != (last_repo_commit  = Kaya::Support::Git.last_commit)
+            $K_LOG.debug "Git has been changed. Perform code update" if $K_LOG
+            Kaya::Support::Git.reset_hard_and_pull
+            Kaya::Database::MongoConnector.insert_commit(last_repo_commit)
+            $K_LOG.debug "Commit log updated on database" if $K_LOG
+            true
+          else
+            $K_LOG.debug "No git changes" if $K_LOG
+            false
+          end
+        else
+          true
+        end
+      end
+
+      def self.is_there_gemfile_lock?
+        begin
+          IO.read("#{Dir.pwd}/Gemfile.lock")
+        rescue
+          false
+        end
+      end
+    end
+  end
+end

data/lib/kaya/support/git.rb

@@ -56,6 +56,10 @@ module Kaya
             Kaya::Support::Console.execute("git reset --hard")
           end
 
+          def self.reset_hard_and_pull
+            self.reset_hard and self.pull
+          end
+
           def self.git_push_origin_to_actual_branch
             branch_name = self.branch
             self.git_push_origin_to branch_name
@@ -140,52 +144,6 @@ module Kaya
             self.commits.first
           end
 
-          # # Returns information about commit
-          # # @return [Hash]
-          # # {
-          # #   "_id":Fixnum,
-          # #   "commit_id":Fixnum,
-          # #   "author":String,
-          # #   "date":String,
-          # #   "message":String
-          # # }
-          # def self.last_commit_info
-          #   commits = self.log
-          #   last_commit_raw = commits.split("\n\ncommit ").first.split("\n")
-          #   {
-          #     "_id" => self.generate_id,
-          #     "commit_id" => self.extract_id(last_commit_raw),
-          #     "author" => self.extract_author(last_commit_raw),
-          #     "date" => self.extract_date(last_commit_raw),
-          #     "message" => self.extract_message(last_commit_raw)
-          #   }
-          # end
-
-          # def self.last_commit_id
-          #   self.last_commit_info["commit_id"]
-          # end
-
-          # # returns commit id
-          # # @return [String] commit
-          # def self.extract_id commit_info
-          #   commit_id = commit_info.select{|line| line.start_with? "commit "}.first
-          #   commit_id.split(" ").last
-          # end
-
-          # def self.extract_author commit_info
-          #   author = commit_info.select{|line| line.start_with? "Author: " }
-          #   author.first.split("Author: ").last
-          # end
-
-          # def self.extract_date commit_info
-          #   date = commit_info.select{|line| line.start_with? "Date:  "}.first
-          #   date.split("   ").last
-          # end
-
-          # def self.extract_message commit_info
-          #   info = commit_info.last
-          # end
-
           def self.is_there_commit_id_diff? obtained_commit
               obtained_commit != self.last_commit_id
           end

data/lib/kaya/support/ricardo.rb

@@ -0,0 +1,10 @@
+require 'selenium-webdriver'
+
+def buscar_en_google palabra
+  @browser = Selenium::WebDriver.for :firefox
+  @browser.get "http://google.com"
+  campo_de_busqueda = @browser.find_element(:id, "q")
+  campo_de_busqueda.send_keys("#{palabra}\n")
+end
+
+buscar_en_google "curso de automatizacion de pruebas"

data/lib/kaya/version.rb

@@ -1,3 +1,3 @@
 module Kaya
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

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

@@ -22,7 +22,7 @@
           Last result: {{Kaya::View.label_color_for_result_id suite["last_result"]}}
         </li>
         <li class='list-group-item'>
-          Started on:&nbsp;{{Kaya::Support::TimeHelper.formatted_time_for suite["last_result"]}}
+          Started on:&nbsp;{{Kaya::Support::TimeHelper.formatted_time_for(Kaya::Results::Result.get(suite["last_result"]).started_at)}}
         </li>
       % end
   % end

data/lib/kaya.rb

@@ -84,6 +84,7 @@ require_relative "kaya/support/query_string"
 require_relative "kaya/support/if_config"
 require_relative "kaya/support/time_helper"
 require_relative "kaya/support/logs"
+require_relative "kaya/support/change_inspector"
 
 
 # Background jobs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaya
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -299,6 +299,7 @@ files:
 - lib/kaya/suites/custom/params.rb
 - lib/kaya/suites/suite.rb
 - lib/kaya/suites/suites.rb
+- lib/kaya/support/change_inspector.rb
 - lib/kaya/support/clean.rb
 - lib/kaya/support/configuration.rb
 - lib/kaya/support/console.rb
@@ -313,6 +314,7 @@ files:
 - lib/kaya/support/processes.rb
 - lib/kaya/support/query_string.rb
 - lib/kaya/support/request.rb
+- lib/kaya/support/ricardo.rb
 - lib/kaya/support/risk.rb
 - lib/kaya/support/time_helper.rb
 - lib/kaya/support/update.rb