Merge pull request #64 from NickLaMuro/add-script-cmd

Add --script-cmd opt

Author: Fryguy

exe/manageiq-cross_repo

@@ -31,6 +31,10 @@ opts = Optimist.options do
     Can also be passed as a REPOS environment variable.
   EOS
 
+  opt :script_cmd, <<~EOS, :type => :string, :default => ENV["SCRIPT_CMD"].presence || ""
+    Optional, a command string for running the specs.  Defaults to `bundle exec rake`.
+  EOS
+
   # Manually add these so they appear in the right order in the help output
   banner ""
   opt :version, "Print version and exit"
@@ -86,7 +90,7 @@ end
 opts[:repos] = opts[:repos].flatten.flat_map { |repo| repo.split(",").map(&:strip) }
 
 begin
-  ManageIQ::CrossRepo.run(opts[:test_repo], opts[:repos])
+  ManageIQ::CrossRepo.run(opts[:test_repo], opts[:repos], opts[:script_cmd])
 rescue ArgumentError => e
   Optimist.die e
 end

lib/manageiq/cross_repo/runner.rb

@@ -3,9 +3,9 @@
 
 module ManageIQ::CrossRepo
   class Runner
-    attr_reader :test_repo, :core_repo, :gem_repos
+    attr_reader :test_repo, :core_repo, :gem_repos, :script_cmd
 
-    def initialize(test_repo, repos)
+    def initialize(test_repo, repos, script_cmd = "")
       @test_repo = Repository.new(test_repo || "ManageIQ/manageiq@master")
 
       core_repos, @gem_repos = Array(repos).collect { |repo| Repository.new(repo) }.partition(&:core?)
@@ -20,6 +20,8 @@ def initialize(test_repo, repos)
 
         @core_repo ||= Repository.new("ManageIQ/manageiq@master")
       end
+
+      @script_cmd = script_cmd.presence || "bundle exec rake"
     end
 
     def run
@@ -35,7 +37,7 @@ def run_tests
       with_test_env do
         system!({"TRAVIS_BUILD_DIR" => test_repo.path.to_s}, "bash", "tools/ci/before_install.sh") if ENV["CI"] && File.exist?("tools/ci/before_install.sh")
         system!(env_vars, "bin/setup")
-        system!("bundle exec rake")
+        system!(script_cmd)
       end
     end