[arch-commits] Commit in ruby-mocha/trunk (3 files)

[Tim Meusel]

    Date: Monday, June 27, 2022 @ 19:35:42
  Author: bastelfreak
Revision: 1239748

Update 1.13.0->1.14.0

Added:
  ruby-mocha/trunk/disable-rubocop.patch
Modified:
  ruby-mocha/trunk/PKGBUILD
Deleted:
  ruby-mocha/trunk/remove-unneeded-dependencies.patch

------------------------------------+
 PKGBUILD                           |   18 ++-----
 disable-rubocop.patch              |   81 +++++++++++++++++++++++++++++++++++
 remove-unneeded-dependencies.patch |   32 -------------
 3 files changed, 87 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-27 19:35:31 UTC (rev 1239747)
+++ PKGBUILD	2022-06-27 19:35:42 UTC (rev 1239748)
@@ -4,7 +4,7 @@
 
 _gemname=mocha
 pkgname="ruby-${_gemname}"
-pkgver=1.13.0
+pkgver=1.14.0
 pkgrel=1
 pkgdesc='Mocha is a mocking and stubbing library for Ruby'
 arch=('any')
@@ -11,26 +11,20 @@
 url='https://github.com/freerange/mocha'
 license=('Custom')
 depends=('ruby')
-checkdepends=('ruby-rake' 'ruby-bundler')
+checkdepends=('ruby-rake' 'ruby-bundler' 'ruby-introspection')
 makedepends=('ruby-minitest')
 options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/freerange/mocha/archive/v${pkgver}.tar.gz"
-        'remove-unneeded-dependencies.patch')
-sha512sums=('84cbe344b0bae434e9931a83b587dcefc14e8699893022a56e30a59bff574b52e3879a123b8f2f70e77301701b167d5992489e2173191ffd3450f09db3e7383b'
-            'fa136458ce008f468605d4e37419d1638569bd666305b1e001d978ac21dcce3c653ea0bd5728832bbcd39f570cbacfc52e6bb283f411a3d08399effb62a3eef5')
+        'disable-rubocop.patch')
+sha512sums=('41dfd1f9add0b62c8609ec4cdf07ae58580503c81eb40886cae6c97ee5a5109ae5aa6094756c9666985266c83fad38adef7c9c4a2add8ef2b7571c2c1753cfb0'
+            '0530a214c2d82be4ce029bad2dc3a6adc1a6b12b8563f25221224d6b761f1b190925181194f035501de356e2fc8c07df402bb66ffc6a8af85747334015621e2f')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
 
-  # remove unneeded dependencies
-  # bundler might require them if they are still in the gemspec file
-  patch --forward --verbose --strip=1 --input='../remove-unneeded-dependencies.patch'
-
-  # replace upper version boundaries for ruby gems
-  sed -r 's|~>|>=|g' -i ${_gemname}.gemspec
-
   # `git` doesn't work within src dir, because we downloaded an archive
   sed --in-place 's|`git ls-files -z`.split("\\x0")|`find`.split("\\n")|' "${_gemname}.gemspec"
