git-pr-release 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a86a7c2e8b0cef94c0eb162660772b0efa212bf
-  data.tar.gz: 81115e65decbf92b726b6218b6fe9cd1cd007f7f
+  metadata.gz: f2a46ea53d359add84c3d2cf0b4fe9306dee5a37
+  data.tar.gz: 0e20bcc51ba00d21349c1c4cc9a3d1c9a345788d
 SHA512:
-  metadata.gz: 64cb59550b604a2a0d189b23dfddeca083bd2a21b656ccadc04e4d72294ed99ce9cf05fc98732b28a1e71f7886ec0f75a472afab2868d551990b38133c94f265
-  data.tar.gz: 0f9f1f277f6f4ce30e73d7d4c6c4681ea9b5e2541a24e17ad518fc3b7291f04af963464ee15a674f36ddbe51d4b723c321f97db8b058f5d732fcb3e421054198
+  metadata.gz: a5dbe7c865ee9b5c9d540b0ec349e90c69acdca6f18df18eb8426ff7c223280ed1d7268e1bb0871169eb8a20c874aa81981e610c5f120eebd9c7839d7938cdc5
+  data.tar.gz: 972cc421a5e02edff5f737e8e0ff25b2abd9827d24730b2bfd3d54acc62eae48df6d0d2b1ac6eaf35a24f1f302c6dcb44cf2c9adcb12969d67bf48482a250032

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 motemen
+
+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

@@ -1,8 +1,15 @@
 git-pr-release <a href="http://badge.fury.io/rb/git-pr-release"><img src="https://badge.fury.io/rb/git-pr-release@2x.png" alt="Gem Version" height="18"></a>
 ==============
 
-Creates a pull request which summarizes feature branches that are to be
-released into production. Useful if your branching storategy is like below:
+Creates a "release pull request", whose body consists of features list or
+pull requests that are to be released into production. It's especially useful for QA and
+pre-release checks. `git-pr-release` automatically collect pull requests
+merged into master branch and generates the content of the release
+pull request.
+
+![Screenshot](https://cloud.githubusercontent.com/assets/113420/3147184/61bf2eec-ea53-11e3-835b-50d63ed11b39.png)
+
+Suitable for branching strategy like below (similar to git-flow):
 
  * Feature branches are first merged into "staging" (or release, development)
    branch.
@@ -12,7 +19,9 @@ released into production. Useful if your branching storategy is like below:
 Configuration
 -------------
 
-All configuration are taken using `git config`.
+All configuration are taken using `git config`. You can write these variables
+in file `.git-pr-release` (instead of `.git/config` or `~/.gitconfig`) to share project-wise configuration to other
+collaborators.
 
 ### `pr-release.token`
 
@@ -38,7 +47,9 @@ Default value: `staging`.
 
 ### `pr-release.template`
 
-The template file path (relative to the workidir top) for pull requests created. Its first line is used for the PR title, the rest for the body. This is an ERB template.
+The template file path (relative to the workidir top) for pull requests
+created. Its first line is used for the PR title, the rest for the body. This
+is an ERB template.
 
 If not specified, the content below is used as the template (embedded in the code):
 
@@ -48,3 +59,8 @@ Release <%= Time.now %>
 <%=  pr.to_checklist_item %>
 <% end -%>
 ```
+
+Author
+------
+
+motemen <motemen@gmail.com>, original in-house version written by @hitode909.

data/bin/git-pr-release

@@ -183,7 +183,8 @@ def obtain_token!
 
     temporary_client = Octokit::Client.new :login => username, :password => password
 
-    auth = temporary_client.create_authorization({ :scopes => [ 'public_repo', 'repo' ], :note => 'summerize-release' })
+    auth = request_authorization(temporary_client, nil)
+
     token = auth.token
     git_config_set 'token', token
   end
@@ -191,6 +192,21 @@ def obtain_token!
   token
 end
 
+def request_authorization(client, two_factor_code)
+  params = { :scopes => [ 'public_repo', 'repo' ], :note => 'git-pr-release' }
+  params[:headers] = { "X-GitHub-OTP" => two_factor_code} if two_factor_code
+
+  auth = nil
+  begin
+    auth = client.create_authorization(params)
+  rescue Octokit::OneTimePasswordRequired
+    two_factor_code = ask('two-factor authentication code? ')
+    auth = request_authorization(client, two_factor_code)
+  end
+
+  auth
+end
+
 def host_and_repository
   @host_and_repository ||= begin
     remote = git(:config, 'remote.origin.url').first.chomp

data/git-pr-release.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "git-pr-release"
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ["motemen"]
   spec.email         = ["motemen@gmail.com"]
   spec.summary       = 'Creates a release pull request'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-pr-release
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - motemen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -78,6 +78,7 @@ files:
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/git-pr-release