[DRE-commits] [ruby-foreman] 06/15: refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Wed Feb 4 17:29:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ruby-foreman.
commit cc12d7b3b4d5fa75fb1ccc1fbce52d4e2cedd5ed
Author: Antonio Terceiro <terceiro at debian.org>
Date: Wed Feb 4 13:03:24 2015 -0200
refresh patches
---
.../0001-Look-for-data-in-usr-share-foreman.patch | 12 ++++----
...4.patch => 0002-Port-tests-to-fakefs-0.4.patch} | 0
...ng-build-dependencies-run-tests-recursive.patch | 35 ----------------------
...> 0003-spec_helper-don-t-use-bundle-exec.patch} | 2 ++
...-Add-missing-.env-file-required-for-tests.patch | 16 ++++++++++
debian/patches/series | 5 ++--
6 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch b/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch
index c348856..2a154e0 100644
--- a/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch
+++ b/debian/patches/0001-Look-for-data-in-usr-share-foreman.patch
@@ -3,12 +3,14 @@ Date: Wed, 4 Feb 2015 10:38:51 -0200
Subject: Look for data in /usr/share/foreman
---
- lib/foreman/export/base.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ lib/foreman/export/base.rb | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+diff --git a/lib/foreman/export/base.rb b/lib/foreman/export/base.rb
+index f8b8a6f..76939d8 100644
--- a/lib/foreman/export/base.rb
+++ b/lib/foreman/export/base.rb
-@@ -111,7 +111,7 @@ private ################################
+@@ -111,7 +111,7 @@ private ######################################################################
elsif File.exist?(file_path = File.expand_path(File.join("~/.foreman/templates", file)))
File.read(file_path)
else
@@ -17,7 +19,7 @@ Subject: Look for data in /usr/share/foreman
end
end
-@@ -123,7 +123,7 @@ private ################################
+@@ -123,7 +123,7 @@ private ######################################################################
matchers = []
matchers << File.join(options[:template], name_without_first) if options[:template]
matchers << File.expand_path("~/.foreman/templates/#{name}")
@@ -26,7 +28,7 @@ Subject: Look for data in /usr/share/foreman
File.read(matchers.detect { |m| File.exists?(m) })
end
end
-@@ -153,4 +153,13 @@ private ################################
+@@ -153,4 +153,13 @@ private ######################################################################
end
end
diff --git a/debian/patches/0003-Port-tests-to-fakefs-0.4.patch b/debian/patches/0002-Port-tests-to-fakefs-0.4.patch
similarity index 100%
rename from debian/patches/0003-Port-tests-to-fakefs-0.4.patch
rename to debian/patches/0002-Port-tests-to-fakefs-0.4.patch
diff --git a/debian/patches/0002-tests-missing-build-dependencies-run-tests-recursive.patch b/debian/patches/0002-tests-missing-build-dependencies-run-tests-recursive.patch
deleted file mode 100644
index 4581188..0000000
--- a/debian/patches/0002-tests-missing-build-dependencies-run-tests-recursive.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Wed, 4 Feb 2015 11:28:08 -0200
-Subject: tests: missing build dependencies + run tests recursively
-
----
- debian/control | 2 +-
- debian/ruby-tests.rake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index 95d5280..82ce968 100644
---- a/debian/control
-+++ b/debian/control
-@@ -3,7 +3,7 @@ Section: ruby
- Priority: optional
- Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
- Uploaders: Antonio Terceiro <terceiro at debian.org>
--Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec, rake
-+Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec, rake, ruby-timecop, ruby-fakefs, ruby-rr, ruby-simplecov
- Standards-Version: 3.9.5
- Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/foreman.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/foreman.git;a=summary
-diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
-index 99987ae..dcc1601 100644
---- a/debian/ruby-tests.rake
-+++ b/debian/ruby-tests.rake
-@@ -1,7 +1,7 @@
- require 'rspec/core/rake_task'
-
- RSpec::Core::RakeTask.new(:spec) do |spec|
-- spec.pattern = './spec/*_spec.rb'
-+ spec.pattern = './spec/**/*_spec.rb'
- end
-
- task :default => :spec
diff --git a/debian/patches/0004-spec_helper-don-t-use-bundle-exec.patch b/debian/patches/0003-spec_helper-don-t-use-bundle-exec.patch
similarity index 93%
rename from debian/patches/0004-spec_helper-don-t-use-bundle-exec.patch
rename to debian/patches/0003-spec_helper-don-t-use-bundle-exec.patch
index 05d6a5b..031ffd5 100644
--- a/debian/patches/0004-spec_helper-don-t-use-bundle-exec.patch
+++ b/debian/patches/0003-spec_helper-don-t-use-bundle-exec.patch
@@ -7,6 +7,8 @@ This patch is mostl probably Debian-specific
spec/spec_helper.rb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 2eaca35..9fd2115 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,3 @@
diff --git a/debian/patches/0004-Add-missing-.env-file-required-for-tests.patch b/debian/patches/0004-Add-missing-.env-file-required-for-tests.patch
new file mode 100644
index 0000000..89a8add
--- /dev/null
+++ b/debian/patches/0004-Add-missing-.env-file-required-for-tests.patch
@@ -0,0 +1,16 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Wed, 4 Feb 2015 13:02:39 -0200
+Subject: Add missing .env file required for tests
+
+---
+ spec/resources/.env | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 spec/resources/.env
+
+diff --git a/spec/resources/.env b/spec/resources/.env
+new file mode 100644
+index 0000000..c075a74
+--- /dev/null
++++ b/spec/resources/.env
+@@ -0,0 +1 @@
++FOO=bar
diff --git a/debian/patches/series b/debian/patches/series
index 2b72c5d..b31c0b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Look-for-data-in-usr-share-foreman.patch
-0003-Port-tests-to-fakefs-0.4.patch
-0004-spec_helper-don-t-use-bundle-exec.patch
+0002-Port-tests-to-fakefs-0.4.patch
+0003-spec_helper-don-t-use-bundle-exec.patch
+0004-Add-missing-.env-file-required-for-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-foreman.git
More information about the Pkg-ruby-extras-commits
mailing list