cukerail 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcb1e0a9b7c38f50b8804df39b29e0157077591c
-  data.tar.gz: fe105c55011ce966dd6105019bce6d0b9d33824b
+  metadata.gz: bcf11c201ebb1d8a3983d0bf8f80ea5601a8f8d1
+  data.tar.gz: 449e790155052adc1014ecd84fc9ebcffbef8ab5
 SHA512:
-  metadata.gz: 0482e90c13c1e1ac3403c4b531a48a59a5863b15b6a7ed007b6676a3092f793bf991f6bb3310156a75a4d22f00d6ae40fd65ed138f138adde1ffd6b077445268
-  data.tar.gz: bdfd582e2d35f50decab8e2dd35e948a376b6f36af968934741bc43c2fcb23532408d387d6c74b637eaf0c98519b40e2fbf1bb9181a9f8059ba4e8e990bf8b55
+  metadata.gz: 0422b5e13cb506b90f6caaad39065a215fb5139c69c06029de08df2fa68084f9ddb918ee0a6430a03023d5a79760a8e32fc37fffdfabb089d770e87a62bc3464
+  data.tar.gz: 2867d379b4c42b7bd9640fec0cfc4b70cd9a2f6025a8a33da541d10e6207a5d62c6efa1327b5fd582c43bb5a92284223ee00eb1ce8558976197afb023cc78eb5

data/cukerail.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "cucumber", "~> 2.3.2"
+  spec.add_runtime_dependency 'retriable', '~> 2.1'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake","~>10.4"

data/lib/cukerail/testrail.rb

@@ -13,99 +13,101 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 require 'json'
-
+require 'retriable'
 module TestRail
-	class APIClient
-		@url = ''
-		@user = ''
-		@password = ''
+  class APIClient
+    @url = ''
+    @user = ''
+    @password = ''
 
-		attr_accessor :user
-		attr_accessor :password
+    attr_accessor :user
+    attr_accessor :password
 
-		def initialize(base_url,user,password,proxy_url=nil,proxy_port=nil)
-			if !base_url.match(/\/$/)
-				base_url += '/'
-			end
-			@url = base_url + 'index.php?/api/v2/'
+    def initialize(base_url,user,password,proxy_url=nil,proxy_port=nil)
+      if !base_url.match(/\/$/)
+        base_url += '/'
+      end
+      @url = base_url + 'index.php?/api/v2/'
       @user ||=user
       @password ||=password
-			@proxy_url ||= proxy_url
-			@proxy_port ||= proxy_port
-		end
+      @proxy_url ||= proxy_url
+      @proxy_port ||= proxy_port
+    end
+
+    #
+    # Send Get
+    #
+    # Issues a GET request (read) against the API and returns the result
+    # (as Ruby hash).
+    #
+    # Arguments:
+    #
+    # uri                 The API method to call including parameters
+    #                     (e.g. get_case/1)
+    #
+    def send_get(uri) 
+      _send_request('GET', uri, nil)
+    end
 
-		#
-		# Send Get
-		#
-		# Issues a GET request (read) against the API and returns the result
-		# (as Ruby hash).
-		#
-		# Arguments:
-		#
-		# uri                 The API method to call including parameters
-		#                     (e.g. get_case/1)
-		#
-		def send_get(uri) 
-			_send_request('GET', uri, nil)
-		end
+    #
+    # Send POST
+    #
+    # Issues a POST request (write) against the API and returns the result
+    # (as Ruby hash).
+    #
+    # Arguments:
+    #
+    # uri                 The API method to call including parameters
+    #                     (e.g. add_case/1)
+    # data                The data to submit as part of the request (as
+    #                     Ruby hash, strings must be UTF-8 encoded)
+    #
+    def send_post(uri, data)
+      _send_request('POST', uri, data)
+    end
 
-		#
-		# Send POST
-		#
-		# Issues a POST request (write) against the API and returns the result
-		# (as Ruby hash).
-		#
-		# Arguments:
-		#
-		# uri                 The API method to call including parameters
-		#                     (e.g. add_case/1)
-		# data                The data to submit as part of the request (as
-		#                     Ruby hash, strings must be UTF-8 encoded)
-		#
-		def send_post(uri, data)
-			_send_request('POST', uri, data)
-		end
+    private
+    def _send_request(method, uri, data)
+      Retriable.retriable multiplier: 3 do
+        url = URI.parse(@url + uri)
+        if method == 'POST'
+          request = Net::HTTP::Post.new(url.path + '?' + url.query)
+          request.body = JSON.dump(data)
+        else
+          request = Net::HTTP::Get.new(url.path + '?' + url.query)
+        end
+        request.basic_auth(@user, @password)
+        request.add_field('Content-Type', 'application/json')
 
