fastlane-plugin-ci_changelog 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1afc08216b7c1b0b4bbd439069efc88f16854ca7
-  data.tar.gz: da33a8b256d212e7d2690b94817655eef240a822
+SHA256:
+  metadata.gz: 6929c151e19d4d869c4420cb5d0416cf9dfa597b5a46cd0ecd98719b1270b564
+  data.tar.gz: de27968b1da6d06eac4e0df8440982f180bdeb4e3f51fa1ab443e0c21e9e512b
 SHA512:
-  metadata.gz: 5f5c2df844bafb1efee0eec3aff52d2e2741081a60ce6d508217f82eb0d4c29f653f973479430e37337ab9612fee154ae47be506ec40da8d2b0ed2454960f53a
-  data.tar.gz: 4b9ffa290c9a82d186892f7f5ba05d7268b6af153c2118a2d3c0815cefdd674c73029d0ffc655cf48edb2aa14984b2fdbe043e4041b2068bab508950370a97d3
+  metadata.gz: f427a4c1e91bb112d469e7d78727e840149a527655e9483dfe5861618e654b392339c0c3ef4349aabce7f93c043e9e6b5ef401fcc29ba7a310c187169c821ed9
+  data.tar.gz: f6f956dc9b13b175869f3cabb88bfa94ffac97cfca3396faf94e627840ff47ea7f836f494dc84a04c1941353037fa5cdc52fbbaa020a79bf02c117664a4bf356

data/README.md

@@ -12,7 +12,7 @@ fastlane add_plugin ci_changelog
 
 ## About ci_changelog
 
-Automate generate changelog between previous and the latest commit of scm during the ci system
+Automate generate changelog between previous and the latest commit of SCM during the CI services.
 
 ### Available CI system:
 
@@ -22,7 +22,7 @@ Automate generate changelog between previous and the latest commit of scm during
 
 ## Configuration
 
-```
+```text
 $ fastlane action ci_changelog
 +------------------------------+---------+--------------+
 |                     Used plugins                      |
@@ -68,7 +68,6 @@ Loading documentation for ci_changelog:
 | CICL_CHANGELOG | the json formatted changelog of CI (datetime, message, author and email) |
 +----------------+--------------------------------------------------------------------------+
 Access the output values using `lane_context[SharedValues::VARIABLE_NAME]`
-
 ```
 
 ## Example

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

@@ -71,12 +71,13 @@ module Fastlane
       end
 
       def self.fetch_jenkins_changelog!
-        commits = []
+        changelog = []
 
+        build_branch = ENV['GIT_BRANCH']
         build_number = ENV['BUILD_NUMBER'].to_i
         loop do
           begin
-            build_url = "#{ENV['JOB_URL']}/#{build_number}/api/json"
+            build_url = "#{ENV['JOB_URL']}#{build_number}/api/json"
             res =
               if Helper::CiChangelogHelper.determine_jenkins_basic_auth?
                 HTTP.basic_auth(user: @params.fetch(:jenkins_user), pass: @params.fetch(:jenkins_token))
@@ -86,15 +87,21 @@ module Fastlane
               end
 
             if res.code == 200
-              build_status, data = Helper::CiChangelogHelper.dump_jenkin_commits(res.body)
-              commits.concat(data)
+              build_status, data = Helper::CiChangelogHelper.dump_jenkins_commits(res.body, build_branch)
+              UI.verbose("Fetching changelog #{build_url}")
+              UI.verbose("- Branch #{build_branch}")
+              UI.verbose("- Status #{build_status}")
+              UI.verbose("- Changelog #{data}")
+
+              changelog.concat(data) unless data.empty?
+
               break if build_status == true
             end
 
             build_number -= 1
 
             break if build_number <= 0
-          rescue
+          rescue HTTP::Error
             # NOTE: break out of loop if build setted keep max builds count
             break
           end
@@ -103,7 +110,7 @@ module Fastlane
         # NOTE: Auto detect the range changelog of build fail.
         # commits = Helper::CiChangelogHelper.git_commits(ENV['GIT_PREVIOUS_SUCCESSFUL_COMMIT']) if Helper.is_test? && commits.empty?
 
-        Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_CHANGELOG, commits.to_json)
+        Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_CHANGELOG, changelog.to_json)
       end
 
       def self.fetch_jenkins_env!
@@ -128,6 +135,9 @@ module Fastlane
 
           if res.code == 200
             build_status, data = Helper::CiChangelogHelper.dump_gitlab_commits(res.body)
+            UI.verbose("Fetching changelog #{build_url}")
+            UI.verbose("- Status #{build_status}")
+            UI.verbose("- Changelog #{data}")
 
             if build_status == true
               commits = data if commits.empty?

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

@@ -12,10 +12,15 @@ module Fastlane
         git_logs.split("\n")
       end
 
-      def self.dump_jenkin_commits(body)
+      def self.dump_jenkins_commits(body, branch)
         json = JSON.parse(body)
+        result = json['result'] == 'SUCCESS' ? true : false
+
+        # return if previous build do not equal to current build branch.
+        return [result, []] unless jenkins_use_same_branch?(json, branch)
+
         # TODO: It must use reverse_each to correct the changelog
-        commit = json['changeSet']['items'].each_with_object([]) do |item, obj|
+        commits = json['changeSet']['items'].each_with_object([]) do |item, obj|
           obj.push({
             id: item['commitId'],
             date: item['date'],
@@ -26,11 +31,7 @@ module Fastlane
           })
         end
 
-        if json['result'] == 'SUCCESS'
-          [true, commit]
-        else
-          [false, commit]
-        end
+        [result, commits]
       end
 
       def self.dump_gitlab_commits(body)
@@ -79,6 +80,19 @@ module Fastlane
         return true
       end
 
+      def self.jenkins_use_same_branch?(json, name)
+        same_branch = false
+        json['actions'].each do |item|
+          if revision = item['lastBuiltRevision']
+            revision['branch'].each do |branch|
+              same_branch = true if branch['name'].end_with?(name)
+            end
+          end
+        end
+
+        same_branch
+      end
+
       def self.store_sharedvalue(key, value)
         Actions.lane_context[key] = value
         ENV[key.to_s] = value

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

@@ -1,5 +1,5 @@
 module Fastlane
   module CiChangelog
-    VERSION = '0.5.1'.freeze
+    VERSION = '0.5.5'.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.1
+  version: 0.5.5
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -139,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automate generate changelog between previous build failed and the latest