Update to factory_girl 4.8.0.

1 files changed, 102 insertions, 42 deletions

diff --git a/rubygem-factory_girl.spec b/rubygem-factory_girl.spec
index 0ed54ec..6d2256b 100644
--- a/rubygem-factory_girl.spec
+++ b/rubygem-factory_girl.spec
@@ -1,18 +1,35 @@
 %global gem_name factory_girl
 
-Summary: Framework and DSL for defining and using model instance factories
+# Circular dependency with cucumber.
+%{?_with_bootstrap: %global bootstrap 1}
+
 Name: rubygem-%{gem_name}
-Version: 2.3.2
-Release: 11%{?dist}
-Group: Development/Languages
+Version: 4.8.0
+Release: 1%{?dist}
+Summary: Framework and DSL for defining and using model instance factories
 License: MIT
-URL: http://thoughtbot.com/projects/factory_girl
-Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
-Requires: ruby(rubygems)
-Requires: ruby(release)
+URL: https://github.com/thoughtbot/factory_girl
+Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# git clone https://github.com/thoughtbot/factory_girl.git && cd factory_girl
+# git checkout v4.8.0 && tar czvf factory_girl-4.8.0-specs.tar.gz spec/
+Source1: %{gem_name}-%{version}-specs.tar.gz
+# git clone https://github.com/thoughtbot/factory_girl.git && cd factory_girl
+# git checkout v4.8.0 && tar czvf factory_girl-4.8.0-features.tar.gz features/
+Source2: %{gem_name}-%{version}-features.tar.gz
+BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
+BuildRequires: ruby
+BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(rspec-its)
+BuildRequires: rubygem(activerecord)
+BuildRequires: rubygem(mocha) >= 0.12.8
+BuildRequires: rubygem(sqlite3)
+BuildRequires: rubygem(timecop)
+%if ! 0%{?bootstrap}
+BuildRequires: %{_bindir}/cucumber
+BuildRequires: rubygem(aruba)
+%endif
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Framework and DSL for defining and using factories - less error-prone,
@@ -20,63 +37,106 @@ more explicit, and all-around easier to work with than fixtures.
 
 %package doc
 Summary: Documentation for %{name}
-Group: Documentation
-Requires:%{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description doc
-Documentation for %{name}
-
+Documentation for %{name}.
 
 %prep
-%setup -q -c -T
-%gem_install -n %{SOURCE0}
-pushd .%{gem_instdir}
-popd
+gem unpack %{SOURCE0}
+
+%setup -q -D -T -n  %{gem_name}-%{version} -b 1 -b 2
 
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 %build
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.gemspec
 
+# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
+# by default, so that we can move it into the buildroot in %%install
+%gem_install
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gem_dir}
-rm ./%{gem_instdir}/.autotest
-rm ./%{gem_instdir}/.gitignore
-rm ./%{gem_instdir}/.rspec
-rm ./%{gem_instdir}/.travis.yml
-rm ./%{gem_instdir}/Appraisals
-rm ./%{gem_instdir}/Gemfile
-rm ./%{gem_instdir}/Gemfile.lock
-rm ./%{gem_instdir}/.yardopts
-rm -rf ./%{gem_instdir}/gemfiles
-cp -va ./%{gem_dir}/* %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
 
 
-%clean
-rm -rf %{buildroot}
+
+%check
+pushd .%{gem_instdir}
+# Move test into the place.
+ln -s %{_builddir}/spec spec
+
+# We don't care about coverage.
+sed -i "/simplecov/ s/^/#/" spec/spec_helper.rb
+
+# We don't have bourne in Fedora and it deprecated upstream:
+# https://github.com/thoughtbot/bourne/pull/36
+# There is aslo PR removing the dependency on Mocha and Bourne:
+# https://github.com/thoughtbot/factory_girl/pull/1016
+# Lets get rid of Bourne and the failures for now.
+sed -i '/bourne/ s/^/#/' spec/spec_helper.rb
+sed -i '/have_received\(.*\)\.never/ s/^/#/' spec/acceptance/attributes_from_instance_spec.rb
+sed -i '/have_received\(.*\)\.once/ s/^/#/' \
+  spec/factory_girl/definition_spec.rb \
+  spec/factory_girl/factory_spec.rb
+sed -i '/load_definitions_from(.*)/ s/^/#/' spec/factory_girl/find_definitions_spec.rb
+sed -i '/have_received\(.*\)\.with/ s/^/#/' \
+  spec/factory_girl/attribute/association_spec.rb \
+  spec/factory_girl/declaration_list_spec.rb \
+  spec/factory_girl/definition_proxy_spec.rb \
+  spec/factory_girl/definition_spec.rb \
+  spec/factory_girl/disallows_duplicates_registry_spec.rb \
+  spec/factory_girl/factory_spec.rb \
+  spec/factory_girl/strategy_calculator_spec.rb \
+  spec/support/shared_examples/strategy.rb
+
+rspec -rfileutils spec
+
+%if ! 0%{?bootstrap}
+# Move features into the place.
+ln -s %{_builddir}/features features
+
+# We don't care about coverage.
+sed -i "/simplecov/ s/^/#/" features/support/env.rb
+
+# Compatibility with Rails 5.1.
+# https://github.com/thoughtbot/factory_girl/pull/1013
+sed -i "s/ActiveRecord::Migration/ActiveRecord::Migration[4.2]/" features/support/factories.rb
+
+cucumber
+%endif
+popd
 
 %files
-%defattr(-, root, root, -)
 %dir %{gem_instdir}
+%exclude %{gem_instdir}/.*
+%license %{gem_instdir}/LICENSE
+%exclude %{gem_instdir}/factory_girl.gemspec
 %{gem_libdir}
-%doc %{gem_instdir}/README.md
-%doc %{gem_instdir}/LICENSE
-%doc %{gem_instdir}/Changelog
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
-%defattr(-, root, root, -)
-%{gem_docdir}
-%{gem_instdir}/features
-%{gem_instdir}/spec
+%doc %{gem_docdir}
+%{gem_instdir}/Appraisals
+%doc %{gem_instdir}/CONTRIBUTING.md
+%doc %{gem_instdir}/GETTING_STARTED.md
+%{gem_instdir}/Gemfile*
+%doc %{gem_instdir}/NAME.md
+%doc %{gem_instdir}/NEWS
+%doc %{gem_instdir}/README.md
+%{gem_instdir}/gemfiles
 %{gem_instdir}/Rakefile
 %{gem_instdir}/cucumber.yml
-%{gem_instdir}/CONTRIBUTION_GUIDELINES.md
-%{gem_instdir}/GETTING_STARTED.md
-
 
 %changelog
+* Wed Jul 12 2017 Vít Ondruch <vondruch@redhat.com> - 4.8.0-1
+- Update to factory_girl 4.8.0.
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild