socialcast-git-extensions 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f505bfd44845962283348e9f86c4bdf32fe13909
-  data.tar.gz: 751be9171dbb1746af72a7b09862b5431921d980
+  metadata.gz: f6df565ab7992070e2b73ec347a44c2f25bf2838
+  data.tar.gz: ac2cfdc3044973c434d7d3ec803e875d9eec9c34
 SHA512:
-  metadata.gz: e4d63a034d7da66a1bd0b0783d1092fc4b23a95928d7661d9b5064cb40737989875bad32059cbdc43d5f484bdd766617b8a0def926f34ca13705311cedd0248c
-  data.tar.gz: 839e0b8fb1c1fa61032b1a3736f02bd50f1ea213650bd0487169678fcb6da4a132d29be698148b94376fa2061e65a22b98b29a632874b0190ac130ffb5f71293
+  metadata.gz: 976edeb8500ab67b7d6789cc454017e0867f980ee012686be02b48f2587e82f071c0699d4ac4a4d9d71925090822ba767d12fbaf61e6c7d62c3648b62d4395f4
+  data.tar.gz: 51db07e95b22c332e1599c7744c1aed17fd2eeeca66c74454fcb73a137ee311759d1c72b45ba277ac3d6aa9066af5094428eb4bd396ab3fa902ff747a33095df

data/lib/socialcast-git-extensions/cli.rb

@@ -128,13 +128,24 @@ module Socialcast
         socialcast_reviewer = socialcast_track_reviewer('Backport')
 
         pull_request_data = github_api_request('GET', "repos/#{repo}/pulls/#{pull_request_num}")
-        commits_data = github_api_request('GET', pull_request_data['commits_url'])
 
-        non_merge_commits_data = commits_data.select { |commit_data| commit_data['parents'].length == 1 }
-        shas = non_merge_commits_data.map { |commit| commit['sha'] }
+        commits_to_cherry_pick = []
+        commit_count = pull_request_data['commits']
+        commits_checked_count = 0
+        page = 1
+
+        while commits_checked_count < commit_count
+          commits_data = github_api_request('GET', pull_request_data['commits_url'] + "?page=#{page}")
+          commits_checked_count += commits_data.size
+          raise 'Received empty commits data response! Could not pull all commits from PR' if commits_data.size == 0
+
+          non_merge_commits_data = commits_data.select { |commit_data| commit_data['parents'].length == 1 }
+          commits_to_cherry_pick += non_merge_commits_data.map { |commit| commit['sha'] }
+          page += 1
+        end
 
         backport_branch = "backport_#{pull_request_num}_to_#{maintenance_branch}"
-        backport_to(backport_branch, shas)
+        backport_to(backport_branch, commits_to_cherry_pick)
 
         maintenance_branch_url = "https://github.com/#{repo}/tree/#{maintenance_branch}"
         description = "Backport ##{pull_request_num} to #{maintenance_branch_url}\n***\n#{pull_request_data['body']}"

data/lib/socialcast-git-extensions/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "4.1.3"
+    VERSION = "4.1.4"
   end
 end

data/spec/cli_spec.rb

@@ -971,7 +971,7 @@ describe Socialcast::Gitx::CLI do
         .to_return(:status => 200, :body => pr_response.to_json, :headers => {})
     end
     let!(:github_pr_commits_list) do
-      stub_request(:get, "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls/59/commits")
+      stub_request(:get, "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls/59/commits?page=1")
         .to_return(:status => 200, :body => commits_response.to_json, :headers => {})
     end
     let!(:github_pr_create) do
@@ -1056,6 +1056,90 @@ describe Socialcast::Gitx::CLI do
         expect(socialcast_message_create).to_not have_been_requested
       end
     end
