gitlab_release_note_generator 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507f3dba9bc317d05783373205b589cb6ccce9d1
-  data.tar.gz: 541c5b895f2f3ef3b205ce89141db3c4925aa21d
+  metadata.gz: 65bafcf06b99f9acd0ae50931f9d379c70f982f5
+  data.tar.gz: 61c6662827e15f4e3d58d5ac01769353912ec20f
 SHA512:
-  metadata.gz: '06087b9ffaf131ac994a421f524868a536f1fc075ee3338731ecfea67dc2f81c2595656bdbd1ee61966946f5ebc0bc52bdd8323a4a72bc0d2d36f2229b052000'
-  data.tar.gz: 5456bc763cce4c7e874256ca81e7e6ab7d9a591d609d10e9bf6db386a8be4c6e6e5150b87012d8fc417853d510f76a47903c0b0e5b819d8ac97386d84e3de2e7
+  metadata.gz: d82958b0e41f544f5cbf7de4ca984a0da7a88782c9ded9ac72a679b2d442350b76003372eb47c1ee6dc58fb5303b260f9c966f933702338fed21ed181e5cc330
+  data.tar.gz: 9b97a77b75160fb9e77bc3b2223f94b901440678d4fd1314e3a8da4d55bc0485b936518ba44485b86a6b11d52860c86393909457e28553c3177817d1c82d8207

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab_release_note_generator (0.1.4)
+    gitlab_release_note_generator (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/gitlab_release_note_generator/builder.rb

@@ -20,33 +20,87 @@ module GitlabReleaseNoteGenerator
             tag_name = tags_dict[0]["name"]
 
             if tags_dict.count > 1 
-                get_all_merge_requests_after(conn, tags_dict[1]["commit"]["created_at"], tag_name)
+                merged_requests = get_all_merge_requests_after(conn, tags_dict[1]["commit"]["created_at"])
+                closed_issues = get_all_issues_after(conn, tags_dict[1]["commit"]["created_at"])
+                generate_changelog(conn, tag_name, merged_requests, closed_issues)
             else
-                get_all_merge_request_before(conn, tags_dict[0]["commit"]["created_at"], tag_name)    
-            end
+                merged_requests = get_all_merge_request_before(conn, tags_dict[0]["commit"]["created_at"])    
+                closed_issues = get_all_issues_before(conn, tags_dict[0]["commit"]["created_at"]) 
+                generate_changelog(conn, tag_name, merged_requests, closed_issues)
+            end            
         end
 
-        def get_all_merge_request_before(conn, datetime, tag) 
-            response = conn.get @@base_url + "/merge_requests?created_before=#{datetime}"
-            generate_changelog(conn, response.body, tag)
+        def get_all_merge_request_before(conn, datetime) 
+            response = conn.get @@base_url + "/merge_requests?created_before=#{datetime}?state=merged?scope=all"
+            return response.body
         end
 
-        def get_all_merge_requests_after(conn, datetime, tag)
-            response = conn.get @@base_url + "/merge_requests?created_after=#{datetime}"
-            generate_changelog(conn, response.body, tag)
+        def get_all_merge_requests_after(conn, datetime)
+            response = conn.get @@base_url + "/merge_requests?created_after=#{datetime}?state=merged?scope=all"
+
+            return response.body
         end
 
-        def generate_changelog(conn, response_body, tag)  
-            merge_requests = JSON.parse(response_body)
-            description = '### Merged merge requests (%s)\r\n#### Closed merge requests\r\n'
-            description = description % [getCurrentTime]
-            for merge in merge_requests
-                description += "- #{merge["title"]} " + "[#{merge["reference"]}]" + "(#{merge["web_url"]})"
-                description += " [#{merge["author"]["username"]}]" + "(#{merge["author"]["web_url"]})" + '\r\n'
-            end    
+        def get_all_issues_before(conn, datetime)
+            response = conn.get @@base_url + "/issues?created_before=#{datetime}?state=closed?scope=all"    
+            return response.body
+        end
+
+        def get_all_issues_after(conn, datetime) 
+            response = conn.get @@base_url + "/issues?created_after=#{datetime}?state=closed?scope=all" 
+            return response.body
+        end 
+
+        def generate_changelog(conn, tag, merged_requests_response_body, closed_issues_response_body)  
+            merged_requests = JSON.parse(merged_requests_response_body)
+            closed_issues = JSON.parse(closed_issues_response_body)
+            description = '### Release note (%s)\r\n'
+            description = description % [getCurrentTime]        
+
+            closed_issues_notes = generate_closed_issues_notes(conn, closed_issues)
+            merged_requests_notes = generate_merged_requests_notes(conn, merged_requests)   
+            
+            if closed_issues_notes.nil? && merged_requests_notes.nil? 
+                puts "Didn't find either closed issues or merged requests between last two tags."
+                return
+            end
+            
+            if !closed_issues_notes.nil? 
+                description += closed_issues_notes
+            end
+
+            if !merged_requests_notes.nil? 
+                description += merged_requests_notes
+            end 
             
             post_new_release(conn, description, tag)
-        end 
+        end
+
+        def generate_merged_requests_notes(conn, merged_requests) 
+            if merged_requests.count == 0 
+                return nil
+            end 
+            description = '#### Closed merge requests\r\n'
+            for merge in merged_requests
+                description += "- #{merge["title"]} " + "[##{merge["reference"]}]" + "(#{merge["web_url"]})"
+                description += " ([#{merge["author"]["username"]}]" + "(#{merge["author"]["web_url"]}))" + '\r\n'
+            end    
+
+            return description
+        end
+
+        def generate_closed_issues_notes(conn, closed_issues) 
+            if closed_issues.count == 0 
+                return nil
+            end 
+            description = '#### Closed issues\r\n' 
+            for issue in closed_issues
+                description += "- #{issue["title"]} " + "[##{issue["iid"]}]" + "(#{issue["web_url"]})"
+                description += " ([#{issue["author"]["username"]}]" + "(#{issue["author"]["web_url"]}))" + '\r\n'
+            end 
+            
+            return description
+        end
 
         def post_new_release(conn, description, tag) 
             body = '{ "name":  "%s", "tag_name": "%s", "description": "%s"}'

data/lib/gitlab_release_note_generator/version.rb

@@ -1,3 +1,3 @@
 module GitlabReleaseNoteGenerator
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_release_note_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ayan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler