kaya 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c3119c8bbaa8212c7affae2b171fc8e32e01f3
-  data.tar.gz: 55b705e678b261d38f7ea741180b5b01e01274a3
+  metadata.gz: 45359e9ff9bad0618df21686ea9caddc36cda396
+  data.tar.gz: edf1cc2eb78c5329fd8c7d5ee1ee969362152940
 SHA512:
-  metadata.gz: c37613be82d5a81612a4a267a686cf6067991320916742dbc53c490753b4c70cd69ee2c8cfa816ee55cd8b247bad2e3bee107ef2fc65ffefde79b0eb5e2f808c
-  data.tar.gz: deb237fe0d85e804eaf970c65773605845363e1db8602aed621197e462a5bd9302d86a0bf1d31199c553ffba7f2fda562f6e8a3f250a0173040e6a91d663f7bc
+  metadata.gz: b99f3101952241a2f6dffc3d9d32f63f4a31a92a4338d0dcbb55fddb2c5f1e618473bcf04e23f8c9181cec88396247c4b8157c8163322ce54b715a7160fdee80
+  data.tar.gz: fd96a85d144aba666260257ff6246bf14167f4df18caae840edd03033e8b2a49a54c4e8b82d75dd6057f5b93fd35965399c360d07e6d1861ba1a4f9f61d15567

data/README.md

@@ -81,92 +81,69 @@ Reference about configuration
 
 kaya/kaya_conf file reference:
 