-		private
-		def _send_request(method, uri, data)
-			url = URI.parse(@url + uri)
-			if method == 'POST'
-				request = Net::HTTP::Post.new(url.path + '?' + url.query)
-				request.body = JSON.dump(data)
-			else
-				request = Net::HTTP::Get.new(url.path + '?' + url.query)
-			end
-			request.basic_auth(@user, @password)
-			request.add_field('Content-Type', 'application/json')
+        conn = Net::HTTP.new(url.host, url.port,@proxy_url,@proxy_port)
 
-			conn = Net::HTTP.new(url.host, url.port,@proxy_url,@proxy_port)
+        if url.scheme == 'https'
+          conn.use_ssl = true
+          conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        response = conn.request(request)
 
-			if url.scheme == 'https'
-				conn.use_ssl = true
-				conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
-			end
-			response = conn.request(request)
+        if response.body && !response.body.empty?
+          result = JSON.parse(response.body)
+        else
+          result = {}
+        end
 
-			if response.body && !response.body.empty?
-				result = JSON.parse(response.body)
-			else
-				result = {}
-			end
+        if response.code != '200'
+          if result && result.key?('error')
+            error = '"' + result['error'] + '"'
+          else
+            error = 'No additional error message received'
+          end
+          raise APIError.new('TestRail API returned HTTP %s (%s)' %
+                             [response.code, error])
+        end
 
-			if response.code != '200'
-				if result && result.key?('error')
-					error = '"' + result['error'] + '"'
-				else
-					error = 'No additional error message received'
-				end
-				raise APIError.new('TestRail API returned HTTP %s (%s)' %
-					[response.code, error])
-			end
-			
-			result
-		end
-	end
+        result
+      end
+    end
+  end
 
-	class APIError < StandardError
-	end
+  class APIError < StandardError
+  end
 end

data/lib/cukerail/version.rb

@@ -1,3 +1,3 @@
 module Cukerail
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

data/lib/tasks/cukerail.rake

@@ -1,5 +1,5 @@
 require_relative '../json_sender'
-desc 'load a json results file into a test suite'
+desc 'load a json results file into a test suite, JSON=filename'
 task :load_to_suite do
   raise 'You must have JSON=filename on the command line' unless ENV['JSON']
   json_sender =Cukerail::JsonSender.new(ENV['JSON'])
@@ -20,7 +20,7 @@ task :load_to_suite do
   end
 end
 
-desc 'load a json results file into a test run'
+desc 'load a json results file into a test run TESTRUN=run_number JSON=filename'
 task :load_to_test_run do
   raise 'You must have TESTRUN=testrun_number on the command line' unless ENV['TESTRUN']
   json_sender =Cukerail::JsonSender.new(ENV['JSON'])
@@ -35,7 +35,7 @@ task :load_to_test_run do
   end
 end
 
-desc "remove cases from a test run that are aren't in the json results"
+desc "remove cases from a test run that are aren't in the json results, TESTRUN=run_number JSON=filename"
 task :remove_from_test_run do
   raise 'You must have TESTRUN=testrun_number on the command line' unless ENV['TESTRUN']
   raise 'You must have JSON=filename on the command line' unless ENV['JSON']
@@ -49,11 +49,11 @@ task :remove_from_test_run do
   json_sender.remove_all_except_these_cases_from_testrun(testcase_ids,ENV['TESTRUN'].to_i)
 end
 
-desc "match test run cases to json results file"
+desc "match test run cases to json results file,"
 task match_to_test_run: [:remove_from_test_run,:load_to_test_run] do 
 end
 
-desc "remove cases from a test suite that aren't in the json results"
+desc "remove cases from a test suite that aren't in the json results, TESTRUN=run_number JSON=filename"
 task :remove_from_test_suite do
   raise 'You must have JSON=filename on the command line' unless ENV['JSON']
   json_sender =Cukerail::JsonSender.new(ENV['JSON'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cukerail
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - John Small
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement