Merge pull request travis-ci#243 from travis-ci/jk_paranoid_addon_sup…

…port Allow for some addons to run in paranoid mode
sol · May 18, 2014 · 937f64f · 937f64f
2 parents eb5b440 + 4b6d96f
commit 937f64f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 3 deletions.
diff --git a/lib/travis/build/script/addons.rb b/lib/travis/build/script/addons.rb
@@ -21,10 +21,8 @@ module Addons
         }
 
         def run_addons(stage)
-          return if data.paranoid_mode?
-
           addons.each do |addon|
-            addon.send(stage) if addon.respond_to?(stage)
+            addon.send(stage) if can_run?(addon, stage)
           end
         end
 
@@ -37,6 +35,18 @@ def addons
         def init_addon(name, config)
           MAP[name] && MAP[name].new(self, config)
         end
+
+        def can_run?(addon, stage)
+          return false if !addon.respond_to?(stage)
+
+          if !data.paranoid_mode?
+            true
+          elsif data.paranoid_mode? && !addon::REQUIRES_SUPER_USER
+            true
+          else
+            false
+          end
+        end
       end
     end
   end

diff --git a/lib/travis/build/script/addons/code_climate.rb b/lib/travis/build/script/addons/code_climate.rb
@@ -3,6 +3,8 @@ module Build
     class Script
       module Addons
         class CodeClimate
+          REQUIRES_SUPER_USER = false
+
           def initialize(script, config)
             @script = script
             @config = config.respond_to?(:to_hash) ? config.to_hash : {}

diff --git a/lib/travis/build/script/addons/coverity_scan.rb b/lib/travis/build/script/addons/coverity_scan.rb
@@ -3,6 +3,8 @@ module Build
     class Script
       module Addons
         class CoverityScan
+          REQUIRES_SUPER_USER = false
+
           SCAN_URL      = 'https://scan.coverity.com'
 
           def initialize(script, config)

diff --git a/lib/travis/build/script/addons/deploy.rb b/lib/travis/build/script/addons/deploy.rb
@@ -3,6 +3,8 @@ module Build
     class Script
       module Addons
         class Deploy
+          REQUIRES_SUPER_USER = false
+
           VERSIONED_RUNTIMES = [:jdk, :node, :perl, :php, :python, :ruby, :scala, :node, :go]
           USE_RUBY           = '1.9.3'
           attr_accessor :script, :config, :allow_failure

diff --git a/lib/travis/build/script/addons/firefox.rb b/lib/travis/build/script/addons/firefox.rb
@@ -3,6 +3,8 @@ module Build
     class Script
       module Addons
         class Firefox
+          REQUIRES_SUPER_USER = true
+
           def initialize(script, config)
             @script = script
             @firefox_version = config.to_s

diff --git a/lib/travis/build/script/addons/hosts.rb b/lib/travis/build/script/addons/hosts.rb
@@ -3,6 +3,8 @@ module Build
     class Script
       module Addons
         class Hosts
+          REQUIRES_SUPER_USER = true
+
           def initialize(script, config)
             @script = script
             @config = [config].flatten

diff --git a/lib/travis/build/script/addons/postgresql.rb b/lib/travis/build/script/addons/postgresql.rb
@@ -3,6 +3,8 @@ module Build
     class Script
       module Addons
         class Postgresql
+          REQUIRES_SUPER_USER = true
+
           def initialize(script, config)
             @script = script
             @postgresql_version = config.to_s

diff --git a/lib/travis/build/script/addons/sauce_connect.rb b/lib/travis/build/script/addons/sauce_connect.rb
@@ -3,6 +3,8 @@ module Build
     class Script
       module Addons
         class SauceConnect
+          REQUIRES_SUPER_USER = false
+
           def initialize(script, config)
             @script = script
             @config = config.respond_to?(:to_hash) ? config.to_hash : {}