[DRE-commits] [ruby-buff-config] 01/03: Refresh patches to fix quilt-patch-missing-description lintian warning
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Tue Aug 15 21:27:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository ruby-buff-config.
commit 8ff0fccd64f0a8a2bf5c1f3e9b04ae539688575c
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Wed Aug 16 00:17:01 2017 +0300
Refresh patches to fix quilt-patch-missing-description lintian warning
---
...specs-to-RSpec-3.3.2-syntax-with-Transpec.patch | 65 ----------------------
.../0002-Don-t-change-LOAD_PATH-in-tests.patch | 2 +-
.../patches/0002-Remove-spork-usage-in-tests.patch | 23 ++++++++
...0003-Explicitly-require-pathname-in-specs.patch | 22 ++++++++
debian/patches/relax-varia-model-dependency | 16 ------
debian/patches/remove-spork | 13 -----
debian/patches/series | 6 +-
debian/patches/spec-load-pathname.patch | 14 -----
8 files changed, 48 insertions(+), 113 deletions(-)
diff --git a/debian/patches/0001-Convert-specs-to-RSpec-3.3.2-syntax-with-Transpec.patch b/debian/patches/0001-Convert-specs-to-RSpec-3.3.2-syntax-with-Transpec.patch
deleted file mode 100644
index 9910620..0000000
--- a/debian/patches/0001-Convert-specs-to-RSpec-3.3.2-syntax-with-Transpec.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Fri, 31 Jul 2015 12:25:01 +0300
-Subject: Convert specs to RSpec 3.3.2 syntax with Transpec
-
-This conversion is done by Transpec 3.1.1 with the following command:
- transpec
-
-* 3 conversions
- from: obj.stub(:message)
- to: allow(obj).to receive(:message)
-
-* 1 conversion
- from: expect(collection).to have(n).items
- to: expect(collection.size).to eq(n)
-
-For more details: https://github.com/yujinakayama/transpec#supported-conversions
----
- spec/buff/config/ruby_spec.rb | 6 +++---
- spec/buff/config_spec.rb | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/spec/buff/config/ruby_spec.rb b/spec/buff/config/ruby_spec.rb
-index de9a535..fc9d44e 100644
---- a/spec/buff/config/ruby_spec.rb
-+++ b/spec/buff/config/ruby_spec.rb
-@@ -51,7 +51,7 @@ describe Buff::Config::Ruby do
- describe '::from_file' do
- let(:filepath) { tmp_path.join('test_config.rb').to_s }
-
-- before { File.stub(:read).with(filepath).and_return(ruby) }
-+ before { allow(File).to receive(:read).with(filepath).and_return(ruby) }
-
- it 'returns an instance of the inheriting class' do
- expect(subject.from_file(filepath)).to be_a(subject)
-@@ -62,7 +62,7 @@ describe Buff::Config::Ruby do
- end
-
- context 'given a filepath that does not exist' do
-- before { File.stub(:read).and_raise(Errno::ENOENT) }
-+ before { allow(File).to receive(:read).and_raise(Errno::ENOENT) }
-
- it 'raises a Buff::Errors::ConfigNotFound error' do
- expect {
-@@ -118,7 +118,7 @@ describe Buff::Config::Ruby do
- describe '#reload' do
- before do
- subject.path = 'foo/bar.rb'
-- File.stub(:read).and_return(ruby)
-+ allow(File).to receive(:read).and_return(ruby)
- end
-
- it 'returns self' do
-diff --git a/spec/buff/config_spec.rb b/spec/buff/config_spec.rb
-index 5536dee..45778b8 100644
---- a/spec/buff/config_spec.rb
-+++ b/spec/buff/config_spec.rb
-@@ -28,7 +28,7 @@ describe Buff::Config::Base do
- end
-
- it "contains just the sliced elements" do
-- expect(@sliced).to have(1).item
-+ expect(@sliced.size).to eq(1)
- end
- end
- end
diff --git a/debian/patches/0002-Don-t-change-LOAD_PATH-in-tests.patch b/debian/patches/0002-Don-t-change-LOAD_PATH-in-tests.patch
index 4bc5217..4152777 100644
--- a/debian/patches/0002-Don-t-change-LOAD_PATH-in-tests.patch
+++ b/debian/patches/0002-Don-t-change-LOAD_PATH-in-tests.patch
@@ -7,7 +7,7 @@ Subject: Don't change LOAD_PATH in tests
1 file changed, 2 deletions(-)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 641fae5..7882886 100644
+index 7a7add5..72ea415 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,3 @@
diff --git a/debian/patches/0002-Remove-spork-usage-in-tests.patch b/debian/patches/0002-Remove-spork-usage-in-tests.patch
new file mode 100644
index 0000000..b2683b4
--- /dev/null
+++ b/debian/patches/0002-Remove-spork-usage-in-tests.patch
@@ -0,0 +1,23 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Wed, 16 Aug 2017 00:13:15 +0300
+Subject: Remove spork usage in tests
+
+ruby-spork is removed from debian
+---
+ spec/spec_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 72ea415..3a9a6ef 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -31,7 +31,7 @@ def tmp_path
+ app_root.join('spec', 'tmp')
+ end
+
+-if Buff::RubyEngine.jruby?
++if true
+ require 'buff/config'
+ setup_rspec
+ else
diff --git a/debian/patches/0003-Explicitly-require-pathname-in-specs.patch b/debian/patches/0003-Explicitly-require-pathname-in-specs.patch
new file mode 100644
index 0000000..1a4b5f4
--- /dev/null
+++ b/debian/patches/0003-Explicitly-require-pathname-in-specs.patch
@@ -0,0 +1,22 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Wed, 16 Aug 2017 00:13:15 +0300
+Subject: Explicitly require pathname in specs
+
+Apparently Pathname is no longer autoloaded on ruby2.3.
+---
+ spec/spec_helper.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 3a9a6ef..0b313ee 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,6 +1,7 @@
+ require 'rspec'
+ require 'buff/ruby_engine'
+ require 'json_spec'
++require 'pathname'
+
+ def setup_rspec
+ RSpec.configure do |config|
diff --git a/debian/patches/relax-varia-model-dependency b/debian/patches/relax-varia-model-dependency
deleted file mode 100644
index df537b1..0000000
--- a/debian/patches/relax-varia-model-dependency
+++ /dev/null
@@ -1,16 +0,0 @@
-Relax dependency on varia-model to allow for 0.5 series, which
-had no real code changes.
-
-Index: ruby-buff-config/buff-config.gemspec
-===================================================================
---- ruby-buff-config.orig/buff-config.gemspec
-+++ ruby-buff-config/buff-config.gemspec
-@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
- spec.require_paths = ["lib"]
- spec.required_ruby_version = ">= 1.9.2"
-
-- spec.add_dependency "varia_model", "~> 0.4"
-+ spec.add_dependency "varia_model", ">= 0.4"
- spec.add_dependency "buff-extensions", "~> 1.0"
-
- spec.add_development_dependency "buff-ruby_engine", "~> 0.1"
diff --git a/debian/patches/remove-spork b/debian/patches/remove-spork
deleted file mode 100644
index 3e67bb9..0000000
--- a/debian/patches/remove-spork
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ruby-buff-config/spec/spec_helper.rb
-===================================================================
---- ruby-buff-config.orig/spec/spec_helper.rb
-+++ ruby-buff-config/spec/spec_helper.rb
-@@ -32,7 +32,7 @@ def tmp_path
- app_root.join('spec', 'tmp')
- end
-
--if Buff::RubyEngine.jruby?
-+if true
- require 'buff/config'
- setup_rspec
- else
diff --git a/debian/patches/series b/debian/patches/series
index 7d1070e..ae540e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-#0001-Convert-specs-to-RSpec-3.3.2-syntax-with-Transpec.patch
0002-Don-t-change-LOAD_PATH-in-tests.patch
-remove-spork
-#relax-varia-model-dependency
-spec-load-pathname.patch
+0002-Remove-spork-usage-in-tests.patch
+0003-Explicitly-require-pathname-in-specs.patch
diff --git a/debian/patches/spec-load-pathname.patch b/debian/patches/spec-load-pathname.patch
deleted file mode 100644
index 4307e3f..0000000
--- a/debian/patches/spec-load-pathname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Apparently Pathname is no longer autoloaded on ruby2.3.
-
-Index: ruby-buff-config/spec/spec_helper.rb
-===================================================================
---- ruby-buff-config.orig/spec/spec_helper.rb
-+++ ruby-buff-config/spec/spec_helper.rb
-@@ -1,6 +1,7 @@
- require 'rspec'
- require 'buff/ruby_engine'
- require 'json_spec'
-+require 'pathname'
-
- def setup_rspec
- RSpec.configure do |config|
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-buff-config.git
More information about the Pkg-ruby-extras-commits
mailing list