feat: add native extension support, update rust tools, rename osx to macos

Author: YOU54F

DEVELOPING.md

@@ -10,15 +10,15 @@ pact-standalone is packaged with `traveling-ruby`
 
 For macOS - it will build for arm64 or x86_64 depending on your processor
 
-    cd osx
+    cd macos
     rake stash_conflicting_paths
     rake --trace
     rake unstash_conflicting_paths
 
 For macOS x86_64 on an m1 machine
 
     sudo softwareupdate --install-rosetta --agree-to-license
-    cd osx
+    cd macos
     rake stash_conflicting_paths
     arch -x86_64 rake --trace
     rake unstash_conflicting_paths
@@ -80,8 +80,8 @@ Build only selected platforms
 
     bundle exec rake package:linux:arm64
     bundle exec rake package:linux:x64
-    bundle exec rake package:osx:arm64
-    bundle exec rake package:osx:x64
+    bundle exec rake package:macos:arm64
+    bundle exec rake package:macos:x64
     bundle exec rake package:windows:x64
     bundle exec rake package:windows:x86
 
@@ -99,12 +99,12 @@ Build only selected platforms
     # download_runtime(TRAVELING_RUBY_VERSION, "linux-arm64")
     end
 
-    file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx-x86_64.tar.gz" do
-    # download_runtime(TRAVELING_RUBY_VERSION, "osx-x86_64")
+    file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-macos-x86_64.tar.gz" do
+    # download_runtime(TRAVELING_RUBY_VERSION, "macos-x86_64")
     end
 
-    file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx-arm64.tar.gz" do
-    # download_runtime(TRAVELING_RUBY_VERSION, "osx-arm64")
+    file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-macos-arm64.tar.gz" do
+    # download_runtime(TRAVELING_RUBY_VERSION, "macos-arm64")
     end
 
     file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-windows-x86_64.tar.gz" do
@@ -130,8 +130,8 @@ Build only selected platforms
 
 | OS     | Ruby      | Architecture | Supported |
 | -------| ------- | ------------ | --------- |
-| OSX    | 3.3.9     | x86_64       | ✅         |
-| OSX    | 3.3.9     | aarch64 (arm)| ✅         |
+| macos    | 3.3.9     | x86_64       | ✅         |
+| macos    | 3.3.9     | aarch64 (arm)| ✅         |
 | Linux  | 3.3.9   | x86_64       | ✅         |
 | Linux  | 3.3.9   | aarch64 (arm)| ✅          |
 | Windows| 3.3.9 | x86_64       | ✅        |

README.md

@@ -29,10 +29,10 @@ Binaries will be extracted into `pact/bin`:
 ├── pact (central entry point to all binaries)
 ├── pact-broker
 ├── pactflow
-├── pact_mock_server_cli
+├── pact-mock-server
 ├── pact-stub-server
-├── pact_verifier_cli
-├── pact-plugin-cli
+├── pact-verifier-cli
+├── pact-plugin
 ├── pact-message (legacy)
 ├── pact-mock-service (legacy)
 ├── pact-provider-verifier (legacy)
@@ -54,7 +54,7 @@ Please append `.exe` to any of the provided rust based binaries
 eg.
 
 ```ps1
-  .\pact\bin\pact_mock_server_cli.exe
+  .\pact\bin\pact-mock-server.exe
 ```
 
 ## Installation

install.sh

@@ -45,16 +45,16 @@ case $(uname -sm) in
   ;;
 'Darwin arm64')
   if [ "$MAJOR_PACT_CLI_VERSION" -lt 2 ]; then
-    os='osx'
+    os='macos'
   else
-    os='osx-arm64'
+    os='macos-arm64'
   fi
   ;;
 'Darwin x86' | 'Darwin x86_64')
   if [ "$MAJOR_PACT_CLI_VERSION" -lt 2 ]; then
-    os='osx'
+    os='macos'
   else
-    os='osx-x86_64'
+    os='macos-x86_64'
   fi
   ;;
 "Windows"* | "MINGW64"*)
@@ -74,7 +74,7 @@ case $os in
 'windows'* | 'win32')
   filename="pact-${PACT_CLI_VERSION#v}-${os}.zip"
   ;;
-'osx'* | 'linux'*)
+'macos'* | 'linux'*)
   filename="pact-${PACT_CLI_VERSION#v}-${os}.tar.gz"
   ;;
 esac
@@ -87,7 +87,7 @@ case $os in
 'windows'* | 'win32')
   (unzip "${filename}" && echo unarchived "${filename}") || (echo "Sorry, you'll need to unarchived the pact-standalone manually." && exit 1)
   ;;
-'osx'* | 'linux'*)
+'macos'* | 'linux'*)
   (tar xzf "${filename}" && echo unarchived "${filename}") || (echo "Sorry, you'll need to unarchived the pact-standalone manually." && exit 1)
   ;;
 esac

packaging/Gemfile

@@ -5,11 +5,10 @@ gem "pact-message", "0.11.1"
 gem "pact-mock_service", "3.12.4"
 gem "pact-provider-verifier", "1.39.1"
 gem "pact_broker-client", "1.77.0"
