Merge ~michal-maloszewski99/ubuntu/+source/ruby-faraday:fix-deprec into ubuntu/+source/ruby-faraday:ubuntu/devel

[Michał Małoszewski]

Unmerged commits

56fe3c3... by Michał Małoszewski on 2022-07-11

sdsdsds

e9fb789... by Michał Małoszewski on 2022-07-11

sds

5ac4bcc... by Michał Małoszewski on 2022-07-11

sdsds

9082b2b... by Michał Małoszewski on 2022-07-11

sdsds

4afe2e7... by Michał Małoszewski on 2022-07-05

dsdsd

abcc9c2... by Michał Małoszewski on 2022-07-05

sds

diff --git a/debian/changelog b/debian/changelog
index 1f86e9d..8571346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 ruby-faraday (1.1.0-7) unstable; urgency=medium
 
   [ Jenkins ]
@@ -94,6 +95,13 @@ ruby-faraday (1.0.0-1) experimental; urgency=medium
   * Add ruby-rspec as build dependency
 
  -- Pirate Praveen <[e-mail]>  Thu, 06 Feb 2020 17:11:57 +0100
+=======
+ruby-faraday (0.15.4-3ubuntu0.1) focal; urgency=medium
+
+  * Fix deprec messages 
+
+ -- Michal Maloszewski <[e-mail]>  Tue, 05 Jul 2022 20:47:02 +0200
+>>>>>>> debian/changelog
 
 ruby-faraday (0.15.4-3) unstable; urgency=medium
 
diff --git a/debian/patches/fix-deprec-msg.patch b/debian/patches/fix-deprec-msg.patch
new file mode 100644
index 0000000..951dc08
--- /dev/null
+++ b/debian/patches/fix-deprec-msg.patch
@@ -0,0 +1,82 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it..
+ .
+ ruby-faraday (0.15.4-3) unstable; urgency=medium
+ .
+   * Fix Breaks for ruby-oauth2 (1.4.1 is compatible)
+Author: Pirate Praveen <[e-mail]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2022-07-05
+
+Index: ruby1/lib/faraday/adapter/em_http.rb
+===================================================================
+--- ruby1.orig/lib/faraday/adapter/em_http.rb
++++ ruby1/lib/faraday/adapter/em_http.rb
+@@ -193,11 +193,11 @@ module Faraday
+ 
+         def running?() @running end
+ 
+-        def add
++        def add(&block)
+           if running?
+             perform_request { yield }
+           else
+-            @registered_procs << Proc.new
++            @registered_procs << block
+           end
+           @num_registered += 1
+         end
+Index: ruby1/lib/faraday/options.rb
+===================================================================
+--- ruby1.orig/lib/faraday/options.rb
++++ ruby1/lib/faraday/options.rb
+@@ -72,7 +72,7 @@ module Faraday
+         if args.size > 0
+           send(key_setter, args.first)
+         elsif block_given?
+-          send(key_setter, Proc.new.call(key))
++          send(key_setter, yield(key))
+         else
+           raise self.class.fetch_error_class, "key not found: #{key.inspect}"
+         end
+@@ -163,7 +163,8 @@ module Faraday
+     end
+ 
+     def self.memoized(key)
+-      memoized_attributes[key.to_sym] = Proc.new
++      memoized_attributes[key.to_sym] = &block
++
+       class_eval <<-RUBY, __FILE__, __LINE__ + 1
+         def #{key}() self[:#{key}]; end
+       RUBY
+Index: ruby1/lib/faraday/response.rb
+===================================================================
+--- ruby1.orig/lib/faraday/response.rb
++++ ruby1/lib/faraday/response.rb
+@@ -54,9 +54,9 @@ module Faraday
+       !!env
+     end
+ 
+-    def on_complete
++    def on_complete(&block)
+       if not finished?
+-        @on_complete_callbacks << Proc.new
++        @on_complete_callbacks << block
+       else
+         yield(env)
+       end
diff --git a/debian/patches/series b/debian/patches/series
index 823d159..164c03c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,12 @@
 skip-test-failure-on-warning.patch
 001_remove-bundler.patch
+<<<<<<< debian/patches/series
 require-faraday.patch
 remove-coveralls.patch
 skip-test-failing-in-ubuntu.patch
+=======
+003_gemspec-no-git.patch
+disable-tests-localhost-port4.patch
+use-system-lib.patch
+fix-deprec-msg.patch
+>>>>>>> debian/patches/series
diff --git a/lib/faraday/adapter/em_http.rb b/lib/faraday/adapter/em_http.rb
index f2d98c5..fcc5cb0 100644
--- a/lib/faraday/adapter/em_http.rb
+++ b/lib/faraday/adapter/em_http.rb
@@ -18,7 +18,7 @@ module Faraday
           configure_ssl(options, env)
           options
         end
-
+#
         def request_config(env)
           options = {
             body: read_body(env),
diff --git a/lib/faraday/options.rb b/lib/faraday/options.rb
index ee198d8..b2eaa68 100644
--- a/lib/faraday/options.rb
+++ b/lib/faraday/options.rb
@@ -29,8 +29,13 @@ module Faraday
         else
           new_value = value
         end
+<<<<<<< lib/faraday/options.rb
 
         send("#{key}=", new_value) unless new_value.nil?
+=======
+#
+        self.send("#{key}=", new_value) unless new_value.nil?
+>>>>>>> lib/faraday/options.rb
       end
       self
     end
@@ -167,12 +172,18 @@ module Faraday
       @attribute_options ||= {}
     end
 
+<<<<<<< lib/faraday/options.rb
     def self.memoized(key, &block)
       unless block_given?
         raise ArgumentError, '#memoized must be called with a block'
       end
 
       memoized_attributes[key.to_sym] = block
+=======
+    def self.memoized(key)
+      memoized_attributes[key.to_sym] = &block
+
+>>>>>>> lib/faraday/options.rb
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{key}() self[:#{key}]; end
       RUBY
diff --git a/lib/faraday/response.rb b/lib/faraday/response.rb
index e931ea0..f25dace 100644
--- a/lib/faraday/response.rb
+++ b/lib/faraday/response.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'forwardable'
-
+#
 module Faraday
   # Response represents an HTTP response from making an HTTP request.
   class Response
@@ -59,7 +59,11 @@ module Faraday
     end
 
     def on_complete(&block)
+<<<<<<< lib/faraday/response.rb
       if !finished?
+=======
+      if not finished?
+>>>>>>> lib/faraday/response.rb
         @on_complete_callbacks << block
       else
         yield(env)