[DRE-commits] [ruby-simple-navigation] 06/09: Refresh Debian packaging using dh-make-ruby (and fix install)

[Sebastien Badia]

This is an automated email from the git hooks/post-receive script.

sbadia-guest pushed a commit to branch master
in repository ruby-simple-navigation.

commit 99bf4080c535894e2f060dc077abc649fda9b215
Author: Sebastien Badia <seb at sebian.fr>
Date:   Thu Mar 3 15:34:49 2016 -0300

    Refresh Debian packaging using dh-make-ruby (and fix install)
---
 debian/control                        |  1 +
 debian/patches/remove_json_spec.patch | 28 ----------------------------
 debian/patches/series                 |  1 -
 debian/ruby-simple-navigation.docs    |  2 +-
 debian/ruby-tests.rake                | 12 +++---------
 debian/rules                          | 13 ++-----------
 6 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/debian/control b/debian/control
index 5ce659c..cb2489a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-simple-navigation.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-simple-navigation.git
 Homepage: http://github.com/codeplant/simple-navigation
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-simple-navigation
diff --git a/debian/patches/remove_json_spec.patch b/debian/patches/remove_json_spec.patch
deleted file mode 100644
index 06d57a4..0000000
--- a/debian/patches/remove_json_spec.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: remove json_spec
- We cannot use json_spec yet, as it is not yet in the archive.
- Besides, only a single test needs it, not all of them, so remove
- it. The test requiring it will need to be skipped.
-Author: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
-Last-Update: 2013-08-11
-Forwarded: no
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,7 +1,7 @@
- ENV["RAILS_ENV"] = "test"
- require 'rubygems'
- require 'rspec'
--require 'json_spec'
-+#require 'json_spec'
- require 'action_controller'
- 
- module Rails
-@@ -29,7 +29,7 @@ RSpec.configure do |config|
-   # config.mock_with :flexmock
-   # config.mock_with :rr
-   config.mock_with :rspec
--  config.include JsonSpec::Helpers
-+#  config.include JsonSpec::Helpers
- end
- 
- # spec helper methods
diff --git a/debian/patches/series b/debian/patches/series
index e51e07c..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-remove_json_spec.patch
diff --git a/debian/ruby-simple-navigation.docs b/debian/ruby-simple-navigation.docs
index e845566..b43bf86 100644
--- a/debian/ruby-simple-navigation.docs
+++ b/debian/ruby-simple-navigation.docs
@@ -1 +1 @@
-README
+README.md
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index eb17398..cf1591e 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,11 +1,5 @@
-require 'rspec/core/rake_task'
+require 'gem2deb/rake/spectask'
 
-desc 'Default: run specs.'
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ['--colour --format progress']
-  file_list = FileList['spec/**/*_spec.rb']
-  file_list = file_list.exclude("spec/lib/simple_navigation/rendering/renderer/json_spec.rb")
-  t.pattern = file_list
+Gem2Deb::Rake::RSpecTask.new do |spec|
+  spec.pattern = './spec/**/*_spec.rb'
 end
diff --git a/debian/rules b/debian/rules
index a5e7dc8..3454d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,6 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-#export DH_RUBY_GEMSPEC=gem.gemspec
+
+export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-simple-navigation.git