git-pr-release 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3858360e38c1b2f4ef52fa613997e282328729b
-  data.tar.gz: bcba7c5512fad71b320fbf35ac229380e51375f5
+  metadata.gz: 6be0d371bb9b42f9b5adf6da8f552247c27a7b9f
+  data.tar.gz: 541beb26f84a5b099e09e5d9ef80944572d8b5de
 SHA512:
-  metadata.gz: c26c855c4bf0b737a4158d81efebcad0e67aa7459c09b6cd3301570269c3bddb24887d156ffcb1022d29b6541bde96c1ef104f05cd25d0bf82c5483c5fc3022c
-  data.tar.gz: afa4072c7d4dcafa9d379db140f1b36ebe0778b2453a979b1f07e261d4830e9d71becbf76186e692a6c54896bfd4959ba71cc1bcf3e5e5cd771d19bcf59f0023
+  metadata.gz: 5abfbceb6829666f581b7a276cc80963cb6a5911525b2155daf9e7b492be4d98dc11aaefb8265b94239ae34d4203c0bc8eee97a117a2c9628ae475231ddfdca2
+  data.tar.gz: 67761b280acfede69804aaa8aa4d48cf21c1a18e604abfb7aea289959fc32a0fd6bfe2de7774bd4f588d7fb73e6040642d3503ed8931587f3a360dbdf134737b

data/bin/git-pr-release

@@ -111,7 +111,7 @@ Release <%= Time.now %>
 <% end -%>
 ERB
 
-def build_pr_title_and_body(release_pr, merged_prs)
+def build_pr_title_and_body(release_pr, merged_prs, changed_files)
   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) }
 
@@ -127,10 +127,11 @@ def build_pr_title_and_body(release_pr, merged_prs)
   content.split(/\n/, 2)
 end
 
-def dump_result_as_json(release_pr, merged_prs)
+def dump_result_as_json(release_pr, merged_prs, changed_files)
   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 }
+    :merged_pull_requests => merged_prs.map { |pr| PullRequest.new(pr).to_hash },
+    :changed_files        => changed_files.map { |file| file.to_hash }
   }.to_json )
 end
 
@@ -223,6 +224,14 @@ def host_and_repository_and_scheme
   end
 end
 
+# Fetch PR files of specified pull_request
+def pull_request_files(client, pull_request)
+  return [] if pull_request.nil?
+
+  host, repository, scheme = host_and_repository_and_scheme
+  return client.pull_request_files repository, pull_request.number
+end
+
 host, repository, scheme = host_and_repository_and_scheme
 
 if host
@@ -304,14 +313,17 @@ found_release_pr = client.pull_requests(repository).find do |pr|
 end
 create_mode = found_release_pr.nil?
 
+# Fetch changed files of a release PR
+changed_files = pull_request_files(client, found_release_pr)
+
 if @dry_run
-  pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs
+  pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs, changed_files
   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
-  dump_result_as_json( found_release_pr, merged_prs ) if @json
+  dump_result_as_json( found_release_pr, merged_prs, changed_files ) if @json
   exit 0
 end
 
@@ -326,10 +338,11 @@ if create_mode
     say 'Failed to create a new pull request', :error
     exit 2
   end
-  pr_title, pr_body = build_pr_title_and_body created_pr, merged_prs
+  changed_files = pull_request_files(client, created_pr) # Refetch changed files from created_pr
+  pr_title, pr_body = build_pr_title_and_body created_pr, merged_prs, changed_files
   release_pr = created_pr
 else
-  pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs
+  pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs, changed_files
   pr_body = merge_pr_body(found_release_pr.body, new_body)
   release_pr = found_release_pr
 end
@@ -360,4 +373,4 @@ if not labels.nil? and not labels.empty?
 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
+dump_result_as_json( release_pr, merged_prs, changed_files ) 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.1.5'
+  spec.version       = '0.2.0'
   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.5
+  version: 0.2.0
 platform: ruby
 authors:
 - motemen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit