manageiq-cross_repo 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38eb0b95370e949b880cb5f8b21c790fd351cbaa323aecb5ac5e92d981b61eb
-  data.tar.gz: 657c13c434c3ea924479366261c10ee995772eb55ac3dc6a8edeb5ded0fcbd33
+  metadata.gz: cae79b4ed33115478d43ed4afef93fc5af092ab1fd03d540709704556fe25718
+  data.tar.gz: 8ba6a4011ac76bc19a9417e2c63342b1c44d145313336e10ae1107fc3cdfc336
 SHA512:
-  metadata.gz: 2943f4aec0723d7636e59096f0919d6fb9458e97dfebc5f12dff1e6fc143885f2c220608d93a210a307b969e08898575b961a7d3d477f31923ebd8b668937304
-  data.tar.gz: 5fcf9c9822b685b53f099570081426c457d6cd6499bc76adfe682106102ea8012e66feb4b1dcbf4d27663a8b3fcfc39771b4d0c868e4e3e2ae3e01788c1b85ee
+  metadata.gz: 0d1083beae51b21b888b569aafad5a267908c816c71665969251ab1fc7b3e240854fa29102184dcd4e2dc031c044b5403b8e08a6c0845c9d5ad7a804c93680c8
+  data.tar.gz: 16cddb73598fc9c17684907e2f0ba272cded605c31764d50791fc43b2db72bd212000d6f1e3c568679d5b028321b15900e53b2d0f01994bfd0a2ec340bbd2161

data/.codeclimate.yml

@@ -0,0 +1,16 @@
+prepare:
+  fetch:
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml
+    path: ".rubocop_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
+    path: ".rubocop_cc_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml
+    path: styles/base.yml
+  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml
+    path: styles/cc_base.yml
+plugins:
+  rubocop:
+    enabled: true
+    config: ".rubocop_cc.yml"
+    channel: rubocop-0-82
+version: '2'

data/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_gem:
+  manageiq-style: ".rubocop_base.yml"
+inherit_from:
+- ".rubocop_local.yml"

data/.rubocop_cc.yml

@@ -0,0 +1,4 @@
+inherit_from:
+- ".rubocop_base.yml"
+- ".rubocop_cc_base.yml"
+- ".rubocop_local.yml"

data/.travis.yml

@@ -1,9 +1,7 @@
-dist: xenial
 language: ruby
 rvm:
 - 2.5.5
-cache:
-  bundler: true
+cache: bundler
 addons:
   postgresql: '10'
   apt:

data/README.md

@@ -16,6 +16,8 @@ Options:
                           If any of the repositories in the list are a core repository that will
                           be used as the root repository, otherwise ManageIQ/manageiq@master will be the default.
                           Can also be passed as a REPOS environment variable.
+  -s, --script-cmd=<s>    Optional, a command string for running the specs.  Defaults to `bundle exec rake`.
+                           (default: )
 
   -v, --version           Print version and exit
   -h, --help              Show this message

data/exe/manageiq-cross_repo

@@ -31,6 +31,18 @@ opts = Optimist.options do
     Can also be passed as a REPOS environment variable.
   EOS
 
+  opt :test_suite, <<~EOS, :type => :string, :default => ENV["TEST_SUITE"].presence
+    Optional, the name of a rake test suite to pass as an environment variable to the test being run.
+    This is commonly used by the .travis.yml to conditionally perform different setup tasks
+    and also to run different test suites, e.g. spec:javascript.
+  EOS
+
+  opt :script_cmd, <<~EOS, :type => :string, :default => ENV["SCRIPT_CMD"].presence
+    Optional, a command string for running the specs.
+    If present this will override the the script section of the test_repo's .travis.yml
+  EOS
+
+
   # Manually add these so they appear in the right order in the help output
   banner ""
   opt :version, "Print version and exit"
@@ -84,9 +96,15 @@ opts = Optimist.options do
 end
 
 opts[:repos] = opts[:repos].flatten.flat_map { |repo| repo.split(",").map(&:strip) }
+test_repo, repos, test_suite, script_cmd = opts.values_at(:test_repo, :repos, :test_suite, :script_cmd)
 
 begin
