[DRE-commits] [ruby-docker-api] 04/09: Add patches

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository ruby-docker-api.

commit 18140dff46d10b4b606f5949a2041ff7721d70c0
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Mar 4 14:23:57 2014 -0300

    Add patches
---
 debian/patches/01_disable_rubygems.diff | 18 ++++++++++++++++++
 debian/patches/02_disable_vcr.diff      | 17 +++++++++++++++++
 debian/patches/series                   |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/debian/patches/01_disable_rubygems.diff b/debian/patches/01_disable_rubygems.diff
new file mode 100644
index 0000000..9dc1c41
--- /dev/null
+++ b/debian/patches/01_disable_rubygems.diff
@@ -0,0 +1,18 @@
+Description: Disable rubygems usage
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2014-03-04
+
+--- ruby-docker-api-1.8.4.orig/lib/docker.rb
++++ ruby-docker-api-1.8.4/lib/docker.rb
+@@ -3,7 +3,9 @@ require 'json'
+ require 'excon'
+ require 'tempfile'
+ require 'base64'
+-require 'rubygems/package'
++# Disabled: rubygems usage conflicts with Debian policies and it's not
++# really used with docker-api gem anyway.
++#require 'rubygems/package'
+ require 'archive/tar/minitar'
+ require 'uri'
+ require 'docker/version'
diff --git a/debian/patches/02_disable_vcr.diff b/debian/patches/02_disable_vcr.diff
new file mode 100644
index 0000000..368123b
--- /dev/null
+++ b/debian/patches/02_disable_vcr.diff
@@ -0,0 +1,17 @@
+Description: Disable ruby-vcr tests
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2014-03-04
+
+--- ruby-docker-api-1.8.4.orig/spec/spec_helper.rb
++++ ruby-docker-api-1.8.4/spec/spec_helper.rb
+@@ -4,7 +4,8 @@ require 'rspec'
+ require 'simplecov'
+ require 'docker'
+ 
+-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
++# vcr tests are excluded because is not available in Debian yet: #695195.
++Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].reject { |f| f =~ /vcr/ }.each { |f| require f }
+ 
+ RSpec.configure do |config|
+   config.mock_with :rspec
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1a29b09
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_disable_rubygems.diff
+02_disable_vcr.diff

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