manageiq-cross_repo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 054abc092ffedefe7b8dcd8bdefb3e010b8e1ed04607ed7ded476ec32e2d3c75
-  data.tar.gz: '080cdb1b599cdc5cb2f83738223a21077e31f6dce21b73ea1e959d140f82071a'
+  metadata.gz: 303420d045bf57bacab3391945b7652115e42e2dece17c37c9c15b6bfe4e07bd
+  data.tar.gz: fd8e604e86f2ed8abb7c383ad08403cb4b20970caeba3fdae913d55fb87543ea
 SHA512:
-  metadata.gz: 97eb42a587763a8425ab9972942cacb09692caf996156c909f5e4bba27626a68ecbaae2529f7b1c523025ab98d6a7d071b7304ce662d08408c0767106ab26a06
-  data.tar.gz: 9ce7dfe06414015efdaf174fd872ce72ac342bca85012bb8982a787f536d5b9b4f531eaa7b7cb67d053ed1832b9b97da61fd580a8a75e9871251e3883158afad
+  metadata.gz: 94020cc0c92e37dca3df2c0eb78ec3b61e3874ea79d5fa09f5d16949d0acf28a99095c2396d3b3ae7b8ca92d8de7d7889084bf6cdce2fbde77c6efe0928aacdf
+  data.tar.gz: 040c9f3265bce6a0d51c7e0ab46cf414f7c8b7fb798a34725ee5e162adb137907ec699cbe004d7ab084e868a72fa41ed78f9e208332bb66fc546c43df68c4a81

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 
 Gemfile.lock
+/repos/

data/exe/manageiq-cross_repo

@@ -33,13 +33,13 @@ opts = Optimist.options do
 
   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
+    This is commonly used by the CI config 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
+    If present this will override the the script section of the test_repo's CI config
   EOS
 
 

data/lib/manageiq/cross_repo/repository.rb

@@ -31,7 +31,9 @@ module ManageIQ::CrossRepo
       require "tmpdir"
       require "zlib"
 
-      puts "Fetching #{tarball_url}"
+      retries ||= 0
+
+      puts "Fetching #{tarball_url}#{retry_count(retries)}"
 
       Dir.mktmpdir do |dir|
         Mixlib::Archive.new(open_tarball_url(tarball_url)).extract(dir)
@@ -40,6 +42,12 @@ module ManageIQ::CrossRepo
         FileUtils.mkdir_p(path.dirname)
         FileUtils.mv(content_dir, path)
       end
+    rescue => e
+      retries += 1
+      raise if retries > 3
+
+      sleep 1
+      retry
     end
 
     private
@@ -167,5 +175,11 @@ module ManageIQ::CrossRepo
     def git_pr_to_sha(url, pr)
       git_branch_to_sha(url, "refs/pull/#{pr}/merge") || git_branch_to_sha(url, "refs/pull/#{pr}/head")
     end
+
+    def retry_count(num)
+      return if num == 0
+
+      "  (retry #{num}/3)"
+    end
   end
 end

data/lib/manageiq/cross_repo/runner/base.rb

@@ -0,0 +1,102 @@
+require "active_support/core_ext/object/blank"
+require "yaml"
+
+module ManageIQ::CrossRepo
+  class Runner
+    class Base
+      attr_accessor :script_cmd
+
+      def initialize(script_cmd = nil)
+        @script_cmd = script_cmd.presence
+      end
+
+      def build_test_script
+        load_config!
+        build_script
+      end
+
+      private
+
+      def environment_setup_commands
+        commands = []
+
+        if config["node_js"]
+          commands << "source ~/.nvm/nvm.sh"
+          commands += Array(config["node_js"]).map do |node_version|
+            "nvm install #{node_version}"
+          end
+        end
+
+        commands.any? ? build_section("environment", *commands) : commands
+      end
+
+      def section_commands
+        sections = %w[before_install install before_script script]
+        sections.flat_map do |section|
+          commands = build_section_commands(section)
+          build_section(section, *commands) if commands.present?
+        end.compact
+      end
+
+      def build_commands
+        environment_setup_commands + section_commands
+      end
+
+      def build_section_commands(section)
+        # Travis sections can have a single command or an array of commands
+        Array(config[section]).map { |cmd| "#{cmd} || exit $?" }
+      end
+
+      def build_section(section, *commands)
+        [
+          "echo 'travis_fold:start:#{section}'",
+          *commands,
+          "echo 'travis_fold:end:#{section}'"
+        ]
+      end
+
+      def build_script
+        <<~BASH_SCRIPT
+          #!/bin/bash
+
+          #{build_commands.join("\n")}
+        BASH_SCRIPT
+      end
+
+      def load_config!
+        config
+      end
+
+      def config
+        @config ||= travis_config.tap do |config|
+          # Set missing sections to the proper defaults
+          config["install"] ||= defaults[config["language"]]["install"]
+
+          config["script"] = script_cmd if script_cmd.present?
+          config["script"] ||= defaults[config["language"]]["script"]
+        end
+      end
+
+      def travis_config
+        raise NotImplementedError, "must be implemented in a subclass"
+      end
+
+      def defaults
+        @defaults ||= {
+          "node_js" => {
+            "language" => "node_js",
+            "node_js"  => ["12"],
+            "install"  => "npm install",
+            "script"   => "npm test"
+          },
+          "ruby"    => {
+            "language" => "ruby",
+            "rvm"      => ["2.7"],
+            "install"  => "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}",
+            "script"   => "bundle exec rake"
+          }
+        }.freeze
+      end
+    end
+  end
+end

