diff -Nru ruby-fuubar-2.0.0/debian/changelog ruby-fuubar-2.0.0/debian/changelog --- ruby-fuubar-2.0.0/debian/changelog 2015-07-27 04:11:06.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/changelog 2018-10-08 18:32:43.000000000 +0000 @@ -1,3 +1,27 @@ +ruby-fuubar (2.0.0-3) unstable; urgency=medium + + * Team upload + + [ Cédric Boutillier ] + * Remove version in the gem2deb build-dependency + * Run wrap-and-sort on packaging files + * Use new default gem2deb Rakefile to run the tests + * Use salsa.debian.org in Vcs-* fields + * Bump debhelper compatibility level to 11 + * Move debian/watch to gemwatch.debian.net + * Bump Standards-Version to 4.2.1 (no changes needed) + * Set Testsuite field to autopkgtest-pkg-ruby + * Use https in copyright format URL + + [ Hleb Valoshka ] + * Remove myself from uploaders + + [ Sophie Brun ] + * Add fix-tests-patch to accommodate tests with ruby-progressbar >= 1.9 + * Bump minimal version in ruby-progressbar dependency to 1.9 + + -- Cédric Boutillier Mon, 08 Oct 2018 20:32:43 +0200 + ruby-fuubar (2.0.0-2) unstable; urgency=medium * Fix dependencies (ruby-rspec>=3.0, ruby-progressbar>=1.4) diff -Nru ruby-fuubar-2.0.0/debian/compat ruby-fuubar-2.0.0/debian/compat --- ruby-fuubar-2.0.0/debian/compat 2013-01-04 18:33:48.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/compat 2018-10-08 18:29:49.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru ruby-fuubar-2.0.0/debian/control ruby-fuubar-2.0.0/debian/control --- ruby-fuubar-2.0.0/debian/control 2015-07-27 04:11:06.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/control 2018-10-08 18:32:43.000000000 +0000 @@ -2,21 +2,26 @@ Section: ruby Priority: optional Maintainer: Debian Ruby Extras Maintainers -Uploaders: Pirate Praveen , Hleb Valoshka <375gnu@gmail.com> -Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.9.0~), ruby-rspec (>= 3.0), - ruby-progressbar (>= 1.4) -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-fuubar.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-fuubar.git;a=summary +Uploaders: Pirate Praveen +Build-Depends: debhelper (>= 11~), + gem2deb, + ruby-progressbar (>= 1.9), + ruby-rspec (>= 3.5) +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/ruby-team/ruby-fuubar.git +Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-fuubar Homepage: https://github.com/jeffkreeftmeijer/fuubar -Testsuite: autopkgtest +Testsuite: autopkgtest-pkg-ruby XS-Ruby-Versions: all Package: ruby-fuubar Architecture: all XB-Ruby-Versions: ${ruby:Versions} -Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, - ruby-rspec (>= 3.0), ruby-progressbar (>= 1.4) +Depends: ruby | ruby-interpreter, + ruby-progressbar (>= 1.9), + ruby-rspec (>= 3.5), + ${misc:Depends}, + ${shlibs:Depends} Description: instafailing RSpec progress bar formatter It is an instafailing RSpec formatter that uses a progress bar instead of a string of letters and dots as feedback. diff -Nru ruby-fuubar-2.0.0/debian/copyright ruby-fuubar-2.0.0/debian/copyright --- ruby-fuubar-2.0.0/debian/copyright 2014-09-10 20:07:22.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/copyright 2018-10-08 18:32:43.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: fuubar Source: http://rubygems.org/gems/fuubar diff -Nru ruby-fuubar-2.0.0/debian/patches/fix-tests.patch ruby-fuubar-2.0.0/debian/patches/fix-tests.patch --- ruby-fuubar-2.0.0/debian/patches/fix-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/patches/fix-tests.patch 2018-10-08 17:56:30.000000000 +0000 @@ -0,0 +1,95 @@ +Origin: https://github.com/thekompanee/fuubar/commit/7073852a3ce420fee9b9e3e772a683189958b9d7 + +--- a/spec/fuubar_spec.rb ++++ b/spec/fuubar_spec.rb +@@ -75,7 +77,7 @@ describe Fuubar do + end + + it 'sets the format of the bar to the default' do +- expect(formatter.progress.instance_variable_get(:@format_string)).to eql ' %c/%C |%w>%i| %e ' ++ expect(formatter.progress.instance_variable_get(:@format)).to eql ' %c/%C |%w>%i| %e ' + end + + it 'sets the total to the number of examples' do +@@ -83,19 +85,19 @@ describe Fuubar do + end + + it 'sets the bar\'s output' do +- expect(formatter.progress.send(:output)).to eql formatter.output +- expect(formatter.progress.send(:output)).to eql output ++ expect(formatter.progress.send(:output).stream).to eql formatter.output ++ expect(formatter.progress.send(:output).stream).to eql output + end + + context 'and continuous integration is enabled' do + before do +- RSpec.configuration.fuubar_progress_bar_options = {:length => 40} ++ RSpec.configuration.fuubar_progress_bar_options = { :length => 40 } + ENV['CONTINUOUS_INTEGRATION'] = 'true' + end + + it 'throttles the progress bar at one second' do +- throttle = formatter.progress.instance_variable_get(:@throttle) +- throttle_rate = throttle.instance_variable_get(:@period) ++ throttle = formatter.progress.__send__(:output).__send__(:throttle) ++ throttle_rate = throttle.__send__(:rate) + + expect(throttle_rate).to eql 1.0 + end +@@ -104,8 +106,8 @@ describe Fuubar do + before do + formatter.start(start_notification) + +- throttle = formatter.progress.instance_variable_get(:@throttle) +- throttle_rate = throttle.instance_variable_set(:@period, 0.0) ++ throttle = formatter.progress.__send__(:output).__send__(:throttle) ++ throttle_rate = throttle.__send__(:rate=, 0.0) + + output.rewind + +@@ -120,13 +122,13 @@ describe Fuubar do + + context 'and continuous integration is not enabled' do + before do +- RSpec.configuration.fuubar_progress_bar_options = {:length => 40} ++ RSpec.configuration.fuubar_progress_bar_options = { :length => 40 } + ENV['CONTINUOUS_INTEGRATION'] = 'false' + end + + it 'throttles the progress bar at the default rate' do +- throttle = formatter.progress.instance_variable_get(:@throttle) +- throttle_rate = throttle.instance_variable_get(:@period) ++ throttle = formatter.progress.__send__(:output).__send__(:throttle) ++ throttle_rate = throttle.__send__(:rate) + + expect(throttle_rate).to eql 0.01 + end +@@ -135,8 +137,8 @@ describe Fuubar do + before do + formatter.start(start_notification) + +- throttle = formatter.progress.instance_variable_get(:@throttle) +- throttle_rate = throttle.instance_variable_set(:@period, 0.0) ++ throttle = formatter.progress.__send__(:output).__send__(:throttle) ++ throttle_rate = throttle.__send__(:rate=, 0.0) + + output.rewind + +@@ -164,7 +166,7 @@ describe Fuubar do + before(:each) { formatter.start(start_notification) } + + it 'properly creates the bar' do +- expect(formatter.progress.instance_variable_get(:@format_string)).to eql '%c' ++ expect(formatter.progress.instance_variable_get(:@format)).to eql '%c' + end + end + end +@@ -178,7 +180,7 @@ describe Fuubar do + + context 'and no custom options are passed in' do + it 'sets the format of the bar to the default' do +- expect(formatter.progress.instance_variable_get(:@format_string)).to eql ' %c/%C |%w>%i| %e ' ++ expect(formatter.progress.instance_variable_get(:@format)).to eql ' %c/%C |%w>%i| %e ' + end + end + diff -Nru ruby-fuubar-2.0.0/debian/patches/series ruby-fuubar-2.0.0/debian/patches/series --- ruby-fuubar-2.0.0/debian/patches/series 2015-07-27 04:11:06.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/patches/series 2018-10-08 17:56:30.000000000 +0000 @@ -1 +1,2 @@ 0001-Use-color-output-in-tests.patch +fix-tests.patch diff -Nru ruby-fuubar-2.0.0/debian/ruby-tests.rake ruby-fuubar-2.0.0/debian/ruby-tests.rake --- ruby-fuubar-2.0.0/debian/ruby-tests.rake 2015-07-27 04:11:06.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/ruby-tests.rake 2018-06-11 21:12:44.000000000 +0000 @@ -1,7 +1,5 @@ -require 'rspec/core/rake_task' +require 'gem2deb/rake/spectask' -RSpec::Core::RakeTask.new(:spec) do |spec| +Gem2Deb::Rake::RSpecTask.new do |spec| spec.pattern = './spec/**/*_spec.rb' end - -task :default => :spec diff -Nru ruby-fuubar-2.0.0/debian/watch ruby-fuubar-2.0.0/debian/watch --- ruby-fuubar-2.0.0/debian/watch 2013-01-04 18:33:48.000000000 +0000 +++ ruby-fuubar-2.0.0/debian/watch 2018-10-08 18:29:44.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/fuubar .*/fuubar-(.*).tar.gz +https://gemwatch.debian.net/fuubar .*/fuubar-(.*).tar.gz