git-pr-release 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bc50424a98694a90f526c8685e4ea743a46b9d6
-  data.tar.gz: 934bf70ff7c35846b4d525023e20593d9dbd2385
+  metadata.gz: 0a86a7c2e8b0cef94c0eb162660772b0efa212bf
+  data.tar.gz: 81115e65decbf92b726b6218b6fe9cd1cd007f7f
 SHA512:
-  metadata.gz: b8110e2381e583f4cdf913d02b85a6b2978cf0344b0b6a5791980e26bcd26bec6bc1f3398d199d93b4dfba1cbaaa312de0985ca04d1cbc16f60aa79a5cfeb8f5
-  data.tar.gz: 7243843af08eba2a5bacf9f72bdc0b1ffc6a5f6eb598ab0d2b0a7af711b997b95d6e7179adc61ae961029d530365a8888cca0b7018d7bfd7b584b5ad4b8aebce
+  metadata.gz: 64cb59550b604a2a0d189b23dfddeca083bd2a21b656ccadc04e4d72294ed99ce9cf05fc98732b28a1e71f7886ec0f75a472afab2868d551990b38133c94f265
+  data.tar.gz: 0f9f1f277f6f4ce30e73d7d4c6c4681ea9b5e2541a24e17ad518fc3b7291f04af963464ee15a674f36ddbe51d4b723c321f97db8b058f5d732fcb3e421054198

data/bin/git-pr-release

@@ -4,6 +4,7 @@ require 'uri'
 require 'erb'
 require 'open3'
 require 'tmpdir'
+require 'json'
 require 'optparse'
 
 require 'octokit'
@@ -25,6 +26,10 @@ class PullRequest
   def html_link
     pr.rels[:html].href
   end
+
+  def to_hash
+    { :data => @pr.to_hash }
+  end
 end
 
 class DummyPullRequest
@@ -39,6 +44,10 @@ class DummyPullRequest
   def html_link
     'http://github.com/DUMMY/DUMMY/issues/?'
   end
+
+  def to_hash
+    { :data => {} }
+  end
 end
 
 def say(message, level)
@@ -59,7 +68,7 @@ def say(message, level)
       :red
     end
 
-  puts message.colorize(color)
+  STDERR.puts message.colorize(color)
 end
 
 def git(*command)
@@ -101,9 +110,9 @@ Release <%= Time.now %>
 <% end -%>
 ERB
 
-def build_pr_title_and_body(target_pr, prs)
-  target_pull_request = target_pr ? PullRequest.new(target_pr) : DummyPullRequest.new
-  pull_requests = prs.map { |pr| PullRequest.new(pr) }
+def build_pr_title_and_body(release_pr, merged_prs)
+  release_pull_request = target_pull_request = release_pr ? PullRequest.new(release_pr) : DummyPullRequest.new
+  merged_pull_requests = pull_requests = merged_prs.map { |pr| PullRequest.new(pr) }
 
   template = DEFAULT_PR_TEMPLATE
 
@@ -117,6 +126,13 @@ def build_pr_title_and_body(target_pr, prs)
   content.split(/\n/, 2)
 end
 
+def dump_result_as_json(release_pr, merged_prs)
+  puts( {
+    :release_pull_request => (release_pr ? PullRequest.new(release_pr) : DummyPullRequest.new).to_hash,
+    :merged_pull_requests => merged_prs.map { |pr| PullRequest.new(pr).to_hash }
+  }.to_json )
+end
+
 def merge_pr_body(old_body, new_body)
   # Try to take over checklist statuses
   pr_body_lines = []
@@ -206,6 +222,9 @@ OptionParser.new do |opts|
   opts.on('-n', '--dry-run', 'Do not create/update a PR. Just prints out') do |v|
     @dry_run = v
   end
+  opts.on('--json', 'Show data of target PRs in JSON format') do |v|
+    @json = v
+  end
 end.parse!
 
 ### Set up configuration
@@ -254,7 +273,7 @@ if merged_pull_request_numbers.empty?
   exit 1
 end
 
-pull_requests = merged_pull_request_numbers.map do |nr|
+merged_prs = merged_pull_request_numbers.map do |nr|
   pr = client.pull_request repository, nr
   say "To be released: ##{pr.number} #{pr.title}", :notice
   pr
@@ -263,45 +282,46 @@ end
 ### Create a release PR
 
 say 'Searching for existing release pull requests...', :info
-existing_pull_request = client.pull_requests(repository).find do |pr|
+found_release_pr = client.pull_requests(repository).find do |pr|
   pr.head.ref == staging_branch && pr.base.ref == production_branch
 end
-create_mode = existing_pull_request.nil?
+create_mode = found_release_pr.nil?
 
 if @dry_run
-  pr_title, new_body = build_pr_title_and_body existing_pull_request, pull_requests
-  pr_body = create_mode ? new_body : merge_pr_body(existing_pull_request.body, new_body)
+  pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs
+  pr_body = create_mode ? new_body : merge_pr_body(found_release_pr.body, new_body)
 
   say 'Dry-run. Not updating PR', :info
   say pr_title, :notice
   say pr_body, :notice
-  exit
+  dump_result_as_json( found_release_pr, merged_prs ) if @json
+  exit 0
 end
 
 pr_title, pr_body = nil, nil
-target_pull_request = nil
+release_pr = nil
 
 if create_mode
-  created_pull_request = client.create_pull_request(
+  created_pr = client.create_pull_request(
     repository, production_branch, staging_branch, 'Preparing release pull request...', ''
   )
-  unless created_pull_request
+  unless created_pr
     say 'Failed to create a new pull request', :error
     exit 1
   end
-  pr_title, pr_body = build_pr_title_and_body created_pull_request, pull_requests
-  target_pull_request = created_pull_request
+  pr_title, pr_body = build_pr_title_and_body created_pr, merged_prs
+  release_pr = created_pr
 else
-  pr_title, new_body = build_pr_title_and_body existing_pull_request, pull_requests
-  pr_body = merge_pr_body(existing_pull_request.body, new_body)
-  target_pull_request = existing_pull_request
+  pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs
+  pr_body = merge_pr_body(found_release_pr.body, new_body)
+  release_pr = found_release_pr
 end
 
 say 'Pull request body:', :debug
 say pr_body, :debug
 
 updated_pull_request = client.update_pull_request(
-  repository, target_pull_request.number, :title => pr_title, :body => pr_body
+  repository, release_pr.number, :title => pr_title, :body => pr_body
 )
 
 unless updated_pull_request
@@ -310,3 +330,4 @@ unless updated_pull_request
 end
 
 say "#{create_mode ? 'Created' : 'Updated'} pull request: #{updated_pull_request.rels[:html].href}", :notice
+dump_result_as_json( release_pr, merged_prs ) if @json

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.0.5'
+  spec.version       = '0.1.0'
   spec.authors       = ["motemen"]
   spec.email         = ["motemen@gmail.com"]
   spec.summary       = 'Creates a release pull request'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: git-pr-release
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - motemen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 description: git-pr-release creates a pull request which summarizes feature branches
@@ -75,7 +75,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -92,19 +92,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Creates a release pull request
 test_files: []
-has_rdoc: