zz-export-pull-requests 0.3.5 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fac5c505982f4e25b9dd2ac9cbeac689c0ba84cc1e0f90e3980f8dc8641a922
-  data.tar.gz: 53cde9d89cf8026a46ddd8c8de6c72d583cc00a445aef2f02a5e0f0ee6ae3e7e
+  metadata.gz: 6508eec69dd50e84840ef599ef8cef449bbb6c5ab1aaa4f4ee030ab48ba23926
+  data.tar.gz: cfe15da1345df4cfcdd61c06777e59b7a466efa9349a4a552a498a390382ca98
 SHA512:
-  metadata.gz: f8b2fd94abe182a4151c077cc8717f9feaca7f848c82bc8ce306d7d9557ee5ea0af2b6d07f7bb9c8fe1d6df200c73ae7c4581e48758a67ab235a6e73e2ff79b7
-  data.tar.gz: cbb6dd165e062e1367a2d53a801c9ada34ba6811bd289c9d14f1003aca25e6804bc27bbba9f82ca43195cdb221d427961b4ab86d67e4f1e021519ab47eb02dfd
+  metadata.gz: 8d46731761ebd3959d17e29b9c95888aef6c83bb44d84088ae4e6e537a55c0978c65ef838e8e0c7ae1c64c501c203263fce1fe09e305b6a482ebe165628753a4
+  data.tar.gz: c2c2f579f861d52b1e9b453ccad9e27c59e7f4c71dcf1ed291cb17d0001c68bae3881c8436198c74a104b3468d807d2959451d9cde7eaa500afaceb3ed99f6d1

data/bin/epr

@@ -9,7 +9,7 @@ require "github_api"
 require "gitlab"
 require "bitbucket_rest_api"
 
-VERSION = "0.3.5"
+VERSION = "0.3.10"
 SERVICES = %w[github gitlab bitbucket]
 GIT_CONFIGS = %w[epr.token github.oauth-token]
 
@@ -55,6 +55,21 @@ def lookup_token
   end
 end
 
+# extract "a3351540a2da" from
+# given "https://api.bitbucket.org/2.0/repositories/hellogold/walletfactory/diff/hellogold/walletfactory:a3351540a2da..05675a5ae8ed?path=go%2Fwalletfactory%2F.gitignore"
+def extract_hash_from_diff(user, repo, diff_link)
+  str1 = diff_link.split("..")
+  str2 = str1[0].split(":")
+  short_hash = str2[2]
+  long_hash = get_full_hash(user, repo, short_hash)
+  return long_hash
+end
+
+def get_full_hash(user, repo, short_hash)
+  result = $bitbucket.repos.commit.get_one(user, repo, short_hash)
+  return result["hash"]
+end
+
 def bitbucket(user, repo)
   # TODO: make sure no need to translate any states
   # https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/pullrequests
@@ -90,12 +105,13 @@ def bitbucket(user, repo)
           pr["links"].html.href,
           pr.summary.raw,
           pr.summary.html,
-          !pr.source.commit.nil? ? pr.source.commit["hash"] : "",
-          !pr.destination.commit.nil? ? pr.destination.commit["hash"] : "",
+          !pr.source.commit.nil? ? get_full_hash(user, repo, pr.source.commit["hash"]) : "",
+          !pr.destination.commit.nil? ? get_full_hash(user, repo, pr.destination.commit["hash"]) : "",
           !pr.source.branch.nil? ? pr.source.branch.name : "",
           !pr.destination.branch.nil? ? pr.destination.branch.name : "",
           !pr.reason.nil? ? pr.reason : "",
-          !pr.merge_commit.nil? ? pr.merge_commit["hash"] : ""
+          !pr.merge_commit.nil? ? pr.merge_commit["hash"] : "",
+          !pr.closed_by.nil? ? pr.closed_by.display_name : ""
         ]
       end
 
@@ -120,8 +136,9 @@ def bitbucket(user, repo)
               repo_name,
               TYPE_PR_COMMENT,
               comment.pullrequest.id,
-              comment.user.display_name,
+              comment.user? ? comment.user.display_name : no_user,
               comment.inline? ? "inline" : "normal",
+              comment.id,
               comment.content.raw,
               comment.content.html,
               localtime(comment.updated_on),
@@ -129,7 +146,9 @@ def bitbucket(user, repo)
               comment.inline? ? comment.inline.to : "",
               comment.inline? ? comment.inline.from : "",
               comment.inline? ? comment.inline.path : "",
-              comment["links"].code? ? comment["links"].code.href : ""
+              comment["links"].code? ? comment["links"].code.href : "",
+              comment.parent? ? comment.parent.id : "",
+              comment["links"].code? ? extract_hash_from_diff(user, repo, comment["links"].code.href) : ""
             ]
           end
           break unless comments["next"]
@@ -281,9 +300,9 @@ def export_repos(argv)
   rows = []
 
   if $export == EXPORT_PR_COMMENTS 
-    rows << %w[Repository Type PRNumber User CommentType BodyRaw BodyHTML CreatedAt IsDeleted ToLine FromLine FilePath Diff]
+    rows << %w[Repository Type PRNumber User CommentType CommentID BodyRaw BodyHTML CreatedAt IsDeleted ToLine FromLine FilePath Diff ParentID CommitHash]
   else
-    rows << %w[Repository Type # User Title State CreatedAt UpdatedAt URL BodyRaw BodyHTML SourceCommit DestinationCommit SourceBranch DestinationBranch DeclineReason MergeCommit]
+    rows << %w[Repository Type # User Title State CreatedAt UpdatedAt URL BodyRaw BodyHTML SourceCommit DestinationCommit SourceBranch DestinationBranch DeclineReason MergeCommit ClosedBy]
   end
 
   rows[-1].insert(4, "Body") if $body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zz-export-pull-requests
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.10
 platform: ruby
 authors:
 - Zulhilmi Zainudin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Export pull requests and issues to a CSV file.