-{
-
-  "USE_GIT" : true,
-
-  "HOSTNAME" : "your-host-name",
-
-  "APP_PORT" : 8080,
-
-  "DATABASE" : {
-
+    {
+    "USE_GIT" : true,
+    "HOSTNAME" : "your-host-name",
+    "APP_PORT" : 8080,
+    "DATABASE" : {
     "TYPE" : "mongodb",
     "HOST" :"localhost",
     "PORT" : 27017,
     "USERNAME" : null,
     "PASSWORD" : null},
-
-  "PROJECT_NAME" : "Awesome Project",
-
-  "PROJECT_URL" : "http://your.project.url",
-
-  "INACTIVITY_TIMEOUT" : 60,
-
-  "KILL_INACTIVE_EXECUTIONS_AFTER" : 300,
-
-  "FORMAT_DATETIME" : "%d/%m/%Y %H:%M:%S",
-
-  "REFRESH_TIME" : 10,
-
-  "NOTIFICATION" : {
+    "PROJECT_NAME" : "Awesome Project",
+    "PROJECT_URL" : "http://your.project.url",
+    "INACTIVITY_TIMEOUT" : 60,
+    "KILL_INACTIVE_EXECUTIONS_AFTER" : 300,
+    "FORMAT_DATETIME" : "%d/%m/%Y %H:%M:%S",
+    "REFRESH_TIME" : 10,
+    "NOTIFICATION" : {
     "USE_GMAIL" : false,
     "USERNAME" : null,
     "PASSWORD" : null,
     "RECIPIENTS" : "your@email.com",
     "ATTACH_REPORT" : false
-  },
-
-  "FOOTER" : "Tests by a great and funny team",
-
-  "AUTO_EXECUTION_ID" : {
+    },
+    "FOOTER" : "Tests by a great and funny team",
+    "AUTO_EXECUTION_ID" : {
     "datetime" : true,
     "format" : "%d%^b%y-%H%M",
     "default" : null
-  },
-
-  "HEADLESS" : {
+    },
+    "HEADLESS" : {
     "active" : false,
     "resolution" : "1024x768",
     "size":"24"}
-}
-
-
-
-
+    }
 
 This file is where you can configure:
 
-    "USE_GIT": (Boolean) set as true if you are using git
-
-    "MONGO_HOST" : (String) The host where mongodb is running
-
-    "APP_PORT" : (Fixnum/Int) The http port that Kaya will be listening
-
-  	"PROJECT_NAME" : (String) The name of your Cucumber project
+  "USE_GIT": (Boolean) set as true if you are using git
 
-    "PROJECT_URL" : (String) The url of your project (basically the url of the repository)
+  "MONGO_HOST" : (String) The host where mongodb is running
 
-    "INACTIVITY_TIMEOUT" : (Fixnum/Int) The time in seconds to consider an execution as inactive. This will show you the option to reset an inactive execution
+  "APP_PORT" : (Fixnum/Int) The http port that Kaya will be listening
 
-    "KILL_INACTIVE_EXECUTIONS_AFTER" : (Fixnum/Int) The time in seconds to wait for killing automatically those inactive executions
+	"PROJECT_NAME" : (String) The name of your Cucumber project
 
-    "FORMAT_DATETIME" : "%d/%m/%Y %H:%M:%S"
+  "PROJECT_URL" : (String) The url of your project (basically the url of the repository)
 
-    "REFRESH_TIME" : (Fixnum/Int) The time in seconds to refresh result window in console view
+  "INACTIVITY_TIMEOUT" : (Fixnum/Int) The time in seconds to consider an execution as inactive. This will show you the option to reset an inactive execution
 
-    "NOTIFICATION" : (Boolean) This is a flag to use notifications through gmail service. You should have a gmail account to use it.
+  "KILL_INACTIVE_EXECUTIONS_AFTER" : (Fixnum/Int) The time in seconds to wait for killing automatically those inactive executions
 
-  	"FOOTER" : (String) A text you want to see at the footer like "Tests by a great team (team_name@domain.com"
+  "FORMAT_DATETIME" : "%d/%m/%Y %H:%M:%S"
 
-    "AUTO_EXECUTION_ID" : (JSON) If you want to use a simple execution id given by the actual time you can set the value of "datetime" to true (Boolean), with this option you can use a strftime format and it will put the execution id automatically.
-    If you set "datetime" to false (Boolean) you can use "default" value. Setting "datetime" as false and "default" as null you will have to (if you need it) set the execution id manually each time you run a suite.
-
-    "HEADLESS" (JSON) : Set active as true to use headless mode
+  "REFRESH_TIME" : (Fixnum/Int) The time in seconds to refresh result window in console view
 
+  "NOTIFICATION" : (Boolean) This is a flag to use notifications through gmail service. You should have a gmail account to use it.
 
+	"FOOTER" : (String) A text you want to see at the footer like "Tests by a great team (team_name@domain.com"
 
+  "AUTO_EXECUTION_ID" : (JSON) If you want to use a simple execution id given by the actual time you can set the value of "datetime" to true (Boolean), with this option you can use a strftime format and it will put the execution id automatically.
+  If you set "datetime" to false (Boolean) you can use "default" value. Setting "datetime" as false and "default" as null you will have to (if you need it) set the execution id manually each time you run a suite.
 
+  "HEADLESS" (JSON) : Set active as true to use headless mode
 
 
 Available Commands
@@ -197,8 +174,6 @@ Available Commands
     $ kaya restart
 
 
-
-
 Get (what you need!)
 ---------------------
 
@@ -217,8 +192,6 @@ Get (what you need!)
 - /kaya/help
 
 
-
-
 Tip
 ---------------------
 
@@ -256,16 +229,9 @@ Returns the result for a given result id
 
     kaya/api/results/<result_id>
 
+Returns the data you've added to result from execution
 
-
-
-
-Kaya
----------------------
-
-[listen](https://www.youtube.com/watch?v=Zgww4QtntnQ "Kaya")
-
-[listen](https://www.youtube.com/watch?v=4t7ghwxuUVo "Kaya")
+    kaya/api/results/<result_id>/data
 
 
 

data/kaya.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email                  = ["roman.g.rodriguez@gmail.com"]
   spec.summary                = %q{Exposes Cucumber suites in a web service to make them run}
   spec.description            = %q{You can run your cucumber suites easily, save and see the execution results}
-  spec.homepage               = "http://qqq.akjsdh"
+  spec.homepage               = "https://github.com/romgrod/kaya"
   spec.license                = "MIT"
   spec.required_ruby_version  = ">= 2.0.0"
 

data/lib/kaya/cuba.rb

@@ -112,7 +112,6 @@ Cuba.define do
 
       on "#{HOSTNAME}/kaya/suites" do
         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
         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)

data/lib/kaya/database/mongo_connector.rb

@@ -7,33 +7,57 @@ module Kaya
       include Mongo
 
       def initialize(opts={host: "localhost", port: 27017, username: nil, pass: nil})
+        set_db_name
+        set_client(opts)
+        set_db
+        authenticate(opts)
+        set_suite_collection
+        set_results_collection
+        set_commits_collection
+        set_documentation_collection
+      end
 
+      def set_db_name
         project_name = Dir.pwd.split("/").last
         @@db_name = "#{project_name}_kaya"
+      end
 
+      def set_client opts
         @@client    = MongoClient.new(opts[:host], opts[:port])
+      end
 
+      def set_db
+        @@db = @@client.db(@@db_name)
+      end
 
-        @@db      = @@client.db(@@db_name)
+      def authenticate opts
         @@auth = @@db.authenticate(opts[:username], opts[:pass]) if opts[:username] and opts[:pass]
+      end
 
+      def set_suite_collection
         @@suites  = @@db.collection("suites")
         @@suites.ensure_index({"last_result" => 1})
+      end
 
+      def set_commits_collection
+        @@commits   = @@db.collection("commits")
+      end
+
+      def set_results_collection
         @@results   = @@db.collection("results")
         @@results.ensure_index({"_id" => 1})
         @@results.ensure_index({"started_at" => 1, "_id" => 1})
+      end
 
+      def set_documentation_collection
         @@documentation = @@db.collection("documentation")
       end
 
-      def self.connected?
-        begin
-          @@db and true
-        rescue
-          false
-        end
-      end
+
+      ##########################
+      # DOCUMENTATION
+      #
+      #
 
       # Removes all documents of documentation from the DB
       def self.clean_documentation
@@ -67,6 +91,20 @@ module Kaya
         @@documentation.find({:$or => [{ "title" => /#{title}/ },{ "title" => /#{title.upcase}/ },{ "body" => /#{title}/ }]}).to_a
       end
 
+
+      ###########################
+      # COMMONS
+      #
+      #
+
+      def self.connected?
+        begin
+          @@db and true
+        rescue
+          false
+        end
+      end
+
       def self.generate_id
         Time.now.to_f.to_s.gsub( ".","")[0..12].to_i
       end
@@ -88,58 +126,80 @@ module Kaya
         MongoClient.new().db(@@db_name)
       end
 
-      # 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
+      ##################################
+      # COMMITS
+      #
+      #
 
-        existing_suites_name_list = existing_suites.map{|suite| suite["name"]}
 
-        cucumber_yml_suites.each_with_index do |cucumber_suite, index|
+      # Saves commit information
+      # @param [Hash] commit_info = {"_id" => Fixnum, "commit_id" => String, "info" => String}
+      def self.insert_commit commit_info
+        @@commits.insert({"_id" => self.generate_id, "log" => commit_info})
+      end
 
-          suite_data = existing_suites.select{|suite| suite["name"]==cucumber_suite["name"]}.first
+      # Returns last saved commit info
+      # @return [Hash] if exist
+      def self.last_commit
+        data = @@commits.find({}).to_a.first
+        data["log"] if data
+      end
 
-          # 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
+      ##################################
+      # SUITES
+      #
+      #
 
-            # 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
+      # # 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
 
-            # Saves register with new data
-            id = self.insert_suite(suite_data)
+      #   existing_suites = self.suites
 
-            print "INSERTED: #{id}\n\n"
+      #   existing_suites_name_list = existing_suites.map{|suite| suite["name"]}
 
-          end
+      #   cucumber_yml_suites.each_with_index do |cucumber_suite, index|
 
+      #     suite_data = existing_suites.select{|suite| suite["name"]==cucumber_suite["name"]}.first
 
-        end
+      #     # 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
 
-        # If at least one existing suite isn't con cucumber yml file, so deactivate them
-        unless existing_suites.empty?
-          existing_suites.each do |suite|
+      #       # 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
 
-            print "DEACTIVATED: #{suite['_id']}\n\n"
-            deactivate_suite(suite["_id"])
-          end
-        end
-      end
+      #       # 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
@@ -148,7 +208,6 @@ module Kaya
         @@suites.insert(suite_data)
       end
 
-
       # Update record for a given suite
       # @param [Hash] suite_data
       def self.update_suite suite_data
@@ -192,8 +251,10 @@ module Kaya
 
 
 
-
-    # RESULTS COLLECTION METHODS
+    ######################################3
+    # RESULTS
+    #
+    #
 
       # Creates a result data andc
       # returns de id for that register

data/lib/kaya/suites/suites.rb

@@ -51,6 +51,24 @@ module Kaya
     end
 
     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
+    end
+
+    def self.update!
       $K_LOG.debug "Updating suites" if $K_LOG
       existing_suites_ids = self.suite_ids
 

data/lib/kaya/support/git.rb

@@ -136,6 +136,56 @@ module Kaya
             "Commit: #{self.commits.first}"
           end
 
+          def self.last_commit
+            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/version.rb

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

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

@@ -25,11 +25,16 @@
     end
   end
 
+
   results_size_text = if (key or status)
     "#{results_list.size} result#{'s' if results_list.size>1} found"
   else
-    "Showing #{results_list.size} results."
+    total_of_results = results_list.size
+    results_list = results_list[0..19] if total_of_results > 20
+    "Showing #{results_list.size} results of #{total_of_results}."
   end
+
+
 ?>
 
 <div class='well'>

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

@@ -1,5 +1,5 @@
 % suites_list = Kaya::API::Suites.list({})
-% $K_LOG.error "results.mote suite_name=#{suite_name}" if $K_LOG
+% $K_LOG.debug "Results for suite name #{suite_name}" if $K_LOG and suite_name
 % unless suites_list["suites"].empty?
   % suites_list["suites"].select!{|suite| suite["name"]==suite_name} if suite_name
   % suites_list["suites"].each do |suite|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaya
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Roman Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -351,7 +351,7 @@ files:
 - lib/kaya/view/view.rb
 - test/features/install.feature
 - test/features/support/env.rb
-homepage: http://qqq.akjsdh
+homepage: https://github.com/romgrod/kaya
 licenses:
 - MIT
 metadata: {}