ci_toolkit 1.5.2 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f898f9b883854f34b85fd9b3fb178cb1847ed5b475efbc0b4187c177462ac472
-  data.tar.gz: f458d206ac2232774d18894d92e97ecdd74e18b1c302ad65242cadaaca3deff0
+  metadata.gz: 6d09aaba9d8cf3b06b0cf990f59346ebd0b60b461569a062f57eaee7343474b2
+  data.tar.gz: 0f12abd8ebbb6abf38705c948d4c2f651413c918828b3008118a18cb1b7082de
 SHA512:
-  metadata.gz: 4a0e324896a793433044ab293b65d842f96492e7d793c9c9a39eb61ef98557d857e8081faf7db3067ffa7b44f369a3dbc71dea750420b6b935c976d003d18a81
-  data.tar.gz: 3254a489095f1a9b2e5667986df0aef5e81cfba1d5e0e53ff68dfbfa795d67c98bbcc44af03e94196ed5b603d7426bdec1f29458b39947aa92b70bf60d3a72f3
+  metadata.gz: 404cd49f9ecd10a0959d540e13ff9bd2f40e2804af2949e1fc1f3b987eb68d51a841bb722baef9bfd60c05c3cdf4a7a6e988115d219fa276fab8a7409e253f66
+  data.tar.gz: 522b89584b12430ae41f5a977ea3c1d0dae10c81d4be7e0fe561d3878cb03b2fa031a0007626f7df89e6efccefec755215344cbfb23f56e57e4d174a52c49f62

data/Gemfile.lock

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

data/lib/ci_toolkit/build_status.rb

@@ -40,17 +40,16 @@ module CiToolkit
       @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,20 @@ 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
   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

@@ -66,7 +66,7 @@ module CiToolkit
     end
 
     def files
-      client.merge_request_changes(@repo_slug, @pr_number)
+      client.merge_request_changes(@repo_slug, @pr_number).changes
     end
 
     def create_status(state, context, target_url, description)
@@ -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,12 +113,17 @@ 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
       @_client = GitLab::Client.new if @_client.nil?
-      # @_client.access_token = @bot.create_token if @_client.access_token.nil?
-
       @_client
     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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.5
 platform: ruby
 authors:
 - Gero Keller