race_condition-rspec 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c2d9166f3c3096d8f478697511724506fa103d
-  data.tar.gz: b47be25f3c6aa37705cac78ef75ea85504c84ac2
+  metadata.gz: 36cda9c2eb826865fb948b83584460adf4e9561c
+  data.tar.gz: 491391fb105aa01f7dde471737f8c56bb8414c43
 SHA512:
-  metadata.gz: 94d10c6abbaa5585cd9b4419b0d2eb9ff9a5005848cb454f859405ecb6a96ed2bb4a3b027e0057d3d702a820fac4d503c35dbe382893195d26d4170ea648d1ac
-  data.tar.gz: 41ad5821ad7db5df621a777ebd2559e7cc6b0475372ea3b9e4ea69f391e0845b26a2bac4469f6ba3d34bf09c93fcd313ce025249189be959b0e3b780d5306a94
+  metadata.gz: 2cda2a25c932b37331fa81e12b628360c16b415784a29c5f95b01067bd136d16c20ef4e4a75b3293df38aeb487a5502bc6a6097cc2cbd094f3effa69fd4ac107
+  data.tar.gz: d8d42a7d8edf891e106bbfa8ef085acbfafc9afd74a316b92c48e21491be5439618977b3857b664ad72859dd266a7ad54afc959e14c62d91ee83dae3b81b20fc

data/README.md

@@ -1,4 +1,4 @@
-# RaceCondition::Rspec [![Build Status](https://travis-ci.org/RaceCondition-io/race_condition-rspec.svg?branch=master)](https://travis-ci.org/RaceCondition-io/race_condition-rspec)
+# RaceCondition::RSpec [![Build Status](https://travis-ci.org/RaceCondition-io/race_condition-rspec.svg?branch=master)](https://travis-ci.org/RaceCondition-io/race_condition-rspec)
 
 RSpec client for sending test suite results to RaceCondition.
 
