jmeter-ruby 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e3df6308fba625f6639be81d7f74a2703b6f31d8a38907620f43c8361e308a
-  data.tar.gz: 3f878f2afa7e83c5a2975c6682719d133136d322511c924863502ebdb18afadd
+  metadata.gz: c6295d5ca488972f89f960b0a06172e968d27567dd96339a289a4def7dbd1611
+  data.tar.gz: 5e54caa52be883697fca1c1c04859ba4508e69f55cd2f158103752497ecc6a7a
 SHA512:
-  metadata.gz: c23624b52ea012efbd7ca96352992ac4a6efc77f4291e673f5bfb94b07f0cc29383dcefb52dc3fee3655c9c06c8a35732e7ddc306f4ef9bd0788b79725c64ab2
-  data.tar.gz: ca7bf82218e82adf99bde069851a900ec830e1c37c0f65bf8391f23016d2cb92cff075f503eb4fa91bb2e1fefb5b90bfa2108a72e6999241ac9378d7d6bead31
+  metadata.gz: 95769e39adaa0c70cb055412268dc34d22e55ce1c315a85fa4f7e9ef8f07ccf579b74e85a3a1216d0806578f67dff97795ec78d8d73cd3c823b84aca41039f47
+  data.tar.gz: 74e16cb6c8a8dfb312bb4e1832ee83986360d232b5f4315c514c1b3d6aec1746fb91518ebda0bb0e559cf9f82a32dc8bce1b454cf98ad6c1994f706a3ac6d5c2

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: bundler
+    directory: /
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

data/.github/workflows/ci.yml

@@ -14,13 +14,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby_version: "3.2"
           - ruby_version: "3.3"
           - ruby_version: "3.4"
+          - ruby_version: "4.0.5"
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v6.0.3
     - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1.313.0
       with:
         ruby-version: ${{ matrix.ruby_version }}
         bundler-cache: true
@@ -31,7 +31,7 @@ jobs:
         RAISE_ON_WARNING: 1
         RUBY_VERSION: ${{ matrix.ruby_version }}
     - name: Upload coverage results
-      uses: actions/upload-artifact@v4.4.0
+      uses: actions/upload-artifact@v7.0.1
       if: always()
       with:
         name: simplecov-resultset-ruby${{matrix.ruby_version}}
@@ -41,14 +41,14 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v6.0.3
     - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1.313.0
       with:
-        ruby-version: 3.4
+        ruby-version: "4.0.5"
         bundler-cache: true
     - name: Download coverage results
-      uses: actions/download-artifact@v4.2.1
+      uses: actions/download-artifact@v8.0.1
     - name: Collate simplecov
       run: |
         bundle exec rake coverage:report

data/.ruby-version

@@ -1 +1 @@
-2.7.7
+4.0.5

data/CHANGES.md

@@ -1,4 +1,15 @@
 # Changes
+## v3.0.1
+- Update local Ruby tooling to Ruby 4.0.5.
+- Raise the supported Ruby floor to 3.3.0 and test supported Ruby branches in CI.
+- Refresh GitHub Actions versions and add Dependabot automation for Bundler and GitHub Actions.
+- Clean up gemspec metadata for release builds.
+- Replace the stale release script with the current Bundler/RubyGems release flow and document it.
+- Create the GitHub release from `script/release` using the matching `CHANGES.md` notes.
+- Make `script/release` fail earlier on missing RubyGems credentials and resume GitHub release creation when the release tag already exists.
+- Make `script/release` fail early when macOS system Ruby is active and document running releases through mise.
+- Make `script/release` automatically re-run through mise when the active shell is using the wrong Ruby.
+
 ## v3.0.0
 - Add Github Actions CI
 - Add support foir modern Rubies

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby '>= 3.3.0'
+
 # Specify your gem's dependencies in jmeter-ruby.gemspec
 gemspec
 

data/README.md

@@ -414,6 +414,28 @@ If contributing please add an appropriate test. See `spec/*_spec.rb` for example
 
     $ bundle exec rspec
 
+### Release
+
+Releases use Bundler's gem release task. Prepare the version bump and `CHANGES.md` entry in a pull request first. After that PR is merged, release from an up-to-date `main` branch:
+
+```sh
+git switch main
+git pull origin main
+gem signin
+gh auth login
+script/release
+```
+
+The release script verifies that `main` is clean and synced, runs `bundle install`, runs the specs, builds the gem, and then delegates publishing to `bundle exec rake release`. If the active shell is using the wrong Ruby and `mise` is installed, the script automatically re-runs itself through the Ruby configured in `mise.toml`. The Bundler release task creates and pushes the `vX.Y.Z` git tag and pushes the gem to RubyGems.org. After that, the script creates the GitHub release for the same tag using the matching `CHANGES.md` section.
+
+If the gem/tag publish succeeds but GitHub release creation fails, rerun `script/release`. The script will reuse the existing tag and finish creating the GitHub release.
+
+To check the release flow without publishing:
+
+```sh
+DRY_RUN=1 script/release
+```
+
 ### Examples
 
 It is often useful to add an appropriate example for other users and for testing your changes locally with the JMeter UI. See `examples` for different types of examples. To let your examples work locally from your own changes / commits simply prefix the examples with:

data/jmeter-ruby.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |gem|
   gem.version       = JmeterRuby::VERSION::STRING
   gem.authors       = ['Reegan Viljoen']
   gem.email         = ['reeganviljoen@outlook.com']
-  gem.description   = %q{Ruby based DSL for writing JMeter test plans}
-  gem.summary       = %q{Ruby based DSL for writing JMeter test plans}
-  gem.homepage      = 'https://github.com/reeganviljoen/jmeter-ruby/issues'
-  gem.required_ruby_version = ">= 3.1.0"
+  gem.summary       = 'Ruby DSL for writing JMeter test plans'
+  gem.description   = 'JMeter-Ruby provides a Ruby DSL for generating Apache JMeter test plans.'
+  gem.homepage      = 'https://github.com/reeganviljoen/jmeter-ruby'
+  gem.required_ruby_version = ">= 3.3.0"
 
   gem.add_dependency 'rest-client'
   gem.add_dependency 'nokogiri'

data/lib/jmeter-ruby/version.rb

@@ -2,7 +2,7 @@ module JmeterRuby
   module VERSION
     MAJOR = 3
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

data/mise.toml

@@ -1,2 +1,2 @@
 [tools]
-ruby = "3.4.2"
+ruby = "4.0.5"

data/script/release

@@ -1,162 +1,232 @@
 #!/usr/bin/env bash
 
-fetch() {
-  git fetch --all
-}
+set -euo pipefail
 
 branch_name() {
   git symbolic-ref --short HEAD
 }
 
-local_history_is_clean() {
-  history=$(git rev-list --count --right-only @{u}...HEAD)
-  [ "$history" == "0" ]
+current_version() {
+  ruby ./lib/jmeter-ruby/version.rb
 }
 
-remote_history_is_clean() {
-  history=$(git rev-list --count --left-only @{u}...HEAD)
-  [ "$history" == "0" ]
+run_with_mise_if_available() {
+  if [ "${JMETER_RUBY_RELEASE_MISE:-}" = "1" ]; then
+    return 1
+  fi
+
+  if ! command -v mise > /dev/null; then
+    return 1
+  fi
+
+  echo "Active Ruby is not supported. Re-running release with mise."
+  mise trust
+  mise install
+  JMETER_RUBY_RELEASE_MISE=1 exec mise exec -- "$0" "$@"
+}
+
+required_ruby_version() {
+  ruby -e 'spec = Gem::Specification.load("jmeter-ruby.gemspec"); puts spec.required_ruby_version.requirements.first.last'
 }
 
-tag_exists_on_remote() {
-  git rev-parse --quiet --verify refs/tags/$1.$2.$3 > /dev/null
+current_ruby_version() {
+  ruby -e 'puts RUBY_VERSION'
+}
+
+require_supported_ruby() {
+  local required_version
+  local active_version
+
+  required_version="$(required_ruby_version)"
+  active_version="$(current_ruby_version)"
+
+  if ruby -e "exit(Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('$required_version'))"; then
+    return
+  fi
+
+  run_with_mise_if_available "$@"
+
+  echo "Error: Ruby ${required_version} or newer is required, but active ruby is ${active_version}."
+  echo "Active ruby: $(command -v ruby)"
+  echo "Install/activate the project Ruby first, for example:"
+  echo "  mise trust && mise install"
+  echo "Then rerun:"
+  echo "  script/release"
+  exit 1
+}
+
+require_bundler() {
+  if command -v bundle > /dev/null && bundle -v > /dev/null 2>&1; then
+    return
+  fi
+
+  echo "Error: Bundler is not available for the active Ruby."
+  echo "Active ruby: $(command -v ruby)"
+  if [ -f Gemfile.lock ]; then
+    local bundled_version
+    bundled_version="$(awk '/^BUNDLED WITH$/ { getline; gsub(/^[[:space:]]+/, ""); print; exit }' Gemfile.lock)"
+
+    if [ -n "$bundled_version" ]; then
+      echo "Install the locked Bundler for this Ruby with:"
+      echo "  gem install bundler:${bundled_version}"
+      exit 1
+    fi
+  fi
+
+  echo "Install Bundler for this Ruby with:"
+  echo "  gem install bundler"
+  exit 1
 }
 
 working_tree_is_clean() {
-  status=$(git status --porcelain)
-  [ "$status" == "" ]
+  [ -z "$(git status --porcelain)" ]
 }
 
-create_release_branch() {
-  git switch -c release-$1-$2-$3
+local_history_is_clean() {
+  [ "$(git rev-list --count --right-only @{u}...HEAD)" = "0" ]
+}
+
+remote_history_is_clean() {
+  [ "$(git rev-list --count --left-only @{u}...HEAD)" = "0" ]
 }
 
-update_readme() {
-  sed -i '' "/## main/ {a\
-  \\
-\\
-## $1.$2.$3
-  }" docs/CHANGELOG.md
+tag_exists() {
+  local version="$1"
+
+  git rev-parse --quiet --verify "refs/tags/v${version}" > /dev/null ||
+    git ls-remote --exit-code --tags origin "refs/tags/v${version}" > /dev/null
+}
+
+github_release_exists() {
+  local version="$1"
+
+  gh release view "v${version}" > /dev/null 2>&1
 }
 
-update_ruby_version() {
-  # Update version file
-  sed -E -i '' \
-      -e "s/MAJOR = [0-9]+/MAJOR = $1/g" \
-      -e "s/MINOR = [0-9]+/MINOR = $2/g" \
-      -e "s/PATCH = [0-9]+/PATCH = $3/g" \
-      lib/jmeter-ruby/version.rb
+require_github_cli() {
+  if ! command -v gh > /dev/null; then
+    echo "Error: GitHub CLI is required to create the GitHub release."
+    echo "Install it from https://cli.github.com/ and run gh auth login."
+    exit 1
+  fi
 
-  # Update deprecation horizon version
-  major=$1
-  sed -E -i '' \
-      -e "s/DEPRECATION_HORIZON = [0-9]+/DEPRECATION_HORIZON = $((major + 1))/g" \
-      lib/jmeter-ruby/deprecation.rb
+  if ! gh auth status -h github.com > /dev/null 2>&1; then
+    echo "Error: GitHub CLI is not authenticated."
+    echo "Run gh auth login before releasing."
+    exit 1
+  fi
 }
 
-update_gemfiles() {
-  # Update Gemfile.lock
-  bundle
+require_rubygems_credentials() {
+  if gem owner jmeter-ruby > /dev/null 2>&1; then
+    return
+  fi
+
+  if [ -t 0 ]; then
+    echo "RubyGems credentials are missing or invalid. Starting gem signin."
+    gem signin
+  fi
+
+  if ! gem owner jmeter-ruby > /dev/null 2>&1; then
+    echo "Error: RubyGems credentials are missing, invalid, or cannot access jmeter-ruby."
+    echo "Run gem signin, make sure you are an owner of jmeter-ruby, then rerun script/release."
+    exit 1
+  fi
 }
 
-add_changed_files() {
-  git add \
-    Gemfile.lock \
-    lib/jmeter-ruby/version.rb
+write_release_notes() {
+  local version="$1"
+  local notes_file="$2"
+
+  awk -v heading="## v${version}" '
+    $0 == heading { in_section = 1; next }
+    in_section && /^## / { exit }
+    in_section { print }
+  ' CHANGES.md > "$notes_file"
+
+  if [ ! -s "$notes_file" ]; then
+    echo "Error: no release notes found for v${version} in CHANGES.md."
+    exit 1
+  fi
 }
 
-commit() {
-  git commit -m "release $1.$2.$3"
+create_github_release() {
+  local version="$1"
+  local notes_file
+
+  notes_file="$(mktemp)"
+  trap 'rm -f "$notes_file"' EXIT
+
+  write_release_notes "$version" "$notes_file"
+  gh release create "v${version}" \
+    --title "v${version}" \
+    --notes-file "$notes_file"
 }
 
-push() {
-  git push origin release-$1-$2-$3
+release_tag_and_gem() {
+  local version="$1"
 
-  echo "####################################################"
-  echo "Now, open a PR with this branch and merge it to main"
-  echo "Then, run script/publish on main to release the gem"
-  echo "Finally, create a GitHub release https://github.com/reeganviljoen/jmeter-ruby/releases/new with the changes from docs/CHANGELOG"
-  echo "####################################################"
+  if tag_exists "$version"; then
+    echo "Tag v${version} already exists. Skipping gem publish and tag creation."
+    return
+  fi
+
+  bundle exec rake release
 }
 
 main() {
-  version=$(ruby ./lib/jmeter-ruby/version.rb)
-  version=(${version//./ })
-  major=${version[0]}
-  minor=${version[1]}
-  patch=${version[2]}
+  local version
 
-  echo "==================="
-  echo "Prerequisite Checks"
-  echo "==================="
+  require_supported_ruby "$@"
+  require_bundler
 
-  if ! working_tree_is_clean; then
-    echo "Error: unclean working tree"
+  version="$(current_version)"
+
+  echo "Preparing to release jmeter-ruby ${version}"
+
+  if [ "$(branch_name)" != "main" ]; then
+    echo "Error: releases must be run from main after the release PR is merged."
     exit 1
   fi
 
-  if [ "$(branch_name)" != "main" ]; then
-    echo "Error: can only make a release on the main branch"
+  if ! working_tree_is_clean; then
+    echo "Error: working tree is not clean."
     exit 1
   fi
 
-  fetch
+  git fetch --all --tags
 
   if ! remote_history_is_clean; then
-    echo "Error: changes exist on origin not pulled into this branch. Please pull"
+    echo "Error: origin/main has changes that are not pulled locally."
     exit 1
   fi
 
   if ! local_history_is_clean; then
-    echo "Error: changes exist that haven't been pushed to origin. Please pull"
+    echo "Error: local main has commits that are not pushed to origin."
     exit 1
   fi
 
-  echo "Type the number of an option to bump, or pick Manual to enter a version number"
-  select bump in Major Minor Patch Manual
-  do
-    if [ "$bump" == "Major" ]; then
-      major=$((major + 1))
-      minor=0
-      patch=0
-    elif [ "$bump" == "Minor" ]; then
-      minor=$((minor + 1))
-      patch=0
-    elif [ "$bump" == "Patch" ]; then
-      patch=$((patch + 1))
-    else
-      read -p "What version? (Currently $major.$minor.$patch): " new_version
-      if [ "$new_version" == "$major.$minor.$patch" ]; then
-        echo "Error: Can't be the same version"
-        exit 1
-      fi
-
-      new_version=(${new_version//./ })
-
-      major=${new_version[0]}
-      minor=${new_version[1]}
-      patch=${new_version[2]}
-    fi
+  require_github_cli
+  require_rubygems_credentials
 
-    if tag_exists_on_remote $major $minor $patch; then
-      echo "Error: tag exists on remote"
-      exit 1
-    fi
+  if github_release_exists "$version"; then
+    echo "Error: GitHub release v${version} already exists."
+    exit 1
+  fi
 
-    echo "==============================="
-    echo "Creating release for $major.$minor.$patch"
-    echo "==============================="
-
-    create_release_branch $major $minor $patch
-    update_readme $major $minor $patch
-    update_ruby_version $major $minor $patch
-    update_gemfiles $major $minor $patch
-    echo "version: $major.$minor.$patch" > docs/_data/library.yml
-    add_changed_files $major $minor $patch
-    commit $major $minor $patch
-    push $major $minor $patch
+  bundle install
+  bundle exec rake spec
+  bundle exec rake build
+
+  if [ "${DRY_RUN:-}" = "1" ]; then
+    echo "Dry run complete. Skipping: bundle exec rake release and gh release create"
     exit 0
-  done
+  fi
+
+  release_tag_and_gem "$version"
+  create_github_release "$version"
+
+  echo "Released jmeter-ruby ${version}."
 }
 
 main

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jmeter-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Reegan Viljoen
 bindir: bin
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -65,7 +65,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.1
-description: Ruby based DSL for writing JMeter test plans
+description: JMeter-Ruby provides a Ruby DSL for generating Apache JMeter test plans.
 email:
 - reeganviljoen@outlook.com
 executables: []
@@ -73,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -336,7 +337,7 @@ files:
 - spec/user_parameters_spec.rb
 - spec/with_helpers_spec.rb
 - spec/xpath_extractor_spec.rb
-homepage: https://github.com/reeganviljoen/jmeter-ruby/issues
+homepage: https://github.com/reeganviljoen/jmeter-ruby
 licenses:
 - MIT
 metadata: {}
@@ -347,14 +348,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 4.0.10
 specification_version: 4
-summary: Ruby based DSL for writing JMeter test plans
+summary: Ruby DSL for writing JMeter test plans
 test_files: []