fastlane-plugin-ci_changelog 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94166581e3e8e438e50791da2fb63abf504095c777e519bef66eea2b288dd0f
-  data.tar.gz: 6065c772d518aaea3a7b472f2407bcf779bcf7f2e71fddb00d4b0ac08cd0d9c6
+  metadata.gz: b1282307e44fff5f87df59f1ecd02151d45570a0d9607a1688873ee2e65ef99e
+  data.tar.gz: 3bc5f6a4bab39255aea3545b351711f22fee754958c3b62f2139535d7d6b63a8
 SHA512:
-  metadata.gz: 59b02f3c05ab4a4fb081d099a06c8ac2f68e919db4cb1575663f6d4e69e605c7ead4e1871a926befd28dfbbd3127b51da437a49fa4c930e3be37d1dbaddb2a75
-  data.tar.gz: a20bd90307e96f7f215aa2fd0a9ea5a20ed20e95017e952d682fe896f8d055d8337fd8dc8bd8863e99e2e5a2b9559be3f84dd0178cd965e4d885f7d462c4093f
+  metadata.gz: 511c98128befa5594c56d350955b520d3b2e2cc29b3a67324728ab66198a43313046b78caafe9af43a8a9a3283b84fb8b3e187a4feb90c6241f9b9fff69c26a8
+  data.tar.gz: efb0cf35c098c3959a3694e88156ee331ce57ace9a7887ff8427b4ce291980f9f2940bae5893222e8f84cc3e4b0840cdf26631a0efccf1201349efc742672d64

data/lib/fastlane/plugin/ci_changelog/helper/ci_changelog_helper.rb

@@ -3,11 +3,6 @@ require 'json'
 module Fastlane
   module Helper
     class CiChangelogHelper
-      def self.git_commits(last_success_commit)
-        git_logs = `git log --pretty="format:%s - %cn [%ci]" #{last_success_commit}..HEAD`.strip.gsub(' +0800', '')
-        git_logs.split("\n")
-      end
-
       def self.dump_jenkins_commits(body, branch)
         json = JSON.parse(body)
         UI.verbose("- API Result: #{json['result']}")
@@ -35,8 +30,11 @@ module Fastlane
         project_id = ENV['CI_PROJECT_ID']
         from, to = fetch_gitlab_compare_commit(endpoint, private_token, project_id)
         return [] unless from && to
-
-        fetch_gitlab_commits(endpoint, private_token, project_id, from, to)
+        if from == to
+          fetch_gitlab_single_commit(endpoint, private_token, project_id, from)
+        else
+          fetch_gitlab_commits(endpoint, private_token, project_id, from, to)
+        end
       end
 
       def self.fetch_gitlab_compare_commit(endpoint, private_token, project_id)
@@ -52,18 +50,22 @@ module Fastlane
                          .get(jobs_url)
 
         jobs = res.parse.select { |job| job['name'] == job_name }
+        UI.verbose("Matched jobs #{job_name}: #{jobs.size}")
 
-        commits = []
-        jobs.each_with_index do |job, i|
-          commit = job['pipeline']['sha']
-          case job['status']
-          when 'running'
-            to_commit = commit
-          when 'success'
-            if to_commit.nil?
+        if jobs.size == 1
+          to_commit = from_commit = jobs[0]['pipeline']['sha']
+        else
+          jobs.each_with_index do |job, i|
+            commit = job['pipeline']['sha']
+            case job['status']
+            when 'running'
               to_commit = commit
-            elsif to_commit && from_commit.nil?
-              from_commit = commit
+            when 'success'
+              if to_commit.nil?
+                to_commit = commit
+              elsif to_commit && from_commit.nil?
+                from_commit = commit
+              end
             end
           end
         end
@@ -86,6 +88,29 @@ module Fastlane
         end
       end
 
+      def self.fetch_gitlab_single_commit(endpoint, private_token, project_id, sha)
+        commit_url = "#{endpoint}/projects/#{project_id}/repository/commits/#{sha}"
+        UI.verbose("Fetching single commit url #{commit_url}")
+        res = HTTP.follow
+                  .headers('PRIVATE-TOKEN' => private_token)
+                  .get(commit_url)
+
+        commits = []
+        if res.code == 200
+          commit = res.parse
+          commits << {
+            id: commit['id'],
+            date: commit['created_at'],
+            title: commit['title'].strip,
+            message: commit['title'].strip,
+            author: commit['author_name'].strip,
+            email: commit['author_email'].strip
+          }
+        end
+
+        commits
+      end
+
       def self.fetch_gitlab_commits(endpoint, private_token, project_id, from, to)
         compare_url = "#{endpoint}/projects/#{project_id}/repository/compare"
         params = {

data/lib/fastlane/plugin/ci_changelog/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module CiChangelog
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-ci_changelog
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http