-gem "webrick", "1.9.1"
-# see https://stdgems.org/ for versions to lock to
-# we require gem locking for gems with native extensions
-# due to lack of windows support
-gem "json", "2.7.2"
-gem "bigdecimal", "3.1.5"
-gem "fiddle", "1.1.2"
-gem "io-console", "0.7.1"
+gem "webrick", "1.9.2"
+# locked to native extensions supported by traveling-ruby
+# https://github.com/trubygems/traveling-ruby/releases/tag/rel-20251122
+gem "json", "2.16.0"
+gem "bigdecimal", "3.3.1"
+gem "fiddle", "1.1.8"
+gem "io-console", "0.8.1"

packaging/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     awesome_print (1.9.2)
     base64 (0.3.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.3.1)
     csv (3.3.5)
     diff-lcs (1.6.2)
     dig_rb (1.0.1)
@@ -17,14 +17,14 @@ GEM
       net-http (~> 0.5)
     faraday-retry (2.4.0)
       faraday (~> 2.0)
-    fiddle (1.1.2)
+    fiddle (1.1.8)
     find_a_port (1.0.1)
     httparty (0.24.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    io-console (0.7.1)
-    json (2.7.2)
+    io-console (0.8.1)
+    json (2.16.0)
     jsonpath (1.1.5)
       multi_json
     logger (1.7.0)
@@ -138,7 +138,7 @@ GEM
       readline
       sync
     uri (1.1.1)
-    webrick (1.9.1)
+    webrick (1.9.2)
     zeitwerk (2.7.4)
 
 PLATFORMS
@@ -158,16 +158,16 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bigdecimal (= 3.1.5)
-  fiddle (= 1.1.2)
-  io-console (= 0.7.1)
-  json (= 2.7.2)
+  bigdecimal (= 3.3.1)
+  fiddle (= 1.1.8)
+  io-console (= 0.8.1)
+  json (= 2.16.0)
   pact (= 1.67.3)
   pact-message (= 0.11.1)
   pact-mock_service (= 3.12.4)
   pact-provider-verifier (= 1.39.1)
   pact_broker-client (= 1.77.0)
-  webrick (= 1.9.1)
+  webrick (= 1.9.2)
 
 BUNDLED WITH
-   2.5.18
+   2.5.22

packaging/README.md.template

@@ -29,10 +29,10 @@ Binaries will be extracted into `pact/bin`:
 ├── pact (central entry point to all binaries)
 ├── pact-broker
 ├── pactflow
-├── pact_mock_server_cli
+├── pact-mock-server
 ├── pact-stub-server
-├── pact_verifier_cli
-├── pact-plugin-cli
+├── pact-verifier-cli
+├── pact-plugin
 ├── pact-message (legacy)
 ├── pact-mock-service (legacy)
 ├── pact-provider-verifier (legacy)
@@ -54,7 +54,7 @@ Please append `.exe` to any of the provided rust based binaries
 eg.
 
 ```ps1
-  .\pact\bin\pact_mock_server_cli.exe
+  .\pact\bin\pact-mock-server.exe
 ```
 
 ## Installation

packaging/RELEASE_NOTES.md.template

@@ -15,15 +15,15 @@ curl -fsSL https://raw.githubusercontent.com/pact-foundation/pact-standalone/mas
 #### x86_64
 
 ```
-curl -LO https://github.com/pact-foundation/pact-standalone/releases/download/<TAG_NAME>/pact-<PACKAGE_VERSION>-osx-x86_64.tar.gz
-tar xzf pact-<PACKAGE_VERSION>-osx-x86_64.tar.gz
+curl -LO https://github.com/pact-foundation/pact-standalone/releases/download/<TAG_NAME>/pact-<PACKAGE_VERSION>-macos-x86_64.tar.gz
+tar xzf pact-<PACKAGE_VERSION>-macos-x86_64.tar.gz
 ```
 
 #### arm64
 
 ```
-curl -LO https://github.com/pact-foundation/pact-standalone/releases/download/<TAG_NAME>/pact-<PACKAGE_VERSION>-osx-arm64.tar.gz
-tar xzf pact-<PACKAGE_VERSION>-osx-arm64.tar.gz
+curl -LO https://github.com/pact-foundation/pact-standalone/releases/download/<TAG_NAME>/pact-<PACKAGE_VERSION>-macos-arm64.tar.gz
+tar xzf pact-<PACKAGE_VERSION>-macos-arm64.tar.gz
 ```
 
 ### Linux

packaging/pact.rb

@@ -45,19 +45,19 @@
   PactBroker::Client::CLI::Broker.start
 when 'plugin'
       ARGV.shift
-      output = `#{File.expand_path("../../bin/pact-plugin-cli", __dir__)} #{ARGV.join(" ")}`
+      output = `#{File.expand_path("../../bin/pact-plugin", __dir__)} #{ARGV.join(" ")}`
       exit_status = $?.exitstatus
       puts output
       exit(exit_status)
 when 'verifier'
       ARGV.shift
-      output = `#{File.expand_path("../../bin/pact_verifier_cli", __dir__)} #{ARGV.join(" ")}`
+      output = `#{File.expand_path("../../bin/pact-verifier", __dir__)} #{ARGV.join(" ")}`
       exit_status = $?.exitstatus
       puts output
       exit(exit_status)
 when 'mock-server'
       ARGV.shift
-      IO.popen([File.expand_path("../../bin/pact_mock_server_cli", __dir__), *ARGV], err: [:child, :out]) do |io|
+      IO.popen([File.expand_path("../../bin/pact-mock-server", __dir__), *ARGV], err: [:child, :out]) do |io|
         while (line = io.gets)
           $stdout.write(line)
         end

script/test.sh

@@ -10,11 +10,11 @@ FILE_EXT=${FILE_EXT:-}
 if [ "$BINARY_OS" == "" ] || [ "$BINARY_ARCH" == "" ] ; then 
     case ${detected_os} in
     'Darwin arm64')
-        BINARY_OS=osx
+        BINARY_OS=macos
         BINARY_ARCH=arm64
         ;;
     'Darwin x86' | 'Darwin x86_64' | "Darwin"*)
-        BINARY_OS=osx
+        BINARY_OS=macos
         BINARY_ARCH=x86_64
         ;;
     "Linux aarch64"* | "Linux arm64"*)
@@ -47,18 +47,18 @@ tools=(
   pact-provider-verifier
   pact-stub-service
   pactflow
-  pact-plugin-cli
+  pact-plugin
   pact-stub-server
-  pact_verifier_cli
-  pact_mock_server_cli
+  pact-verifier-cli
+  pact-mock-server
 )
 
 test_cmd=""
 for tool in ${tools[@]}; do
   echo testing $tool
   if [ "$BINARY_OS" = "windows" ] ; then FILE_EXT=.bat; fi
-  if [ "$BINARY_OS" = "windows" ] && ([ "$tool" = "pact-plugin-cli" ] || [ "$tool" = "pact-stub-server" ] || [ "$tool" = "pact_verifier_cli" ] || [ "$tool" = "pact_mock_server_cli" ]) ; then  FILE_EXT=.exe ; fi
-  if [ "$tool" = "pact_verifier_cli" ] || [ "$tool" = "pact-mock-service" ]; then  test_cmd="--help" ; fi
+  if [ "$BINARY_OS" = "windows" ] && ([ "$tool" = "pact-plugin" ] || [ "$tool" = "pact-stub-server" ] || [ "$tool" = "pact-verifier-cli" ] || [ "$tool" = "pact-mock-server" ]) ; then  FILE_EXT=.exe ; fi
+  if [ "$tool" = "pact-verifier-cli" ] || [ "$tool" = "pact-mock-service" ]; then  test_cmd="--help" ; fi
   echo executing ${tool}${FILE_EXT} 
   ${PATH_TO_BIN}${tool}${FILE_EXT} ${test_cmd};
 done

script/unpack-and-test.sh

@@ -10,11 +10,11 @@ FILE_EXT=${FILE_EXT:-}
 if [ "$BINARY_OS" == "" ] || [ "$BINARY_ARCH" == "" ] ; then 
     case ${detected_os} in
     'Darwin arm64')
-        BINARY_OS=osx
+        BINARY_OS=macos
         BINARY_ARCH=arm64
         ;;
     'Darwin x86' | 'Darwin x86_64' | "Darwin"*)
-        BINARY_OS=osx
+        BINARY_OS=macos
         BINARY_ARCH=x86_64
         ;;
     "Linux aarch64"* | "Linux arm64"*)
@@ -56,18 +56,18 @@ tools=(
   pact-provider-verifier
   pact-stub-service
   pactflow
-  pact-plugin-cli
+  pact-plugin
   pact-stub-server
-  pact_verifier_cli
-  pact_mock_server_cli
+  pact-verifier-cli
+  pact-mock-server
 )
 
 test_cmd=""
 for tool in ${tools[@]}; do
   echo testing $tool
   if [ "$BINARY_OS" = "windows" ] ; then FILE_EXT=.bat; fi
-  if [ "$BINARY_OS" = "windows" ] && ([ "$tool" = "pact-plugin-cli" ] || [ "$tool" = "pact-stub-server" ] || [ "$tool" = "pact_verifier_cli" ] || [ "$tool" = "pact_mock_server_cli" ]) ; then  FILE_EXT=.exe ; fi
-  if [ "$tool" = "pact_verifier_cli" ] || [ "$tool" = "pact-mock-service" ]; then  test_cmd="--help" ; fi
+  if [ "$BINARY_OS" = "windows" ] && ([ "$tool" = "pact-plugin" ] || [ "$tool" = "pact-stub-server" ] || [ "$tool" = "pact-verifier-cli" ] || [ "$tool" = "pact-mock-server" ]) ; then  FILE_EXT=.exe ; fi
+  if [ "$tool" = "pact-verifier-cli" ] || [ "$tool" = "pact-mock-service" ]; then  test_cmd="--help" ; fi
   echo executing ${tool}${FILE_EXT} 
   ${PATH_TO_BIN}${tool}${FILE_EXT} ${test_cmd};
 done