ci_toolkit 1.5.3 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87feaa62793778d43ee9e9ad8cb0c80c47060e3430637deeda2f16ca8d582504
-  data.tar.gz: f7f316e25915399f317d852fad2f9bc31ade2aab39c6ca0e0dc020641d960d62
+  metadata.gz: f11234ad0258930d676483a6489573cc85177c5436257785d9a9632709cd5bd5
+  data.tar.gz: e5d6284dbd20c33a4a4c272910cf583399f94eb5744fa1dba3bd7e9c67f133c6
 SHA512:
-  metadata.gz: 6d84278903059b2a2ddb229d41c99c39d70ae608a33f91c0e97122f40441c33d324ef9d073776ed552e6f70871498fb50967eb5342472ed1609e714e1445963f
-  data.tar.gz: 061eb27df8659e1b1b64a6f7b5089fa286448fbb311ce73e50bd36b497f4f8da2656c90ecfa68b6ac9a5de7810c9980a2f5a6a3b6021892b7c0042d42888d6ee
+  metadata.gz: bd3e440efc0fc2f7e8bc376f745ca1f2f6fba257f71d2b34b22c0e9d8c6fb1acce268ab902216f32e57fb70fa4f2ccb030a278583bbb4366cc9f6080512acb2d
+  data.tar.gz: 47c8697ab06e4fd4ad6c86cf08fb47b4605b2d9153a01de0c03cc26ece60d155eeadd4b6ec4d751a3f5f2d82d44d36a6c2af13dfc22db67b63de3d8ca7f92645

data/Gemfile.lock

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

data/lib/ci_toolkit/build_status.rb

@@ -27,30 +27,29 @@ 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)
+      @github.create_status(state, @context, @env.app_url, "Building failed")
     end
 
     private
 
     def load_counter
-      status = @github.get_status(@context)
-      return if status.nil?
+      description = @github.get_status_description(@context)
+      return if description.nil?
 
-      description = status[:description]
       build_counter = description[%r{(\d/\d)}] || "0/0"
       { num_finished: build_counter.split("/")[0].to_i, num_total: build_counter.split("/")[1].to_i }
     end

data/lib/ci_toolkit/dvcs_pr.rb

@@ -97,5 +97,26 @@ module CiToolkit
     def realm_module_modified?
       CiToolkit::DvcsPr.api_not_implemented(self)
     end
+
+    def get_status_description(_context)
+      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(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/github_pr.rb

@@ -110,6 +110,13 @@ module CiToolkit
       modified_files.length.positive?
     end
 
+    def get_status_description(context)
+      status = get_status(context)
+      return if status.nil?
+
+      status[:description]
+    end
+
     private
 
     def client

data/lib/ci_toolkit/gitlab_pr.rb

@@ -74,7 +74,7 @@ module CiToolkit
         @repo_slug,
         @commit_sha,
         state,
-        { context: context, target_url: target_url, description: description }
+        { name: context, target_url: target_url, description: description }
       )
     end
 
@@ -113,6 +113,13 @@ module CiToolkit
       modified_files.length.positive?
     end
 
+    def get_status_description(context)
+      status = get_status(context)
+      return if status.nil?
+
+      status.description
+    end
+
     private
 
     def client

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.6
 platform: ruby
 authors:
 - Gero Keller