ci_toolkit 1.5.4 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cedc7fa6c13bd1256e5724b8c36852f39c1893a99f55ebfef23fe1d7e99ab4a
-  data.tar.gz: 0e50375d5c21fcd106dfe9013de91a55f93ce5b805203d9d4867dc16270ad576
+  metadata.gz: 7bd58d0e078f5dee40ecc35c8fa16ff08399afaff00b7c0677865cef3063f7a9
+  data.tar.gz: 619ed482655f971d38c3c13c273e21cda5ce764b18335b283cb9118ea9b08fab
 SHA512:
-  metadata.gz: 74cdb925c2a57bcafbc4f5e663b21dd461203117e1e6c1bb71ea4489ad6b92e51cad298de9af2f820bf7bb8b61b14ba3a8d1cd1501cfba3a6c5b85fa88e0702a
-  data.tar.gz: 8b739f154a353585d1fdfba66f9d2d277217ab5e65d33923fb72af1632870bfe1bb4baaa49ec98117d43c56cfd3ab9c563ae0b17623e58107342d1a722ab643c
+  metadata.gz: c4eca8ae8468e769d873b804ed6559717f7c41c02625cdb794c79501497cddac6d9e763b7a5bb4968f225995969255d1fcb3d49a380cf5445b866bf5d6f7ac83
+  data.tar.gz: 40c6db84c1a4e60e6de5521f64ddc7ec3437503a52e60cf9f63ba9a018aec78157e537339cff49e8689afc06e53ab7b96a895e7a800379f505fdccf52f2a49cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci_toolkit (1.5.4)
+    ci_toolkit (1.5.7)
       faraday
       faraday_middleware
       gitlab

data/lib/ci_toolkit/build_status.rb

@@ -27,21 +27,21 @@ module CiToolkit
       @github.create_status(state, @context, target_url, desc)
     end
 
-    def increment
+    def increment(status = CiToolkit::DvcsPrUtil.status_state_pending)
       counter = load_counter
       return if counter.nil?
 
       num_finished = counter[:num_finished] + 1
       num_total = counter[:num_total]
 
-      state = "pending"
+      state = status
       state = "success" if num_finished == num_total
 
       @github.create_status(state, @context, @env.app_url, "Finished building #{num_finished}/#{num_total}")
     end
 
-    def error
-      @github.create_status("error", @context, @env.app_url, "Building failed")
+    def error(state = CiToolkit::DvcsPrUtil.status_state_error)
+      @github.create_status(state, @context, @env.app_url, "Building failed")
     end
 
     private

data/lib/ci_toolkit/dvcs_pr.rb

@@ -102,4 +102,21 @@ module CiToolkit
       CiToolkit::DvcsPr.api_not_implemented(self)
     end
   end
+
+  # Use this to provide commit status state for github or gitlab as
+  # values for the two services are different
+  # It uses the ENV["DVCS_SERVICE"] to decide which DVCS to use.
+  class DvcsPrUtil
+    def self.status_state_error(service = ENV["DVCS_SERVICE"])
+      status = "error"
+      status = "failed" if service == "gitlab"
+      status
+    end
+
+    def self.status_state_pending(service = ENV["DVCS_SERVICE"])
+      status = "pending"
+      status = "running" if service == "gitlab"
+      status
+    end
+  end
 end

data/lib/ci_toolkit/jira.rb

@@ -6,7 +6,7 @@ module CiToolkit
     attr_reader :ticket
 
     def initialize(
-      github_pr = CiToolkit::GithubPr.new,
+      github_pr = CiToolkit::DvcsPrFactory.create(CiToolkit::BitriseEnv.new),
       git = CiToolkit::Git.new,
       ticket_regex_keys = ENV["SUPPORTED_JIRA_PROJECT_KEYS_REGEX"]
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.7
 platform: ruby
 authors:
 - Gero Keller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday