[DRE-commits] [ruby-mixlib-install] 13/15: Update 0004-Stub-real-HTTP-requests.patch

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-mixlib-install.

commit 15fdbfe96073605979187b999af41c890852c281
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Thu Aug 4 18:24:05 2016 +0300

    Update 0004-Stub-real-HTTP-requests.patch
---
 debian/patches/0004-Stub-real-HTTP-requests.patch | 30 +++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/debian/patches/0004-Stub-real-HTTP-requests.patch b/debian/patches/0004-Stub-real-HTTP-requests.patch
index 7c7f4ea..129bddd 100644
--- a/debian/patches/0004-Stub-real-HTTP-requests.patch
+++ b/debian/patches/0004-Stub-real-HTTP-requests.patch
@@ -3,15 +3,15 @@ Date: Thu, 4 Aug 2016 09:05:04 +0300
 Subject: Stub real HTTP requests
 
 ---
- spec/mixlib/install/backend/bintray_spec.rb | 35 ++++++++++++++++++++---
+ spec/mixlib/install/backend/bintray_spec.rb | 35 ++++++++++++++++++---
  spec/mixlib/install_spec.rb                 | 12 ++++++++
  spec/spec_helper.rb                         |  2 ++
- spec/webmocks.rb                            | 43 +++++++++++++++++++++++++++++
- 4 files changed, 88 insertions(+), 4 deletions(-)
+ spec/webmocks.rb                            | 47 +++++++++++++++++++++++++++++
+ 4 files changed, 92 insertions(+), 4 deletions(-)
  create mode 100644 spec/webmocks.rb
 
 diff --git a/spec/mixlib/install/backend/bintray_spec.rb b/spec/mixlib/install/backend/bintray_spec.rb
-index faa3a20..f39c777 100644
+index 2f221f8..3fa7dff 100644
 --- a/spec/mixlib/install/backend/bintray_spec.rb
 +++ b/spec/mixlib/install/backend/bintray_spec.rb
 @@ -44,7 +44,33 @@ context "Mixlib::Install::Backend::Bintray", :vcr do
@@ -20,20 +20,20 @@ index faa3a20..f39c777 100644
    let(:mixlib_options) { Mixlib::Install::Options.new(options) }
 -  let(:bintray) { Mixlib::Install::Backend::Bintray.new(mixlib_options) }
 +  let(:bintray) do
-+     stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chef/versions/_latest").
-+       to_return(:status => 200, :body => CHEF_VERSIONS_LATEST, :headers => {})
++    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chef/versions/_latest").
++      to_return(:status => 200, :body => CHEF_VERSIONS_LATEST, :headers => {})
 +    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chef/versions/12.12.15/files").
 +      to_return(:status => 200, :body => CHEF_VERSIONS_12_12_15_FILES, :headers => {})
 +    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/_latest").
 +      to_return(:status => 200, :body => CHEFDK_VERSIONS_LATEST, :headers => {})
 +    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chefdk/versions/0.16.28/files").
 +      to_return(:status => 200, :body => CHEFDK_VERSIONS_0_16_28_FILES, :headers => {})
-+    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/v
-+ersions/_latest").
++    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/versions/_latest").
 +       to_return(:status => 200, :body => CHEF_32_ON_64, :headers => {})
-+    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/v
-+ersions/_latest").
-+      to_return(:status => 200, :body => CHEF_64_ON_64, :headers => {}) # TODO: not works
++    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/versions/_latest").
++      to_return(:status => 200, :body => CHEF_64_ON_64, :headers => {})
++    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/current/chef/versions/12.13.16/files").
++      to_return(:status => 200, :body => CHEF_VERSIONS_12_13_16_FILES, :headers => {})
 +    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/chef/versions/12.4.1/files").
 +       to_return(:status => 200, :body => CHEF_VERSIONS_12_4_1_FILES, :headers => {})
 +    stub_request(:get, "https://mixlib-install%40chef:a83d3a2ffad50eb9a2230f281a2e19b70fe0db2d@bintray.com/api/v1/packages/chef/stable/compliance/versions/1.3.1/files").
@@ -111,10 +111,10 @@ index 421d315..cd360e4 100644
  
 diff --git a/spec/webmocks.rb b/spec/webmocks.rb
 new file mode 100644
-index 0000000..e58200a
+index 0000000..c5c213b
 --- /dev/null
 +++ b/spec/webmocks.rb
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,47 @@
 +CHEF_VERSIONS_LATEST = <<END
 +{"name":"12.12.15","desc":"","package":"chef","repo":"stable","owner":"chef","labels":[],"attribute_names":["project","version","iteration"],"created":"2016-07-09T21:36:46.593Z","updated":"2016-07-20T22:20:18.820Z","released":"","ordinal":73.0}
 +END
@@ -158,3 +158,7 @@ index 0000000..e58200a
 +CHEF_64_ON_64 = <<END
 +{"name":"12.13.16","desc":"","package":"chef","repo":"current","owner":"chef","labels":[],"attribute_names":["project","version","iteration"],"created":"2016-07-29T15:11:35.680Z","updated":"2016-07-29T15:13:38.131Z","released":"","ordinal":57.0}
 +END
++
++CHEF_VERSIONS_12_13_16_FILES = <<END
++[{"name":"chef-12.13.16-1.powerpc.bff","path":"aix/6.1/chef-12.13.16-1.powerpc.bff","repo":"current","package":"chef","version":"12.13.16","owner":"chef","created":"2016-07-29T15:12:22.181Z","size":91960832,"sha1":"f18f61e5b63ed161d4075f558700f5b098b5ed6d","sha256":"2e4b5c6bd1030400f595a8f9a53c89dc87d97c12d866121af84d099ce905dbe7"},{"name":"chef-12.13.16-1.powerpc.bff.asc","path":"aix/6.1/chef-12.13.16-1.powerpc.bff.asc","repo":"current","package":"chef","version":"12.13.16","owner":"ch [...]
++END

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