res 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcf73c2d31e4a4a6efe8416ab4a55578d9aa5917
-  data.tar.gz: b97d9c7d2861c7d38cc21b538edc8bf7fb0b4ba7
+  metadata.gz: 397c8eaa87c2580e7614f5cffbecb68002b49918
+  data.tar.gz: bf6cbb9371ce3a37f97ad4f312343024723bf602
 SHA512:
-  metadata.gz: cceb20237589a154257dbeec297d8a538a9c75f2261a1c2d2d817d76fd016bf70a33710ee66e42f3ae4e1ddf8e5e265e9613e17594566d7db8d96a79738569e3
-  data.tar.gz: 63d21f4d44a2210595d374f2d4f6004145374b5f3e935c128b3750779731d0afd8b4dafac44da401a2edb2f05ef4e9c2ffb21c8e8b4ede45a492d96b95095e29
+  metadata.gz: b2da6b94daacf555737a09118713510f2335095f2b5cad63f09e57149ee93939ffdcf70da43cb8b0d7cc11a80f11150d57723f31e396032907c4db04125891f3
+  data.tar.gz: 2e1d7b1350423779a1e8210483d65922747cc58bb249f5f7a6d9315b6503797d0e6206993b9f336a7685caa6d728be1ec22f1a94ecc819825b629cabe077ff40

data/bin/res

@@ -170,6 +170,9 @@ if options.reporter
       reporter = Res::Reporters::Lion.new(
           :config_file => options.config_file,
           :url         => options.url,
+          :cert        => options.cert,
+          :cacert      => options.cacert,
+          :ssl_verify_mode => options.ssl_verify_mode,
           :ir          => ir
       )
 

data/lib/res/reporters/lion.rb

@@ -9,7 +9,7 @@ module Res
       def initialize(args)
         @url = args[:url]
         @config = Res::Config.new([:url, :tag, :description, :app_name],
-                                  :optional => [:hive_job_id, :queue],
+                                  :optional => [:hive_job_id, :queue, :cert, :cacert, :ssl_verify_mode],
                                   :pre_env  => 'LION_')
         config.process(args)
       end
@@ -37,17 +37,24 @@ module Res
           :status => status,
           :perf_values => values.compact!
         }
+        
+        
         uri = URI.parse(config.url)
-        net = Net::HTTP.new(uri.host, uri.port)
-        request = Net::HTTP::Post.new("/import")
-        request.set_form_data(lion_data)
-
-        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
+        
+        request = Net::HTTP::Post.new(config.url + "/import")
+        request.content_type = 'application/json'
+        request.body = lion_data.to_json
+
+        @http.request(request)
       end
 
     end

data/lib/res/version.rb

@@ -1,3 +1,3 @@
 module Res
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-12 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.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Test Result report libraries