data/lib/manageiq/cross_repo/runner/github.rb

@@ -0,0 +1,30 @@
+require_relative "./base"
+require "yaml"
+
+module ManageIQ::CrossRepo
+  class Runner
+    class Github < Base
+      CONFIG_FILE = ".github/workflows/ci.yaml".freeze
+
+      def self.available?
+        File.exist?(CONFIG_FILE)
+      end
+
+      private
+
+      def travis_config
+        steps = github_config["jobs"]["ci"]["steps"]
+        language = steps.any? { |s| s["uses"] == "ruby/setup-ruby@v1" } ? "ruby" : "node_js"
+
+        defaults[language].clone.tap do |config|
+          script_step = steps.detect { |s| s["name"] == "Run tests" }
+          config["script"] = script_step["run"] if script_step
+        end
+      end
+
+      def github_config
+        YAML.load_file(CONFIG_FILE)
+      end
+    end
+  end
+end

data/lib/manageiq/cross_repo/runner/travis.rb

@@ -0,0 +1,20 @@
+require_relative "./base"
+require "yaml"
+
+module ManageIQ::CrossRepo
+  class Runner
+    class Travis < Base
+      CONFIG_FILE = ".travis.yml".freeze
+
+      def self.available?
+        File.exist?(CONFIG_FILE)
+      end
+
+      private
+
+      def travis_config
+        YAML.load_file(CONFIG_FILE)
+      end
+    end
+  end
+end

data/lib/manageiq/cross_repo/runner.rb

@@ -1,5 +1,7 @@
 require "manageiq/cross_repo/repository"
+require "active_support/core_ext/class/subclasses"
 require "active_support/core_ext/object/blank"
+Dir.glob(File.join(__dir__, "runner", "*")).sort.each { |f| require f }
 
 module ManageIQ::CrossRepo
   class Runner
@@ -16,8 +18,6 @@ module ManageIQ::CrossRepo
 
         @core_repo = @test_repo
       else
-        raise ArgumentError, "You must pass at least one repo when running a plugin test." if repos.blank?
-
         @core_repo ||= Repository.new("ManageIQ/manageiq@master")
       end
 
@@ -34,14 +34,20 @@ module ManageIQ::CrossRepo
 
     private
 
+    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
-        run_test_script(build_test_script)
+        test_script = script_source.new(script_cmd).build_test_script
+        run_test_script(test_script)
       end
     end
 
     def env_vars
-      {"MANAGEIQ_REPO" => core_repo.path.to_s, "TRAVIS_BUILD_DIR" => test_repo.path.to_s, "TEST_SUITE" => test_suite}
+      {"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
@@ -62,6 +68,10 @@ module ManageIQ::CrossRepo
       exit($?.exitstatus) unless $?.success?
     end
 
+    def script_source
+      Base.descendants.detect(&:available?)
+    end
+
     def generate_bundler_d
       bundler_d_path = core_repo.path.join("bundler.d")
       override_path  = bundler_d_path.join("overrides.rb")
@@ -95,74 +105,5 @@ module ManageIQ::CrossRepo
 
       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.1.0"
+    VERSION = "1.2.0"
   end
 end

data/manageiq-cross_repo.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
 
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", "~> 6.0.3"
   spec.add_dependency "ffi-libarchive"
   spec.add_dependency "mixlib-archive"
   spec.add_dependency "optimist"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-cross_repo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manageiq-style
@@ -70,16 +70,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: ffi-libarchive
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: ManageIQ CrossRepo testing library
-email:
+email: 
 executables:
 - manageiq-cross_repo
 extensions: []
@@ -147,15 +147,19 @@ files:
 - lib/manageiq/cross_repo.rb
 - lib/manageiq/cross_repo/repository.rb
 - lib/manageiq/cross_repo/runner.rb
+- lib/manageiq/cross_repo/runner/base.rb
+- lib/manageiq/cross_repo/runner/github.rb
+- lib/manageiq/cross_repo/runner/travis.rb
 - lib/manageiq/cross_repo/version.rb
 - manageiq-cross_repo.gemspec
+- repos/.gitkeep
 homepage: https://github.com/ManageIQ/manageiq-cross_repo
 licenses:
 - MIT
 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
@@ -170,8 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
-signing_key:
+rubygems_version: 3.2.27
+signing_key: 
 specification_version: 4
 summary: ManageIQ CrossRepo testing library
 test_files: []