gitlab-dangerfiles 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f299245a993fb11dfa01fb1f8c3a09167c0fd327c07c7580368f0b7fbd0c4da5
-  data.tar.gz: 18b3be58359757bd1587106ddcce00d80f4ce25d6179b3ce394505449ca3fda4
+  metadata.gz: f5e1069be5416d6980879af3330451834b57881c46101119bfc5917e2057edd7
+  data.tar.gz: e911c514f8d32d65e4aecef6ad111c80c808dd273b12775d57438532ba8a05b3
 SHA512:
-  metadata.gz: 6916956a8eedeef8ef292e10a7a31ea4269648f1136c3dca198f0567f563f0534d3fa5c75e37bb66b451e817067971b62390334e4f2060988f83b611d51b6c49
-  data.tar.gz: e20cc032bcff74bc423d2d0b50c6026b4ea05f99fde5b053a9941249b52bf799e34cea420028d5411fe4646b52a409d886baaca2da56289e739f53fc9a9b8e61
+  metadata.gz: b3814724620240a6485ffce4191fb8a2461c267dda5dad2466b6dc5173fbe848b66cae92aaea69ef82a49dd4726db3a7e77c106fdbd73ea58738eaf4613c4cba
+  data.tar.gz: 0fcabbe03f856d29951ae2f35e9f6f9784fa22af8d8d6bfa13a41452b4a1c35a454135751443882e6a2762325ef05dd6b8bd1b3dde58c5c7661db65ffef4c5d7

data/lib/danger/{helper.rb → plugins/helper.rb}

@@ -2,10 +2,10 @@
 
 require "net/http"
 require "json"
-require "danger"
-require_relative "../gitlab/dangerfiles/changes"
-require_relative "../gitlab/dangerfiles/teammate"
-require_relative "../gitlab/dangerfiles/title_linting"
+
+require_relative "../../gitlab/dangerfiles/changes"
+require_relative "../../gitlab/dangerfiles/teammate"
+require_relative "../../gitlab/dangerfiles/title_linting"
 
 module Danger
   # Common helper functions for our danger scripts.
@@ -99,7 +99,7 @@ module Danger
       return nil unless ci?
       return nil if defined?(@force_changes_from_git)
 
-      @changes_from_api ||= gitlab_helper.api.merge_request_changes(gitlab_helper.mr_json["project_id"], gitlab_helper.mr_json["iid"]).to_h["changes"]
+      @changes_from_api ||= gitlab_helper.mr_changes.to_h["changes"]
     rescue
       # Fallback to the Git strategy in any case
       @force_changes_from_git = true
@@ -229,6 +229,12 @@ module Danger
       gitlab_helper.mr_json["iid"]
     end
 
+    def mr_author
+      return `whoami`.strip unless ci?
+
+      gitlab_helper.mr_author
+    end
+
     def mr_title
       return "" unless ci?
 
@@ -247,6 +253,12 @@ module Danger
       gitlab_helper.mr_labels
     end
 
+    def mr_source_branch
+      return `git rev-parse --abbrev-ref HEAD`.strip unless ci?
+
+      gitlab_helper.mr_json["source_branch"]
+    end
+
     def mr_target_branch
       return "" unless ci?
 

data/lib/danger/{roulette.rb → plugins/roulette.rb}

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "helper"
-require_relative "../gitlab/dangerfiles/teammate"
-require_relative "../gitlab/dangerfiles/weightage/maintainers"
-require_relative "../gitlab/dangerfiles/weightage/reviewers"
+require_relative "../../gitlab/dangerfiles/teammate"
+require_relative "../../gitlab/dangerfiles/weightage/maintainers"
+require_relative "../../gitlab/dangerfiles/weightage/reviewers"
 
 module Danger
   # Common helper functions for our danger scripts. See Danger::Helper
@@ -19,7 +18,7 @@ module Danger
     Spin = Struct.new(:category, :reviewer, :maintainer, :optional_role, :timezone_experiment)
 
     def team_mr_author
-      team.find { |person| person.username == mr_author_username }
+      team.find { |person| person.username == helper.mr_author }
     end
 
     # Assigns GitLab team members to be reviewer and maintainer
@@ -122,21 +121,7 @@ module Danger
     # @param [Teammate] person
     # @return [Boolean]
     def mr_author?(person)
-      person.username == mr_author_username
-    end
-
-    def mr_author_username
-      helper.gitlab_helper&.mr_author || `whoami`
-    end
-
-    def mr_source_branch
-      return `git rev-parse --abbrev-ref HEAD` unless helper.gitlab_helper&.mr_json
-
-      helper.gitlab_helper.mr_json["source_branch"]
-    end
-
-    def mr_labels
-      helper.gitlab_helper&.mr_labels || []
+      person.username == helper.mr_author
     end
 
     def new_random(seed)
@@ -145,7 +130,7 @@ module Danger
 
     def spin_role_for_category(team, role, project, category)
       team.select do |member|
-        member.public_send("#{role}?", project, category, mr_labels) # rubocop:disable GitlabSecurity/PublicSend
+        member.public_send("#{role}?", project, category, helper.mr_labels) # rubocop:disable GitlabSecurity/PublicSend
       end
     end
 
@@ -156,7 +141,7 @@ module Danger
           spin_role_for_category(team, role, project, category)
         end
 
-      random = new_random(mr_source_branch)
+      random = new_random(helper.mr_source_branch)
 
       weighted_reviewers = Gitlab::Dangerfiles::Weightage::Reviewers.new(reviewers, traintainers).execute
       weighted_maintainers = Gitlab::Dangerfiles::Weightage::Maintainers.new(maintainers).execute

data/lib/gitlab/dangerfiles.rb

@@ -3,7 +3,7 @@ require "gitlab/dangerfiles/version"
 module Gitlab
   module Dangerfiles
     def self.import_plugins(danger)
-      danger.import_plugin(File.expand_path("../danger/*.rb", __dir__))
+      danger.import_plugin(File.expand_path("../danger/plugins/*.rb", __dir__))
     end
   end
 end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Rémy Coutable
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-gitlab
@@ -130,8 +130,8 @@ files:
 - fixtures/emojis/aliases.json
 - fixtures/emojis/digests.json
 - gitlab-dangerfiles.gemspec
-- lib/danger/helper.rb
-- lib/danger/roulette.rb
+- lib/danger/plugins/helper.rb
+- lib/danger/plugins/roulette.rb
 - lib/gitlab-dangerfiles.rb
 - lib/gitlab/Dangerfile
 - lib/gitlab/dangerfiles.rb