[DRE-commits] [ruby-serverspec] 05/07: Update packaging with a new dh-make-ruby run

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-serverspec.

commit 57bd43ea45429a36f70ee9617efaae26b24f7f38
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 13 18:52:33 2015 -0300

    Update packaging with a new dh-make-ruby run
---
 debian/changelog       |  1 +
 debian/control         | 26 ++++++++++++++++++++------
 debian/ruby-tests.rake | 26 ++++----------------------
 debian/rules           | 13 ++-----------
 4 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ca6bf7..717c297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-serverspec (2.18.0-1) UNRELEASED; urgency=medium
   * Team upload
   * New upstream release
   * debian/patches/old-rspec: dropped, we want the new rspec now
+  * Update packaging with a new dh-make-ruby run
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 13 Jun 2015 17:25:51 -0300
 
diff --git a/debian/control b/debian/control
index 07b2a6e..41818a1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,33 @@ Source: ruby-serverspec
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: KURASHIKI Satoru <lurdan at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec (>= 2.13.0~), ruby-specinfra (>= 1.25.4~)
+Uploaders: KURASHIKI Satoru <lurdan at gmail.com>,
+           Antonio Terceiro <terceiro at debian.org>,
+Build-Depends: debhelper (>= 7.0.50~),
+               gem2deb,
+               rake,
+               ruby-multi-json,
+               ruby-rspec,
+               ruby-rspec (>= 3.0),
+               ruby-rspec-its,
+               ruby-specinfra (>= 2.35)
 Standards-Version: 3.9.6
-Vcs-Git: https://github.com/lurdan/serverspec.git
-Vcs-Browser: https://github.com/lurdan/serverspec/tree/dpkg
+Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-serverspec.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-serverspec.git
 Homepage: http://serverspec.org/
+Testsuite: autopkgtest-pkg-ruby
 XS-Ruby-Versions: all
 
 Package: ruby-serverspec
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-net-ssh, ruby-rspec (>= 2.13.0~), ruby-highline, ruby-specinfra (>= 1.25.4~)
-Recommends: bundler (>= 1.3~), rake
+Depends: ruby | ruby-interpreter,
+         ruby-multi-json,
+         ruby-rspec (>= 3.0),
+         ruby-rspec-its,
+         ruby-specinfra (>= 2.35),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: RSpec tests for your servers configured by Puppet, Chef or anything else
  With serverspec, you can write RSpec tests for checking your servers
  are configured correctly.
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index acaba32..dcc1601 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,25 +1,7 @@
 require 'rspec/core/rake_task'
 
-task :default => 'spec:all'
-
-namespace :spec do
-  oses = %w( darwin debian gentoo plamo redhat aix solaris solaris10 solaris11 smartos windows freebsd)
-
-  task :all => [ oses.map {|os| "spec:#{os}" }, :helpers, :exec, :ssh, :cmd, :winrm, :powershell ].flatten
-
-  oses.each do |os|
-    RSpec::Core::RakeTask.new(os.to_sym) do |t|
-      t.pattern = "spec/#{os}/*_spec.rb"
-    end
-  end
-
-  RSpec::Core::RakeTask.new(:helpers) do |t|
-    t.pattern = "spec/helpers/*_spec.rb"
-  end
-
-  [:exec, :ssh, :cmd, :winrm, :powershell].each do |backend|
-    RSpec::Core::RakeTask.new(backend) do |t|
-      t.pattern = "spec/backend/#{backend.to_s}/*_spec.rb"
-    end
-  end
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = './spec/**/*_spec.rb'
 end
+
+task :default => :spec
diff --git a/debian/rules b/debian/rules
index 3e62b68..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 ruby2.0 ruby2.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-serverspec.git