+  patch --forward --verbose --strip=1 --input='../disable-rubocop.patch'
 }
 
 check() {

Added: disable-rubocop.patch
===================================================================
--- disable-rubocop.patch	                        (rev 0)
+++ disable-rubocop.patch	2022-06-27 19:35:42 UTC (rev 1239748)
@@ -0,0 +1,81 @@
+diff --git a/Rakefile b/Rakefile
+index bbcea3b..95a77bd 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,7 +1,3 @@
+-require 'bundler'
+-Bundler::GemHelper.install_tasks
+-require 'bundler/setup'
+-
+ require 'rake/testtask'
+
+ desc 'Run all tests'
+@@ -9,12 +5,8 @@ task 'default' => ['test', 'test:performance']
+
+ desc 'Run tests'
+ task 'test' do
+-  if (test_library = ENV['MOCHA_RUN_INTEGRATION_TESTS'])
+-    Rake::Task["test:integration:#{test_library}"].invoke
+-  else
+-    Rake::Task['test:units'].invoke
+-    Rake::Task['test:acceptance'].invoke
+-  end
++  Rake::Task['test:units'].invoke
++  Rake::Task['test:acceptance'].invoke
+ end
+
+ namespace 'test' do # rubocop:disable Metrics/BlockLength
+@@ -83,15 +75,6 @@ namespace 'test' do # rubocop:disable Metrics/BlockLength
+   end
+ end
+
+-begin
+-  require 'rubocop/rake_task'
+-  if RUBY_VERSION >= '2.2.0' && (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby') && ENV['MOCHA_RUN_INTEGRATION_TESTS'].nil?
+-    RuboCop::RakeTask.new
+-    task 'test' => 'rubocop'
+-  end
+-rescue LoadError # rubocop:disable Lint/HandleExceptions
+-end
+-
+ # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+ def benchmark_test_case(klass, iterations)
+   require 'benchmark'
+@@ -121,37 +104,3 @@ def benchmark_test_case(klass, iterations)
+   end
+ end
+ # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+-
+-if ENV['MOCHA_GENERATE_DOCS']
+-  require 'yard'
+-
+-  desc 'Remove generated documentation'
+-  task 'clobber_yardoc' do
+-    `rm -rf ./docs`
+-  end
+-
+-  task 'docs_environment' do
+-    unless ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
+-      puts "\nWarning: GOOGLE_ANALYTICS_WEB_PROPERTY_ID was not defined\n\n"
+-    end
+-  end
+-
+-  desc 'Generate documentation'
+-  YARD::Rake::YardocTask.new('yardoc' => 'docs_environment') do |task|
+-    task.options = ['--title', "Mocha #{Mocha::VERSION}", '--fail-on-warning']
+-  end
+-
+-  task 'checkout_docs_cname' do
+-    `git checkout docs/CNAME`
+-  end
+-
+-  task 'checkout_docs_js' do
+-    `git checkout docs/js/app.js`
+-    `git checkout docs/js/jquery.js`
+-  end
+-
+-  desc 'Generate documentation'
+-  task 'generate_docs' => %w[clobber_yardoc yardoc checkout_docs_cname checkout_docs_js]
+-end
+-
+-task 'release' => 'default'

Deleted: remove-unneeded-dependencies.patch
===================================================================
--- remove-unneeded-dependencies.patch	2022-06-27 19:35:31 UTC (rev 1239747)
+++ remove-unneeded-dependencies.patch	2022-06-27 19:35:42 UTC (rev 1239748)
@@ -1,32 +0,0 @@
-diff --git a/mocha.gemspec b/mocha.gemspec
-index 3fcfc79..f1ab7c5 100644
---- a/mocha.gemspec
-+++ b/mocha.gemspec
-@@ -30,26 +30,10 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
-     end
-   end
- 
--  if RUBY_VERSION < '1.9.3'
--    s.add_development_dependency 'rake', '~> 10.0'
--  elsif RUBY_VERSION < '2'
--    s.add_development_dependency 'rake', '~> 12.2.1'
--  elsif RUBY_VERSION < '2.2'
--    s.add_development_dependency 'rake', '~> 12.3.3'
--  else
--    s.add_development_dependency 'rake'
--  end
-+  s.add_development_dependency 'rake'
- 
--  s.add_development_dependency('introspection', '~> 0.0.1')
-   if RUBY_VERSION >= '2.2.0'
-     # No test libraries in standard library
-     s.add_development_dependency('minitest')
-   end
--  if RUBY_VERSION >= '2.2.0'
--    s.add_development_dependency('rubocop', '<= 0.58.2')
--  end
--  if ENV['MOCHA_GENERATE_DOCS']
--    s.add_development_dependency('redcarpet')
--    s.add_development_dependency('yard')
--  end
- end