New Upstream Snapshot - ruby-webmock
Ready changes
Summary
Merged new upstream version: 3.18.1+git20220818.1.833291d (was: 3.18.1).
Resulting package
Built on 2023-02-09T16:25 (took 34m7s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots ruby-webmock
Lintian Result
Diff
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8611c37..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-.*.sw[a-z]
-
-## RubyMine and related
-.idea
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-*.gem
-.bundle
-Gemfile.lock
-gemfiles/*.gemfile.lock
-pkg/*
-tmp/*
-*.rbc
-*.rbx
-.ruby-gemset
-.ruby-version
diff --git a/debian/changelog b/debian/changelog
index e9cf3c3..b4bb67b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-webmock (3.18.1+git20220818.1.833291d-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 09 Feb 2023 15:59:58 -0000
+
ruby-webmock (3.18.1-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/0004-Skip-tests-requiring-Internet-connection.patch b/debian/patches/0004-Skip-tests-requiring-Internet-connection.patch
index 774a102..6d035da 100644
--- a/debian/patches/0004-Skip-tests-requiring-Internet-connection.patch
+++ b/debian/patches/0004-Skip-tests-requiring-Internet-connection.patch
@@ -7,10 +7,10 @@ Forwarded: not-needed
spec/acceptance/net_http/net_http_shared.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/spec/acceptance/net_http/net_http_shared.rb b/spec/acceptance/net_http/net_http_shared.rb
-index c7d7ebb..1e29d9f 100644
---- a/spec/acceptance/net_http/net_http_shared.rb
-+++ b/spec/acceptance/net_http/net_http_shared.rb
+Index: ruby-webmock.git/spec/acceptance/net_http/net_http_shared.rb
+===================================================================
+--- ruby-webmock.git.orig/spec/acceptance/net_http/net_http_shared.rb
++++ ruby-webmock.git/spec/acceptance/net_http/net_http_shared.rb
@@ -45,7 +45,7 @@ shared_examples_for "Net::HTTP" do
end
end
diff --git a/debian/patches/drop-load-path-manipulation.diff b/debian/patches/drop-load-path-manipulation.diff
index 4cf72b7..936f6ee 100644
--- a/debian/patches/drop-load-path-manipulation.diff
+++ b/debian/patches/drop-load-path-manipulation.diff
@@ -1,5 +1,7 @@
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
+Index: ruby-webmock.git/spec/spec_helper.rb
+===================================================================
+--- ruby-webmock.git.orig/spec/spec_helper.rb
++++ ruby-webmock.git/spec/spec_helper.rb
@@ -9,8 +9,6 @@ if RUBY_PLATFORM =~ /java/
require 'manticore'
end
diff --git a/debian/patches/remove-patron.patch b/debian/patches/remove-patron.patch
index cd81ecd..ad3de44 100644
--- a/debian/patches/remove-patron.patch
+++ b/debian/patches/remove-patron.patch
@@ -3,9 +3,11 @@ Description: Remove patron adapter
Author: Pirate Praveen <praveen@debian.org>
Last-Update: 2019-09-15
---- a/lib/webmock.rb
-+++ b/lib/webmock.rb
-@@ -48,7 +48,6 @@
+Index: ruby-webmock.git/lib/webmock.rb
+===================================================================
+--- ruby-webmock.git.orig/lib/webmock.rb
++++ ruby-webmock.git/lib/webmock.rb
+@@ -48,7 +48,6 @@ require_relative 'webmock/http_lib_adapt
require_relative 'webmock/http_lib_adapters/net_http'
require_relative 'webmock/http_lib_adapters/http_rb_adapter'
require_relative 'webmock/http_lib_adapters/httpclient_adapter'
@@ -13,9 +15,11 @@ Last-Update: 2019-09-15
require_relative 'webmock/http_lib_adapters/curb_adapter'
require_relative 'webmock/http_lib_adapters/em_http_request_adapter'
require_relative 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -2,7 +2,6 @@
+Index: ruby-webmock.git/spec/spec_helper.rb
+===================================================================
+--- ruby-webmock.git.orig/spec/spec_helper.rb
++++ ruby-webmock.git/spec/spec_helper.rb
+@@ -2,7 +2,6 @@ require 'rubygems'
require 'httpclient'
unless RUBY_PLATFORM =~ /java/
require 'curb'
diff --git a/debian/patches/skip-gem-building-whitespace-tests.patch b/debian/patches/skip-gem-building-whitespace-tests.patch
index 0d4dac4..5c3cab7 100644
--- a/debian/patches/skip-gem-building-whitespace-tests.patch
+++ b/debian/patches/skip-gem-building-whitespace-tests.patch
@@ -3,8 +3,10 @@ Author: Praveen Arimbrathodiyil <praveen@debian.org>
Forwarded: no
Last-Update: 2013-05-26
---- a/spec/quality_spec.rb
-+++ b/spec/quality_spec.rb
+Index: ruby-webmock.git/spec/quality_spec.rb
+===================================================================
+--- ruby-webmock.git.orig/spec/quality_spec.rb
++++ ruby-webmock.git/spec/quality_spec.rb
@@ -61,9 +61,10 @@ describe "The library itself" do
end
diff --git a/lib/webmock/util/hash_counter.rb b/lib/webmock/util/hash_counter.rb
index 6e9e175..77f48db 100644
--- a/lib/webmock/util/hash_counter.rb
+++ b/lib/webmock/util/hash_counter.rb
@@ -4,26 +4,30 @@ module WebMock
module Util
class HashCounter
attr_accessor :hash
+
def initialize
- self.hash = {}
+ self.hash = Hash.new(0)
@order = {}
@max = 0
@lock = ::Mutex.new
end
- def put key, num=1
+
+ def put(key, num=1)
@lock.synchronize do
- hash[key] = (hash[key] || 0) + num
- @order[key] = @max = @max + 1
+ hash[key] += num
+ @order[key] = @max += 1
end
end
- def get key
+
+ def get(key)
@lock.synchronize do
- hash[key] || 0
+ hash[key]
end
end
def select(&block)
return unless block_given?
+
@lock.synchronize do
hash.select(&block)
end
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files