Hello community, here is the log from the commit of package rubygem-excon for openSUSE:Factory checked in at 2016-10-10 16:23:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-excon (Old) and /work/SRC/openSUSE:Factory/.rubygem-excon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-excon" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-excon/rubygem-excon.changes 2016-09-12 13:26:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-excon.new/rubygem-excon.changes 2016-10-10 16:23:05.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Sep 28 04:37:36 UTC 2016 - [email protected] + +- updated to version 0.53.0 + see installed changelog.txt + + 0.32.0 09/27/2016 + ================= + + add ability to pass ssl options as strings + progress towards rspec + update bundled certs + +------------------------------------------------------------------- Old: ---- excon-0.52.0.gem New: ---- excon-0.53.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-excon.spec ++++++ --- /var/tmp/diff_new_pack.MmyCxD/_old 2016-10-10 16:23:08.000000000 +0200 +++ /var/tmp/diff_new_pack.MmyCxD/_new 2016-10-10 16:23:08.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-excon -Version: 0.52.0 +Version: 0.53.0 Release: 0 %define mod_name excon %define mod_full_name %{mod_name}-%{version} ++++++ excon-0.52.0.gem -> excon-0.53.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2016-08-22 23:48:42.000000000 +0200 +++ new/Gemfile 2016-09-27 22:21:36.000000000 +0200 @@ -2,8 +2,7 @@ gemspec -gem 'jruby-openssl', :platform => :jruby -gem 'puma', :groups => [:development, :test] +gem 'jruby-openssl', '~> 0.9', :platform => :jruby gem 'unicorn', :platforms => [:mri, :rbx], :groups => [:development, :test] gem 'rubysl', '~> 2.0', :platform => :rbx gem 'rack', '~> 1.6' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile.lock new/Gemfile.lock --- old/Gemfile.lock 2016-08-22 23:48:42.000000000 +0200 +++ new/Gemfile.lock 2016-09-27 22:21:36.000000000 +0200 @@ -1,7 +1,7 @@ PATH remote: . specs: - excon (0.52.0) + excon (0.53.0) GEM remote: http://rubygems.org/ @@ -10,7 +10,6 @@ i18n (~> 0.6) multi_json (~> 1.0) backports (3.6.4) - bouncy-castle-java (1.5.0147) chronic (0.6.7) delorean (2.0.0) chronic @@ -20,8 +19,7 @@ ffi2-generators (0.1.1) formatador (0.2.3) i18n (0.6.0) - jruby-openssl (0.8.8) - bouncy-castle-java (>= 1.5.0147) + jruby-openssl (0.9.17-java) json (1.8.2) json (1.8.2-java) kgio (2.9.2) @@ -29,6 +27,7 @@ multi_json (1.3.6) open4 (1.3.0) puma (3.6.0) + puma (3.6.0-java) rack (1.6.0) rack-protection (1.2.0) rack @@ -284,7 +283,7 @@ delorean eventmachine (>= 1.0.4) excon! - jruby-openssl + jruby-openssl (~> 0.9) json (>= 1.8.2) open4 puma @@ -299,4 +298,4 @@ unicorn BUNDLED WITH - 1.12.5 + 1.13.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2016-08-22 23:48:42.000000000 +0200 +++ new/README.md 2016-09-27 22:21:36.000000000 +0200 @@ -413,6 +413,20 @@ `client_key_pass` is optional. +If you already have loaded the certificate and key into memory, then pass it through like: + +```ruby +client_cert_data = File.load 'mycert.pem' +client_key_data = File.load 'mycert.key' + +connection = Excon.new('https://example.com', + client_cert_data: client_cert_data, + client_key_data: client_key_data) +``` + +This can be useful if your program has already loaded the assets through +another mechanism (E.g. a remote API call to a secure K:V system like Vault). + ## HTTPS/SSL Issues By default excon will try to verify peer certificates when using HTTPS. Unfortunately on some operating systems the defaults will not work. This will likely manifest itself as something like `Excon::Errors::CertificateError: SSL_connect returned=1 ...` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/changelog.txt new/changelog.txt --- old/changelog.txt 2016-08-22 23:48:42.000000000 +0200 +++ new/changelog.txt 2016-09-27 22:21:37.000000000 +0200 @@ -1,3 +1,10 @@ +0.32.0 09/27/2016 +================= + +add ability to pass ssl options as strings +progress towards rspec +update bundled certs + 0.52.0 08/22/2016 ================= Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/data/cacert.pem new/data/cacert.pem --- old/data/cacert.pem 2016-08-22 23:48:42.000000000 +0200 +++ new/data/cacert.pem 2016-09-27 22:21:37.000000000 +0200 @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Apr 20 03:12:05 2016 +## Certificate data from Mozilla as of: Wed Sep 14 03:12:05 2016 ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -13,8 +13,8 @@ ## an Apache+mod_ssl webserver for SSL client authentication. ## Just configure this file as the SSLCACertificateFile. ## -## Conversion done with mk-ca-bundle.pl version 1.25. -## SHA1: 5df367cda83086392e1acdf22bfef00c48d5eba6 +## Conversion done with mk-ca-bundle.pl version 1.26. +## SHA256: 01bbf1ecdd693f554ff4dcbe15880b3e6c33188a956c15ff845d313ca69cfeb8 ## @@ -3863,3 +3863,174 @@ is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7 zAYspsbiDrW5viSP -----END CERTIFICATE----- + +Hellenic Academic and Research Institutions RootCA 2015 +======================================================= +-----BEGIN CERTIFICATE----- +MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT +BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0 +aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl +YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx +MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg +QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV +BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw +MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv +bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh +iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+ +6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd +FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr +i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F +GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2 +fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu +iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc +Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI +hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+ +D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM +d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y +d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn +82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb +davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F +Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt +J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa +JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q +p/UsQu0yrbYhnr68 +-----END CERTIFICATE----- + +Hellenic Academic and Research Institutions ECC RootCA 2015 +=========================================================== +-----BEGIN CERTIFICATE----- +MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0 +aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u +cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj +aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw +MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj +IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD +VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290 +Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP +dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK +Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O +BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA +GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn +dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR +-----END CERTIFICATE----- + +Certplus Root CA G1 +=================== +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgISESBVg+QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUAMD4xCzAJBgNV +BAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTAe +Fw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhD +ZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBANpQh7bauKk+nWT6VjOaVj0W5QOVsjQcmm1iBdTYj+eJZJ+622SLZOZ5KmHN +r49aiZFluVj8tANfkT8tEBXgfs+8/H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt6kuJPKNx +Qv4c/dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1/oA/caP0FG7Yn2ksYyy/yARujVj +BYZHYEMzkPZHogNPlk2dT8Hq6pyi/jQu3rfKG3akt62f6ajUeD94/vI4CTYd0hYCyOwqaK/1jpTv +LRN6HkJKHRUxrgwEV/xhc/MxVoYxgKDEEW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2 +z4QTd28n6v+WZxcIbekN1iNQMLAVdBM+5S//Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc +4nBvCGrch2c0798wct3zyT8j/zXhviEpIDCB5BmlIOklynMxdCm+4kLV87ImZsdo/Rmz5yCTmehd +4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z/fyL8inqh3SV4EJQeIQEQWGw9CEj +jy3LKCHyamz0GqbFFLQ3ZU+V/YDI+HLlJWvEYLF7bY5KinPOWftwenMGE9nTdDckQQoRb5fc5+R+ +ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G +A1UdDgQWBBSowcCbkahDFXxdBie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHY +lwuBsTANBgkqhkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh/k4DgYzDLDKTudQSk0YcbX8ACh +66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT+Hern+X+2B50ioUHj3/MeXrKls3N/U/7/SMNkPX0XtPG +YX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE+2J2winq14J2by5BSS7CTKtQ+FjPlnsZlFT5kOwQ/ +2wyPX1wdaR+v8+khjPPvl/aatxm2hHSco1S1cE5j2FddUyGbQJJD+tZ3VTNPZNX70Cxqjm0lpu+F +6ALEUz65noe8zDUa3qHpimOHZR4RKttjd5cUvpoUmRGywO6wT/gUITJDT5+rosuoD6o7BlXGEilX +CNQ314cnrUlZp5GrRHpejXDbl85IULFzk/bwg2D5zfHhMf1bfHEhYxQUqq/F3pN+aLHsIqKqkHWe +tUNy6mSjhEv9DKgma3GX7lZjZuhCVPnHHd/Qj1vfyDBviP4NxDMcU6ij/UgQ8uQKTuEVV/xuZDDC +VRHc6qnNSlSsKWNEz0pAoNZoWRsz+e86i9sgktxChL8Bq4fA1SCC28a5g4VCXA9DO2pJNdWY9BW/ ++mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl++O/QmueD6i9a5jc2NvLi6Td11n0bt3+ +qsOR0C5CB8AMTVPNJLFMWx5R9N/pkvo= +-----END CERTIFICATE----- + +Certplus Root CA G2 +=================== +-----BEGIN CERTIFICATE----- +MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4xCzAJBgNVBAYT +AkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjAeFw0x +NDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0 +cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BM0PW1aC3/BFGtat93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uN +Am8xIk0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0PAQH/BAQD +AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMB8GA1Ud +IwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqGSM49BAMDA2gAMGUCMHD+sAvZ94OX7PNV +HdTcswYO/jOYnYs5kGuUIe22113WTNchp+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjl +vPl5adytRSv3tjFzzAalU5ORGpOucGpnutee5WEaXw== +-----END CERTIFICATE----- + +OpenTrust Root CA G1 +==================== +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUAMEAxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcx +MB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM +CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7fa +Yp6bwiTXj/HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX/uMftk87 +ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij/swjm4eTrwSSTilZHcYTSSjFR077F9jAHiOH3BX2pfJLKO +YheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGPuY4zbGneWK2gDqdkVBFpRGZPTBKnjix9 +xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLxp2NX5Ntqp66/K7nJ5rInieV+mhxNaMbBGN4zK1FGSxyO +9z0M+Yo0FMT7MzUj8czxKselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ/GbI4Kq +3ywgsNw2TgOzfALU5nsaqocTvz6hdLubDuHAk5/XpGbKuxs74zD0M1mKB3IDVedzagMxbm+WG+Oi +n6+Sx+31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPwvFEVVJSmdz7QdFG9 +URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYYEQRVzXR7z2FwefR7LFxckvzluFqr +TJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUl0YhVyE12jZVx/PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx/Px +N3DlCPaTKbYwDQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E +PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr/jyTwyqkxf3kfgLMtMrpkZ2Cv +uVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN+VxbSFXJfLkur1J1juONI5f6ELlgK +n0Md/rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv/TW0V8/bhUiZucJvbI/NeJWsZCj9VrDDb8O+WVLh +X4SPgPL0DTatdrOjteFkdjpY3H1PXlZs5VVZV6Xf8YpmMIzUUmI4d7S+KNfKNsSbBfD4Fdvb8e80 +nR14SohWZ25g/4/Ii+GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcm +GS3tTAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L9109S5zvE/ +bw4cHjdx5RiHdRk/ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS/KyPu1svf0OnWZzsD2097+o +4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJAwSQiumPv+i2tCqjI40cHLI5kqiPAlxA +OXXUc0ECd97N4EOH1uS6SsNsEn/+KuYj1oxx +-----END CERTIFICATE----- + +OpenTrust Root CA G2 +==================== +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESChaRu/vbm9UpaPI+hIvyYRMA0GCSqGSIb3DQEBDQUAMEAxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcy +MB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM +CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQDMtlelM5QQgTJT32F+D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG+ +Ntmh/LzubKh8NBpxGuga2F8ORAbtp+Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78eCbY2albz +4e6WiWYkBuTNQjpK3eCasMSCRbP+yatcfD7J6xcvDH1urqWPyKwlCm/61UWY0jUJ9gNDlP7ZvyCV +eYCYitmJNbtRG6Q3ffyZO6v/v6wNj0OxmXsWEH4db0fEFY8ElggGQgT4hNYdvJGmQr5J1WqIP7wt +UdGejeBSzFfdNTVY27SPJIjki9/ca1TSgSuyzpJLHB9G+h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz +3GIZ38i1MH/1PCZ1Eb3XG7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW+vj +3CzMpSZyYhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L+epJUzpM5ChaHvGOz +9bGTXOBut9Dq+WIyiET7vycotjCVXRIouZW+j1MY5aIYFuJWpLIsEPUdN6b4t/bQWVyJ98LVtZR0 +0dX+G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA+aC/gh7PU3+06yzbXfZqfUAkBXKJOAGT +y3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUajn6QiL35okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59 +M4PLuG53hq8wDQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx+4BkJamz +Gj5oXScmp7oq4fBXgwpkTx4idBvpkF/wrM//T2h6OKQQbA2xx6R3gBi2oihEdqc0nXGEL8pZ0keI +mUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO+qTRmTFAHneIWv2V6CG1wZy7HBG +S4tz3aAhdT7cHcCP009zHIXZ/n9iyJVvttN7jLpTwm+bREx50B1ws9efAvSyB7DH5fitIw6mVskp +EndI2S9G/Tvw/HRwkqWOOAgfZDC2t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ +6e18CL13zSdkzJTaTkZQh+D5wVOAHrut+0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97kr +gCf2o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY/X0VdiLWK2gKgW0VU3jg9CcCo +SmVGFvyqv1ROTVu+OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eAiN1nE28daCSLT7d0geX0 +YJ96Vdc+N9oWaz53rK4YcJUIeSkDiv7BO7M/Gg+kO14fWKGVyasvc0rQLW6aWQ9VGHgtPFGml4vm +u7JwqkwR3v98KzfUetF3NI/n+UL3PIEMS1IK +-----END CERTIFICATE----- + +OpenTrust Root CA G3 +==================== +-----BEGIN CERTIFICATE----- +MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAxCzAJBgNVBAYT +AkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEczMB4X +DTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9w +ZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAARK7liuTcpm3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5B +ta1doYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4GA1UdDwEB +/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAf +BgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAKBggqhkjOPQQDAwNpADBmAjEAj6jcnboM +BBf6Fek9LykBl7+BFjNAk2z8+e2AcG+qj9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta +3U1fJAuwACEl74+nBCZx4nxp5V2a+EEfOzmTk51V6s2N8fvB +-----END CERTIFICATE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/excon.gemspec new/excon.gemspec --- old/excon.gemspec 2016-08-22 23:48:42.000000000 +0200 +++ new/excon.gemspec 2016-09-27 22:21:37.000000000 +0200 @@ -13,8 +13,8 @@ ## If your rubyforge_project name is different, then edit it and comment out ## the sub! line in the Rakefile s.name = 'excon' - s.version = '0.52.0' - s.date = '2016-08-22' + s.version = '0.53.0' + s.date = '2016-09-27' s.rubyforge_project = 'excon' ## Make sure your summary is short. The description may be as long @@ -65,7 +65,9 @@ s.add_development_dependency('sinatra') s.add_development_dependency('sinatra-contrib') s.add_development_dependency('json', '>= 1.8.2') - + if RUBY_VERSION.to_f >= 1.9 + s.add_development_dependency 'puma' + end ## Leave this section as-is. It will be automatically generated from the ## contents of your Git repository via the gemspec task. DO NOT REMOVE ## THE MANIFEST COMMENTS, they are used as delimiters by the task. @@ -127,9 +129,17 @@ lib/excon/test/server.rb lib/excon/unix_socket.rb lib/excon/utils.rb + spec/excon/error_spec.rb + spec/excon/test/server_spec.rb spec/excon_spec.rb - spec/excon_test_server_spec.rb + spec/helpers/file_path_helpers.rb + spec/requests/basic_spec.rb + spec/requests/eof_requests_spec.rb spec/spec_helper.rb + spec/support/shared_contexts/test_server_context.rb + spec/support/shared_examples/shared_example_for_clients.rb + spec/support/shared_examples/shared_example_for_streaming_clients.rb + spec/support/shared_examples/shared_example_for_test_servers.rb tests/authorization_header_tests.rb tests/bad_tests.rb tests/basic_tests.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/excon/constants.rb new/lib/excon/constants.rb --- old/lib/excon/constants.rb 2016-08-22 23:48:42.000000000 +0200 +++ new/lib/excon/constants.rb 2016-09-27 22:21:37.000000000 +0200 @@ -1,7 +1,7 @@ # frozen_string_literal: true module Excon - VERSION = '0.52.0' + VERSION = '0.53.0' CR_NL = "\r\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/excon/ssl_socket.rb new/lib/excon/ssl_socket.rb --- old/lib/excon/ssl_socket.rb 2016-08-22 23:48:42.000000000 +0200 +++ new/lib/excon/ssl_socket.rb 2016-09-27 22:21:37.000000000 +0200 @@ -65,24 +65,19 @@ ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE end - # maintain existing API - certificate_path = @data[:client_cert] || @data[:certificate_path] - private_key_path = @data[:client_key] || @data[:private_key_path] - private_key_pass = @data[:client_key_pass] || @data[:private_key_pass] - - if certificate_path && private_key_path - ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(certificate_path)) + if client_cert_data && client_key_data + ssl_context.cert = OpenSSL::X509::Certificate.new client_cert_data if OpenSSL::PKey.respond_to? :read - ssl_context.key = OpenSSL::PKey.read(File.read(private_key_path), private_key_pass) + ssl_context.key = OpenSSL::PKey.read(client_key_data, client_key_pass) else - ssl_context.key = OpenSSL::PKey::RSA.new(File.read(private_key_path), private_key_pass) + ssl_context.key = OpenSSL::PKey::RSA.new(client_key_data, client_key_pass) end elsif @data.key?(:certificate) && @data.key?(:private_key) ssl_context.cert = OpenSSL::X509::Certificate.new(@data[:certificate]) if OpenSSL::PKey.respond_to? :read - ssl_context.key = OpenSSL::PKey.read(@data[:private_key], private_key_pass) + ssl_context.key = OpenSSL::PKey.read(@data[:private_key], client_key_pass) else - ssl_context.key = OpenSSL::PKey::RSA.new(@data[:private_key], private_key_pass) + ssl_context.key = OpenSSL::PKey::RSA.new(@data[:private_key], client_key_pass) end end @@ -141,10 +136,37 @@ private + def client_cert_data + @client_cert_data ||= if ccd = @data[:client_cert_data] + ccd + elsif path = @data[:client_cert] + File.read path + elsif path = @data[:certificate_path] + warn ":certificate_path is no longer supported and will be deprecated. Please use :client_cert or :client_cert_data" + File.read path + end + end + def connect # backwards compatability for things lacking nonblock @nonblock = HAVE_NONBLOCK && @nonblock super end + + def client_key_data + @client_key_data ||= if ckd = @data[:client_key_data] + ckd + elsif path = @data[:client_key] + File.read path + elsif path = @data[:private_key_path] + warn ":private_key_path is no longer supported and will be deprecated. Please use :client_key or :client_key_data" + File.read path + end + end + + def client_key_pass + @data[:client_key_pass] || @data[:private_key_pass] + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/excon/test/plugin/server/puma.rb new/lib/excon/test/plugin/server/puma.rb --- old/lib/excon/test/plugin/server/puma.rb 2016-08-22 23:48:42.000000000 +0200 +++ new/lib/excon/test/plugin/server/puma.rb 2016-09-27 22:21:37.000000000 +0200 @@ -4,7 +4,6 @@ module Server module Puma def start(app_str = app, bind_uri = bind) - bind.host = bind_uri.host.gsub(/[\[\]]/, '') open_process('puma', '-b', bind_uri.to_s, app_str) line = '' until line =~ /Use Ctrl-C to stop/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/excon/test/server.rb new/lib/excon/test/server.rb --- old/lib/excon/test/server.rb 2016-08-22 23:48:42.000000000 +0200 +++ new/lib/excon/test/server.rb 2016-09-27 22:21:37.000000000 +0200 @@ -30,8 +30,7 @@ if args[:timeout] @timeout = args[:timeout] else - # Double the default timeout if jruby because of the startup cost - @timeout = RUBY_PLATFORM == "java" ? 20 : 10 + @timeout = 20 end name = @server.to_s.split('_').collect(&:capitalize).join plug = nested_const_get("Excon::Test::Plugin::Server::#{name}") @@ -72,7 +71,7 @@ true end def dump_errors - lines = error.read.split($INPUT_RECORD_SEPARATOR) + lines = error.read.split($/) while line = lines.shift case line when /(ERROR|Error)/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2016-08-22 23:48:42.000000000 +0200 +++ new/metadata 2016-09-27 22:21:36.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: excon version: !ruby/object:Gem::Version - version: 0.52.0 + version: 0.53.0 platform: ruby authors: - dpiddy (Dan Peterson) @@ -10,7 +10,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2016-08-22 00:00:00.000000000 Z +date: 2016-09-27 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rspec @@ -166,6 +166,20 @@ - - ">=" - !ruby/object:Gem::Version version: 1.8.2 +- !ruby/object:Gem::Dependency + name: puma + requirement: !ruby/object:Gem::Requirement + requirements: + - - ">=" + - !ruby/object:Gem::Version + version: '0' + type: :development + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - ">=" + - !ruby/object:Gem::Version + version: '0' description: EXtended http(s) CONnections email: [email protected] executables: [] @@ -229,9 +243,17 @@ - lib/excon/test/server.rb - lib/excon/unix_socket.rb - lib/excon/utils.rb +- spec/excon/error_spec.rb +- spec/excon/test/server_spec.rb - spec/excon_spec.rb -- spec/excon_test_server_spec.rb +- spec/helpers/file_path_helpers.rb +- spec/requests/basic_spec.rb +- spec/requests/eof_requests_spec.rb - spec/spec_helper.rb +- spec/support/shared_contexts/test_server_context.rb +- spec/support/shared_examples/shared_example_for_clients.rb +- spec/support/shared_examples/shared_example_for_streaming_clients.rb +- spec/support/shared_examples/shared_example_for_test_servers.rb - tests/authorization_header_tests.rb - tests/bad_tests.rb - tests/basic_tests.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/excon/error_spec.rb new/spec/excon/error_spec.rb --- old/spec/excon/error_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/excon/error_spec.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,137 @@ +describe Excon::Error do + # Regression against e300458f2d9330cb265baeb8973120d08c665d9 + describe '#status_errors' do + describe '.keys ' do + expected = [ + 100, + 101, + (200..206).to_a, + (300..307).to_a, + (400..417).to_a, + 422, + 429, + (500..504).to_a + ].flatten + + it('returns the pertinent HTTP error numbers') do + expected.flatten == Excon::Error.status_errors.keys + end + end + end + + describe '#new' do + it('returns an Excon::Error') do + expect(Excon::Error.new('bar').class == Excon::Error).to be true + end + it('raises errors for bad URIs') do + expect { Excon.new('foo') }.to raise_error(ArgumentError) + end + + it('raises errors for bad paths') do + expect { Excon.new('http://localhost', path: "foo\r\nbar: baz") }.to raise_error(URI::InvalidURIError) + end + end + + context 'when remaining backwards compatible' do + describe '#new' do + it 'should raise standard error and catch standard error' do + expect { raise Excon::Error::Client, 'foo' }.to raise_error(Excon::Error) + end + + it 'should raise legacy errors and catch legacy errors' do + expect do + raise Excon::Errors::Error, 'bar' + end.to raise_error(Excon::Errors::Error) + end + + it 'should raise standard error and catch legacy errors' do + expect do + raise Excon::Error::NotFound, 'bar' + end.to raise_error(Excon::Errors::Error) + end + end + + describe '#status_error' do + it 'should raise with status_error() and catch with standard error' do + expect do + raise Excon::Error.status_error({ expects: 200 }, status: 400) + end.to raise_error(Excon::Error) + end + + it 'should raise with status_error() and catch with legacy error' do + expect do + raise Excon::Error.status_error({ expects: 200 }, status: 400) + end.to raise_error(Excon::Errors::BadRequest) + end + + it 'should raise with legacy status_error() and catch with standard' do + expect do + raise Excon::Errors.status_error({ expects: 200 }, status: 400) + end.to raise_error(Excon::Error) + end + end + end + + context 'when exceptions are rescued' do + include_context("test server", :exec, 'error.rb', :before => :start, :after => :stop ) + + context 'when :debug_request and :debug_response are switched off' do + it('exception message does not include response or response info') do + begin + Excon.get('http://127.0.0.1:9292/error/not_found', expects: 200) + rescue Excon::Errors::HTTPStatusError => err + truth = + err.message.include?('Expected(200) <=> Actual(404 Not Found)') && + !err.message.include?('excon.error.request') && + !err.message.include?('excon.error.response') + expect(truth).to be true + end + end + end + + context 'when :debug_request and :debug_response are switched on' do + it 'exception message includes request and response info' do + begin + Excon.get('http://127.0.0.1:9292/error/not_found', expects: 200, + debug_request: true, debug_response: true) + rescue Excon::Errors::HTTPStatusError => err + truth = + err.message.include?('Expected(200) <=> Actual(404 Not Found)') && + err.message.include?('excon.error.request') && + err.message.include?('excon.error.response') + expect(truth).to be true + end + end + end + + context 'when only :debug_request is turned on' do + it('exception message includes only request info') do + begin + Excon.get('http://127.0.0.1:9292/error/not_found', expects: 200, + debug_request: true) + rescue Excon::Errors::HTTPStatusError => err + truth = + err.message.include?('Expected(200) <=> Actual(404 Not Found)') && + err.message.include?('excon.error.request') && + !err.message.include?('excon.error.response') + expect(truth).to be true + end + end + end + + context 'when only :debug_response is turned on ' do + it('exception message includes only response info') do + begin + Excon.get('http://127.0.0.1:9292/error/not_found', expects: 200, + debug_response: true) + rescue Excon::Errors::HTTPStatusError => err + truth = + err.message.include?('Expected(200) <=> Actual(404 Not Found)') && + !err.message.include?('excon.error.request') && + err.message.include?('excon.error.response') + expect(truth).to be true + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/excon/test/server_spec.rb new/spec/excon/test/server_spec.rb --- old/spec/excon/test/server_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/excon/test/server_spec.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,28 @@ +require 'spec_helper' + +describe Excon::Test::Server do + + context 'when the web server is webrick' do + it_should_behave_like "a excon test server", :webrick, 'basic.ru' + end + + + context 'when the web server is unicorn' do + context 'bound to a tcp socket' do + it_should_behave_like "a excon test server", :unicorn, 'streaming.ru' + end + + context "bound to a unix socket" do + socket_uri = 'unix:///tmp/unicorn.socket' + it_should_behave_like "a excon test server", :unicorn, 'streaming.ru', socket_uri + end + end + + context 'when the web server is puma' do + it_should_behave_like "a excon test server", :puma, 'streaming.ru' + end + + context 'when the web server is a executable' do + it_should_behave_like "a excon test server", :exec, 'good.rb' + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/excon_test_server_spec.rb new/spec/excon_test_server_spec.rb --- old/spec/excon_test_server_spec.rb 2016-08-22 23:48:42.000000000 +0200 +++ new/spec/excon_test_server_spec.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -require 'spec_helper' - -# The variable file should be renamed to something better - starbelly -shared_examples_for "a web server" do |plugin, file, bind_str = nil| - plugin = plugin.to_sym unless plugin.is_a? Symbol - - if plugin == :unicorn && RUBY_PLATFORM == "java" - before { skip("until unicorn supports jruby") } - end - - abs_file = Object.send("#{plugin}_path", file) - instance = nil - args = { plugin => abs_file} - args[:bind] = bind_str unless bind_str.nil? - - it "returns an instance" do - instance = Excon::Test::Server.new(args) - expect(instance).to be_instance_of Excon::Test::Server - end - - it 'starts the server' do - expect(instance.start).to be true - end - - it 'stops the server' do - expect(instance.stop).to be true - end -end - -describe Excon::Test::Server do - context 'when webrick' do - it_should_behave_like "a web server", :webrick, 'basic.ru' - end - - context 'when unicorn' do - it_should_behave_like "a web server", :unicorn, 'streaming.ru' - end - - context "when unicorn is given a unix socket uri" do - socket_uri = 'unix:///tmp/unicorn.socket' - it_should_behave_like "a web server", :unicorn, 'streaming.ru', socket_uri - end - - context 'when puma' do - it_should_behave_like "a web server", :puma, 'streaming.ru' - end - - context 'when executable' do - it_should_behave_like "a web server", :exec, 'good.rb' - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/helpers/file_path_helpers.rb new/spec/helpers/file_path_helpers.rb --- old/spec/helpers/file_path_helpers.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/helpers/file_path_helpers.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,22 @@ +# Todo: s/tests/specs when migration is complete +def get_abs_path(*parts) + File.join(File.expand_path('../../..', __FILE__), 'tests', *parts) +end + +def data_path(*parts) + get_abs_path('data', *parts) +end + +def rackup_path(*parts) + get_abs_path('rackups', *parts) +end + +def webrick_path(*parts) rackup_path(*parts); end + +def unicorn_path(*parts) rackup_path(*parts); end + +def puma_path(*parts) rackup_path(*parts); end + +def exec_path(*parts) + get_abs_path('servers', *parts) +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/requests/basic_spec.rb new/spec/requests/basic_spec.rb --- old/spec/requests/basic_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/requests/basic_spec.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,40 @@ +require 'spec_helper' + +describe Excon::Connection do + include_context('test server', :webrick, 'basic.ru', before: :start, after: :stop) + context 'when an explicit uri is passed' do + let(:conn) do + Excon::Connection.new(host: '127.0.0.1', + hostname: '127.0.0.1', + nonblock: false, + port: 9292, + scheme: 'http', + ssl_verify_peer: false) + end + + describe '.new' do + it 'returns an instance' do + expect(conn).to be_instance_of Excon::Connection + end + end + + context "when :method is :get and :path is /content-length/100" do + describe "#request" do + let(:response) do + response = conn.request(method: :get, path: '/content-length/100') + end + it 'returns an Excon::Response' do + expect(response).to be_instance_of Excon::Response + end + describe Excon::Response do + describe '#status' do + it 'returns 200' do + expect(response.status).to eq 200 + end + end + end + end + end + include_examples 'a basic client' + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/requests/eof_requests_spec.rb new/spec/requests/eof_requests_spec.rb --- old/spec/requests/eof_requests_spec.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/requests/eof_requests_spec.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,36 @@ +require 'spec_helper' + +describe Excon do + context "when dispatching requests" do + context('to a server that does not supply response headers') do + include_context("test server", :exec, 'bad.rb', :before => :start, :after => :stop ) + before(:all) do + @conn = Excon.new('http://127.0.0.1:9292') + end + + context('when no block is given') do + it 'should rescue from an EOFError and return response' do + body = @conn.request(:method => :get, :path => '/eof/no_content_length_and_no_chunking').body + expect(body).to eq 'hello' + end + end + + context('when a block is given') do + it 'should rescue from EOFError and return response' do + body = "" + response_block = lambda {|chunk, remaining, total| body << chunk } + @conn.request(:method => :get, :path => '/eof/no_content_length_and_no_chunking', :response_block => response_block) + expect(body).to eq 'hello' + end + end + end + + context('to a server that prematurely aborts the request with no response') do + include_context("test server", :exec, 'eof.rb', :before => :start, :after => :stop ) + + it 'should raise an EOFError' do + expect { Excon.get('http://127.0.0.1:9292/eof') }.to raise_error(Excon::Errors::SocketError) + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/spec_helper.rb new/spec/spec_helper.rb --- old/spec/spec_helper.rb 2016-08-22 23:48:42.000000000 +0200 +++ new/spec/spec_helper.rb 2016-09-27 22:21:37.000000000 +0200 @@ -1,126 +1,24 @@ require 'excon' require 'excon/test/server' +require 'json' -# This file was generated by the `rspec --init` command. Conventionally, all -# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`. -# The generated `.rspec` file contains `--require spec_helper` which will cause -# this file to always be loaded, without a need to explicitly require it in any -# files. -# -# Given that it is always loaded, you are encouraged to keep this file as -# light-weight as possible. Requiring heavyweight dependencies from this file -# will add to the boot time of your test suite on EVERY test run, even for an -# individual file that may not need all of that loaded. Instead, consider making -# a separate helper file that requires the additional dependencies and performs -# the additional setup, and require it from the spec files that actually need -# it. -# -# The `.rspec` file also contains a few flags that are not defaults but that -# users commonly want. -# # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration RSpec.configure do |config| - # rspec-expectations config goes here. You can use an alternate - # assertion/expectation library such as wrong or the stdlib/minitest - # assertions if you prefer. config.expect_with :rspec do |expectations| - # This option will default to `true` in RSpec 4. It makes the `description` - # and `failure_message` of custom matchers include text for helper methods - # defined using `chain`, e.g.: - # be_bigger_than(2).and_smaller_than(4).description - # # => "be bigger than 2 and smaller than 4" - # ...rather than: - # # => "be bigger than 2" expectations.include_chain_clauses_in_custom_matcher_descriptions = true end - # rspec-mocks config goes here. You can use an alternate test double - # library (such as bogus or mocha) by changing the `mock_with` option here. - config.mock_with :rspec do |mocks| - # Prevents you from mocking or stubbing a method that does not exist on - # a real object. This is generally recommended, and will default to - # `true` in RSpec 4. - mocks.verify_partial_doubles = true + config.mock_with :rspec do |mocks| + mocks.verify_partial_doubles = true end - # This option will default to `:apply_to_host_groups` in RSpec 4 (and will - # have no way to turn it off -- the option exists only for backwards - # compatibility in RSpec 3). It causes shared context metadata to be - # inherited by the metadata hash of host groups and examples, rather than - # triggering implicit auto-inclusion in groups with matching metadata. - config.shared_context_metadata_behavior = :apply_to_host_groups - -# The settings below are suggested to provide a good initial experience -# with RSpec, but feel free to customize to your heart's content. -=begin - # This allows you to limit a spec run to individual examples or groups - # you care about by tagging them with `:focus` metadata. When nothing - # is tagged with `:focus`, all examples get run. RSpec also provides - # aliases for `it`, `describe`, and `context` that include `:focus` - # metadata: `fit`, `fdescribe` and `fcontext`, respectively. - config.filter_run_when_matching :focus - - # Allows RSpec to persist some state between runs in order to support - # the `--only-failures` and `--next-failure` CLI options. We recommend - # you configure your source control system to ignore this file. - config.example_status_persistence_file_path = "spec/examples.txt" - - # Limits the available syntax to the non-monkey patched syntax that is - # recommended. For more details, see: - # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/ - # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/ - # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode - config.disable_monkey_patching! - - # This setting enables warnings. It's recommended, but in some cases may - # be too noisy due to issues in dependencies. - config.warnings = true - - # Many RSpec users commonly either run the entire suite or an individual - # file, and it's useful to allow more verbose output when running an - # individual spec file. if config.files_to_run.one? - # Use the documentation formatter for detailed output, - # unless a formatter has already been configured - # (e.g. via a command-line flag). config.default_formatter = 'doc' end - - # Print the 10 slowest examples and example groups at the - # end of the spec run, to help surface which specs are running - # particularly slow. - config.profile_examples = 10 - - # Run specs in random order to surface order dependencies. If you find an - # order dependency and want to debug it, you can fix the order by providing - # the seed, which is printed after each run. - # --seed 1234 - config.order = :random - - # Seed global randomization in this process using the `--seed` CLI option. - # Setting this allows you to use `--seed` to deterministically reproduce - # test failures related to randomization by passing the same `--seed` value - # as the one that triggered the failure. - Kernel.srand config.seed -=end - -end - -# Todo: s/tests/specs when migration is complete -def get_abs_path(*parts) - File.join(File.expand_path('../..', __FILE__), 'tests', *parts) -end - -def rackup_path(*parts) - get_abs_path('rackups', *parts) end -def webrick_path(*parts) rackup_path(*parts); end - -def unicorn_path(*parts) rackup_path(*parts); end +# Load helpers +Dir["./spec/helpers/**/*.rb"].sort.each { |f| require f} -def puma_path(*parts) rackup_path(*parts); end - -def exec_path(*parts) - get_abs_path('servers', *parts) -end +# Load shared examples and contexts +Dir["./spec/support/**/*.rb"].sort.each { |f| require f} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/support/shared_contexts/test_server_context.rb new/spec/support/shared_contexts/test_server_context.rb --- old/spec/support/shared_contexts/test_server_context.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/support/shared_contexts/test_server_context.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,83 @@ +# TODO: Clean up this doc and dry up the conditionals +# +# Required params: +# plugin (e.g., webrick, unicorn, etc) +# file (e.g. a rackup ) +# +# Optional params: +# optional paramters may given as a hash +# opts may contain a bind argument +# opts may also contain before and after options +# +# In its simplest form: +# { :before => :start, :after => :stop } +# +# With lambdas, which recieve @server as an argument +# { before: lambda {|s| s.start }, after: lambda { |s| s.stop} } +# +# In both the cases above, before defaults to before(:all) +# This can be circumvented with a Hash +# { before: { :context => :start }, after: { :context => :stop } } +# or +# { before: { context: lambda { |s| s.start } }, after: { context: lambda { |s| s.stop } } } + +shared_context "test server" do |plugin, file, opts = {}| + plugin = plugin.to_sym unless plugin.is_a? Symbol + if plugin == :unicorn && RUBY_PLATFORM == "java" + before { skip("until unicorn supports jruby") } + end + abs_file = Object.send("#{plugin}_path", file) + args = { plugin => abs_file} + args[:bind] = opts[:bind] if opts.key? :bind + + + before_hook = opts.key?(:before) && (opts[:before].is_a?(Symbol) || opts[:before].is_a?(Proc) || opts[:before].is_a?(Hash)) + + if before_hook && opts[:before].is_a?(Hash) + event = opts[:before].keys.first + before(event) { + @server = Excon::Test::Server.new(args) + if opts[:before][event].is_a? Symbol + @server.send(opts[:before][event]) + else + opts[:before][event].call(@server) + end + } + elsif + before(:all) { + @server = Excon::Test::Server.new(args) + before_hook = opts.key?(:before) && (opts[:before].is_a?(Symbol) || opts[:before].is_a?(Proc) || opts[:before].is_a?(Hash)) + + if before_hook + if opts[:before].is_a? Symbol + @server.send(opts[:before]) + else + opts[:before].call(@server) + end + end + } + end + + after_hook = opts.key?(:after) && (opts[:after].is_a?(Symbol) || opts[:after].is_a?(Proc) || opts[:after].is_a?(Hash)) + + if after_hook && opts[:after].is_a?(Hash) + event = opts[:after].keys.first + after(event) { + if opts[:after][event].is_a? Symbol + @server.send(opts[:after][event]) + else + opts[:after][event].call(@server) + end + } + elsif after_hook + after(:all) { + if opts[:after].is_a? Symbol + @server.send(opts[:after]) + elsif opts[:after].is_a? Hash + + else + opts[:after].call(@server) + end + } + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/support/shared_examples/shared_example_for_clients.rb new/spec/support/shared_examples/shared_example_for_clients.rb --- old/spec/support/shared_examples/shared_example_for_clients.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/support/shared_examples/shared_example_for_clients.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,207 @@ +shared_examples_for 'a basic client' do |url = 'http://127.0.0.1:9292', opts = {}| + # TODO: Ditch iterator and manually write a context for each set of options + ([true, false] * 2).combination(2).to_a.uniq.each do |nonblock, persistent| + context "when nonblock is #{nonblock} and persistent is #{persistent}" do + opts = opts.merge(ssl_verify_peer: false, nonblock: nonblock, persistent: persistent) + + let(:conn) { Excon.new(url, opts) } + + context 'when :method is get and :path is /content-length/100' do + describe '#request' do + let(:response) do + conn.request(method: :get, path: '/content-length/100') + end + + it 'returns an Excon::Response' do + expect(response).to be_instance_of Excon::Response + end + describe Excon::Response do + describe '#status' do + it 'returns 200' do + expect(response.status).to eq 200 + end + + it '#status returns 200' do + expect(response[:status]).to eq 200 + end + end + describe '#headers' do + it '["Content-Length"] returns 100' do + expect(response.headers['Content-Length']).to eq '100' + end + it '["Content-Type"] returns "text/html;charset=utf-8"' do + expect(response.headers['Content-Type']).to eq 'text/html;charset=utf-8' + end + + it "['Date'] returns a valid date" do + if RUBY_PLATFORM == 'java' && conn.data[:scheme] == Excon::UNIX + skip('until puma responds with a date header') + else + time = Time.parse(response.headers['Date']) + expect(time.is_a?(Time)).to be true + end + end + + it "['Server'] matches /^WEBrick/" do + pending('until unix_socket response has server header') if conn.data[:scheme] == Excon::UNIX + expect(!!(response.headers['Server'] =~ /^WEBrick/)).to be true + end + + it "['Custom'] returns Foo: bar" do + expect(response.headers['Custom']).to eq 'Foo: bar' + end + end + describe '#remote_ip' do + it 'returns 127.0.0.1' do + pending('until pigs can fly') if conn.data[:scheme] == Excon::UNIX + expect(response.remote_ip).to eq '127.0.0.1' + end + end + end + + context('when tcp_nodelay is true') do + describe '#request' do + response = nil + options = opts.merge(ssl_verify_peer: false, nonblock: nonblock, tcp_nodelay: true) + connection = Excon.new(url, options) + + it 'returns an Excon::Response' do + expect do + response = connection.request(method: :get, path: '/content-length/100') + end.to_not raise_error + end + + describe Excon::Response do + describe '#body' do + describe '.status' do + it '#returns 200' do + expect(response.status).to eq 200 + end + end + end + end + end + end + end + + context 'when utilizing deprecated block usage' do + describe '#request' do + data = [] + it 'yields with a chunk, remaining length, and total length' do + expect do + conn.request(method: :get, path: '/content-length/100') do |chunk, remaining_length, total_length| + data = [chunk, remaining_length, total_length] + end + end.to_not raise_error + end + it 'completes with expected data' do + expect(data).to eq ['x' * 100, 0, 100] + end + end + end + + context 'when utilizing response_block usage' do + describe '#request' do + data = [] + it 'yields a chunk, remaining length, and total_length' do + response_block = lambda do |chunk, remaining_length, total_length| + data = [chunk, remaining_length, total_length] + end + expect do + conn.request(method: :get, path: '/content-length/100', response_block: response_block) + end.to_not raise_error + end + it 'completes with expected data' do + expect(data).to eq ['x' * 100, 0, 100] + end + end + end + context 'when method is :post' do + context 'when :path is /body-sink' do + context 'when a body parameter is supplied' do + response = nil + it 'returns an Excon::Response' do + response = conn.request(method: :post, path: '/body-sink', headers: { 'Content-Type' => 'text/plain' }, body: 'x' * 5_000_000) + expect(response).to be_instance_of Excon::Response + end + describe Excon::Response do + describe '#body' do + it 'equals "5000000"' do + expect(response.body).to eq '5000000' + end + end + end + end + context 'when the body parameter is an empty string' do + response = nil + + it 'returns an Excon::Response' do + response = conn.request(method: :post, path: '/body-sink', headers: { 'Content-Type' => 'text/plain' }, body: '') + expect(response).to be_instance_of Excon::Response + end + describe Excon::Response do + describe '#body' do + it 'equals "0"' do + expect(response.body).to eq '0' + end + end + end + end + end + + context 'when :path is /echo' do + context('when a file handle is the body paramter') do + describe Excon::Response do + it '#body equals "x" * 100 + "\n"' do + file_path = data_path('xs') + response = conn.request(method: :post, path: '/echo', body: File.open(file_path)) + expect(response.body).to eq 'x' * 100 + "\n" + end + end + end + + context 'when a string is the body paramter' do + context 'without request_block' do + describe Excon::Response do + it "#body equals 'x' * 100)" do + response = conn.request(method: :post, path: '/echo', body: 'x' * 100) + expect(response.body).to eq 'x' * 100 + end + end + end + + context 'when a request_block paramter is supplied' do + describe Excon::Response do + it "#body equals'x' * 100" do + data = ['x'] * 100 + request_block = lambda do + data.shift.to_s + end + response = conn.request(method: :post, path: '/echo', request_block: request_block) + expect(response.body).to eq 'x' * 100 + end + end + end + + context('when a multi-byte string is the body paramter') do + body = "\xC3\xBC" * 100 + headers = { 'Custom' => body.dup } + if RUBY_VERSION >= '1.9' + body.force_encoding('BINARY') + headers['Custom'].force_encoding('UTF-8') + end + describe Excon::Response do + it '#body properly concatenates request+headers and body' do + response = conn.request(method: :post, path: '/echo', + headers: headers, body: body) + expect(response.body).to eq body + end + end + end + end + end + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/support/shared_examples/shared_example_for_streaming_clients.rb new/spec/support/shared_examples/shared_example_for_streaming_clients.rb --- old/spec/support/shared_examples/shared_example_for_streaming_clients.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/support/shared_examples/shared_example_for_streaming_clients.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,20 @@ +shared_examples_for 'a streaming client' do |endpoint, timeout| + ret = [] + timing = 'response times ok' + start = Time.now + block = lambda do |c,r,t| + # add the response + ret.push(c) + # check if the timing is ok + # each response arrives after timeout and before timeout + 1 + cur_time = Time.now - start + if cur_time < ret.length * timeout or cur_time > (ret.length+1) * timeout + timing = 'response time not ok!' + end + end + it "gets a response in less than or equal to #{(timeout*3).round(2)} seconds" do + Excon.get(endpoint, :response_block => block) + # validate the final timing + expect((Time.now - start <= timeout*3) == true && timing == 'response times not ok!').to be false + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/support/shared_examples/shared_example_for_test_servers.rb new/spec/support/shared_examples/shared_example_for_test_servers.rb --- old/spec/support/shared_examples/shared_example_for_test_servers.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/spec/support/shared_examples/shared_example_for_test_servers.rb 2016-09-27 22:21:37.000000000 +0200 @@ -0,0 +1,16 @@ +shared_examples_for "a excon test server" do |plugin, file| + + include_context("test server", plugin, file) + + it "returns an instance" do + expect(@server).to be_instance_of Excon::Test::Server + end + + it 'starts the server' do + expect(@server.start).to be true + end + + it 'stops the server' do + expect(@server.stop).to be true + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tests/basic_tests.rb new/tests/basic_tests.rb --- old/tests/basic_tests.rb 2016-08-22 23:48:42.000000000 +0200 +++ new/tests/basic_tests.rb 2016-09-27 22:21:37.000000000 +0200 @@ -202,11 +202,13 @@ connection.request(:method => :get, :path => '/content-length/100') end - basic_tests('https://127.0.0.1:8443', - :client_key => File.join(File.dirname(__FILE__), 'data', 'excon.cert.key'), - :client_cert => File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt') - ) + cert_key_path = File.join(File.dirname(__FILE__), 'data', 'excon.cert.key') + cert_crt_path = File.join(File.dirname(__FILE__), 'data', 'excon.cert.crt') + basic_tests('https://127.0.0.1:8443', client_key: cert_key_path, client_cert: cert_crt_path) + cert_key_data = File.read cert_key_path + cert_crt_data = File.read cert_crt_path + basic_tests('https://127.0.0.1:8443', client_key_data: cert_key_data, client_cert_data: cert_crt_data) end end