-  ManageIQ::CrossRepo.run(opts[:test_repo], opts[:repos])
+  ManageIQ::CrossRepo.run(
+    :test_repo  => test_repo,
+    :repos      => repos,
+    :test_suite => test_suite,
+    :script_cmd => script_cmd
+  )
 rescue ArgumentError => e
   Optimist.die e
 end

data/lib/manageiq/cross_repo/repository.rb

@@ -34,7 +34,7 @@ module ManageIQ::CrossRepo
       puts "Fetching #{tarball_url}"
 
       Dir.mktmpdir do |dir|
-        Mixlib::Archive.new(open(tarball_url, "rb")).extract(dir)
+        Mixlib::Archive.new(open_tarball_url(tarball_url)).extract(dir)
 
         content_dir = Pathname.new(dir).children.detect(&:directory?)
         FileUtils.mkdir_p(path.dirname)
@@ -147,12 +147,25 @@ module ManageIQ::CrossRepo
       url && File.join(url, "tarball", sha)
     end
 
+    def open_tarball_url(url)
+      archive = URI.open(tarball_url, "rb")
+
+      if archive.kind_of?(StringIO)
+        archive = Tempfile.new('cross_repo').tap do |f|
+          f.write(archive.string)
+          f.fsync
+        end.path
+      end
+
+      archive
+    end
+
     def git_branch_to_sha(url, branch)
       `git ls-remote #{url} #{branch}`.split("\t").first
     end
 
     def git_pr_to_sha(url, pr)
-      git_branch_to_sha(url, "refs/pull/#{pr}/head")
+      git_branch_to_sha(url, "refs/pull/#{pr}/merge") || git_branch_to_sha(url, "refs/pull/#{pr}/head")
     end
   end
 end

data/lib/manageiq/cross_repo/runner.rb

@@ -3,9 +3,9 @@ require "active_support/core_ext/object/blank"
 
 module ManageIQ::CrossRepo
   class Runner
-    attr_reader :test_repo, :core_repo, :gem_repos
+    attr_reader :test_repo, :core_repo, :gem_repos, :test_suite, :script_cmd
 
-    def initialize(test_repo, repos)
+    def initialize(test_repo:, repos:, test_suite: nil, script_cmd: nil)
       @test_repo = Repository.new(test_repo || "ManageIQ/manageiq@master")
 
       core_repos, @gem_repos = Array(repos).collect { |repo| Repository.new(repo) }.partition(&:core?)
@@ -20,34 +20,33 @@ module ManageIQ::CrossRepo
 
         @core_repo ||= Repository.new("ManageIQ/manageiq@master")
       end
+
+      @script_cmd = script_cmd.presence
+      @test_suite = test_suite.presence
     end
 
     def run
       test_repo.ensure_clone
-      test_repo.core? ? run_core : run_plugin
+      core_repo.ensure_clone unless test_repo.core?
+      prepare_gem_repos
+      run_tests
     end
 
     private
 
-    def run_core
-      prepare_gem_repos
+    def bundle_path
+      app_path = Pathname.new(ENV["TRAVIS_BUILD_DIR"].presence || Pathname.pwd)
+      app_path.join("vendor", "bundle")
+    end
 
+    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"]
-        system!("bin/setup")
-        system!("bundle exec rake")
+        run_test_script(build_test_script)
       end
     end
 
-    def run_plugin
-      core_repo.ensure_clone
-      prepare_gem_repos
-
-      env_vars = {"MANAGEIQ_REPO" => core_repo.path.to_s}
-      with_test_env do
-        system!(env_vars, "bin/setup")
-        system!("bundle exec rake")
-      end
+    def env_vars
+      {"MANAGEIQ_REPO" => core_repo.path.to_s, "TRAVIS_BUILD_DIR" => test_repo.path.to_s, "BUNDLE_PATH" => bundle_path.to_s, "TEST_SUITE" => test_suite}
     end
 
     def with_test_env
@@ -63,17 +62,26 @@ module ManageIQ::CrossRepo
         repo = Dir.pwd.split("/").last(2).join("/")
         puts "\e[36mDEBUG: #{repo} - #{args.join(" ")}\e[0m"
       end
