gitlab-dangerfiles 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17495e36a06253d291cf69ea61fd426ba3541738591873cfdef64e2c9132e8ee
-  data.tar.gz: 5e690f454e356ae1dd7e372ae16d9d8b99b32e1450a48560fe359dfcad20eab9
+  metadata.gz: bcb56a4513a5f26239f800a2692bd8feedc8fed15bd2d4d2d93d9d2203e0df70
+  data.tar.gz: 0fd4fd6f9cacee27bf394c2b5ef17a7fee6b34b45b215e08524d5641fc0b092d
 SHA512:
-  metadata.gz: f96558f5954dea10cf802d32003045dcdcb6bccaa00c34b4079a654a275ec8dcb980ca84bf8116d87db1e0dc8a5e85a54b07ec05dc2dbcab4b2696e3e1532173
-  data.tar.gz: b112119bfbbff88bb66966bed0e5ee0cd32369b2eae89507e17f9e602a8c0a987bbd423aa1a4ed089479c1d9f6842f523db76e83c887676c9387cbd6da4db3e3
+  metadata.gz: 8bcfa9f04ce155b7e77393c9d8e2eef9ab6534111f2ce5eaa33d484ed5e811827172ba90f40589b81f1987fd35277eab91afcd5365282e4deb94de92752d5054
+  data.tar.gz: 526c301f0e148a4ed6faf4dcffb3afa4d142ab828eb36eb8e745783ba80964a769a4e3456683ad1898d0d4328bc3f25f5847557042fad7ae9f53b20b7d2e22e1

data/lib/danger/plugins/roulette.rb

@@ -226,6 +226,10 @@ module Danger
     def http_get_json(url)
       rsp = Net::HTTP.get_response(URI.parse(url))
 
+      if rsp.is_a?(Net::HTTPRedirection)
+        raise "Redirection detected: #{rsp.header["location"]}"
+      end
+
       unless rsp.is_a?(Net::HTTPOK)
         raise HTTPError, "Failed to read #{url}: #{rsp.code} #{rsp.message}"
       end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.4.1"
+    VERSION = "3.4.2"
   end
 end

data/lib/gitlab/dangerfiles.rb

@@ -58,7 +58,7 @@ module Gitlab
         danger_plugin.import_plugin(File.expand_path("../danger/plugins/*.rb", __dir__))
 
         Dir.glob(File.expand_path("danger/plugins/*.rb", config.project_root)).sort.each do |path|
-          puts "Importing plugin at #{path}" if dangerfile.verbose
+          puts "Importing plugin at #{path}" if helper_plugin.ci?
           danger_plugin.import_plugin(path)
         end
       end
@@ -87,10 +87,9 @@ module Gitlab
         return if helper_plugin.release_automation?
 
         rules = filtered_rules(only, except)
-        puts "Running rules: #{rules}\n" if dangerfile.verbose
 
         rules.each do |rule, path|
-          puts "Importing rule #{rule} at #{path}" if dangerfile.verbose
+          puts "Importing rule #{rule} at #{path}" if helper_plugin.ci?
           danger_plugin.import_dangerfile(path: path)
         end
       end
@@ -116,45 +115,45 @@ module Gitlab
 
       attr_reader :dangerfile
 
+      def filtered_rules(only_rules, except_rules)
+        only_rules = Array(only_rules).compact.map(&:to_s)
+
+        rules = allowed_rules_based_on_context.reject { |rule, _v| except_rules.include?(rule) }
+
+        if only_rules.any?
+          rules.select! { |rule, _v| only_rules.include?(rule) }
+        end
+
+        rules.sort.to_h
+      end
+
+      def allowed_rules_based_on_context
+        helper_plugin.ci? ? all_rules : local_rules
+      end
+
+      def all_rules
+        all_gem_rules.merge(custom_rules)
+      end
+
       def all_gem_rules
-        @all_gem_rules ||= Dir.glob(File.join(RULES_DIR, "*")).sort.each_with_object({}) do |path, memo|
+        @all_gem_rules ||= Dir.glob(File.join(RULES_DIR, "*")).each_with_object({}) do |path, memo|
           rule_name = File.basename(path)
           memo[rule_name] = path if File.directory?(path) && File.exist?(File.join(path, "Dangerfile"))
         end
       end
 
       def custom_rules
-        @custom_rules ||= Dir.glob(File.expand_path("danger/*", config.project_root)).sort.each_with_object({}) do |path, memo|
+        @custom_rules ||= Dir.glob(File.expand_path("danger/*", config.project_root)).each_with_object({}) do |path, memo|
           rule_name = File.basename(path)
           memo[rule_name] = path if File.directory?(path) && File.exist?(File.join(path, "Dangerfile"))
         end
       end
 
-      def all_rules
-        all_gem_rules.merge(custom_rules)
-      end
-
       def local_rules
         ci_only_rules = CI_ONLY_RULES | config.ci_only_rules
         all_rules.reject { |rule, _v| ci_only_rules.include?(rule) }
       end
 
-      def allowed_rules_based_on_context
-        helper_plugin.ci? ? all_rules : local_rules
-      end
-
-      def filtered_rules(only_rules, except_rules)
-        only_rules = Array(only_rules).compact.map(&:to_s)
-
-        rules = allowed_rules_based_on_context.reject { |rule, _v| except_rules.include?(rule) }
-
-        if only_rules.any?
-          rules.select! { |rule, _v| only_rules.include?(rule) }
-        end
-
-        rules
-      end
-
       def danger_plugin
         @danger_plugin ||= dangerfile.plugins[Danger::DangerfileDangerPlugin]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake