[DRE-commits] [ruby-crb-blast] 01/03: adjust test and finish removal of bindeps dependency

[Michael Crusoe]

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

misterc-guest pushed a commit to tag debian/0.6.6-1
in repository ruby-crb-blast.

commit 7a05907dd39ce3058e167c0b65f73e2f0cd460d2
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sun Aug 14 02:21:40 2016 -0700

    adjust test and finish removal of bindeps dependency
---
 debian/changelog                |  2 ++
 debian/clean                    |  1 +
 debian/patches/adjust-test      | 13 +++++++++++
 debian/patches/drop-bindeps-req | 50 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  2 +-
 6 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 816b35d..a6bd1ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ruby-crb-blast (0.6.6-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Update to latest standards version
+  * Finish removal of bindeps dependency (Closes: #830080), enabled the check
+    of dependencies during build to prevent its reoccurance.
 
  -- Michael R. Crusoe <michael.crusoe at gmail.com>  Wed, 27 Apr 2016 13:58:43 -0700
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..0f65186
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/*.1
diff --git a/debian/patches/adjust-test b/debian/patches/adjust-test
new file mode 100644
index 0000000..3e4f125
--- /dev/null
+++ b/debian/patches/adjust-test
@@ -0,0 +1,13 @@
+Author: Michael R. Crusoe <michael.crusoe at gmail.com>
+Description: Fixes test due to stricter results from newer blast versions
+--- ruby-crb-blast.orig/test/test_test.rb
++++ ruby-crb-blast/test/test_test.rb
+@@ -79,7 +79,7 @@
+ 
+ 
+     should 'get number of reciprocals' do
+-      assert_equal 11, @blaster.size
++      assert_equal 10, @blaster.size
+     end
+ 
+   end
diff --git a/debian/patches/drop-bindeps-req b/debian/patches/drop-bindeps-req
index eae7b12..201a156 100644
--- a/debian/patches/drop-bindeps-req
+++ b/debian/patches/drop-bindeps-req
@@ -10,6 +10,17 @@ Description: we manage deps using packages; not bindeps
  
  opts = Trollop::options do
    version CRB_Blast::VERSION::STRING.dup
+@@ -55,10 +54,6 @@
+ Trollop::die :query, "must exist" if !File.exist?(opts[:query])
+ Trollop::die :target, "must exist" if !File.exist?(opts[:target])
+ 
+-gem_dir = Gem.loaded_specs['crb-blast'].full_gem_path
+-gem_deps = File.join(gem_dir, 'deps', 'deps.yaml')
+-Bindeps.require gem_deps
+-
+ blaster = CRB_Blast::CRB_Blast.new(opts.query, opts.target)
+ dbs = blaster.makedb
+ run = blaster.run_blast(opts.evalue, opts.threads, opts.split)
 --- ruby-crb-blast.orig/test/test_bin.rb
 +++ ruby-crb-blast/test/test_bin.rb
 @@ -7,7 +7,7 @@
@@ -21,3 +32,42 @@ Description: we manage deps using packages; not bindeps
        runner = CRB_Blast::Cmd.new(cmd)
        runner.run
        assert runner.status.success?
+--- ruby-crb-blast.orig/crb-blast.gemspec
++++ ruby-crb-blast/crb-blast.gemspec
+@@ -19,7 +19,6 @@
+   gem.add_dependency 'bio', '~> 1.4', '>= 1.4.3'
+   gem.add_dependency 'fixwhich', '~> 1.0', '>= 1.0.2'
+   gem.add_dependency 'threach', '~> 0.2', '>= 0.2.0'
+-  gem.add_dependency 'bindeps', '~> 1.0', '>= 1.0.3'
+ 
+   gem.add_development_dependency 'rake', '~> 10.3', '>= 10.3.2'
+   gem.add_development_dependency 'turn', '~> 0.9', '>= 0.9.7'
+--- ruby-crb-blast.orig/metadata.yml
++++ ruby-crb-blast/metadata.yml
+@@ -86,26 +86,6 @@
+       - !ruby/object:Gem::Version
+         version: 0.2.0
+ - !ruby/object:Gem::Dependency
+-  name: bindeps
+-  requirement: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - "~>"
+-      - !ruby/object:Gem::Version
+-        version: '1.0'
+-    - - ">="
+-      - !ruby/object:Gem::Version
+-        version: 1.0.3
+-  type: :runtime
+-  prerelease: false
+-  version_requirements: !ruby/object:Gem::Requirement
+-    requirements:
+-    - - "~>"
+-      - !ruby/object:Gem::Version
+-        version: '1.0'
+-    - - ">="
+-      - !ruby/object:Gem::Version
+-        version: 1.0.3
+-- !ruby/object:Gem::Dependency
+   name: rake
+   requirement: !ruby/object:Gem::Requirement
+     requirements:
diff --git a/debian/patches/series b/debian/patches/series
index 4966096..33d0598 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 drop-coverage-check
 drop-bindeps-req
+adjust-test
diff --git a/debian/rules b/debian/rules
index 10204ac..3cdf3db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 #export DH_RUBY_GEMSPEC=gem.gemspec
 #
 # Uncomment to check dependencies during build:
-# export GEM2DEB_TEST_RUNNER = --check-dependencies
+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-crb-blast.git