-      exit($?.exitstatus) unless system(*args)
+
+      Process.wait(spawn(*args))
+      exit($?.exitstatus) unless $?.success?
     end
 
     def generate_bundler_d
       bundler_d_path = core_repo.path.join("bundler.d")
       override_path  = bundler_d_path.join("overrides.rb")
 
+      require "fileutils"
+
       if gem_repos.empty?
         FileUtils.rm_f override_path
       else
-        content = gem_repos.map { |gem| "ensure_gem \"#{gem.repo}\", :path => \"#{gem.path}\"" }.join("\n")
+        content = gem_repos.map do |gem|
+          # If there is a gemspec get the name of the gem from that instead of the repository
+          gem_name = gem.path.glob("*.gemspec")&.first&.basename(".gemspec") || gem.repo
+          "ensure_gem \"#{gem_name}\", :path => \"#{gem.path}\""
+        end.join("\n")
+
         FileUtils.mkdir_p(bundler_d_path)
 
         File.write(override_path, content)
@@ -84,5 +92,82 @@ module ManageIQ::CrossRepo
       gem_repos.each { |gem_repo| gem_repo.ensure_clone }
       generate_bundler_d
     end
+
+    def run_test_script(test_script)
+      r, w = IO.pipe
+      w.write(test_script)
+      w.close
+
+      system!(env_vars, "/bin/bash -s", :in => r, :out => $stdout, :err => $stderr)
+    end
+
+    def build_test_script
+      load_travis_yml!
+
+      commands = environment_setup_commands
+
+      sections = %w[before_install install before_script script]
+      commands += sections.flat_map do |section|
+        # Travis sections can have a single command or an array of commands
+        section_commands = Array(travis_yml[section]).map { |cmd| "#{cmd} || exit $?" }
+        next if section_commands.blank?
+
+        [
+          "echo 'travis_fold:start:#{section}'",
+          *section_commands,
+          "echo 'travis_fold:end:#{section}'"
+        ]
+      end.compact
+
+      <<~BASH_SCRIPT
+        #!/bin/bash
+
+        #{commands.join("\n")}
+      BASH_SCRIPT
+    end
+
+    def environment_setup_commands
+      setup_commands = []
+
+      if travis_yml["node_js"]
+        setup_commands << "source ~/.nvm/nvm.sh"
+        setup_commands += Array(travis_yml["node_js"]).map do |node_version|
+          "nvm install #{node_version}"
+        end
+      end
+
+      setup_commands
+    end
+
+    def load_travis_yml!
+      # Load the test_repo's .travis.yml file
+      travis_yml
+
+      # Set missing travis sections to the proper defaults
+      travis_yml["install"] ||= travis_defaults[travis_yml["language"]]["install"]
+
+      travis_yml["script"] = script_cmd if script_cmd.present?
+      travis_yml["script"] ||= travis_defaults[travis_yml["language"]]["script"]
+    end
+
+    def travis_yml
+      @travis_yml ||= begin
+        require "yaml"
+        YAML.load_file(".travis.yml")
+      end
+    end
+
+    def travis_defaults
+      @travis_defaults ||= {
+        "node_js" => {
+          "install" => "npm install",
+          "script"  => "npm test"
+        },
+        "ruby"    => {
+          "install" => "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}",
+          "script"  => "bundle exec rake"
+        }
+      }.freeze
+    end
   end
 end

data/lib/manageiq/cross_repo/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module CrossRepo
-    VERSION = "1.0.1"
+    VERSION = "1.1.1"
   end
 end

data/manageiq-cross_repo.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-cross_repo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: manageiq-style
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,14 +123,18 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: ManageIQ CrossRepo testing library
-email: 
+email:
 executables:
 - manageiq-cross_repo
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_cc.yml"
+- ".rubocop_local.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -137,7 +155,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ManageIQ/manageiq-cross_repo
   source_code_uri: https://github.com/ManageIQ/manageiq-cross_repo
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: ManageIQ CrossRepo testing library
 test_files: []