assertthat-bdd 1.1.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90d148c2e22d1110f6c61b513c36fc64428710ab22d83dd93c1ae8c89419163e
-  data.tar.gz: c83dd62a77345624400751fc1ad00396c84205e76d5d2223715c4f62db2d7d02
+  metadata.gz: 4e15b2d3b006bf3f512e0500d0010f24a60334b73de44778f2a56d1d77cf1a58
+  data.tar.gz: 5c7a16d25c2944e5c9805fc9034aab2665d79a028e2cab2cd9dd45e5f9d42b2c
 SHA512:
-  metadata.gz: 865042a3aa9b8c0ea0ae182711d61c60724def7c0750b69e5881dc69c0941ee1d1f557dcaefadf6bb1d8785c51b7e5577fc06eaeb777d210d5bc457af4943aca
-  data.tar.gz: 13e6ba610abcdddaea4b0b7449e2f1b4d038d5526a879a7296ad79a7bf96070efe4b3df32ea6c326fa77889bf1b399e57fe976badac59223e831a186d9dd9d8e
+  metadata.gz: db72766225400afb9e6fdcef3fb477b766d7cfe612be5e9252d24e95e84eff9ab5ed9237c92e4f0e67c0ba476f0f845a5eb4edb25d711c5d23c06a7d68d9eaf4
+  data.tar.gz: 1d62e0b8393dcead620285101149a3f4aa3b21f09f07f910a10df0d01840c72dccda38b5817f2b078b700700111980c4ed0be3b1d84b85439a51be43397d262c

data/bin/assertthat-bdd-features

@@ -1,31 +1,33 @@
-#!/usr/bin/env ruby
-require 'assertthat-bdd'
-require 'optparse'
-
-VERSION = '1.0.2'
-
-options = {}
-OptionParser.new do |opt|
-  opt.on('-a','--accessKey ACCESS_KEY', 'Access key same as env variable ASSERTTHAT_ACCESS_KEY') { |o| options[:accessKey] = o }
-  opt.on('-s','--secretKey SECRET_KEY', 'Secret key same as env variable ASSERTTHAT_SECRET_KEY') { |o| options[:secretKey] = o }
-  opt.on('-p','--projectId PROJECT_ID', 'Jira project id') { |o| options[:projectId] = o }
-  opt.on('-o','--outputFolder OUTPUT_FOLDER', 'Featured output folder - default ./features') { |o| options[:outputFolder] = o }
-  opt.on('-m','--mode MODE', 'Mode one of automated,manual,both - deafult automated') { |o| options[:mode] = o }
-  opt.on('-j','--jql JQL_FILTER', 'Jql issues filter') { |o| options[:jql] = o }
-  opt.on('-x','--proxy PROXY_URL', 'proxy url to connect to Jira') { |o| options[:proxy] = o }
-  opt.on_tail('-h', '--help', 'Show help') do
-  	puts opt
-  	exit
-  end
-  opt.on_tail('-v','--version', 'Show version') do
-  	puts VERSION
-    exit
-  end
-end.parse!
-
-raise OptionParser::MissingArgument, "'projectId' option is not specified" if options[:projectId].nil?
-
-AssertThatBDD::Features.download(options)
-
- 
+#!/usr/bin/env ruby
+require 'assertthat-bdd'
+require 'optparse'
+
+VERSION = '1.2.0'
+
+options = {}
+OptionParser.new do |opt|
+  opt.on('-a','--accessKey ACCESS_KEY', 'Access key same as env variable ASSERTTHAT_ACCESS_KEY') { |o| options[:accessKey] = o }
+  opt.on('-s','--secretKey SECRET_KEY', 'Secret key same as env variable ASSERTTHAT_SECRET_KEY') { |o| options[:secretKey] = o }
+  opt.on('-u','--jiraServerUrl SERVER_URL', 'Jira server URL') { |o| options[:jiraServerUrl] = o }
+  opt.on('-p','--projectId PROJECT_ID', 'Jira project id') { |o| options[:projectId] = o }
+  opt.on('-o','--outputFolder OUTPUT_FOLDER', 'Featured output folder - default ./features') { |o| options[:outputFolder] = o }
+  opt.on('-m','--mode MODE', 'Mode one of automated,manual,both - deafult automated') { |o| options[:mode] = o }
+  opt.on('-t','--tags <tag-expression>', 'Cucucmber tag expression for scenarios filtering') { |o| options[:tags] = o }
+  opt.on('-j','--jql JQL_FILTER', 'Jql issues filter') { |o| options[:jql] = o }
+  opt.on('-x','--proxy PROXY_URL', 'proxy url to connect to Jira') { |o| options[:proxy] = o }
+  opt.on_tail('-h', '--help', 'Show help') do
+  	puts opt
+  	exit
+  end
+  opt.on_tail('-v','--version', 'Show version') do
+  	puts VERSION
+    exit
+  end
+end.parse!
+
+raise OptionParser::MissingArgument, "'projectId' option is not specified" if options[:projectId].nil?
+
+AssertThatBDD::Features.download(options)
+
+ 
   

data/bin/assertthat-bdd-report

@@ -1,30 +1,31 @@
-#!/usr/bin/env ruby
-require 'assertthat-bdd'
-require 'optparse'
-
-VERSION = '1.0.2'
-
-options = {}
-OptionParser.new do |opt|
-  opt.on('-a','--accessKey ACCESS_KEY', 'Access key same as env variable ASSERTTHAT_ACCESS_KEY') { |o| options[:accessKey] = o }
-  opt.on('-s','--secretKey SECRET_KEY', 'Secret key same as env variable ASSERTTHAT_SECRET_KEY') { |o| options[:secretKey] = o }
-  opt.on('-p', '--projectId PROJECT_ID', 'Jira project id') { |o| options[:projectId] = o }
-  opt.on('-n','--runName RUN_NAME', 'The name of the run - default \'Test run dd MMM yyyy HH:mm:ss\'') { |o| options[:runName] = o }
-  opt.on('-f','--jsonReportFolder JSON_FOLDER_PATH', 'Json report folder - default ./reports') { |o| options[:mode] = o }
-  opt.on('-i','--jsonReportIncludePattern INCLUDE_REGEX', 'Regex to search for cucumber reports - default .*.json') { |o| options[:jql] = o }
-  opt.on('-x','--proxy PROXY_URL', 'proxy url to connect to Jira') { |o| options[:proxy] = o }
-  opt.on_tail('-h', '--help', 'Show help') do
-  	puts opt
-  	exit
-  end
-  opt.on_tail('-v','--version', 'Show version') do
-  	puts VERSION
-    exit
-  end
-end.parse!
-
-raise OptionParser::MissingArgument, "'projectId' option is not specified" if options[:projectId].nil?
-
-AssertThatBDD::Report.upload(options)
-
-
+#!/usr/bin/env ruby
+require 'assertthat-bdd'
+require 'optparse'
+
+VERSION = '1.2.0'
+
+options = {}
+OptionParser.new do |opt|
+  opt.on('-a','--accessKey ACCESS_KEY', 'Access key same as env variable ASSERTTHAT_ACCESS_KEY') { |o| options[:accessKey] = o }
+  opt.on('-s','--secretKey SECRET_KEY', 'Secret key same as env variable ASSERTTHAT_SECRET_KEY') { |o| options[:secretKey] = o }
+  opt.on('-u','--jiraServerUrl SERVER_URL', 'Jira server URL') { |o| options[:jiraServerUrl] = o }
+  opt.on('-p', '--projectId PROJECT_ID', 'Jira project id') { |o| options[:projectId] = o }
+  opt.on('-n','--runName RUN_NAME', 'The name of the run - default \'Test run dd MMM yyyy HH:mm:ss\'') { |o| options[:runName] = o }
+  opt.on('-f','--jsonReportFolder JSON_FOLDER_PATH', 'Json report folder - default ./reports') { |o| options[:mode] = o }
+  opt.on('-i','--jsonReportIncludePattern INCLUDE_REGEX', 'Regex to search for cucumber reports - default .*.json') { |o| options[:jql] = o }
+  opt.on('-x','--proxy PROXY_URL', 'proxy url to connect to Jira') { |o| options[:proxy] = o }
+  opt.on_tail('-h', '--help', 'Show help') do
+  	puts opt
+  	exit
+  end
+  opt.on_tail('-v','--version', 'Show version') do
+  	puts VERSION
+    exit
+  end
+end.parse!
+
+raise OptionParser::MissingArgument, "'projectId' option is not specified" if options[:projectId].nil?
+
+AssertThatBDD::Report.upload(options)
+
+

data/lib/assertthat-bdd.rb

@@ -1,92 +1,99 @@
-require 'rest-client'
-require 'zip'
-require 'find'
-require 'json'
-
-module AssertThatBDD
-  class Features
-    def self.download(accessKey: ENV['ASSERTTHAT_ACCESS_KEY'], secretKey: ENV['ASSERTTHAT_ACCESS_KEY'], projectId: nil, outputFolder: './features/', proxy: nil, mode: 'automated', jql: '')
-		RestClient.proxy = proxy unless proxy.nil?
-		url = 'https://bdd.assertthat.app/rest/api/1/project/'+ projectId +'/features'
-		resource = RestClient::Resource.new(url, :user => accessKey, :password => secretKey, :content_type => 'application/zip')
-		begin
-			contents = resource.get(:accept => 'application/zip', params: {mode: mode, jql: jql})
-	    rescue => e
-	    	 
-	  			if e.respond_to?('response') then
-		          if e.response.respond_to?('code') then
-		            case e.response.code
-		              when 401
-		                puts '*** ERROR: Unauthorized error (401). Supplied secretKey/accessKey is invalid'
-		              when 400
-		                puts '*** ERROR: ' + e.response		          
-		              when 500
-		                puts '*** ERROR: Jira server error (500)'
-		            end
-		          end
-		        else
-		        	puts '*** ERROR: Failed download features: ' + e.message
-		        end
-				return
-		end
-		Dir.mkdir("#{outputFolder}") unless File.exists?("#{outputFolder}")
-		File.open("#{outputFolder}/features.zip", 'wb') {|f| f.write(contents) }
-		features_count = 0
-		Zip::File.open("#{outputFolder}/features.zip") do |zip_file|
-		  zip_file.each do |entry|
-		  	features_count = features_count + 1
-			File.delete("#{outputFolder}#{entry.name}") if File.exists?("#{outputFolder}#{entry.name}")
-			entry.extract("#{outputFolder}#{entry.name}")
-		  end
-		end
-		puts "*** INFO: #{features_count} features downloaded"
-		File.delete("#{outputFolder}/features.zip")
-	end
-  end
-  
-  class Report
-    def self.upload(accessKey: ENV['ASSERTTHAT_ACCESS_KEY'], secretKey: ENV['ASSERTTHAT_ACCESS_KEY'], projectId: nil, runName: 'Test run '+Time.now.strftime("%d %b %Y %H:%M:%S"), jsonReportFolder: './reports', jsonReportIncludePattern: '.*.json'  )
-    	url = "https://bdd.assertthat.app/rest/api/1/project/" + projectId + "/report"
-    	files = Find.find(jsonReportFolder).grep(/#{jsonReportIncludePattern}/)
-    	puts "*** INFO: #{files.count} files found matching parretn #{jsonReportIncludePattern}:"
-    	puts "*** INFO: #{files}"
-    	runId = -1
-    	files.each do |f|
-			request = RestClient::Request.new(
-	         	:method => :post,
-	         	:url => url,
-	         	:user => accessKey,
-	         	:password => secretKey,
-	         	:payload => {
-		            :multipart => true,
-		            :file => File.new(f, 'rb')
-	        	},
-	        	:headers => { :params =>{:runName => runName, :runId=> runId}}
-        	)      
-        	begin
-	  			response = request.execute 
-	  		rescue => e
-	  			if e.respond_to?('response') then
-		          if e.response.respond_to?('code') then
-		            case e.response.code
-		              when 401
-		                puts '*** ERROR: Unauthorized error (401). Supplied secretKey/accessKey is invalid'
-		              when 500
-		                puts '*** ERROR: Jira server error (500)'
-		            end
-		          end
-		        else
-		        	puts "*** ERROR: Failed to submit json #{f}: " + e.message
-		        end
-				return
-			end
-			resposne_json = JSON.parse(response)
-			if resposne_json['result'] == 'success'
-				runId = resposne_json['runId']
-			else
-			    puts "*** ERROR: Failed to submit json #{f}: " + resposne_json['message']
-			end	
-		end
-    end
-  end  
-end
+require 'rest-client'
+require 'zip'
+require 'find'
+require 'json'
+
+module AssertThatBDD
+  class Features
+    def self.download(accessKey: ENV['ASSERTTHAT_ACCESS_KEY'], secretKey: ENV['ASSERTTHAT_ACCESS_KEY'], projectId: nil, outputFolder: './features/', proxy: nil, mode: 'automated', jql: '', tags: '', jiraServerUrl: nil)
+		RestClient.proxy = proxy unless proxy.nil?
+		url = ['https://heavy-bat-23.loca.lt/rest/api/1/project/', projectId, '/features'].map(&:to_s).join('')
+		url = [jiraServerUrl,"/rest/assertthat/latest/project/",projectId,"/client/features"].map(&:to_s).join('') unless jiraServerUrl.nil?
+		resource = RestClient::Resource.new(url, :user => accessKey, :password => secretKey, :content_type => 'application/zip')
+		begin
+			resource.get(:accept => 'application/zip', params: {mode: mode, jql: jql, tags: tags}) do |response, request, result|
+			Dir.mkdir("#{outputFolder}") unless File.exists?("#{outputFolder}")
+			File.open("#{outputFolder}/features.zip", 'wb') {|f| f.write(response) }
+			features_count = 0
+			Zip::File.open("#{outputFolder}/features.zip") do |zip_file|
+			zip_file.each do |entry|
+				features_count = features_count + 1
+				File.delete("#{outputFolder}#{entry.name}") if File.exists?("#{outputFolder}#{entry.name}")
+				entry.extract("#{outputFolder}#{entry.name}")
+			end
+			if response.headers.member?('features_count'.to_sym) and response.headers.member?('scenarios_count'.to_sym) then
+				puts "*** INFO: #{response.headers['features_count'.to_sym]} features downloaded with #{response.headers['scenarios_count'.to_sym]} scenarios"
+			else
+				puts "*** INFO: #{features_count} features downloaded"
+			end
+			File.delete("#{outputFolder}/features.zip")
+	    rescue => e
+	    	 
+	  			if e.respond_to?('response') then
+					if e.response.respond_to?('code') then
+		            case e.response.code
+		              when 401
+		                puts '*** ERROR: Unauthorized error (401). Supplied secretKey/accessKey is invalid'
+		              when 400
+		                puts '*** ERROR: ' + e.response		          
+		              when 500
+		                puts '*** ERROR: Jira server error (500)'
+		            end
+		          end
+				  else
+		        	puts '*** ERROR: Failed download features: ' + e.message
+		        end
+				return
+		end
+		end
+		end
+	end
+  end
+  
+  class Report
+    def self.upload(accessKey: ENV['ASSERTTHAT_ACCESS_KEY'], secretKey: ENV['ASSERTTHAT_ACCESS_KEY'], projectId: nil, runName: 'Test run '+Time.now.strftime("%d %b %Y %H:%M:%S"), jsonReportFolder: './reports', jsonReportIncludePattern: '.*.json', jiraServerUrl: nil  )
+		url = "https://bdd.assertthat.app/rest/api/1/project/" + projectId + "/report"
+		url = jiraServerUrl+"/rest/assertthat/latest/project/"+projectId+"/client/report" unless jiraServerUrl.nil?
+    	files = Find.find(jsonReportFolder).grep(/#{jsonReportIncludePattern}/)
+    	puts "*** INFO: #{files.count} files found matching parretn #{jsonReportIncludePattern}:"
+    	puts "*** INFO: #{files}"
+    	runId = -1
+    	files.each do |f|
+			request = RestClient::Request.new(
+	         	:method => :post,
+	         	:url => url,
+	         	:user => accessKey,
+	         	:password => secretKey,
+	         	:payload => {
+		            :multipart => true,
+		            :file => File.new(f, 'rb')
+	        	},
+	        	:headers => { :params =>{:runName => runName, :runId=> runId}}
+        	)      
+        	begin
+	  			response = request.execute 
+	  		rescue => e
+	  			if e.respond_to?('response') then
+		          if e.response.respond_to?('code') then
+		            case e.response.code
+		              when 401
+		                puts '*** ERROR: Unauthorized error (401). Supplied secretKey/accessKey is invalid'
+		              when 500
+		                puts '*** ERROR: Jira server error (500)'
+		            end
+		          end
+		        else
+		        	puts "*** ERROR: Failed to submit json #{f}: " + e.message
+		        end
+				return
+			end
+			resposne_json = JSON.parse(response)
+			if resposne_json['result'] == 'success'
+				runId = resposne_json['runId']
+			else
+			    puts "*** ERROR: Failed to submit json #{f}: " + resposne_json['message']
+			end	
+		end
+    end
+  end  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assertthat-bdd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Glib Briia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -50,7 +50,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: 
+description:
 email: glib@assertthat.com
 executables:
 - assertthat-bdd-features
@@ -65,7 +65,7 @@ homepage: https://rubygems.org/gems/assertthat-bdd
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,9 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: AssertThat bdd integration for Ruby
 test_files: []