export-pull-requests 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88245d15b5031425be423a98f42b42451a5e7810
-  data.tar.gz: 1d60dce9efefbb4d282110b537756ac31a8d6a06
+  metadata.gz: 9aa3a32a54b67ebcc317255f9575cd1cb92eabef
+  data.tar.gz: e614ed2ff03d1d3571513fe0923bf0162bc45c38
 SHA512:
-  metadata.gz: 49af965c7fb6817c8bf8dcdbfbf07608e4b384abf35b2af56692b1f04dcdac63378e8f01bcb015b3d3af78395b431c1a5a5c4090b0199045a15516b5b15c9e49
-  data.tar.gz: c3f868be0eaeb4a760ae8e71f5a49d3a855dba2662149b361b8ef5e6fcdbfe9316f1b458bcce5bead831a629966edb3a8007724fff77d40823ddeb7f63fb5404
+  metadata.gz: d584c1f5406cba8733a910513a8079f37d2544cc07656f0484a856d4d38b0121892e9ef49cd809bca61a614ec75f27d2491f1af4a02dad7ac65685224013061a
+  data.tar.gz: 53b26f30445b60c26955e2212396cd069ab262374a50876938f40b7c131d91472bd3aebf43093738428d8181e298a3020b167aac23df7b5018e8dc1768507ce1

data/Changes

@@ -1,3 +1,9 @@
+v0.3.5  2021-03-16
+--------------------
+Enhancements:
+* Add Merged column containing PR merge time
+* Exit with failure if attempting to export GitHub milestones for PRs
+
 v0.3.4  2021-02-12
 --------------------
 Bug Fixes:

data/bin/epr

@@ -9,7 +9,7 @@ require "github_api"
 require "gitlab"
 require "bitbucket_rest_api"
 
-VERSION = "0.3.4"
+VERSION = "0.3.5"
 SERVICES = %w[github gitlab bitbucket]
 GIT_CONFIGS = %w[epr.token github.oauth-token]
 
@@ -163,10 +163,20 @@ def github(user, repo)
         item.title,
         item.state,
         localtime(item.created_at),
-        localtime(item.updated_at),
-        item.html_url,
+        localtime(item.updated_at)
       ]
 
+      # GitHub issues API returns PRs but not their merged_at time. To get that we need to specifically export PRs
+      if item.pull_request && $export != EXPORT_ISSUES
+        rows[-1] << "(use `-x pr` option)"
+      elsif $export != EXPORT_PRS
+        rows[-1] << "N/A"
+      else
+        rows[-1] << (item.merged_at ? localtime(item.merged_at) : nil)
+      end
+
+      rows[-1] << item.html_url
+
       if $body
         body = item.body
         # -3 for "..."
@@ -216,9 +226,16 @@ def gitlab(user, repo)
         item.title,
         item.state,
         localtime(item.created_at),
-        localtime(item.updated_at),
-        item.web_url
+        localtime(item.updated_at)
       ]
+
+      if method == :issues
+        rows[-1] << "N/A"
+      else
+        rows[-1] << (item.merged_at ? localtime(item.merged_at) : nil)
+      end
+
+      rows[-1] << item.web_url
     end
   end
 
@@ -227,13 +244,14 @@ end
 
 def export_repos(argv)
   rows = []
-  rows << %w[Repository Type # User Title State Created Updated URL]
+  rows << %w[Repository Type # User Title State Created Updated Merged URL]
   rows[-1].insert(4, "Body") if $body
 
   repos = parse_repos(argv)
   repos.each do |user, repo|
     case $provider
     when "github"
+      abort "milestone filtering can only be used with issues" if $milestone && $export == EXPORT_PRS
       rows.concat(github(user, repo))
     when "gitlab"
       rows.concat(gitlab(user, repo))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: export-pull-requests
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github_api
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 12.3.3
 description: Program to export GitHub, GitLab, or Bitbucket pull requests/merge requests
   and issues to CSV a file.
 email: skye.shaw@gmail.com