fastlane-plugin-ci_changelog 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6929c151e19d4d869c4420cb5d0416cf9dfa597b5a46cd0ecd98719b1270b564
-  data.tar.gz: de27968b1da6d06eac4e0df8440982f180bdeb4e3f51fa1ab443e0c21e9e512b
+  metadata.gz: f52ebce0dd70e93ac96f3b4657c35605ce07fb7fc2aca8422ad896649f4ff875
+  data.tar.gz: a0e353bfee554c35beed63132581feb25570ee8d9b3c1f264b0d0600708c4da8
 SHA512:
-  metadata.gz: f427a4c1e91bb112d469e7d78727e840149a527655e9483dfe5861618e654b392339c0c3ef4349aabce7f93c043e9e6b5ef401fcc29ba7a310c187169c821ed9
-  data.tar.gz: f6f956dc9b13b175869f3cabb88bfa94ffac97cfca3396faf94e627840ff47ea7f836f494dc84a04c1941353037fa5cdc52fbbaa020a79bf02c117664a4bf356
+  metadata.gz: d1fa7f713f838b3fb68dae763554fe1c50bcbc14a26d545d88f201abdb0776f08fce8fe7b92e2fe3294d213ee2a844defb03ba8547d7e95047c55ee4540623c8
+  data.tar.gz: babd1c34757f6a6a90cb558c177a761d0c59b584d82151103bdf78b8c0c58ff7ecd9abb80b738d7baea2843a95033ba112614725547a92e3a840eed80503cfa8

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

@@ -76,8 +76,10 @@ module Fastlane
         build_branch = ENV['GIT_BRANCH']
         build_number = ENV['BUILD_NUMBER'].to_i
         loop do
+          build_url = "#{ENV['JOB_URL']}#{build_number}/api/json"
+          UI.verbose("Fetching changelog #{build_url}")
+          UI.verbose("- Branch #{build_branch}")
           begin
-            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))
@@ -88,8 +90,6 @@ module Fastlane
 
             if res.code == 200
               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}")
 
@@ -99,10 +99,15 @@ module Fastlane
             end
 
             build_number -= 1
-
             break if build_number <= 0
-          rescue HTTP::Error
+          rescue JSON::ParserError => e
+            UI.verbose(e.message)
+            build_number -= 1
+            break if build_number <= 0
+          rescue HTTP::Error => e
             # NOTE: break out of loop if build setted keep max builds count
+            UI.verbose(e.message)
+            UI.verbose(e.backtrace.join("\n"))
             break
           end
         end
@@ -131,25 +136,35 @@ module Fastlane
         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}"
-          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("Fetching changelog #{build_url}")
-            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
+          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
-          end
-          build_number -= 1
+            build_number -= 1
 
-          break if fetch_correct_changelog || build_number <= 0
+            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
 
         Helper::CiChangelogHelper.store_sharedvalue(SharedValues::CICL_CHANGELOG, commits.to_json)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module CiChangelog
-    VERSION = '0.5.5'.freeze
+    VERSION = '0.5.6'.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.5
+  version: 0.5.6
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http