results_keeper 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 529561f32d09a5d68e0184afd63888010f1129e3
-  data.tar.gz: c2ac7a79925433080048a151be9ec3a338641c04
+  metadata.gz: 29e6f515750e584c6a8eb7ebf99c8d0953231c43
+  data.tar.gz: 0fe308d8e3a3729f2fce4af7315a0db59edadae0
 SHA512:
-  metadata.gz: 6902c3773f74d2cb0ea4c5065ea81e43fe1e2da4060557ec9e0058f77c1c87c0d9c4dc9f84884ef6af62692fe76dfd6cb8a8cf6258e5886a5ef3b5a1e501fe28
-  data.tar.gz: 21bf37d7b1af7a6131f607b4ec55ffc0d9676999093a2a241111a66c3ff16b01a089ca56f57f143cd3a16b8e347be3f67e9612a4d23610ba174befad7a6ffa99
+  metadata.gz: efdd084b8978c642b768c97b73f7a8dc34be0000d29d66dd487d7b425b9ead683b62ebd68116f0354895a42e78ea7fbab10f87d58ff9d780a74f68276e4e1f4a
+  data.tar.gz: 8c115a544bf00d172e5fb33cc7be73c19b29133a4b6c3feae431ba81fbb0a3e427de3231006d61843d9737e915c9319d6a5e287de9c18bafbbd9dea8d3a3567f

data/lib/results_keeper.rb

@@ -4,57 +4,44 @@ require 'rest_client'
 require_relative 'string'
 require 'singleton'
 require 'pry'
+require_relative 'test_data_generator'
 
 class ResultsKeeper
   include Singleton
 
-  attr_reader :revision_name, :revision_project
-
   DEFAULT_PORT = 3000
   DEFAULT_HOST = 'localhost'
 
   def initialize
-    @revision_name = ENV['REVISION_NAME'] || "Result for #{Time.now}"
-    @revision_project = ENV['PROJECT_NAME'] || 'Default'
+    @data_generator = TestDataGenerator.new
+    @tmp_data ||= {}
+    @tmp_data[:tests] ||= []
+    @rk_host = ENV['RK_REPORT_SERVER_HOST'] || DEFAULT_HOST
+    @rk_port = ENV['RK_REPORT_SERVER_PORT'] || DEFAULT_PORT
   end
 
   def send_revision
-    data = {revision: @revision_name, project: project_name}
-    @revision = send_json(data, 'revisions', "#{@revision_project} > #{@revision_name} started")
+    @revision = send_json(@data_generator.revision_data,
+                          'revisions',
+                          "#{@data_generator.project_name} > #{@data_generator.revision_name} started")
   end
 
   def send_revision_complete
-    data = {revision: @revision_name, project: project_name, completed: 1}
-    send_json(data, 'revisions', "#{@revision_name} completed")
+    send_not_sent_scenarios
+    send_json(@data_generator.revision_completed_data,
+              'revisions',
+              "#{@data_generator.revision_name} completed")
   end
 
   def send_test(scenario)
-    test_duration = Time.now - @test_started_at
-    @screenshot_path = save_screenshot(scenario) if ENV['SEND_SCREENSHOTS']
-    scenario_error = scenario.exception.message if scenario.exception
-    run_path = "cucumber #{scenario.location.file}:#{scenario.location.line}"
-    data = {name: scenario.name,
-            status: scenario.status,
-            feature_name: scenario.feature.name,
-            run_path: run_path,
-            tags: scenario.tags.map(&:name).join(', '),
-            error: scenario_error,
-            revision_id: @revision['revision_id'],
-            steps: scenario_steps(scenario),
-            duration: test_duration
-    }
-    @test = send_json(data, 'tests')
+    # In case if the host is not available we need to send revision once more (when it comes back)
+    send_revision unless @revision
+    return add_test_to_tmp(scenario) unless @revision
+    @screenshot_path = save_screenshot(scenario) if ENV['RK_SEND_SCREENSHOTS']
+    @test = send_json(@data_generator.test_data(scenario, @revision), 'tests')
     send_screenshot(@screenshot_path) if @screenshot_path
   end
 
-  def scenario_steps(scenario)
-    if scenario.test_steps.first.to_s.include? 'Cucumber::Core::Test'
-      scenario.test_steps.map { |s| "And #{s.name.to_s}" }
-    else
-      scenario.test_steps.map { |s| "And #{s.to_s}" }
-    end
-  end
-
   def save_screenshot(scenario)
     if scenario.exception
       begin
@@ -69,48 +56,63 @@ class ResultsKeeper
     end
   end
 
+  def add_test_to_tmp(scenario)
+    #console_warning_message("Could not send '#{scenario.name}' there seems to be a problem with #{@rk_host}:#{@rk_port}")
+    @tmp_data[:tests] << scenario
+    puts console_warning_message("Not sent scenarios amount: #{@tmp_data[:tests].count}")
+  end
+
+  def send_not_sent_scenarios
+    if @revision
+      @tmp_data[:tests].each do |s|
+        console_message("Trying to re-send '#{s.name}' once more")
+        send_test(s)
+      end
+    else
+      false
+    end
+   end
+
   def send_json(body, path, message_to_client=nil)
-    @host = ENV['REPORT_SERVER_HOST'] || DEFAULT_HOST
-    @port = ENV['REPORT_SERVER_PORT'] || DEFAULT_PORT
 
     body['secret_key'] = ENV['RK_SECRET_KEY']
     @path = "/api/#{path}"
     @body = body.to_json
 
-    request = Net::HTTP::Post.new(@path, initheader = {'Content-Type' => 'application/json'})
-    request.body = @body
-    response = Net::HTTP.new(@host, @port).start {|http| http.request(request)}
     begin
+      request = Net::HTTP::Post.new(@path, initheader = {'Content-Type' => 'application/json'})
+      request.body = @body
+      response = Net::HTTP.new(@rk_host, @rk_port).start {|http| http.request(request)}
+
       message_to_client ? console_message("#{message_to_client} - #{response.code} - #{response.message}") : console_message("#{response.code} - #{response.message}")
-      results_hash = JSON.parse(response.body)
-      results_hash
+      JSON.parse(response.body)
     rescue
-      console_message('There seems to be a problem. Are you authorized?')
+      console_warning_message("There seems to be a problem with #{@rk_host}:#{@rk_port}, make sure your RK_SECRET_KEY is correct and server is up.")
+      false
     end
   end
 
   def send_screenshot(screenshot_path)
-    if ENV['SEND_SCREENSHOTS']
-      t1 = Thread.new do
-        params = {project: @revision['project_id'], revision: @revision['revision_id'], test: @test['id']}
-        RestClient.post("http://#{@host}:#{@port}/api/tests/upload_screenshot",
-                        :name_of_file_param => File.new(screenshot_path), :body => params)
-        File.delete(screenshot_path)
-      end
-      t1.join
+    begin
+      params = {project: @revision['project_id'], revision: @revision['revision_id'], test: @test['id']}
+      RestClient.post("http://#{@rk_host}:#{@rk_port}/api/tests/upload_screenshot",
+                      :name_of_file_param => File.new(screenshot_path), :body => params)
+      File.delete(screenshot_path)
+    rescue => e
+      console_warning_message("Could not send screenshot, there seems to be a problem with #{@rk_host}:#{@rk_port}")
     end
   end
 
-  def project_name
-    ENV['PROJECT_NAME']
+  def test_started(scenarion=nil)
+    @data_generator.test_started
   end
 
   def console_message(text)
     puts "    Results Keeper: #{text}".blue unless ENV['HIDE_RK_MESSAGES'] == 'true'
   end
 
-  def test_started(scenarion=nil)
-    @test_started_at = Time.now
+  def console_warning_message(text)
+    puts "    Results Keeper: #{text}".yellow unless ENV['HIDE_RK_MESSAGES'] == 'true'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: results_keeper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Kozakov