res 1.2.16 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b18b5dab714e0f2047c7cd740180a4a3c06a03e
-  data.tar.gz: 64c203ffe4cdb6f660cc86cccca52b023fb7532d
+  metadata.gz: e495d9220fa374e9c75cf6f694ada1608b8f2fbf
+  data.tar.gz: c6011b3ced7ae736c19486c0bd91d606dcf3252f
 SHA512:
-  metadata.gz: 77e19fe525f1e0985d0dd9f1c316d4bc635e600d8132a5180ffc44c493ab8b1b4243493acefaa1de8baee2461bcfe79553431f31c46146a562aba0f37f3304a2
-  data.tar.gz: 09ab11dd2e4c72979f36c133503c8ce8fa22e84603f1b23e54755d677a80af0d061c7e33bd5336dec977ede0e34c6efaaa9b71d6e5ed1d285f588634252f555d
+  metadata.gz: 2c1d96c99304680bc61fbb37185758459963743db25a4d90c43055245eeab8394d0f1adb1c55ba53638c02701e9f3883c68f54cc00d74144b4313ac72c515915
+  data.tar.gz: db38fc0d05955a148f63579a343345db7810ef0faad169951cc6b6ac1ef3d73dd537e0d0ca42fa7bdd3d70749e0d7e5d370dc94523d42efd256a38fa04dd4a8f

data/README.md

@@ -1,4 +1,5 @@
 # Res
+[![Build Status](https://travis-ci.org/bbc/res.svg?branch=master)](https://travis-ci.org/bbc/res)
 
 Res is a collection of formatting tools for making test 
 result reporting easier and more consistent. The concept is that 

data/bin/res

@@ -149,13 +149,17 @@ if options.reporter
 
       reporter = Res::Reporters::Testmine.new(
           :config_file => options.config_file,
-          :version     => options.version,
+          :url         => options.url,
+          :cert        => options.cert,
+          :cacert      => options.cacert,
           :target      => options.target,
-          :url         => options.url
+          :ssl_verify_mode => options.ssl_verify_mode,
+          :ir          => ir
       )
 
       id = reporter.submit_results(ir)
       puts "Reported to testmine: #{id}"
+
     when 'testrail'
       reporter = Res::Reporters::TestRail.new(
           :config_file => options.config_file,
@@ -166,6 +170,7 @@ if options.reporter
 
       output = reporter.submit_results(ir)
       puts output
+
     when 'lion'
       reporter = Res::Reporters::Lion.new(
           :config_file => options.config_file,

data/lib/res/reporters/testmine.rb

@@ -8,8 +8,8 @@ module Res
 
       def initialize(args)
         @url = args[:url]
-        @config = Res::Config.new([:project, :component, :suite, :version, :url, :target],
-                                  :optional => [:hive_job_id],
+        @config = Res::Config.new([:project, :component, :suite, :url],
+                                  :optional => [:hive_job_id, :version, :target, :cert, :cacert, :ssl_verify_mode],
                                   :pre_env  => 'TESTMINE_')
         config.process(args)
       end
@@ -29,18 +29,23 @@ module Res
         }
 
         # Submit to testmine
+
         uri = URI.parse(config.url)
-        net = Net::HTTP.new(uri.host, uri.port)
-        request = Net::HTTP::Post.new("/api/v1/submit")
-        request.set_form_data({"data" => ir.to_json})
-        net.read_timeout = 60
-        net.open_timeout = 10
-        
-        response = net.start do |http|
-          http.request(request)
+        @http = Net::HTTP.new(uri.host, uri.port)
+        if config.cert
+          pem = File.read(config.cert)
+          @http.use_ssl = true if uri.scheme == 'https'
+          @http.cert = OpenSSL::X509::Certificate.new(pem)
+          @http.key = OpenSSL::PKey::RSA.new(pem)
+          @http.ca_file = config.cacert if config.cacert
+          @http.verify_mode = config.ssl_verify_mode if config.ssl_verify_mode
         end
         
-        response.read_body
+        request = Net::HTTP::Post.new(config.url + "/api/v1/submit")
+        request.content_type = 'application/json'
+        request.set_form_data({"data" => ir.to_json})
+        @http.request(request)
+
       end
 
     end

data/lib/res/version.rb

@@ -1,3 +1,3 @@
 module Res
-  VERSION = '1.2.16'
+  VERSION = '1.2.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Test Result report libraries