gh-pr-backport 0.1.0.alpha2 → 0.1.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1c05225c80e6b714a85021a0918e18c050a5cde87251b1c6818b0f80e26ef0
-  data.tar.gz: 940d33dba73c8c043604a868bcea44269f4f19d14c11474c64650bf2acd61721
+  metadata.gz: 3fd9ac1d7f61467e3a140371a8ccf44623c929458e5e81653131ecbff31dc12d
+  data.tar.gz: f40d8da0820b9c29eb1e393c17a5a7a7f4ba00eb69fad170e16ffb3e633285f0
 SHA512:
-  metadata.gz: d3be7947fd595a682d309db9b1c236df2ec94239ca238db3f06aec9b0fae93173941191960362b8ffaa1fa0dfad1b1ae703b32d3cb1215bf044f6a99b268c1af
-  data.tar.gz: 307f651897173c79379ba41aa4b8b64043aec1127c7e76f3592f0e310e39a43806c45e919ea55b8cc13fb0383025fcad6e50b537284c5f722e7145560d81d20b
+  metadata.gz: 5c6feefcaedf0e35e70fc0995553342b980c6e3128c3c7140adc62eb824773e8c7e47d3bfb28d54b8c8ff19c3adeb2cf40caef663025da54558de161a76a5d7e
+  data.tar.gz: 5bbda3418e08593d87ee9c1d21106140f0158af05c182159233f26edf5c4e0aa94d4d1ade4a1d5b767a800c07078fd60f00a98b71cecbfc9d5059ae14f2f6642

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gh-pr-backport (0.1.0.alpha2)
+    gh-pr-backport (0.1.0.alpha3)
       hashie (~> 3.5, >= 3.5.7)
       octokit (~> 4.8, >= 4.8.0)
 

data/exe/gh-pr-backport-at-once

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'gh_pr_backport'
+
+backporter = GhPrBackport::AtOnceBackporter.new
+backporter.run

data/lib/gh_pr_backport.rb

@@ -8,4 +8,6 @@ module GhPrBackport
   class PushFailed < StandardError; end
 
   autoload :Backporter, 'gh_pr_backport/backporter'
+  autoload :AtOnceBackporter, 'gh_pr_backport/at_once_backporter'
+  autoload :Common, 'gh_pr_backport/common'
 end

data/lib/gh_pr_backport/at_once_backporter.rb

@@ -0,0 +1,94 @@
+require 'octokit'
+
+module GhPrBackport
+  class AtOnceBackporter
+    include GhPrBackport::Common
+
+    def run
+      raise GhPrBackport::DirectoryIsMessy unless clean?
+      create_todo_file
+      open_editor
+      run_todos_from_file
+    end
+
+    def open_editor
+      unless system("#{optional_str ENV['EDITOR'], 'vim'} #{todo_file}")
+        raise 'Editor returned non-zero exit status.'
+      end
+    end
+
+    def run_todos_from_file
+      todo_commits = read_todo_file
+      if todo_commits.empty?
+        puts 'Nothing to do.'
+        return
+      end
+      system("git cherry-pick -m 1 -x #{todo_commits.join(' ')}")
+    end
+
+    def list_todo_prs
+      picked_pr_numbers = list_picked_prs.map { |commit| commit[:pr_number] }.to_set
+      list_merged_prs.select { |commit| !picked_pr_numbers.include?(commit[:pr_number]) }
+    end
+
+    def list_merged_prs
+      parse_log_stream(`git log --merges #{log_format_option} HEAD..origin/HEAD`)
+        .select { |commit| commit[:pr_number] }
+    end
+
+    def list_picked_prs
+      parse_log_stream(`git log #{log_format_option} origin/HEAD..HEAD`)
+        .select { |commit| commit[:pr_number] }
+    end
+
+    private
+
+    def git_dir
+      optional_str ENV['GIT_DIR'], '.git'
+    end
+
+    def todo_file
+      File.join(git_dir, '.git-pr-backport-todo')
+    end
+
+    def read_todo_file
+      File.readlines(todo_file)
+        .map(&:strip)
+        .reject { |line| line == '' || line.start_with?('#') }
+        .each_with_index { |line, i| raise "Parse error in line #{i + 1}: #{line}" unless line =~ /^[0-9A-Za-z]+(?:\s|\z)/ }
+        .map { |line| line.split(/\s+/, 2)[0] }
+    end
+
+    def create_todo_file
+      File.write(todo_file, list_todo_prs.map do |commit|
+        "# #{commit[:hash][0..7]} ##{commit[:pr_number]} #{commit[:body].lines[0]} (#{pr_to_link(commit)})"
+      end.join("\n"))
+    end
+
+    def pr_to_link(commit)
+      "#{repo.url}/pull/#{commit[:pr_number]}"
+    end
+
+    def log_format_option
+      # null terminated
+      '--format=format:%H%n%B%x00'
+    end
+
+    def parse_log_stream(stream)
+      stream
+        .split("\0\n")
+        .map { |commit_data| parse_commit_data(commit_data) }
+        .reverse
+    end
+
+    def parse_commit_data(commit_data)
+      hash, subject, body = commit_data.split("\n", 3).map(&:strip)
+      pr_number = subject.match(/\AMerge pull request #([1-9][0-9]*) from/)&.tap { |m| break m[1].to_i }
+      { hash: hash, pr_number: pr_number, subject: subject, body: body || '' }
+    end
+
+    def optional_str(str, default)
+      str == '' ? default : str || default
+    end
+  end
+end

data/lib/gh_pr_backport/backporter.rb

@@ -1,10 +1,11 @@
 require 'uri'
 
 require 'hashie'
-require 'octokit'
 
 module GhPrBackport
   class Backporter
+    include GhPrBackport::Common
+
     def initialize(original_pr_number:, staging_branch: nil)
       @client   = client
       @repo     = repo
@@ -39,16 +40,6 @@ module GhPrBackport
       end
     end
 
-    def client
-      client = Octokit::Client.new(access_token: `git config backport.token`.chomp)
-      client.scopes # Validate token. If the token is invalid, then raise an error.
-      client
-    end
-
-    def clean?
-      `git status --porcelain`.chomp.empty?
-    end
-
     def create_backport_pull_request
       body = "##{@original.number} のバックポートです\r\n\r\n" +
         @original.body.lines.map { |l| "> #{l}" }.join
@@ -87,16 +78,6 @@ module GhPrBackport
       `git config -f #{path}/.git-pr-release pr-release.branch.staging`.chomp
     end
 
-    def repo
-      remote = `git config remote.origin.url`.chomp
-      repo_name = if remote.start_with?('git@github.com:')
-                    remote.split(':', 2)[1].sub(/.git$/, '')
-                  else
-                    URI.parse(remote).path.sub(%r{^\/}, '').sub(/.git$/, '')
-                  end
-      Octokit::Repository.new(repo_name)
-    end
-
     def system!(program, *args, error_class)
       raise error_class unless system(program, *args)
       true

data/lib/gh_pr_backport/common.rb

@@ -0,0 +1,25 @@
+require 'octokit'
+
+module GhPrBackport
+  module Common
+    def client
+      client = Octokit::Client.new(access_token: `git config backport.token`.chomp)
+      client.scopes # Validate token. If the token is invalid, then raise an error.
+      client
+    end
+
+    def clean?
+      `git status --porcelain`.chomp.empty?
+    end
+
+    def repo
+      remote = `git config remote.origin.url`.chomp
+      repo_name = if remote.start_with?('git@github.com:')
+                    remote.split(':', 2)[1].sub(/.git$/, '')
+                  else
+                    URI.parse(remote).path.sub(%r{^\/}, '').sub(/.git$/, '')
+                  end
+      Octokit::Repository.new(repo_name)
+    end
+  end
+end

data/lib/gh_pr_backport/version.rb

@@ -1,3 +1,3 @@
 module GhPrBackport
-  VERSION = '0.1.0.alpha2'.freeze
+  VERSION = '0.1.0.alpha3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gh-pr-backport
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha2
+  version: 0.1.0.alpha3
 platform: ruby
 authors:
 - Takeru Naito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ email:
 - takeru.naito@gmail.com
 executables:
 - gh-pr-backport
+- gh-pr-backport-at-once
 extensions: []
 extra_rdoc_files: []
 files:
@@ -127,9 +128,12 @@ files:
 - bin/console
 - bin/setup
 - exe/gh-pr-backport
+- exe/gh-pr-backport-at-once
 - gh-pr-backport.gemspec
 - lib/gh_pr_backport.rb
+- lib/gh_pr_backport/at_once_backporter.rb
 - lib/gh_pr_backport/backporter.rb
+- lib/gh_pr_backport/common.rb
 - lib/gh_pr_backport/version.rb
 homepage: https://github.com/elim/gh-pr-backport
 licenses: