Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ start_demo_gprc_consumer:
ruby examples/area_calculator/area_calculator_consumer_run.rb

verify_demo_gprc_local:
TEST_COMMAND='pact/verifier/pact_verifier_cli -f examples/area_calculator/pacts/grpc-consumer-ruby-area-calculator-provider.json -p 37757 -l info' \
TEST_COMMAND='pact/standalone/pact/bin/pact_verifier_cli -f examples/area_calculator/pacts/grpc-consumer-ruby-area-calculator-provider.json -p 37757 -l info' \
make start_server_and_test

start_broker:
Expand All @@ -77,7 +77,7 @@ publish_pacts:


verify_demo_gprc_publish_broker:
TEST_COMMAND="pact/verifier/pact_verifier_cli \
TEST_COMMAND="pact/standalone/pact/bin/pact_verifier_cli \
-f pacts/grpc-consumer-ruby-area-calculator-provider.json \
-p 37757 \
-l info \
Expand All @@ -88,7 +88,7 @@ verify_demo_gprc_publish_broker:
./start_server_and_test.sh

verify_demo_gprc_fetch_broker:
TEST_COMMAND="pact/verifier/pact_verifier_cli \
TEST_COMMAND="pact/standalone/pact/bin/pact_verifier_cli \
-p 37757 \
-l debug \
--publish \
Expand Down
2 changes: 1 addition & 1 deletion lib/pact/ffi/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Pact
module Version
VERSION = '0.4.26.0'
VERSION = '0.4.28.0'
end
end
1 change: 1 addition & 0 deletions pact-ffi.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'rake'
spec.add_development_dependency 'rspec', '~> 3.0'
spec.add_development_dependency 'webrick', '~> 1.8'
spec.add_development_dependency 'csv'
spec.add_dependency 'ffi', '~> 1.15'
end
4 changes: 1 addition & 3 deletions script/download-all-libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the

. "${SCRIPT_DIR}/lib/export-binary-versions.sh"
"${SCRIPT_DIR}/lib/download-ffi.sh"
"${SCRIPT_DIR}/lib/download-standalone.sh"
"${SCRIPT_DIR}/lib/download-plugin-cli.sh"
"${SCRIPT_DIR}/lib/download-verifier-cli.sh"
"${SCRIPT_DIR}/lib/download-standalone.sh"
4 changes: 1 addition & 3 deletions script/download-libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the

. "${SCRIPT_DIR}/lib/export-binary-versions.sh"
"${SCRIPT_DIR}/lib/download-ffi-only-os-dependant.sh"
"${SCRIPT_DIR}/lib/download-standalone.sh"
"${SCRIPT_DIR}/lib/download-plugin-cli.sh"
"${SCRIPT_DIR}/lib/download-verifier-cli.sh"
"${SCRIPT_DIR}/lib/download-standalone.sh"
2 changes: 1 addition & 1 deletion script/lib/download-ffi-only-os-dependant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ case ${detected_os} in
os='win32'
;;
*)
echo "Sorry, you'll need to install the pact-ruby-standalone manually."
echo "Sorry, you'll need to install the pact-standalone manually."
echo "or add your os to the list"
exit 1
;;
Expand Down
112 changes: 0 additions & 112 deletions script/lib/download-plugin-cli.sh

This file was deleted.

4 changes: 2 additions & 2 deletions script/lib/download-standalone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require_binary curl
require_binary unzip
require_env_var STANDALONE_VERSION

BASEURL=https://github.com/pact-foundation/pact-ruby-standalone/releases/download
BASEURL=https://github.com/pact-foundation/pact-standalone/releases/download
STANDALONE_DIR="${LIB_DIR}/../../pact/standalone"

function download_standalone {
Expand Down Expand Up @@ -71,7 +71,7 @@ case ${detected_os} in
download_standalone "pact-${STANDALONE_VERSION}-windows-x86_64.zip" "windows-x64-${STANDALONE_VERSION}.zip"
;;
*)
echo "Sorry, you'll need to install the pact-ruby-standalone manually."
echo "Sorry, you'll need to install the pact-standalone manually."
echo "or add your os to the list"
exit 1
;;
Expand Down
112 changes: 0 additions & 112 deletions script/lib/download-verifier-cli.sh

This file was deleted.

8 changes: 2 additions & 6 deletions script/lib/export-binary-versions.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#!/bin/bash -eu
LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the script is running
PROJECT_DIR="${LIB_DIR}"/../../
export FFI_VERSION=v0.4.26
export STANDALONE_VERSION=2.4.20
export PLUGIN_CLI_VERSION=v0.1.3
export VERIFIER_CLI_VERSION=v1.1.4
# export STANDALONE_VERSION=$(grep "PACT_STANDALONE_VERSION = '" "$PROJECT_DIR"/standalone/install.ts | grep -E -o "'(.*)'" | cut -d"'" -f2)
# export FFI_VERSION=v$(grep "PACT_FFI_VERSION = '" "$PROJECT_DIR"/src/ffi/index.ts | grep -E -o "'(.*)'" | cut -d"'" -f2)
export FFI_VERSION=v0.4.28
export STANDALONE_VERSION=2.5.2
Loading