git-pr-release 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79571d68044b4b6400cd27b0ea810cc26cc4d009
-  data.tar.gz: 4a5413b28460e4083c3aa9492d78a429285ba0a5
+  metadata.gz: 01b3c946c2a231690f39774716ac1d7a73e8d795
+  data.tar.gz: b0be27e932dc56f83e112c53f9a9c74d5ae080b7
 SHA512:
-  metadata.gz: 563d365becde236f2bff0b111925b8dff67021f2e6a7cf931dc857671bf198934b671c3823c7996d1d1b4df9cb947cdc762c4d2d63f6fceb2dc5c1edd76a4860
-  data.tar.gz: 510e8000fcd8a6de989f8366284b7eefbbf7ae44717bb195df3c6d328bef791600b80661586f3ca988ac8429fdadc45fef9e140c6e2f826e71103ed31411f52d
+  metadata.gz: 1ca4bb2f17fe20b0d631d65b1c63310cac8251f085e0b7355b8df1a0a8bdc6de396eccf7cc051000b2a0a4e37ca3186285b72ee364fcb26a02672fe58794d6ea
+  data.tar.gz: d13dd5e4cafd8d6988add6976afd1677dc11c500ba517197eef8ccabddd8c7bc4adc77785160436d2ff885959ecbdaa4ab2b2ba8040aaebaab957fea157e1aa8

data/README.md

@@ -33,3 +33,16 @@ The branch name that the feature branches are merged into and is going to be
 merged into the "production" branch.
 
 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.
+
+If not specified, the content below is used as the template (embedded in the code):
+
+```erb
+Release <%= Time.now %>
+<% pull_requests.each do |pr| -%>
+<%=  pr.to_checklist_item %>
+<% end -%>
+```

data/bin/git-pr-release

@@ -4,6 +4,8 @@ require 'uri'
 require 'erb'
 require 'open3'
 require 'tmpdir'
+require 'optparse'
+
 require 'octokit'
 require 'colorize'
 require 'diff/lcs'
@@ -53,13 +55,25 @@ end
 
 
 def git_config(key)
+  host, _ = host_and_repository()
+
+  plain_key = [ 'pr-release', key ].join('.')
+  host_aware_key = [ 'pr-release', host, key ].compact.join('.')
+
   begin
-    git('config', key).first.chomp
+    git(:config, '-f', '.git-pr-release', plain_key).first.chomp
   rescue
-    nil
+    git(:config, host_aware_key).first.chomp rescue nil
   end
 end
 
+def git_config_set(key, value)
+  host, _ = host_and_repository()
+  host_aware_key = [ 'pr-release', host, key ].compact.join('.')
+
+  git :config, '--global', host_aware_key, value
+end
+
 # First line will be the title of the PR
 DEFAULT_PR_TEMPLATE = <<ERB
 Release <%= Time.now %>
@@ -73,7 +87,7 @@ def build_pr_title_and_body(prs)
 
   template = DEFAULT_PR_TEMPLATE
 
-  if path = git_config('pr-release.template.path')
+  if path = git_config('pr-release.template')
     template_path = File.join(git('rev-parse', '--show-toplevel').first.chomp, path)
     template = File.read(template_path)
   end
@@ -121,11 +135,11 @@ def merge_pr_body(old_body, new_body)
 end
 
 def obtain_token!
-  token = git_config('pr-release.token')
+  token = git_config('token')
 
   unless token
     require 'highline/import'
-    STDERR.puts 'Could not obtain config variable pr-release.token.'
+    STDERR.puts 'Could not obtain GitHub API token.'
     STDERR.puts 'Trying to generate token...'
 
     username = ask('username? ') { |q| q.default = ENV['USER'] }
@@ -135,34 +149,49 @@ def obtain_token!
 
     auth = temporary_client.create_authorization({ :scopes => [ 'public_repo', 'repo' ], :note => 'summerize-release' })
     token = auth.token
-    git :config, '--global', 'pr-release.token', token
+    git_config_set 'token', token
   end
 
   token
 end
 
-remote = git_config 'remote.origin.url'
-unless %r(^\w+://) === remote
-  remote = "ssh://#{remote.sub(':', '/')}"
+def host_and_repository
+  @host_and_repository ||= begin
+    remote = git(:config, 'remote.origin.url').first.chomp
+    unless %r(^\w+://) === remote
+      remote = "ssh://#{remote.sub(':', '/')}"
+    end
+
+    remote_url = URI.parse(remote)
+    repository = remote_url.path.sub(%r(^/), '').sub(/\.git$/, '')
+
+    host = remote_url.host == 'github.com' ? nil : remote_url.host
+    [ host, repository ]
+  end
 end
 
-remote_url = URI.parse(remote)
-repository = remote_url.path.sub(%r(^/), '').sub(/\.git$/, '')
+host, repository = host_and_repository
 
-if remote_url.host != 'github.com'
+if host
   # GitHub:Enterprise
   OpenSSL::SSL.const_set :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE # XXX
 
   Octokit.configure do |c|
-    c.api_endpoint = "https://#{remote_url.host}/api/v3"
-    c.web_endpoint = "https://#{remote_url.host}/"
+    c.api_endpoint = "https://#{host}/api/v3"
+    c.web_endpoint = "https://#{host}/"
   end
 end
 
+OptionParser.new do |opts|
+  opts.on('-n', '--dry-run', 'Do not create/update a PR. Just prints out') do |v|
+    @dry_run = v
+  end
+end.parse!
+
 ### Set up configuration
 
-production_branch  = git_config('pr-release.branch.production') || 'master'
-staging_branch     = git_config('pr-release.branch.staging')    || 'staging'
+production_branch  = git_config('branch.production') || 'master'
+staging_branch     = git_config('branch.staging')    || 'staging'
 
 say "Repository:        #{repository}", :debug
 say "Production branch: #{production_branch}", :debug
@@ -232,15 +261,30 @@ if existing_release_pr
 
   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
-  )
+  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
+    )
+  end
 else
   say 'Creating release pull request...', :info
-  release_pr = client.create_pull_request(
-    repository, production_branch, staging_branch, pr_title, pr_body
-  )
-  created = true
+
+  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
 end
 
 unless release_pr

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