git-pr-release 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98451853b6d661fc267e971bc26da386c77db073
-  data.tar.gz: 2437ff8212312fae03bbdfc28f2bae9e1b2806a7
+  metadata.gz: 79571d68044b4b6400cd27b0ea810cc26cc4d009
+  data.tar.gz: 4a5413b28460e4083c3aa9492d78a429285ba0a5
 SHA512:
-  metadata.gz: e03be692ee0bbb5a4ac1dd4cffd68fb625a39601cda7171d2c93770f4162b162e6cd5ae287877f4030ca2c4d65dafd442e8bd42803f0389c9f58178f5171aec5
-  data.tar.gz: d8831448a215b076fdd69782ccfdcbc5c22eeb979623f7cb0818754dbdc311fb07bb681eae75f0608af00dfdb89e592e8c0529746ecf3180dc5828966f8dcf3f
+  metadata.gz: 563d365becde236f2bff0b111925b8dff67021f2e6a7cf931dc857671bf198934b671c3823c7996d1d1b4df9cb947cdc762c4d2d63f6fceb2dc5c1edd76a4860
+  data.tar.gz: 510e8000fcd8a6de989f8366284b7eefbbf7ae44717bb195df3c6d328bef791600b80661586f3ca988ac8429fdadc45fef9e140c6e2f826e71103ed31411f52d

data/Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     git-pr-release (0.0.1)
       colorize (~> 0.6)
+      diff-lcs (~> 1.2)
       highline (~> 1.6)
       octokit (~> 2.7)
 
@@ -11,13 +12,14 @@ GEM
   specs:
     addressable (2.3.5)
     colorize (0.6.0)
+    diff-lcs (1.2.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     highline (1.6.20)
     multipart-post (2.0.0)
     octokit (2.7.0)
       sawyer (~> 0.5.2)
-    sawyer (0.5.2)
+    sawyer (0.5.3)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
 

data/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/bin/git-pr-release

@@ -1,10 +1,24 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'uri'
+require 'erb'
 require 'open3'
+require 'tmpdir'
 require 'octokit'
 require 'colorize'
+require 'diff/lcs'
+
+class PullRequest
+  attr_reader :pr
+
+  def initialize(pr)
+    @pr = pr
+  end
+
+  def to_checklist_item
+    "- [ ] ##{pr.number} #{pr.title}" + (pr.assignee ? " @#{pr.assignee.login}" : '')
+  end
+end
 
 def say(message, level)
   color = case level
@@ -46,10 +60,64 @@ def git_config(key)
   end
 end
 
-def generate_description(pull_requests)
-  pull_requests.map do |pr|
-    "- [ ] ##{pr.number} #{pr.title}" + (pr.assignee ? " @#{pr.assignee.login}" : '')
-  end.join("\n")
+# First line will be the title of the PR
+DEFAULT_PR_TEMPLATE = <<ERB
+Release <%= Time.now %>
+<% pull_requests.each do |pr| -%>
+<%=  pr.to_checklist_item %>
+<% end -%>
+ERB
+
+def build_pr_title_and_body(prs)
+  pull_requests = prs.map { |pr| PullRequest.new(pr) }
+
+  template = DEFAULT_PR_TEMPLATE
+
+  if path = git_config('pr-release.template.path')
+    template_path = File.join(git('rev-parse', '--show-toplevel').first.chomp, path)
+    template = File.read(template_path)
+  end
+
+  erb = ERB.new template, nil, '-'
+  content = erb.result binding
+  content.split(/\n/, 2)
+end
+
+def merge_pr_body(old_body, new_body)
+  # Try to take over checklist statuses
+  pr_body_lines = []
+
+  Diff::LCS.traverse_balanced(old_body.split(/\r?\n/), new_body.split(/\r?\n/)) do |event|
+    say "diff: #{event.inspect}", :trace
+    action, old, new = *event
+    old_nr, old_line = *old
+    new_nr, new_line = *new
+
+    case action
+    when '=', '+'
+      say "Use line as is: #{new_line}", :trace
+      pr_body_lines << new_line
+    when '-'
+      say "Use old line: #{old_line}", :trace
+      pr_body_lines << old_line
+    when '!'
+      if [ old_line, new_line ].all? { |line| /^- \[[ x]\]/ === line }
+        say "Found checklist diff; use old one: #{old_line}", :trace
+        pr_body_lines << old_line
+      else
+        # not a checklist diff, use both line
+        say "Use line as is: #{old_line}", :trace
+        pr_body_lines << old_line
+
+        say "Use line as is: #{new_line}", :trace
+        pr_body_lines << new_line
+      end
+    else
+      say "Unknown diff event: #{event}", :warn
+    end
+  end
+
+  pr_body_lines.join("\n")
 end
 
 def obtain_token!
@@ -91,7 +159,8 @@ if remote_url.host != 'github.com'
   end
 end
 
-## Project specific configuration
+### Set up configuration
+
 production_branch  = git_config('pr-release.branch.production') || 'master'
 staging_branch     = git_config('pr-release.branch.staging')    || 'staging'
 
@@ -103,6 +172,8 @@ client = Octokit::Client.new :access_token => obtain_token!
 
 git :remote, 'update', 'origin'
 
+### Fetch merged PRs
+
 merged_feature_head_sha1s = git(
   :log, '--merges', '--pretty=format:%P', "origin/#{production_branch}..origin/#{staging_branch}"
 ).map do |line|
@@ -140,22 +211,34 @@ pull_requests = merged_pull_request_numbers.map do |nr|
   pr
 end
 
+### Create a release PR
+
 say 'Searching for existing release pull requests...', :info
-release_pr = client.pull_requests(repository).find do |pr|
+existing_release_pr = client.pull_requests(repository).find do |pr|
   pr.head.ref == staging_branch && pr.base.ref == production_branch
 end
 
 created = false
 
-if release_pr
-  say "Updating release pull request ##{release_pr.number}...", :info
-  client.update_pull_request(
-    repository, release_pr.number, :body => generate_description(pull_requests)
+pr_title, pr_body = build_pr_title_and_body pull_requests
+
+say 'Pull request body:', :debug
+say pr_body, :debug
+
+release_pr = nil
+
+if existing_release_pr
+  say "Updating release pull request ##{existing_release_pr.number}...", :info
+
+  merged_pr_body = merge_pr_body existing_release_pr.body, pr_body
+
+  release_pr = client.update_pull_request(
+    repository, existing_release_pr.number, :title => pr_title, :body => merged_pr_body
   )
 else
   say 'Creating release pull request...', :info
   release_pr = client.create_pull_request(
-    repository, production_branch, staging_branch, "release #{Time.now}", generate_description(pull_requests)
+    repository, production_branch, staging_branch, pr_title, pr_body
   )
   created = true
 end

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.1'
+  spec.version       = '0.0.2'
   spec.authors       = ["motemen"]
   spec.email         = ["motemen@gmail.com"]
   spec.summary       = 'Creates a release pull request'
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'octokit',  '~> 2.7'
   spec.add_dependency 'highline', '~> 1.6'
   spec.add_dependency 'colorize', '~> 0.6'
+  spec.add_dependency 'diff-lcs', '~> 1.2'
 
   spec.license = 'MIT'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-pr-release
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - motemen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !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
   that are to be released into production
 email:
@@ -65,6 +79,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - bin/git-pr-release
 - git-pr-release.gemspec
 homepage: https://github.com/motemen/git-pr-release