rpms/rubygem-aruba
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:f43
rpms:main
rpms:f42
rpms:next
rpms:f41
rpms:f40
rpms:epel8
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:2-prepare
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f29
rpms:f30
rpms:f28
rpms:f27
rpms:f26
rpms:f24
rpms:f25
rpms:f23
rpms:f21
rpms:f22
rpms:epel7
rpms:f20
rpms:f19
rpms:f18
rpms:f17
rpms:epel9
..
compare: rpms:2-prepare
Branches Tags
rpms:f43
rpms:main
rpms:rawhide
rpms:f42
rpms:next
rpms:f41
rpms:f40
rpms:epel8
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:2-prepare
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f29
rpms:f30
rpms:f28
rpms:f27
rpms:f26
rpms:f24
rpms:f25
rpms:f23
rpms:f21
rpms:f22
rpms:epel7
rpms:f20
rpms:f19
rpms:f18
rpms:f17
rpms:epel9

No commits in common. "rawhide" and "2-prepare" have entirely different histories.
rawhide ... 2-prepare

6 changed files with 62 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.gitignore vendored
View file

@ -1,2 +1,18 @@
/aruba-*.gem
/rubygem-aruba-*-testsuite.tar.gz
/aruba-0.4.11.gem
/aruba-0.5.2.gem
/aruba-0.5.4.gem
/aruba-0.6.0.gem
/aruba-0.6.2.gem
/aruba-0.14.2.gem
/aruba-0.14.3.gem
/aruba-0.14.5.gem
/aruba-0.14.6.gem
/aruba-0.14.7.gem
/aruba-0.14.8.gem
/aruba-0.14.9.gem
/aruba-0.14.11.gem
/aruba-0.14.12.gem
/aruba-0.14.13.gem
/aruba-0.14.14.gem
/aruba-2.0.0.gem
/rubygem-aruba-2.0.0-testsuite.tar.gz

8
rubygem-aruba-2.0.0-make-bundler-optional.patch
View file

@ -1,10 +1,8 @@
--- aruba-2.0.0/lib/aruba/api/bundler.rb.make_optional 2021-07-27 04:28:08.000000000 +0900
+++ aruba-2.0.0/lib/aruba/api/bundler.rb 2022-01-14 14:40:50.369324292 +0900
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'aruba/api/environment'
-require 'bundler'
@@ -1,5 +1,4 @@
require "aruba/api/environment"
-require "bundler"
module Aruba
module Api

9
rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch Normal file
View file

@ -0,0 +1,9 @@
--- aruba-2.0.0/lib/aruba/platforms/unix_platform.rb.explicit 2021-07-27 04:28:08.000000000 +0900
+++ aruba-2.0.0/lib/aruba/platforms/unix_platform.rb 2022-01-14 15:01:38.513634793 +0900
@@ -1,5 +1,6 @@
require "rbconfig"
require "pathname"
+require "rubygems"
require "aruba/aruba_path"

42
rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch
View file

@ -1,42 +0,0 @@
From bd2aea600f7e989e4da734c3e823c3ce12ce629b Mon Sep 17 00:00:00 2001
From: Matijs van Zuijlen <matijs@matijs.net>
Date: Sun, 6 Apr 2025 23:32:36 +0200
Subject: [PATCH] Update expected diff output to match changes in diff-lcs
Version 1.6.0 of diff-lcs included a bug fix that corrects the hunk
ranges it outputs. This change bumps the minimum version of diff-lcs to
1.6.0 so this change is sure to be included, and updates the
expectations in the cucumber scenarios that depend on exact diff-lcs
output.
---
aruba.gemspec | 1 +
.../cucumber/steps/command/check_output_of_command.feature | 2 +-
.../cucumber/steps/command/check_stderr_of_command.feature | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature
index 3266514b..1f0d1997 100644
--- a/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature
+++ b/features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature
@@ -353,7 +353,7 @@ Feature: All output of commands which were executed
world" to output string is eq: "hello
worl"
Diff:
- @@ -1,3 +1,3 @@
+ @@ -1,2 +1,2 @@
hello
-worl
+world
diff --git a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature
index cc0e7aad..d3b4c9a9 100644
--- a/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature
+++ b/features/03_testing_frameworks/cucumber/steps/command/check_stderr_of_command.feature
@@ -82,7 +82,7 @@ Feature: STDERR of commands which were executed
expected "hello
world!" to output string is eq: ""
Diff:
- @@ -1,2 +1,4 @@
+ @@ -0,0 +1,2 @@
+hello
+world!
"""

138
rubygem-aruba.spec
View file

@ -3,23 +3,23 @@
Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
Name: rubygem-%{gem_name}
Version: 2.3.3
Release: 1%{?dist}
Version: 2.0.0
Release: 2%{?dist}
# SPDX confirmed
# templates/, jquery.js existed on 0.14.14, no longer included in 2.0 and above
License: MIT
URL: https://github.com/cucumber/aruba
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# aruba itself is MIT
# icons in templates/images are CC-BY
# jquery.js itself is MIT or GPLv2
# jquery.js includes sizzle.js, which is MIT or BSD or GPLv2
License: MIT and CC-BY and (MIT or GPLv2) and (MIT or BSD or GPLv2)
URL: http://github.com/cucumber/aruba
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
Source1: %{name}-%{version}-testsuite.tar.gz
# Source1 is created by $ bash %%SOURCE2 %%VERSION
Source2: %{gem_name}-create-test-suite-tarball.sh
# Make bundler runtime dependency optional
Patch1: rubygem-aruba-2.0.0-make-bundler-optional.patch
# https://github.com/cucumber/aruba/commit/bd2aea600f7e989e4da734c3e823c3ce12ce629b
# We still use diff-lcs 1.5, revert the above patch for now
Patch2: rubygem-aruba-2.3.1-diff-lcs-1_6-change.patch
# Workaround to make rspec-core rspec test suite pass
Patch2: rubygem-aruba-2.0.0-make-rubygems-dependency-explicit.patch
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
@ -30,9 +30,11 @@ BuildRequires: rubygem(contracts)
BuildRequires: rubygem(cucumber)
BuildRequires: rubygem(irb)
BuildRequires: rubygem(minitest)
BuildRequires: rubygem(pry)
BuildRequires: rubygem(rspec) >= 3
BuildRequires: rubygem(thor)
BuildRequires: less
# features/steps/command/shell.feature:97 # Scenario: Running python commands
BuildRequires: %{_bindir}/python3
BuildArch: noarch
@ -50,25 +52,11 @@ BuildArch: noarch
Documentation for %{name}
%prep
%setup -q -n %{gem_name}-%{version} -a 1
pushd %{gem_name}-%{version}
for f in *
do
basef=$(basename $f)
target=../${basef}
ln -sf $(pwd)/$f $target
done
# For tests
ln -sf ../lib
popd
%patch -P1 -p1
%patch -P2 -p1 -R
%autosetup -n %{gem_name}-%{version} -p1 -a 1
mv ../%{gem_name}-%{version}.gemspec .
# Relax cucumber dependency
# Partially revert https://github.com/cucumber/aruba/pull/906
sed -i '\@cucumber@s|>= 8.0|>= 7.0|' %{gem_name}-%{version}.gemspec
# Relax childprocess dependency
%gemspec_remove_dep -g childprocess '>= 2.0' -s %{gem_name}-%{version}.gemspec
# Remove bundler dependency harder
sed -i '\@dependency.*bundler@d' %{gem_name}-%{version}.gemspec
@ -113,10 +101,17 @@ sed -i features/support/env.rb \
sed -i fixtures/cli-app/spec/spec_helper.rb \
-e "\@\$LOAD_PATH@s|\.\./\.\./lib|$(pwd)/lib|"
# Kill tests which requires python explicitly
# (to reduce BR, anyway this test is not important)
sed -i features/step_definitions/hooks.rb \
-e '\@platform.which@s|"python"|"no-python"|'
# /usr/bin/python is reporting deprecation warning :/
# No need to modify @requires-python (in run_commands.feature and hooks.rb)
if ! grep -q python3 features/steps/command/shell.feature
then
sed -i features/03_testing_frameworks/cucumber/steps/command/run_commands_which_require_a_shell.feature \
-e 's|python|python3|'
sed -i lib/aruba/generators/script_file.rb \
-e '\@interpreter@s|A-Z|A-Z0-9|'
sed -i features/01_getting_started_with_aruba/run_commands.feature \
-e '\@[^-]python@s|python|python3|'
fi
# The following test fails on ppc64le, due to different block size
# (expected: 64k actual: 4k), disabling
@ -137,8 +132,8 @@ sed -i features/02_configure_aruba/home_directory.feature \
-e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|"
# Make the Aruba always awailable.
export CUCUMBER_PUBLISH_QUIET=true
env RUBYOPT=-I$(pwd)/lib cucumber -f progress
env RUBYOPT=-I$(pwd)/lib \
cucumber --publish-quiet
# Go back the skipped test
if test x"${PPC64_ENV_P}" == x0
@ -164,79 +159,6 @@ popd # from .%%{gem_instdir}
%doc %{gem_instdir}/CHANGELOG.md
%changelog
* Sat Dec 06 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.3-1
- 2.3.3
* Sun Sep 14 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.2-1
- 2.3.2
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jun 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.1-1
- 2.3.1
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jan 03 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-1
- 2.3.0
* Thu Nov 28 2024 Vít Ondruch <vondruch@redhat.com> - 2.2.0-10
- Drop BR: rubygem(pry)
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Feb 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-8
- Adjust testsuite for Minitest 5.22.2
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Dec 27 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-5
- Patch for ruby3.3
* Thu Nov 9 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-4
- Explicitly add BR: less for BR: pry
- Change cucumber publish quiet method
* Mon Sep 11 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-2
- Kill python test entirely to redure BR, it is not important
(related to bug 2237692)
* Fri Sep 8 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-1
- 2.2.0
- Relax cucumber dependency
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Mar 21 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.0-4
- Correct license tag
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu May 26 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.0-1
- 2.1.0
* Sun Apr 24 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.1-1
- 2.0.1
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jan 19 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.0-3
- Use upstream patch for rspec-core rspec test suite issue
(Gem.win_platform? related)
* Fri Jan 14 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.0-2
- Make bundler optional again
- Workaround patch to make rspec-core test suite pass

4
sources
View file

@ -1,2 +1,2 @@
SHA512 (aruba-2.3.3.gem) = 4892651a703d0b2badf15a7f45e461ab1478e53d290fc39e7b0a3fa2a4c4830754bdcabddb38ba3e161bd34071da85aad4f56ccaea5ff8b37a5d74ae1e7ca8c2
SHA512 (rubygem-aruba-2.3.3-testsuite.tar.gz) = a2aa74d9c920dbc3b9709358f5e219886e54f92b85b34de15bd9614308dccd48a3f97bed2f286e8e4dc520259e63063d167a74d72ed70a0635cb8c7348ccb175
SHA512 (aruba-2.0.0.gem) = 798a5aaf1f03132eb1e6872be93e61d0a0aa7ec21f0783110132207c357240dee2a0e75f5c9f7d91d4d471d38d385deccfaa07c31a43cc8cb8c54d6156b762f9
SHA512 (rubygem-aruba-2.0.0-testsuite.tar.gz) = 67fd9c892a9da66d686baeb377748aea843872344e7a04c0f0910e1123bc8be9c66fe12fb56a2657388568ec0c586970aba8a3da4a1816ecbcbe42a843e8e80a