git_pretty_accept 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f87f9416e6f2fa9ffab67ff78e28c62052f40584
-  data.tar.gz: f7d1cd58d438f24d312236f6bf1d845c3660f6b5
+  metadata.gz: 12f24d9aa0af834a4394838c7075e19e55c7573e
+  data.tar.gz: 2ec2c68340f2e2b906d1225d805cbc08e34d17d9
 SHA512:
-  metadata.gz: 050fc7845fa9e5d1998662fa1b9ec13111c6c9c804a5b5ed3ad65c366c652257b220ec3ff7b806daa9c0a659628e6d97c24ab5ad0ae88ecf97055015572001b9
-  data.tar.gz: 9aae68dd5f32c4e303415e777b89fa94f8a6a29da8b497938ea1833c8aa8da0146b2ef677e3c8c129c79ca500ce10021e2039551f035067c9c32b35bda95168d
+  metadata.gz: 0c77d78b5c061b26f954bfbfe6708ae83925a21186deafa8cb957e440d84295a70a2c6e4ed937526f3b66bed74b2f3f3b3367953aadb3b17cb547b48537a2e14
+  data.tar.gz: c544dcc0f68d9ba1efed28a9841407c9d60b0acff1028f578b2410ccddb50d944d03ce5225d7b13e10581a24dc1ac78e7220b404c1fe086bfc0aa7cda535a7bb

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+## 0.3.1 - 2014-01-21
+
+* Transfer ownership to Love With Food.
+* Minor README updates.
+* Add MIT license.
+
 ## 0.3.0 - 2013-12-14
 
 * Rebase local PR branch from remote.

data/MIT-LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2014 Love With Food, George Mendoza
+https://www.lovewithfood.com
+
+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.

data/README.md

@@ -29,7 +29,28 @@ Or install it yourself as:
 
 ## Usage
 
-    $ git pretty-accept BRANCH
+To accept a pull request, just run `git pretty-accept BRANCH_NAME` in
+the branch where `BRANCH_NAME` will be merged.
+
+## Merge commit template
+
+You can also provide a merge commit template
+`.git-pretty-accept-template.txt` to your project directory. This is
+great if you want your merge commits to follow a certain format e.g.
+you want your team to enter the issue link when accepting pull requests.
+
+## Caveats
+
+We wrote git_pretty_accept for our particular workflow. If you'd like
+to use the gem, here are a few things you'll need to keep in mind. The
+script
+
+1. Assumes that your remote repository is origin. It doesn't work yet with
+   Github forks.
+1. Automatically removes the local and remote branch of the pull request
+   once the pull request is merged.
+1. Complains if you accidentally try to accept the master branch to a feature
+   branch.
 
 ## Contributing
 

data/git_pretty_accept.gemspec

@@ -6,8 +6,8 @@ require 'git_pretty_accept/version'
 Gem::Specification.new do |spec|
   spec.name          = "git_pretty_accept"
   spec.version       = GitPrettyAccept::VERSION
-  spec.authors       = ["George Mendoza"]
-  spec.email         = ["gsmendoza@gmail.com"]
+  spec.authors       = ["Love With Food, George Mendoza"]
+  spec.email         = ["george@lovewithfood.com"]
   spec.description   = %q{
     `git-pretty-accept` is a script that rebases a pull request before
     merging to master. Pull requests are _always_ merged recursively. The
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   }.gsub(/\s+/, ' ')
 
   spec.summary       = %q{Accept pull requests, the pretty way}
-  spec.homepage      = "https://github.com/gsmendoza/git_pretty_accept"
+  spec.homepage      = "https://github.com/lovewithfood/git_pretty_accept"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/git_pretty_accept/version.rb

@@ -1,3 +1,3 @@
 module GitPrettyAccept
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pretty_accept
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
-- George Mendoza
+- Love With Food, George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -154,7 +154,7 @@ description: ' `git-pretty-accept` is a script that rebases a pull request befor
   merging to master. Pull requests are _always_ merged recursively. The result is
   a linear history with merge bubbles indicating pull requests. In short, pretty. '
 email:
-- gsmendoza@gmail.com
+- george@lovewithfood.com
 executables:
 - git-pretty-accept
 extensions: []
@@ -165,6 +165,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE.txt
+- MIT-LICENSE
 - README.md
 - Rakefile
 - bin/git-pretty-accept
@@ -178,7 +179,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/local_repo.rb
 - spec/support/remote_repo.rb
-homepage: https://github.com/gsmendoza/git_pretty_accept
+homepage: https://github.com/lovewithfood/git_pretty_accept
 licenses:
 - MIT
 metadata: {}