Date: Sunday, August 15, 2021 @ 09:11:47
Author: bastelfreak
Revision: 998699
archrelease: copy trunk to community-any
Added:
ruby-metadata-json-lint/repos/community-any/PKGBUILD
(from rev 998698, ruby-metadata-json-lint/trunk/PKGBUILD)
ruby-metadata-json-lint/repos/community-any/disable_rubocop.patch
(from rev 998698, ruby-metadata-json-lint/trunk/disable_rubocop.patch)
ruby-metadata-json-lint/repos/community-any/dont_call_msl_via-bundler.patch
(from rev 998698,
ruby-metadata-json-lint/trunk/dont_call_msl_via-bundler.patch)
Deleted:
ruby-metadata-json-lint/repos/community-any/PKGBUILD
ruby-metadata-json-lint/repos/community-any/disable_rubocop.patch
ruby-metadata-json-lint/repos/community-any/dont_call_msl_via-bundler.patch
---------------------------------+
PKGBUILD | 114 +++++++++++++++++++-------------------
disable_rubocop.patch | 39 ++++++++-----
dont_call_msl_via-bundler.patch | 62 ++++++++++----------
3 files changed, 113 insertions(+), 102 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-15 09:11:42 UTC (rev 998698)
+++ PKGBUILD 2021-08-15 09:11:47 UTC (rev 998699)
@@ -1,57 +0,0 @@
-# Maintainer: Tim Meusel <t...@bastelfreak.de>
-
-_gemname='metadata-json-lint'
-pkgname="ruby-${_gemname}"
-pkgver=3.0.0
-pkgrel=1
-pkgdesc='Tool to check the validity of Puppet metadata.json files'
-arch=('any')
-url="https://github.com/voxpupuli/${_gemname}";
-license=('Apache')
-depends=('ruby' 'ruby-json-schema' 'ruby-spdx-licenses' 'ruby-semantic_puppet')
-makedepends=('ruby-rdoc' 'ruby-rake' 'ruby-rspec' 'ruby-bundler')
-options=('!emptydirs')
-source=("${url}/archive/${pkgver}/${_gemname}-${pkgver}.tar.gz"
'disable_rubocop.patch' 'dont_call_msl_via-bundler.patch')
-sha512sums=('72783f5b9657d4d7e12bc7ab7eafac62d063b300e40ae242d4b3dd14c54c89454c64660c2049041b7d231f3890e14a6d6c5c4ad39ad03b4f8c0d79e824d48bf9'
-
'd76e58f22ef04f69ddf4cf65b3ce73ca4151d64af3c21e5b0b8cad96eed558632b9510b9f5a7678db1e687cfacded1d4c693d5f3e38ac863286a5d59e1976a43'
-
'ed730430b39554b74586fd47c85581afa289a700a677b5c9189fca06ccedb10b31bdef424f692949ed3fa54b292d7a51bb07d838f80d4bcd1cfe80e6d69e398c')
-
-prepare() {
- cd "${srcdir}/${_gemname}-${pkgver}"
- # allow latest dependencies
- sed --in-place 's|~>|>=|g' "${_gemname}.gemspec"
-
- # drop development deps, they only cause dependency issues and aren't
required
- sed --in-place '/add_development_dependency/d' "${_gemname}.gemspec"
-
- # disable rubocop
- patch --forward --verbose --strip=1 --input=../disable_rubocop.patch
-
- # we build with a release tar ball, not a git archive
- sed --in-place 's|`git ls-files -z`.split("\\x0")|`find`.split("\\n")|'
"${_gemname}.gemspec"
-
- # the tests work through bundle, which doesn't work during *our* build
- patch --forward --verbose --strip=1
--input=../dont_call_msl_via-bundler.patch
-}
-
-build() {
- cd "${srcdir}/${_gemname}-${pkgver}"
- gem build "${_gemname}.gemspec"
-}
-
-check() {
- cd "${srcdir}/${_gemname}-${pkgver}"
- rake spec test:acceptance
-}
-
-package() {
-cd "${srcdir}/${_gemname}-${pkgver}"
- local _gemdir="$(gem env gemdir)"
- gem install --verbose --ignore-dependencies --no-user-install --install-dir
"${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "${_gemname}-${pkgver}.gem"
-
- install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-
- install -Dm 644 README.md HISTORY.md CHANGELOG.md -t
"${pkgdir}/usr/share/doc/${pkgname}"
-
- rm -rf "${pkgdir}/${_gemdir}/cache"
-}
Copied: ruby-metadata-json-lint/repos/community-any/PKGBUILD (from rev 998698,
ruby-metadata-json-lint/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-15 09:11:47 UTC (rev 998699)
@@ -0,0 +1,57 @@
+# Maintainer: Tim Meusel <t...@bastelfreak.de>
+
+_gemname='metadata-json-lint'
+pkgname="ruby-${_gemname}"
+pkgver=3.0.1
+pkgrel=1
+pkgdesc='Tool to check the validity of Puppet metadata.json files'
+arch=('any')
+url="https://github.com/voxpupuli/${_gemname}";
+license=('Apache')
+depends=('ruby' 'ruby-json-schema' 'ruby-spdx-licenses' 'ruby-semantic_puppet')
+makedepends=('ruby-rdoc' 'ruby-rake' 'ruby-rspec' 'ruby-bundler')
+options=('!emptydirs')
+source=("${url}/archive/${pkgver}/${_gemname}-${pkgver}.tar.gz"
'disable_rubocop.patch' 'dont_call_msl_via-bundler.patch')
+sha512sums=('6e61a409f8eee3246906fcbf5fe3257029524e86837cc22279f67a93009d96af2eeb1fae2c2212de4ecec617edce8826741343c08323007011f95366648a4bff'
+
'479a94337a0d3ec93f017780dedcbfec6173ab1ba3c20c402e889cf51d7309b892bb2c557ee3de4ad8d502742a44cb272420b997c3b90753c22c0a6cd590ca94'
+
'ed730430b39554b74586fd47c85581afa289a700a677b5c9189fca06ccedb10b31bdef424f692949ed3fa54b292d7a51bb07d838f80d4bcd1cfe80e6d69e398c')
+
+prepare() {
+ cd "${srcdir}/${_gemname}-${pkgver}"
+ # allow latest dependencies
+ sed --in-place 's|~>|>=|g' "${_gemname}.gemspec"
+
+ # drop development deps, they only cause dependency issues and aren't
required
+ sed --in-place '/add_development_dependency/d' "${_gemname}.gemspec"
+
+ # disable rubocop
+ patch --forward --verbose --strip=1 --input=../disable_rubocop.patch
+
+ # we build with a release tar ball, not a git archive
+ sed --in-place 's|`git ls-files -z`.split("\\x0")|`find`.split("\\n")|'
"${_gemname}.gemspec"
+
+ # the tests work through bundle, which doesn't work during *our* build
+ patch --forward --verbose --strip=1
--input=../dont_call_msl_via-bundler.patch
+}
+
+build() {
+ cd "${srcdir}/${_gemname}-${pkgver}"
+ gem build "${_gemname}.gemspec"
+}
+
+check() {
+ cd "${srcdir}/${_gemname}-${pkgver}"
+ rake spec test:acceptance
+}
+
+package() {
+cd "${srcdir}/${_gemname}-${pkgver}"
+ local _gemdir="$(gem env gemdir)"
+ gem install --verbose --ignore-dependencies --no-user-install --install-dir
"${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "${_gemname}-${pkgver}.gem"
+
+ install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+ install -Dm 644 README.md HISTORY.md CHANGELOG.md -t
"${pkgdir}/usr/share/doc/${pkgname}"
+
+ rm -rf "${pkgdir}/${_gemdir}/cache"
+}
Deleted: disable_rubocop.patch
===================================================================
--- disable_rubocop.patch 2021-08-15 09:11:42 UTC (rev 998698)
+++ disable_rubocop.patch 2021-08-15 09:11:47 UTC (rev 998699)
@@ -1,14 +0,0 @@
-diff --git a/Rakefile b/Rakefile
-index db82161..f2a1362 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -1,8 +1,5 @@
- desc 'Run all tests'
--task :test => %i[rubocop spec test:acceptance]
--
--require 'rubocop/rake_task'
--RuboCop::RakeTask.new
-+task :test => %i[spec test:acceptance]
-
- namespace :test do
- desc 'Acceptance suite under test/ which runs metadata-json-lint against
sample files with expected output'
Copied: ruby-metadata-json-lint/repos/community-any/disable_rubocop.patch (from
rev 998698, ruby-metadata-json-lint/trunk/disable_rubocop.patch)
===================================================================
--- disable_rubocop.patch (rev 0)
+++ disable_rubocop.patch 2021-08-15 09:11:47 UTC (rev 998699)
@@ -0,0 +1,25 @@
+diff --git a/Rakefile b/Rakefile
+index 2969965..b3b271a 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,19 +1,5 @@
+ desc 'Run all tests'
+-task :test => %i[rubocop spec test:acceptance]
+-
+-require 'rubocop/rake_task'
+-RuboCop::RakeTask.new(:rubocop) do |task|
+- # These make the rubocop experience maybe slightly less terrible
+- task.options = ['-D', '-S', '-E']
+-
+- # Use Rubocop's Github Actions formatter if possible
+- if ENV['GITHUB_ACTIONS'] == 'true'
+- rubocop_spec = Gem::Specification.find_by_name('rubocop')
+- if Gem::Version.new(rubocop_spec.version) >= Gem::Version.new('1.2')
+- task.formatters << 'github'
+- end
+- end
+-end
++task :test => %i[spec test:acceptance]
+
+ namespace :test do
+ desc 'Acceptance suite under test/ which runs metadata-json-lint against
sample files with expected output'
Deleted: dont_call_msl_via-bundler.patch
===================================================================
--- dont_call_msl_via-bundler.patch 2021-08-15 09:11:42 UTC (rev 998698)
+++ dont_call_msl_via-bundler.patch 2021-08-15 09:11:47 UTC (rev 998699)
@@ -1,31 +0,0 @@
-diff --git a/tests/test.sh b/tests/test.sh
-index aeecb34..eccaab5 100755
---- a/tests/test.sh
-+++ b/tests/test.sh
-@@ -31,7 +31,7 @@ test_bin() {
- local expect=$1; shift
- local RESULT=-1
- cd $name;
-- bundle exec metadata-json-lint $* metadata.json >last_output 2>&1
-+ ../../bin/metadata-json-lint $* metadata.json >last_output 2>&1
- RESULT=$?
- if [ $RESULT -ne $expect ]; then
- fail "Failing Test '${name}' (unexpected exit code '${RESULT}' instead of
'${expect}') (bin)"
-@@ -66,7 +66,7 @@ test_rake() {
- local RESULT=-1;
-
- cd $name;
-- bundle exec rake $rake_task >last_rake_output 2>&1
-+ rake $rake_task >last_rake_output 2>&1
- RESULT=$?
- if [ $RESULT -ne $expect ]; then
- fail "Failing Test '${name}' (rake: ${rake_task})"
-@@ -152,7 +152,7 @@ test "duplicate-requirement" $FAILURE
-
- # Test running without specifying file to parse
- cd perfect
--bundle exec metadata-json-lint
-+../../bin/metadata-json-lint
- if [ $? -ne 0 ]; then
- fail "Failing Test 'running without specifying metadata.json' (bin)"
- else
Copied:
ruby-metadata-json-lint/repos/community-any/dont_call_msl_via-bundler.patch
(from rev 998698, ruby-metadata-json-lint/trunk/dont_call_msl_via-bundler.patch)
===================================================================
--- dont_call_msl_via-bundler.patch (rev 0)
+++ dont_call_msl_via-bundler.patch 2021-08-15 09:11:47 UTC (rev 998699)
@@ -0,0 +1,31 @@
+diff --git a/tests/test.sh b/tests/test.sh
+index aeecb34..eccaab5 100755
+--- a/tests/test.sh
++++ b/tests/test.sh
+@@ -31,7 +31,7 @@ test_bin() {
+ local expect=$1; shift
+ local RESULT=-1
+ cd $name;
+- bundle exec metadata-json-lint $* metadata.json >last_output 2>&1
++ ../../bin/metadata-json-lint $* metadata.json >last_output 2>&1
+ RESULT=$?
+ if [ $RESULT -ne $expect ]; then
+ fail "Failing Test '${name}' (unexpected exit code '${RESULT}' instead of
'${expect}') (bin)"
+@@ -66,7 +66,7 @@ test_rake() {
+ local RESULT=-1;
+
+ cd $name;
+- bundle exec rake $rake_task >last_rake_output 2>&1
++ rake $rake_task >last_rake_output 2>&1
+ RESULT=$?
+ if [ $RESULT -ne $expect ]; then
+ fail "Failing Test '${name}' (rake: ${rake_task})"
+@@ -152,7 +152,7 @@ test "duplicate-requirement" $FAILURE
+
+ # Test running without specifying file to parse
+ cd perfect
+-bundle exec metadata-json-lint
++../../bin/metadata-json-lint
+ if [ $? -ne 0 ]; then
+ fail "Failing Test 'running without specifying metadata.json' (bin)"
+ else
