Merge branch 'master' into updating_faraday

CHANGELOG.md

@@ -1,6 +1,27 @@
 Changelog
 =========
 
+## 5.1.0 (Feb 5, 2020)
+[Full Changelog](https://github.com/vcr/vcr/compare/v5.0.0...v5.1.0)
+  - Use RSpec metadata value as cassette name if value is String (#774)
+  - Include body.class feedback for non-String body error (#756) …
+  - Made our YAML output more inline with the spec to avoid issues (#782)
+  - Fix broken build due to Hashdiff deprecation (#758)
+  - Drop removed Travis directive (#751)
+  - Repair Shields.io badges (#753)
+  - Badges - swap out release for tag (#760)
+  - Removing broken badges (#777)
+  - Add record_on_error configuration option (#765)
+  - Clearing up intention of new maintainers request
+  - Avoid updating the gem gem in system during travis build (#781)
+  - Updated our version of Aruba (#780)
+  - Remove link to mailing list (#784)
+  - Add note about sensitive data in documentation (#783)
+  - [patch] Fix turning off VCR not working when server thread already started (#764)
+  - Support runnning structs_spec by itself (#791)
+  - Changing the license to an ethical license (#792)
+
+
 ## 5.0.0 (May 27, 2019)
 [Full Changelog](https://github.com/vcr/vcr/compare/v4.0.0...v5.0.0)
 
@@ -17,7 +38,7 @@ Changelog
   - support ruby 2.5 in test matrix
   - support Typhoeus 1.1 in test matrix
   - updating repository meta files
-  
+
 I want to take explicit time here to thank the wonder people who contributed these changes. Some were small and easy while others were challenging and large. They are all meaningful to me and to VCR. Those people are (in no order):
 
 @marshall-lee, @mcfiredrill, @aimerald, @saveriomiroddi, @bwilczek, @felipecsl, @jessedoyle, @raszi, @hdabrows, @nicolasleger, @sckott, @Mehonoshin, @willywg, @sathieu, @skryukov, @joshRpowell, @gregmolnar, @notEthan, @andrew-lewin, and @laserlemon.

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Myron Marston
+Copyright 2019 Myron Marston, Kurtis Rainbolt-Greene, Olle Jonsson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -11,10 +11,36 @@ the following conditions:
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 
+No Harm: The software may not be used by anyone for systems or
+activities that actively and knowingly endanger, harm, or
+otherwise threaten the physical, mental, economic, or general
+well-being of other individuals or groups, in violation of the
+United Nations Universal Declaration of Human Rights
+(https://www.un.org/en/universal-declaration-human-rights/).
+
+Services: If the Software is used to provide a service to others,
+the licensee shall, as a condition of use, require those others
+not to use the service in any way that violates the No Harm
+clause above.
+
+Enforceability: If any portion or provision of this License
+shall to any extent be declared illegal or unenforceable by
+a court of competent jurisdiction, then the remainder of
+this License, or the application of such portion or
+provision in circumstances other than those as to which
+it is so declared illegal or unenforceable, shall not be affected
+thereby, and each portion and provision of this Agreement shall
+be valid and enforceable to the fullest extent permitted by law.
+
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+This Hippocratic License is an Ethical Source license (https://ethicalsource.dev)
+derived from the MIT License, amended to limit the impact of the unethical use
+of open source software.

README.md

@@ -3,7 +3,6 @@ vcr
 
 [![Build](https://img.shields.io/travis/vcr/vcr/master.svg?style=flat-square)](https://travis-ci.org/vcr/vcr)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/vcr/vcr.svg?style=flat-square)](http://github.com/vcr/vcr/releases)
-[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://opensource.org/licenses/MIT)
 [![Version](https://img.shields.io/gem/v/vcr.svg?style=flat-square)](https://rubygems.org/gems/vcr)
 [![OpenCollective](https://opencollective.com/vcr/backers/badge.svg?style=flat-square)](https://opencollective.com/vcr#backer)
 [![OpenCollective](https://opencollective.com/vcr/sponsors/badge.svg?style=flat-square)](https://opencollective.com/vcr#sponsor)
@@ -314,29 +313,3 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 <a href="https://opencollective.com/vcr/sponsor/27/website" target="_blank"><img src="https://opencollective.com/vcr/sponsor/27/avatar"></a>
 <a href="https://opencollective.com/vcr/sponsor/28/website" target="_blank"><img src="https://opencollective.com/vcr/sponsor/28/avatar"></a>
 <a href="https://opencollective.com/vcr/sponsor/29/website" target="_blank"><img src="https://opencollective.com/vcr/sponsor/29/avatar"></a>
-
-
-
-Copyright
-=========
-
-Copyright (c) 2010-2019 Myron Marston
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/vcr/version.rb

@@ -10,7 +10,7 @@ module VCR
   #   * `parts` [Array<Integer>] List of the version parts.
   def version
     @version ||= begin
-      string = '5.0.0'
+      string = '5.1.0'
 
       def string.parts
         split('.').map { |p| p.to_i }

vcr.gemspec

@@ -8,12 +8,12 @@ require "vcr/version"
 Gem::Specification.new do |spec|
   spec.name          = "vcr"
   spec.version       = VCR.version
-  spec.authors       = ["Myron Marston"]
-  spec.email         = ["myron.marston@gmail.com"]
+  spec.authors       = ["Myron Marston", "Kurtis Rainbolt-Greene", "Olle Jonsson"]
+  spec.email         = ["kurtis@rainbolt-greene.online"]
   spec.summary       = %q{Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.}
   spec.description   = spec.summary
   spec.homepage      = "https://relishapp.com/vcr/vcr/docs"
-  spec.license       = "MIT"
+  spec.license       = "MIT-Hippocratic-1.2"
 
   spec.files         = Dir[File.join("lib", "**", "*")]
   spec.executables   = Dir[File.join("bin", "**", "*")].map! { |f| f.gsub(/bin\//, "") }