fastlane-plugin-ci_changelog 0.5.7 → 0.6.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9187cae7e24e9b529f3370beceed5b22f3e07d5c640ec3f957df1eae21518810
-  data.tar.gz: fbf76c9d336fda77f48fb7f23314c9e0c2ec388037b804e2afa8c61c6f920ea6
+  metadata.gz: 6da83bb912083e4b737cb6ac066502236b26ea5176816f85579ec7b5d13e258a
+  data.tar.gz: cbbaeaafb329e368573e61d65d7774401e5916498a40cb18e26f5d0bb021cf84
 SHA512:
-  metadata.gz: a92bf0405fea2b9b0f087a141ff0bf10c105c5030629668c1619fd2389ce1412e27908fa4eee499e415e89643f84b97c2eaadcad70c02ded5b32b7b9d0465d25
-  data.tar.gz: c0a8e9e7ecc5a717ec09ac2862289fe55975f3af74af1faf4e4c25aa08506f779d53df6a65ad2cd197018ba814fdb388475cff320bd7e14c8634d3010057e727
+  metadata.gz: 185224c17abe1a12c670e09c112b1f0a07038a91493829e691ab893d5e6ee8d807c542ecbf5d7030284a6825d0898d223b164bdd9b8867ae55ad94a83148a236
+  data.tar.gz: 4d9b8a2eef3d4ba592284bcc2b4e75f305d8c4216a391569fc5ed0c3cd811c2a2e95d3b7c76901a995d9e9a32f7774d786dd0a5473f9a4edddadd34ec8a609e7

data/README.md

@@ -53,7 +53,7 @@ Loading documentation for ci_changelog:
 | jenkins_user         | the user of jenkins if enabled security      | CICL_CHANGELOG_JENKINS_USER         |         |
 | jenkins_token        | the token or password of jenkins if enabled  | CICL_CHANGELOG_JENKINS_TOKEN        |         |
 |                      | security                                     |                                     |         |
-| gitlab_url           | the url of gitlab                            | CICL_CHANGELOG_GITLAB_URL           |         |
+| gitlab_api_url           | the api url of gitlab                            | CICL_CHANGELOG_GITLAB_API_URL           |         |
 | gitlab_private_token | the private token of gitlab                  | CICL_CHANGELOG_GITLAB_PRIVATE_TOKEN |         |
 +----------------------+----------------------------------------------+-------------------------------------+---------+
 

data/lib/fastlane/plugin/ci_changelog/actions/ci_changelog_action.rb

@@ -130,63 +130,27 @@ module Fastlane
       end
 
       def self.fetch_gitlab_changelog!
-        commits = []
-        loop_count = 1
-        fetch_correct_changelog = false
-
-        build_number = ENV['CI_BUILD_ID'].to_i
-        loop do
-          build_url = "#{@params[:gitlab_url]}/api/v3/projects/#{ENV['CI_PROJECT_ID']}/builds/#{build_number}"
-          UI.verbose("Fetching changelog #{build_url}")
-
-          begin
-            res = HTTP.headers('PRIVATE-TOKEN' => @params[:gitlab_private_token]).get(build_url)
-            if res.code == 200
-              build_status, data = Helper::CiChangelogHelper.dump_gitlab_commits(res.body)
-              UI.verbose("- Status #{build_status}")
-              UI.verbose("- Changelog #{data}")
-
-              if build_status == true
-                commits = data if commits.empty?
-                fetch_correct_changelog = true
-              else
-                commits = commits.empty? ? data : commits.concat(data)
-                loop_count += 1
-              end
-            end
-            build_number -= 1
-
-            break if fetch_correct_changelog || build_number <= 0
-          rescue JSON::ParserError => e
-            UI.verbose(e.message)
-            build_number -= 1
-            break if fetch_correct_changelog || build_number <= 0
-          rescue HTTP::Error => e
-            UI.verbose(e.message)
-            UI.verbose(e.backtrace.join("\n"))
-            break
-          end
-        end
+        endpoint = @params[:gitlab_api_url] || ENV['CI_API_V4_URL']
+        private_token = @params[:gitlab_private_token]
+        commits = Helper::CiChangelogHelper.dump_gitlab_commits(endpoint, private_token)
 
         Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_CHANGELOG, commits.to_json)
       end
 
       def self.fetch_gitlab_env!
         build_url =
-          if ENV['CI_PROJECT_URL']
-            "#{ENV['CI_PROJECT_URL']}/builds/#{ENV['CI_BUILD_ID']}"
-          else
-            uri = URI.parse(ENV['CI_BUILD_REPO'])
-            ci_project_namespace = ENV['CI_PROJECT_DIR'].split('/')[-2..-1].join('/')
-            url_port = uri.port == 80 ? '' : ":#{uri.port}"
-
-            "#{uri.scheme}://#{uri.host}#{url_port}/#{ci_project_namespace}/builds/#{ENV['CI_BUILD_ID']}"
+          if ENV['CI_JOB_URL']
+            # Gitlab >= 11.1, Runner 0.5
+            ENV['CI_JOB_URL']
+          elsif ENV['CI_PROJECT_URL']
+            # Gitlab >= 8.10, Runner 0.5
+            "#{ENV['CI_PROJECT_URL']}/-/jobs/#{ENV['CI_BUILD_ID']}"
           end
 
         Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_CI, CICLType::GITLAB_CI)
         Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_BRANCH, ENV['CI_BUILD_REF_NAME'])
         Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_COMMIT, ENV['CI_BUILD_REF'])