+    context 'when backport has multiple pages of commits' do
+      let(:pr_response) do
+        # https://developer.github.com/v3/search/#search-issues
+        {
+          "url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls/59",
+          "id" => 13712197,
+          "html_url" => "https://github.com/socialcast/socialcast-git-extensions/pull/59",
+          "diff_url" => "https://github.com/socialcast/socialcast-git-extensions/pull/59.diff",
+          "patch_url" => "https://github.com/socialcast/socialcast-git-extensions/pull/59.patch",
+          "issue_url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/issues/59",
+          "number" => 59,
+          "state" => "closed",
+          "title" => "additional-notifications",
+          "body" => "simply testing this out",
+          "created_at" => "2014-03-18T22:39:37Z",
+          "updated_at" => "2014-03-18T22:40:18Z",
+          "closed_at" => "2014-03-18T22:39:46Z",
+          "merged_at" => nil,
+          "merge_commit_sha" => "f73009f4eb245c84da90e8abf9be846c58bc1e3b",
+          "assignee" => nil,
+          "milestone" => nil,
+          "commits_url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls/59/commits",
+          "review_comments_url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls/59/comments",
+          "review_comment_url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls/comments/{number}",
+          "comments_url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/issues/59/comments",
+          "statuses_url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/statuses/5e30d5af3f4d1bb3a34cc97568299be028b65f6f",
+          "commits" => 2,
+        }
+      end
+      let(:commits_response) do
+        [
+          {
+            "sha" => "5e30d5af3f4d1bb3a34cc97568299be028b65f6f",
+            "commit" => {
+              "message" => "adding the ability to specify additional reviewers"
+            },
+            "url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/commits/5e30d5af3f4d1bb3a34cc97568299be028b65f6f",
+            "parents" => [
+              {
+                "sha" => "1baae2de301c43d44297647f3f9c1e06697748ad",
+                "url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/commits/1baae2de301c43d44297647f3f9c1e06697748ad",
+                "html_url" => "https://github.com/socialcast/socialcast-git-extensions/commit/1baae2de301c43d44297647f3f9c1e06697748ad"
+              }
+            ]
+          }
+        ]
+      end
+
+      let(:commits_response2) do
+        [
+          {
+            "sha" => "5e30d5af3f4d1bb3a34cc97568299be028b65f6d",
+            "commit" => {
+              "message" => "adding the ability to specify additional reviewers"
+            },
+            "url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/commits/5e30d5af3f4d1bb3a34cc97568299be028b65f6d",
+            "parents" => [
+              {
+                "sha" => "5e30d5af3f4d1bb3a34cc97568299be028b65f6f",
+                "url" => "https://api.github.com/repos/socialcast/socialcast-git-extensions/commits/5e30d5af3f4d1bb3a34cc97568299be028b65f6f",
+                "html_url" => "https://github.com/socialcast/socialcast-git-extensions/commit/5e30d5af3f4d1bb3a34cc97568299be028b65f6f"
+              }
+            ]
+          }
+        ]
+      end
+
+      let!(:github_pr_commits_list2) do
+        stub_request(:get, "https://api.github.com/repos/socialcast/socialcast-git-extensions/pulls/59/commits?page=2")
+          .to_return(:status => 200, :body => commits_response2.to_json, :headers => {})
+      end
+      let(:use_pr_comments) { true }
+      it 'creates a branch based on v1.x and cherry-picks in PR 59' do
+        Socialcast::Gitx::CLI.start ['backportpr', '59', 'v1.x']
+        expect(github_pr_show).to have_been_requested
+        expect(github_pr_commits_list).to have_been_requested
+        expect(github_pr_commits_list2).to have_been_requested
+        expect(github_pr_create).to have_been_requested
+
+        expect(github_pr_comment_create).to have_been_requested
+        expect(socialcast_message_create).to_not have_been_requested
+      end
+    end
+
   end
 
   describe '#findpr' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Socialcast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -212,6 +212,7 @@ files:
 - lib/socialcast-git-extensions/highline.rb
 - lib/socialcast-git-extensions/string_ext.rb
 - lib/socialcast-git-extensions/version.rb
+- socialcast-git-extensions-4.1.3.gem
 - socialcast-git-extensions.gemspec
 - spec/cli_spec.rb
 - spec/git_spec.rb
@@ -236,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socialcast-git-extensions
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: git extension scripts for socialcast workflow