feat: upgrade to travelling ruby 2.4.10 (#75)

* chore: upgdate travelling ruby version

* chore: update bundler

* chore: upgrade to last Travelling Ruby v2.4

Travelling ruby has deprecated support for linux-x86 (x86_64 is still
supported), so that's been removed from the created packages.

The naming convention for the Windows client has also changed, and that's fixed.

* chore: retain old windows package name

Instead of using the changed Traveling Ruby package name for win32 packages, we'll retain the old naming convention to make the packaging simpler for downstream systems.

See #75 (comment)

* chore: Lock json to version in 2.4.10

I don't know how it worked previously, but when building against ruby 2.2, the Gemfile.lock generated includes refernces to json-2.5.1, and bundler was quite happy to find it.

This is extra weird, because json builds native extensions by default, something that doesn't work with cross-platform binaries.

According to https://stdgems.org/2.4.10/, json is still included as a standard gem, but only up to version 2.0.4

When tring to check the created package, it's now failing though.

```shell
$ BUNDLE_GEMFILE=lib/vendor/Gemfile lib/ruby/bin/bundle check
The following gems are missing
 * json (2.5.1)
Install missing gems with `bundle install`
```

A solution is to lock the JSON gem at the version provided by Ruby's standard libraries (https://stdgems.org/2.4.10/)

Whether this is still cross-platform (bundler output does report building native extensions) is unknown.

Co-authored-by: Beth Skurrie <[email protected]>
Co-authored-by: Jonathon Padfield <[email protected]>
Co-authored-by: Beth Skurrie <[email protected]>

Author: 3 people

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.2.10
+        ruby-version: 2.4.10
 
     - name: Set up environment
       run: bundle install

install.sh

@@ -7,9 +7,6 @@
 #
 
 case $(uname -sm) in
-  'Linux x86')
-    os='linux-x86'
-    ;;
   'Linux x86_64')
     os='linux-x86_64'
     ;;

packaging/Gemfile

@@ -7,3 +7,4 @@ gem "pact-provider-verifier", "1.36.1"
 gem "pact_broker-client", "1.64.0"
 gem "webrick", "1.3.1" # Later versions require Ruby 2.3
 gem "rack", "~>2.1.4"
+gem "json", "2.0.4"

packaging/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    json (2.5.1)
+    json (2.0.4)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
@@ -103,6 +103,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  json (= 2.0.4)
   pact (= 1.62.0)
   pact-message (= 0.11.1)
   pact-mock_service (= 3.9.0)

tasks/package.rake

@@ -3,38 +3,33 @@ require 'bundler/setup'
 
 PACKAGE_NAME = "pact"
 VERSION = File.read('VERSION').strip
-TRAVELING_RUBY_VERSION = "20150715-2.2.2"
+TRAVELING_RUBY_VERSION = "20210206-2.4.10"
 
-desc "Package pact-ruby-standalone for OSX, Linux x86 and Linux x86_64"
-task :package => ['package:linux:x86', 'package:linux:x86_64', 'package:osx', 'package:win32']
+desc "Package pact-ruby-standalone for OSX, Linux x86_64 and Win32 x86_64"
+task :package => ['package:linux:x86_64', 'package:osx', 'package:win32']
 
 namespace :package do
   namespace :linux do
-    desc "Package pact-ruby-standalone for Linux x86"
-    task :x86 => [:bundle_install, "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
-      create_package(TRAVELING_RUBY_VERSION, "linux-x86")
-    end
-
     desc "Package pact-ruby-standalone for Linux x86_64"
     task :x86_64 => [:bundle_install, "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
-      create_package(TRAVELING_RUBY_VERSION, "linux-x86_64")
+      create_package(TRAVELING_RUBY_VERSION, "linux-x86_64", "linux-x86_64", :unix)
     end
   end
 
   desc "Package pact-ruby-standalone for OS X"
   task :osx => [:bundle_install, "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
-    create_package(TRAVELING_RUBY_VERSION, "osx")
+    create_package(TRAVELING_RUBY_VERSION, "osx", "osx", :unix)
   end
 
-  desc "Package pact-ruby-standalone for Windows x86"
-  task :win32 => [:bundle_install, "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32.tar.gz"] do
-    create_package(TRAVELING_RUBY_VERSION, "win32", :windows)
+  desc "Package pact-ruby-standalone for Win32 x86_64"
+  task :win32 => [:bundle_install, "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32-86_64.tar.gz"] do
+    create_package(TRAVELING_RUBY_VERSION, "x86_64-win32", "win32", :windows)
   end
 
   desc "Install gems to local directory"
   task :bundle_install do
-    if RUBY_VERSION !~ /^2\.2\./
-      abort "You can only 'bundle install' using Ruby 2.2, because that's what Traveling Ruby uses."
+    if RUBY_VERSION !~ /^2\.4\./
+      abort "You can only 'bundle install' using Ruby 2.4, because that's what Traveling Ruby uses."
     end
     sh "rm -rf build/tmp"
     sh "mkdir -p build/tmp"
@@ -59,10 +54,6 @@ namespace :package do
   end
 end
 
-file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
-  download_runtime(TRAVELING_RUBY_VERSION, "linux-x86")
-end
-
 file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
   download_runtime(TRAVELING_RUBY_VERSION, "linux-x86_64")
 end
@@ -71,13 +62,13 @@ file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
   download_runtime(TRAVELING_RUBY_VERSION, "osx")
 end
 
-file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32.tar.gz" do
-  download_runtime(TRAVELING_RUBY_VERSION, "win32")
+file "build/traveling-ruby-#{TRAVELING_RUBY_VERSION}-win32-86_64.tar.gz" do
+  download_runtime(TRAVELING_RUBY_VERSION, "x86_64-win32")
 end
 
-def create_package(version, target, os_type = :unix)
+def create_package(version, source_target, package_target, os_type)
   package_dir = "#{PACKAGE_NAME}"
-  package_name = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
+  package_name = "#{PACKAGE_NAME}-#{VERSION}-#{package_target}"
   sh "rm -rf #{package_dir}"
   sh "mkdir #{package_dir}"
   sh "mkdir -p #{package_dir}/lib/app"
@@ -87,16 +78,19 @@ def create_package(version, target, os_type = :unix)
 
   # sh "cp -pR lib #{package_dir}/lib/app"
   sh "mkdir #{package_dir}/lib/ruby"
-  sh "tar -xzf build/traveling-ruby-#{version}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
+  sh "tar -xzf build/traveling-ruby-#{version}-#{source_target}.tar.gz -C #{package_dir}/lib/ruby"
   # From https://curl.se/docs/caextract.html
   sh "cp packaging/cacert.pem #{package_dir}/lib/ruby/lib/ca-bundle.crt"
 
-  if os_type == :unix
+  case os_type
+  when :unix
     Dir.chdir('packaging'){ Dir['pact*.sh'] }.each do | name |
       sh "cp packaging/#{name} #{package_dir}/bin/#{name.chomp('.sh')}"
     end
-  else
+  when :windows
     sh "cp packaging/pact*.bat #{package_dir}/bin"
+  else
+    raise "We don't serve their kind (#{os_type}) here!"
   end
 
   sh "cp -pR build/vendor #{package_dir}/lib/"