-        Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_PROJECT_URL, build_url)
+        Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_PROJECT_URL, build_url) if build_url
       end
 
       def self.output
@@ -228,9 +192,9 @@ module Fastlane
                                description: "the token or password of jenkins if enabled security",
                                   optional: true,
                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :gitlab_url,
-                                  env_name: "CICL_CHANGELOG_GITLAB_URL",
-                               description: "the url of gitlab",
+          FastlaneCore::ConfigItem.new(key: :gitlab_api_url,
+                                  env_name: "CICL_CHANGELOG_GITLAB_API_URL",
+                               description: "the api url of gitlab",
                                   optional: true,
                                       type: String),
           FastlaneCore::ConfigItem.new(key: :gitlab_private_token,

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

@@ -3,10 +3,6 @@ require 'json'
 module Fastlane
   module Helper
     class CiChangelogHelper
-      def self.show_message
-        UI.message("Hello from the ci_changelog plugin helper!")
-      end
-
       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")
@@ -35,34 +31,118 @@ module Fastlane
         [result, commits]
       end
 
-      def self.dump_gitlab_commits(body)
+      def self.dump_gitlab_commits(endpoint, private_token)
+        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)
+      end
+
+      def self.fetch_gitlab_compare_commit(endpoint, private_token, project_id)
+        job_name = ENV['CI_JOB_NAME']
+
+        from_commit = nil
+        to_commit = nil
+
+        jobs_url = "#{endpoint}/projects/#{project_id}/jobs"
+        UI.verbose("Fetching jobs url #{jobs_url}")
+        res = res = HTTP.follow
+                         .headers('PRIVATE-TOKEN' => private_token)
+                         .get(jobs_url)
+
+        jobs = res.parse.select { |job| job['name'] == job_name }
+
+        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?
+              to_commit = commit
+            elsif to_commit && from_commit.nil?
+              from_commit = commit
+            end
+          end
+        end
+
+        [from_commit, to_commit]
+      end
+
+      def self.fetch_gitlab_commit(body)
+        job_name = ENV['CI_JOB_NAME']
         json = JSON.parse(body)
-        commit = {
-          id: json['commit']['id'],
-          date: json['commit']['created_at'],
-          title: json['commit']['title'].strip,
-          message: json['commit']['message'].strip,
-          author: json['commit']['author_name'].strip,
-          email: json['commit']['author_email'].strip
-        }
+        commit = json['pipeline']['sha']
 
-        if json['status'] == 'success'
-          [true, [commit]]
+        if json['name'] != job_name
+          UI.verbose("No match job name: #{job_name} != #{json['name']}")
+          [false, commit]
+        elsif json['status'] == 'success'
+          [true, commit]
         else
-          [false, [commit]]
+          [false, commit]
+        end
+      end
+
+      def self.fetch_gitlab_commits(endpoint, private_token, project_id, from, to)
+        compare_url = "#{endpoint}/projects/#{project_id}/repository/compare"
+        params = {
+          from: from,
+          to: to
+        }
+
+        UI.verbose("Fetching commit compare url #{compare_url} with params: #{params}")
+        res = HTTP.follow
+                  .headers('PRIVATE-TOKEN' => private_token)
+                  .get(compare_url, params: params)
+
+        commits = []
+        if res.code == 200
+          res.parse['commits'].each do |commit|
+            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
         end
+
+        commits
       end
 
+      # def self.dump_gitlab_commits(body)
+      #   json = JSON.parse(body)
+      #   json['commits'].each_with_object([]) do |commit, obj|
+      #     commit = {
+            # 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
+      #     }
+
+      #     obj << commit
+      #   end
+      # end
+
       def self.determine_gitlab_options!(options)
-        %w(gitlab_url gitlab_private_token).each do |key|
-          UI.user_error!("Missing #{key} param or empty value.") unless options.fetch(key.to_sym) && !options[key.to_sym].empty?
+        return if options[:gitlab_api_url].to_s.empty? && !ENV['CI_API_V4_URL'].to_s.empty?
+
+        %w(gitlab_api_url gitlab_private_token).each do |key|
+          UI.user_error!("Missing #{key} param or it is an empty value.") unless options.fetch(key.to_sym) && !options[key.to_sym].empty?
         end
       end
 
       def self.determine_jenkins_options!(options)
         if determine_jenkins_basic_auth?
           %w(jenkins_user jenkins_token).each do |key|
-            UI.user_error!("Missing #{key} param or empty value.") unless options.fetch(key.to_sym) && !options[key.to_sym].empty?
+            UI.user_error!("Missing #{key} param or it is an empty value.") unless options.fetch(key.to_sym) && !options[key.to_sym].empty?
           end
         end
       end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-ci_changelog
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -135,11 +135,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Automate generate changelog between previous build failed and the latest