From 331dcbc70d17e7d3efb2e7b77131671ced4409d4 Mon Sep 17 00:00:00 2001 From: John Barnette Date: Tue, 19 Jan 2016 15:10:05 -0600 Subject: [PATCH 1/7] Bump to 1.0.0 --- lib/scientist/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/scientist/version.rb b/lib/scientist/version.rb index 6a6860c..43d7d79 100644 --- a/lib/scientist/version.rb +++ b/lib/scientist/version.rb @@ -1,3 +1,3 @@ module Scientist - VERSION = "0.0.4" + VERSION = "1.0.0" end From 5f4864550252311093170fedcc62788bc2231819 Mon Sep 17 00:00:00 2001 From: John Barnette Date: Sun, 24 Jan 2016 17:43:44 -0600 Subject: [PATCH 2/7] Remove outdated CLA, it's exposed in the PR flow --- CLA.md | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 CLA.md diff --git a/CLA.md b/CLA.md deleted file mode 100644 index 3187cde..0000000 --- a/CLA.md +++ /dev/null @@ -1,54 +0,0 @@ -GitHub CLA -=============== - -## Don't give up - please go ahead and create this PR. - -We welcome you to follow, fork, and work on, our open source projects. If you want to contribute back to this project, or any other GitHub project, we need to ask you to complete the Contributor License Agreement (CLA) below. If you are contributing on behalf of your employer, or as part of your role as an employee, remember that you are signing in the name of your employer and you have to make sure that that's okay before you sign. - -## What is this? - -This is GitHub Inc.'s Contributor License Agreement. If you've worked in the technology space before, contributed or maintained an open source project, there's a good chance that you've run across one or more of these in the past. What CLAs aim to do is make sure the project is able to merge contributions from multiple contributors without getting itself into different types of trouble. This one is no different in that sense. - -## Why is this? - -The answer is that we need to protect the open source projects that we maintain, their users and their contributors (including Hubber contributors, of course, but not just). Why? Just imagine a case when a contributor is making a contribution to a project and that contribution is subsequently merged and becomes an integral part of the project. Now, go on to imagine that our contributor copied the code, or that this contributor works for a company that doesn't want its employees to make contributions to this project or any project. What then? Well, the person the code was copied from or the company can do whatever the hell they like, including to come after the project and its users if using it, make them stop or even sue. If either has patent rights in the code, the project is in even deeper trouble. - - -## So. - -Please read the following terms, make sure you understand, and that if you agree, that you sign. Then, your pull request would be created and the project and the other contributors would be safe. It's important to us that you remember that except for the license you grant by signing this document - to GitHub, to your fellow contributors and to the project, you reserve all right, title, and interest in your contributions. - -### 1. Definitions. - -*You*, *you* (*Your*, or *your*) means the copyright owner or legal entity authorized by the copyright owner to sign this agreement. - -*Contribution* or *contribution* means any original work of authorship, including any modifications or additions to an existing work, that is submitted to a GitHub project. "Submitted" means via a Pull Request, an issue or any form of electronic, verbal, or written communication sent to GitHub. - -### 2. Grant of Copyright License. - -Subject to the terms and conditions of this agreement, you grant to GitHub, to fellow contributors and to the project a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions and such derivative works. - -### 3. Grant of Patent License. - -Subject to the terms and conditions of this agreement, You hereby grant to GitHub, to fellow contributors to the project, and to its users a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contribution as part of the project, where such license applies only to those patent claims licensable by you that are necessarily infringed by your contribution or by combination of your contribution with the project to which this contribution was submitted. If any entity institutes patent litigation against you or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your contribution, or the project to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this agreement for that contribution shall terminate as of the date such litigation is filed. - -### 4. You Can Grant this License. - -Signing would mean that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your contributions, you have verified and are certain that you have received permission to make your contribution on behalf of that employer, that your employer has waived such rights for your contribution, or that your employer has executed a separate license with GitHub or the project. - -### 5. Your Contribution is Yours. - -Signing doesn't change the fact that your contribution is your original creation (see section 7 for submissions on behalf of others) and that they include complete details of any third-party license or other restriction (including related patents and trademarks) of which you are personally aware and which are associated with any part of your contributions. - -### 6. You Provide Your Contribution "as is". - -Signing this won't mean anybody will argue otherwise. In other words, your contributions are made without warranties or conditions of any kind. - -### 7. If Some or All Your Contributions Is Not Yours. - -That's fine but you need to identify the source or sources of the contribution and any license or other restriction (like related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the contribution as "Submitted on behalf of a third-party or third parties: [named here]". A place where you can do this is in a commit comment to the PR. - -### 8. If Any Circumstances of Your Contribution change. -You agree to notify the project and GitHub of any facts or circumstances of which you become aware. - -### 9. That's it! From 4d5c71db03bc2d2c2df99bd7d019873c6dfa9fc1 Mon Sep 17 00:00:00 2001 From: John Barnette Date: Sun, 24 Jan 2016 18:30:40 -0600 Subject: [PATCH 3/7] Add GitHub Open Source as an author --- scientist.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scientist.gemspec b/scientist.gemspec index 330aa43..26ea32f 100644 --- a/scientist.gemspec +++ b/scientist.gemspec @@ -4,8 +4,8 @@ Gem::Specification.new do |gem| gem.name = "scientist" gem.description = "A Ruby library for carefully refactoring critical paths" gem.version = Scientist::VERSION - gem.authors = ["John Barnette", "Rick Bradley"] - gem.email = ["jbarnette@github.com", "rick@github.com"] + gem.authors = ["GitHub Open Source", "John Barnette", "Rick Bradley"] + gem.email = ["opensource+scientist@github.com", "jbarnette@github.com", "rick@github.com"] gem.summary = "Carefully test, measure, and track refactored code." gem.homepage = "https://github.com/github/scientist" gem.license = "MIT" From 2e64248536ddf0b78a1cdbd7dfdcc83b7b7cff4b Mon Sep 17 00:00:00 2001 From: Rick Bradley Date: Sun, 24 Jan 2016 21:10:27 -0600 Subject: [PATCH 4/7] Use a working email address for me Otherwise technoweenie will get my spam. --- scientist.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scientist.gemspec b/scientist.gemspec index 26ea32f..fbe946a 100644 --- a/scientist.gemspec +++ b/scientist.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |gem| gem.description = "A Ruby library for carefully refactoring critical paths" gem.version = Scientist::VERSION gem.authors = ["GitHub Open Source", "John Barnette", "Rick Bradley"] - gem.email = ["opensource+scientist@github.com", "jbarnette@github.com", "rick@github.com"] + gem.email = ["opensource+scientist@github.com", "jbarnette@github.com", "rick@rickbradley.com"] gem.summary = "Carefully test, measure, and track refactored code." gem.homepage = "https://github.com/github/scientist" gem.license = "MIT" From 30102da0f790d6a4c79809e25305f7b36f29679d Mon Sep 17 00:00:00 2001 From: Jesse Toth Date: Sun, 24 Jan 2016 22:42:00 -0800 Subject: [PATCH 5/7] add myself to gemspec email list --- scientist.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scientist.gemspec b/scientist.gemspec index fbe946a..874bc83 100644 --- a/scientist.gemspec +++ b/scientist.gemspec @@ -4,8 +4,8 @@ Gem::Specification.new do |gem| gem.name = "scientist" gem.description = "A Ruby library for carefully refactoring critical paths" gem.version = Scientist::VERSION - gem.authors = ["GitHub Open Source", "John Barnette", "Rick Bradley"] - gem.email = ["opensource+scientist@github.com", "jbarnette@github.com", "rick@rickbradley.com"] + gem.authors = ["GitHub Open Source", "John Barnette", "Rick Bradley", "Jesse Toth"] + gem.email = ["opensource+scientist@github.com", "jbarnette@github.com", "rick@rickbradley.com", "jesseplusplus@github.com"] gem.summary = "Carefully test, measure, and track refactored code." gem.homepage = "https://github.com/github/scientist" gem.license = "MIT" From 83af5c689115bc5ece9e699babe69336185c9756 Mon Sep 17 00:00:00 2001 From: Nathan Witmer Date: Mon, 25 Jan 2016 10:50:47 -0700 Subject: [PATCH 6/7] Add @zerowidth to gemspec --- scientist.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scientist.gemspec b/scientist.gemspec index 874bc83..79f00dc 100644 --- a/scientist.gemspec +++ b/scientist.gemspec @@ -4,8 +4,8 @@ Gem::Specification.new do |gem| gem.name = "scientist" gem.description = "A Ruby library for carefully refactoring critical paths" gem.version = Scientist::VERSION - gem.authors = ["GitHub Open Source", "John Barnette", "Rick Bradley", "Jesse Toth"] - gem.email = ["opensource+scientist@github.com", "jbarnette@github.com", "rick@rickbradley.com", "jesseplusplus@github.com"] + gem.authors = ["GitHub Open Source", "John Barnette", "Rick Bradley", "Jesse Toth", "Nathan Witmer"] + gem.email = ["opensource+scientist@github.com", "jbarnette@github.com", "rick@rickbradley.com", "jesseplusplus@github.com","zerowidth@github.com"] gem.summary = "Carefully test, measure, and track refactored code." gem.homepage = "https://github.com/github/scientist" gem.license = "MIT" From ccafeeadbf7c7e422f27824ff44925a276859064 Mon Sep 17 00:00:00 2001 From: John Barnette Date: Thu, 28 Jan 2016 09:31:55 -0600 Subject: [PATCH 7/7] Remove outdated CONTRIBUTING info --- CONTRIBUTING.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index b851fc3..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,3 +0,0 @@ -Hi there! We're thrilled that you'd like to contribute to this project. Before you do, would you mind reading [this license agreement](CLA.md)? If you open a PR, we'll assume you agree to it. If you have any hesitation or disagreement, please do open a PR still, but note your concerns as well. - -Thanks!