#1 Rebase to 1.2.0.
Merged 2 years ago by pvalena. Opened 2 years ago by pvalena.
rpms/ pvalena/rubygem-rspec-its rebase  into  master

file modified
+1

@@ -1,1 +1,2 @@ 

  /rspec-its-1.1.0.gem

+ /rspec-its-1.2.0.gem

@@ -0,0 +1,33 @@ 

+ From e28d273df0c75a16278bd959d46c6489b035860e Mon Sep 17 00:00:00 2001

+ From: Pavel Valena <pvalena@redhat.com>

+ Date: Tue, 12 Sep 2017 23:19:25 +0200

+ Subject: [PATCH] Fixnum to integer

+ 

+ ---

+  spec/rspec/its_spec.rb | 4 ++--

+  1 file changed, 2 insertions(+), 2 deletions(-)

+ 

+ diff --git a/spec/rspec/its_spec.rb b/spec/rspec/its_spec.rb

+ index 91eed5f..83788f6 100644

+ --- a/spec/rspec/its_spec.rb

+ +++ b/spec/rspec/its_spec.rb

+ @@ -55,7 +55,7 @@ module RSpec

+            end

+            its("name") { should eq("John") }

+            its("name.size") { should eq(4) }

+ -          its("name.size.class") { should eq(Fixnum) }

+ +          its("name.size.class") { should eq(Integer) }

+  

+            context "using should_not" do

+              its("name") { should_not eq("Paul") }

+ @@ -86,7 +86,7 @@ module RSpec

+            end

+            its([:a]) { should eq("Symbol: a") }

+            its(['a']) { should eq("String: a") }

+ -          its([:b, 'c', 4]) { should eq("Symbol: b; String: c; Fixnum: 4") }

+ +          its([:b, 'c', 4]) { should eq("Symbol: b; String: c; Integer: 4") }

+            its(:name) { should eq("George") }

+            context "when referring to an attribute that doesn't exist" do

+              context "it raises an error" do

+ -- 

+ 1.8.3.1

file modified
+30 -36

@@ -1,13 +1,18 @@ 

  %global gem_name rspec-its

  

  Name: rubygem-%{gem_name}

- Version: 1.1.0

- Release: 5%{?dist}

- Summary: Provides "its" method formally part of rspec-core

+ Version: 1.2.0

+ Release: 1%{?dist}

+ Summary: Provides "its" method formerly part of rspec-core

  Group: Development/Languages

  License: MIT

  URL: https://github.com/rspec/rspec-its

  Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem

+ 

+ # Fix Ruby 2.4 compatibility

+ # https://github.com/rspec/rspec-its/pull/45

+ Patch0: rubygem-rspec-its-1.2.0-Fix-Ruby-2.4-compatibility.patch

+ 

  %if 0%{?el7}

  Requires: ruby(release)

  Requires: ruby(rubygems)

@@ -16,13 +21,9 @@ 

  %endif

  BuildRequires: ruby(release)

  BuildRequires: rubygems-devel

- BuildRequires: rubygem(rspec-core) >= 2.99.0.beta1

- BuildRequires: rubygem(rspec-expectations) >= 2.99.0.beta1

- # cucumber tests are non-functional during RPM build

- #BuildRequires: rubygem(cucumber) => 1.3.8

- #BuildRequires: rubygem(cucumber) < 1.4

- #BuildRequires: rubygem(aruba) => 0.5

- #BuildRequires: rubygem(aruba) < 1

+ BuildRequires: rubygem(rspec-core)

+ BuildRequires: rubygem(rspec-expectations)

+ BuildRequires: rubygem(aruba)

  BuildArch: noarch

  %if 0%{?el7}

  Provides: rubygem(%{gem_name}) = %{version}

@@ -41,27 +42,12 @@ 

  Documentation for %{name}.

  

  %prep

- gem unpack %{SOURCE0}

- 

- %setup -q -D -T -n  %{gem_name}-%{version}

- 

- gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec

- 

- # Remove developer-only files.

- for f in .gitignore .rspec .travis.yml Gemfile Rakefile \

- script/test_all cucumber.yml; do

-   rm $f

-   sed -i "s|\"$f\",||g" %{gem_name}.gemspec

- done

+ %setup -q -n %{gem_name}-%{version}

  

  %build

- gem build %{gem_name}.gemspec

- 

+ gem build ../%{gem_name}-%{version}.gemspec

  %gem_install

  

- # remove unnecessary gemspec

- rm .%{gem_instdir}/%{gem_name}.gemspec

- 

  %install

  mkdir -p %{buildroot}%{gem_dir}

  cp -a .%{gem_dir}/* \

@@ -69,30 +55,38 @@ 

  

  %check

  pushd .%{gem_instdir}

-   rspec -Ilib spec

-   # cucumber tests are non-functional during RPM build

-   #cucumber -Ilib features/*.feature

+ cat %{PATCH0} | patch -p1 -F 0

+ rspec -Ilib spec

+ export RUBYOPT="-I${PWD}/lib"

+ cucumber

  popd

  

  

  %files

  %{!?_licensedir:%global license %%doc}

  %dir %{gem_instdir}

- %doc %{gem_instdir}/Changelog.md

  %license %{gem_instdir}/LICENSE.txt

- %doc %{gem_instdir}/README.md

  %{gem_libdir}

  %exclude %{gem_cache}

+ %exclude %{gem_instdir}/.*

  %{gem_spec}

  

  %files doc

  %doc %{gem_docdir}

- %exclude %{gem_instdir}/cucumber.yml

- %exclude %{gem_instdir}/features

- %exclude %{gem_instdir}/spec

- 

+ %doc %{gem_instdir}/Changelog.md

+ %{gem_instdir}/cucumber.yml

+ %{gem_instdir}/features

+ %{gem_instdir}/spec

+ %{gem_instdir}/Gemfile

+ %{gem_instdir}/Rakefile

+ %{gem_instdir}/script

+ %doc %{gem_instdir}/README.md

+ %{gem_instdir}/%{gem_name}.gemspec

  

  %changelog

+ * Tue Sep 12 2017 Pavel Valena <pvalena@redhat.com> - 1.2.0-1

+ - Update to 1.2.0.

+ 

  * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-5

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- 7e355caebff9a7f3cecc45096740d9f6  rspec-its-1.1.0.gem

+ SHA512 (rspec-its-1.2.0.gem) = 6b390f92654f8e6482f0da30d4e721ee127f628eb305268e474d4c9fb14fca1d0fb8922cabc9a8c1372976b5a52349c5a5a774e3026f32d8050c5aea2bc9ccae

@ktdreyer, could you please take a look.

I'd also like to have a committer ACLs, If you'd not mind.

You probably can apply the patch in %prep section. Also, I typically try to avoid the "export" calls, if it is enough to define the variable just prior the call, not sure it works in this case. I'd also use just relative path instead of the ${PWD}, but there probably some reasons why you went this way ...

Actually, I've just tried to be explicit about those (I do this by default nowdays).
I'll try making the changes you suggested.

Thanks!

Well, maybe I've been 'forced' to do it like that after all, because both are needed to run cucumber tests.

Pull-Request has been merged by pvalena

2 years ago