@@ -29,7 +29,7 @@ RaceCondition::RSpec.configure do |c|
 end
 ```
 
-* `report_if` - This is a boolean or lambda that tells the reporter if it should test suite results to the server.  Most popular CI servers set the `CI` environment variable.
+* `report_if` - This is a boolean or lambda that tells the reporter if it should send test suite results to the server.  Most popular CI servers set the `CI` environment variable.
 * `codebase_id` - This is the codebase ID from RaceCondition that you want to send the results to.
 * `branch_name` - The current branch name (optional, but recommended).
 * `commit` - The commit under test (optional).

data/lib/race_condition/client.rb

@@ -1,29 +1,48 @@
+require "net/http"
+require 'json'
+
 module RaceCondition
   class Client
-    include APISmith::Client
-
-    base_uri "https://racecondition.io/"
-    endpoint "api/1"
+    ENDPOINT = "api/v1"
 
     def report!(project_id, report_output)
       return unless report?
 
       puts "Sending test run data to RaceCondition..."
-      params = { build: report_output }
-      post("projects/#{project_id}/builds", extra_body: params)
-    rescue Errno::ECONNREFUSED, SocketError, Net::ReadTimeout
-      puts "Unable to reach RaceCondition."
-    end
+      response = post("projects/#{project_id}/builds", report_output)
 
-    def check_response_errors(response)
+      unless response.code.to_i == 200
+        puts "Unable to log test results to RaceCondition."
+      end
+    rescue Errno::ECONNREFUSED, SocketError, Net::ReadTimeout => e
+      puts "Unable to reach RaceCondition."
     end
 
     private
 
+    def post(path, params)
+      url = URI.parse("#{base_url}/#{ENDPOINT}/#{path}")
+
+      http = Net::HTTP.new(url.host, url.port)
+      http.read_timeout = 5
+      http.open_timeout = 5
+
+      json_headers = {
+        "Content-Type" => "application/json",
+        "Accept" => "application/json"
+      }
+
+      http.post(url.path, params.to_json, json_headers)
+    end
+
     def report?
       config.report?
     end
 
+    def base_url
+      config.report_to_domain
+    end
+
     def config
       RaceCondition::RSpec.configuration
     end

data/lib/race_condition/rspec/configuration.rb

@@ -6,7 +6,12 @@ module RaceCondition
                     :commit,
                     :build_number,
                     :codebase_id,
-                    :report_if
+                    :report_if,
+                    :report_to_domain # for testing purposes
+
+      def initialize
+        self.report_to_domain = "https://racecondition.io"
+      end
 
       def report?
         if report_if.respond_to? :call

data/lib/race_condition/rspec/report.rb

@@ -13,10 +13,13 @@ module RaceCondition
 
       def broadcast!
         data = {
-          seed: seed,
-          duration: duration,
           examples: examples_output,
-          metadata: metadata
+          seed: seed.seed,
+          client: "race_condition-rspec",
+          duration: duration,
+          branch_name: config.branch_name,
+          commit: config.commit,
+          build_number: config.build_number
         }
 
         allow_webmock!
@@ -29,14 +32,6 @@ module RaceCondition
         WebMock.allow_net_connect! if Object.const_defined?("WebMock")
       end
 
-      def metadata
-        {
-          branch_name: config.branch_name,
-          commit: config.commit,
-          build_number: config.build_number
-        }
-      end
-
       def config
         RaceCondition::RSpec.configuration
       end
@@ -56,18 +51,20 @@ module RaceCondition
           example = example.example
         end
 
-        data = example.execution_result.merge({
-          description: example.description,
+        data = {
+          started_at: example.execution_result[:started_at].iso8601,
+          finished_at: example.execution_result[:finished_at].iso8601,
+          run_time: example.execution_result[:run_time],
+          result: example.execution_result[:status],
           full_description: example.full_description,
           file_path: example.file_path,
           location: example.location,
           type: example.metadata[:type]
-        })
-
-        if data[:exception]
-          exception = data[:exception]
+        }
 
+        if exception = example.exception
           data[:exception] = {
+            rerun: "rspec #{rerun_argument_for(example)}",
             class: exception.class.name,
             message: exception.message,
             backtrace: exception.backtrace
@@ -76,6 +73,26 @@ module RaceCondition
 
         data
       end
+
+      # rerun logic from https://github.com/rspec/rspec-core/blob/4b0a10466cd19271bc5387bf5179bdb3b47a744d/lib/rspec/core/notifications.rb
+
+      def rerun_argument_for(example)
+        location = example.location_rerun_argument
+        return location unless duplicate_rerun_locations.include?(location)
+        example.id
+      end
+
+      def duplicate_rerun_locations
+        @duplicate_rerun_locations ||= begin
+          locations = ::RSpec.world.all_examples.map(&:location_rerun_argument)
+
+          Set.new.tap do |s|
+            locations.group_by { |l| l }.each do |l, ls|
+              s << l if ls.count > 1
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/race_condition/rspec/version.rb

@@ -1,5 +1,5 @@
 module RaceCondition
   module Rspec
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/race_condition/rspec.rb

@@ -1,4 +1,3 @@
-require "api_smith"
 require "race_condition/rspec/version"
 require "race_condition/rspec/configuration"
 require "race_condition/client"

data/race_condition-rspec.gemspec

@@ -18,10 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "api_smith"
-
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.99.0"
+  spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "pry"
 end

data/spec/fakes/spec_helper.rb

@@ -1,8 +1,10 @@
 require "race_condition/rspec.rb"
 
-class RaceCondition::Client
-  def report!(project, data)
-    puts data.to_json
+module RaceCondition
+  class Client
+    def report!(project_id, data)
+      puts data.to_json
+    end
   end
 end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: race_condition-rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: api_smith
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: RSpec client for sending test suite results to RaceCondition.