git-pr-release 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 694fe3719f59b5f9f4a2798de0076b8e29200b9b
-  data.tar.gz: 394d44150cdccadaa2443e214f4b69bfe3f66f83
+  metadata.gz: 6bc50424a98694a90f526c8685e4ea743a46b9d6
+  data.tar.gz: 934bf70ff7c35846b4d525023e20593d9dbd2385
 SHA512:
-  metadata.gz: c21ff349e9e5d0e62ab68e2a37d30933bd607ba61811e9a60c4acbcb337afdb347b733517beeb2d9fc145470953bc7d987dcf3e360f2f1375280c7d270c9afcb
-  data.tar.gz: adc973a3068dbe13cba52fbfd5de3ad67c4ea3960780a6243c61746d42f873c5d33645cc66c4f680784eeba9ec9a9b1fc9dd58e37bf87f260f00840667517829
+  metadata.gz: b8110e2381e583f4cdf913d02b85a6b2978cf0344b0b6a5791980e26bcd26bec6bc1f3398d199d93b4dfba1cbaaa312de0985ca04d1cbc16f60aa79a5cfeb8f5
+  data.tar.gz: 7243843af08eba2a5bacf9f72bdc0b1ffc6a5f6eb598ab0d2b0a7af711b997b95d6e7179adc61ae961029d530365a8888cca0b7018d7bfd7b584b5ad4b8aebce

data/README.md

@@ -1,4 +1,4 @@
-git-pr-release
+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

data/bin/git-pr-release

@@ -18,7 +18,26 @@ class PullRequest
   end
 
   def to_checklist_item
-    "- [ ] ##{pr.number} #{pr.title}" + (pr.assignee ? " @#{pr.assignee.login}" : '')
+    "- [ ] ##{pr.number} #{pr.title}" +
+       (pr.assignee ? " @#{pr.assignee.login}" : pr.user ? " @#{pr.user.login}" : "")
+  end
+
+  def html_link
+    pr.rels[:html].href
+  end
+end
+
+class DummyPullRequest
+  def initialize
+    # nop
+  end
+
+  def to_checklist_item
+    "- [ ] #??? THIS IS DUMMY PULL REQUEST"
+  end
+
+  def html_link
+    'http://github.com/DUMMY/DUMMY/issues/?'
   end
 end
 
@@ -82,7 +101,8 @@ Release <%= Time.now %>
 <% end -%>
 ERB
 
-def build_pr_title_and_body(prs)
+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) }
 
   template = DEFAULT_PR_TEMPLATE
@@ -243,53 +263,50 @@ end
 ### Create a release PR
 
 say 'Searching for existing release pull requests...', :info
-existing_release_pr = client.pull_requests(repository).find do |pr|
+existing_pull_request = client.pull_requests(repository).find do |pr|
   pr.head.ref == staging_branch && pr.base.ref == production_branch
 end
+create_mode = existing_pull_request.nil?
 
-created = false
-
-pr_title, pr_body = build_pr_title_and_body pull_requests
+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)
 
-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
+  say 'Dry-run. Not updating PR', :info
+  say pr_title, :notice
+  say pr_body, :notice
+  exit
+end
 
-  merged_pr_body = merge_pr_body existing_release_pr.body, pr_body
+pr_title, pr_body = nil, nil
+target_pull_request = nil
 
-  if @dry_run
-    say 'Dry-run. Not updating PR', :info
-    say pr_title, :notice
-    say merged_pr_body, :notice
-    exit
-  else
-    release_pr = client.update_pull_request(
-      repository, existing_release_pr.number, :title => pr_title, :body => merged_pr_body
-    )
+if create_mode
+  created_pull_request = client.create_pull_request(
+    repository, production_branch, staging_branch, 'Preparing release pull request...', ''
+  )
+  unless created_pull_request
+    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
 else
-  say 'Creating release pull request...', :info
-
-  if @dry_run
-    say 'Dry-run. Not creating PR', :info
-    say pr_title, :notice
-    say pr_body, :notice
-    exit
-  else
-    release_pr = client.create_pull_request(
-      repository, production_branch, staging_branch, pr_title, pr_body
-    )
-    created = true
-  end
+  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
 end
 
-unless release_pr
-  say 'No pull request found/created', :error
+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
+)
+
+unless updated_pull_request
+  say 'Failed to update a pull request', :error
   exit 1
 end
 
-say "#{created ? 'Created' : 'Updated'} pull request: #{release_pr.rels[:html].href}", :notice
+say "#{create_mode ? 'Created' : 'Updated'} pull request: #{updated_pull_request.rels[:html].href}", :notice

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.4'
+  spec.version       = '0.0.5'
   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.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - motemen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit