manageiq-cross_repo 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda31356d4afc3ad2915a51609ccd2431966ead420b64f940f445c9bdc5c53af
-  data.tar.gz: f4b6d4b85db8ce770949b38029cb55f67b36903e9b2f96bbf3e1cc90f16594e7
+  metadata.gz: ecad3c073c0e642e1b0c6acdbd4aee93ab2ee491761c6674ca8333b8ddd2b778
+  data.tar.gz: '0952c2b0fe57ee11a23ed5749ae3e1728e9c4eac1257e09b01edd17ac4b6b88b'
 SHA512:
-  metadata.gz: 21d72ac24791f7f514b1ed29762b31da4545fe18f5217e6ad710dea9a82f2b676b4f9f5b58049276e4f15b935bc9c620a58afb52c83b9fb0592c56bec9638855
-  data.tar.gz: b908ca0717197420725d5cbff74e49b2da84e7911017b2e2a085b4face3f39ae19c13810c4c4d8ebd37613958026113a60fcd43762b5865bcb30b1a74d33a918
+  metadata.gz: a519f48d8f113042c44c9a31a169ce415fb86b6c2ca0db0251bdda0f9a01d25bf76bb92b974054350bd800ca6f69a39ca0e3ec6fbea48c6f6142bf484b223378
+  data.tar.gz: b7b6e3974e05fad7c7f8d2727fc174de49329bcec10445e97089f5adc2d2d95902dffb992b46eacfbd046808022c41d991e8577254ce6beace91223308bbb211

data/README.md

@@ -1,7 +1,7 @@
 # ManageIQ cross-repository testing framework
 
 ```
-Usage: manageiq-cross_repo --test-repo repo [--core-repo repo] [--gem-repos repo1 repo2 ...]
+Usage: manageiq-cross_repo --test-repo repo [--repos repo1 repo2 ...]
 
 manageiq-cross_repo is a cross repository test framework for the ManageIQ project.
 Its purpose is to allow running multiple repository tests suites in the context
@@ -12,12 +12,10 @@ Options:
   -t, --test-repo=<s>     This is the repository which will be tested.
                           Can also be passed as a TEST_REPO environment variable.
                            (default: ManageIQ/manageiq@master)
-  -c, --core-repo=<s>     Used to specify a different core branch in which plugin tests will run.
-                           If --test-repo is a plugin, defaults to ManageIQ/manageiq@master.
-                           If --test-repo is a core repo, this option is not allowed.
-                          Can also be passed as a CORE_REPO environment variable.
-  -g, --gem-repos=<s+>    Optional, a list of other plugin/gem overrides which are needed to run the tests.
-                          Can also be passed as a GEM_REPOS environment variable.
+  -r, --repos=<s+>        Optional, a list of other repos and/or gems to override while running the tests.
+                          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.
 
   -v, --version           Print version and exit
   -h, --help              Show this message
@@ -39,7 +37,7 @@ Examples:
   manageiq-cross_repo --test-repo manageiq-ui-classic
 
   # Test a plugin against a ManageIQ SHA
-  manageiq-cross_repo --test-repo manageiq-ui-classic --core-repo manageiq@1234abcd
+  manageiq-cross_repo --test-repo manageiq-ui-classic --repos manageiq@1234abcd
 
   # Test a plugin branch
   manageiq-cross_repo --test-repo manageiq-ui-classic@feature
@@ -51,16 +49,16 @@ Examples:
   manageiq-cross_repo --test-repo manageiq-ui-classic#1234
 
   # Test a plugin with a set of other plugins
-  manageiq-cross_repo --test-repo manageiq-ui-classic --gem-repos manageiq-providers-vmware@feature manageiq-content@feature
+  manageiq-cross_repo --test-repo manageiq-ui-classic --repos manageiq-providers-vmware@feature manageiq-content@feature
 
   # Test a plugin branch with a ManageIQ SHA and a set of other plugins
-  manageiq-cross_repo --test-repo manageiq-ui-classic@feature --core-repo manageiq@1234abcd --gem-repos manageiq-providers-vmware@feature manageiq-content@feature
+  manageiq-cross_repo --test-repo manageiq-ui-classic@feature --repos manageiq@1234abcd manageiq-providers-vmware@feature manageiq-content@feature
 
   # Run core tests with ManageIQ master using a gem version
-  manageiq-cross_repo --gem-repos johndoe/manageiq-ui-classic@feature
+  manageiq-cross_repo --repos johndoe/manageiq-ui-classic@feature
 
   # Run core tests for a branch and a set of gems
-  manageiq-cross_repo --test-repo johndoe/manageiq@feature --gem-repos manageiq-providers-vmware@feature manageiq-content@feature
+  manageiq-cross_repo --test-repo johndoe/manageiq@feature --repos manageiq-providers-vmware@feature manageiq-content@feature
 ```
 
 ## License

data/exe/manageiq-cross_repo

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
+require "bundler"
 require "bundler/setup"
 
 require "manageiq-cross_repo"
 require "optimist"
 
 opts = Optimist.options do
-  usage "--test-repo repo [--core-repo repo] [--gem-repos repo1 repo2 ...]"
+  usage "--test-repo repo [--repos repo1 repo2 ...]"
 
   version "v#{ManageIQ::CrossRepo::VERSION}\n"
 
@@ -23,16 +24,11 @@ opts = Optimist.options do
     Can also be passed as a TEST_REPO environment variable.
   EOS
 
-  opt :core_repo, <<~EOS, :type => :string, :default => ENV["CORE_REPO"].presence
-    Used to specify a different core branch in which plugin tests will run.
-     If --test-repo is a plugin, defaults to ManageIQ/manageiq@master.
-     If --test-repo is a core repo, this option is not allowed.
-    Can also be passed as a CORE_REPO environment variable.
-  EOS
-
-  opt :gem_repos, <<~EOS, :type => :strings, :multi => true, :default => Array(ENV["GEM_REPOS"].presence)
-    Optional, a list of other plugin/gem overrides which are needed to run the tests.
-    Can also be passed as a GEM_REPOS environment variable.
+  opt :repos, <<~EOS, :type => :strings, :default => Array(ENV["REPOS"].presence)
+    Optional, a list of other repos and/or gems to override while running the tests.
+    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.
   EOS
 
   # Manually add these so they appear in the right order in the help output
@@ -62,7 +58,7 @@ opts = Optimist.options do
       manageiq-cross_repo --test-repo manageiq-ui-classic
 
       # Test a plugin against a ManageIQ SHA
-      manageiq-cross_repo --test-repo manageiq-ui-classic --core-repo manageiq@1234abcd
+      manageiq-cross_repo --test-repo manageiq-ui-classic --repos manageiq@1234abcd
 
       # Test a plugin branch
       manageiq-cross_repo --test-repo manageiq-ui-classic@feature
@@ -74,28 +70,23 @@ opts = Optimist.options do
       manageiq-cross_repo --test-repo manageiq-ui-classic#1234
 
       # Test a plugin with a set of other plugins
-      manageiq-cross_repo --test-repo manageiq-ui-classic --gem-repos manageiq-providers-vmware@feature manageiq-content@feature
+      manageiq-cross_repo --test-repo manageiq-ui-classic --repos manageiq-providers-vmware@feature manageiq-content@feature
 
       # Test a plugin branch with a ManageIQ SHA and a set of other plugins
-      manageiq-cross_repo --test-repo manageiq-ui-classic@feature --core-repo manageiq@1234abcd --gem-repos manageiq-providers-vmware@feature manageiq-content@feature
+      manageiq-cross_repo --test-repo manageiq-ui-classic@feature --repos manageiq@1234abcd manageiq-providers-vmware@feature manageiq-content@feature
 
       # Run core tests with ManageIQ master using a gem version
-      manageiq-cross_repo --gem-repos johndoe/manageiq-ui-classic@feature
+      manageiq-cross_repo --repos johndoe/manageiq-ui-classic@feature
 
       # Run core tests for a branch and a set of gems
-      manageiq-cross_repo --test-repo johndoe/manageiq@feature --gem-repos manageiq-providers-vmware@feature manageiq-content@feature
+      manageiq-cross_repo --test-repo johndoe/manageiq@feature --repos manageiq-providers-vmware@feature manageiq-content@feature
   EOS
 end
 
-opts[:gem_repos] = opts[:gem_repos].flatten.flat_map { |repo| repo.split(",").map(&:strip) }
-
-if ENV["CI"] && opts[:test_repo] == "ManageIQ/manageiq@master" && opts[:core_repo].blank? && opts[:gem_repos].blank?
-  puts "Nothing to do!"
-  exit
-end
+opts[:repos] = opts[:repos].flatten.flat_map { |repo| repo.split(",").map(&:strip) }
 
 begin
-  ManageIQ::CrossRepo.run(opts[:test_repo], opts[:core_repo], opts[:gem_repos])
+  ManageIQ::CrossRepo.run(opts[:test_repo], opts[:repos])
 rescue ArgumentError => e
   Optimist.die e
 end

data/lib/manageiq/cross_repo/runner.rb

@@ -5,20 +5,21 @@ module ManageIQ::CrossRepo
   class Runner
     attr_reader :test_repo, :core_repo, :gem_repos
 
-    def initialize(test_repo, core_repo, gem_repos)
+    def initialize(test_repo, repos)
       @test_repo = Repository.new(test_repo || "ManageIQ/manageiq@master")
+
+      core_repos, @gem_repos = Array(repos).collect { |repo| Repository.new(repo) }.partition(&:core?)
+      @core_repo = core_repos.first
+
       if @test_repo.core?
-        raise ArgumentError, "You cannot pass core repo when running a core test"           if core_repo.present? && core_repo != test_repo
-        raise ArgumentError, "You must pass at least one gem repo when running a core test" if gem_repos.blank?
+        raise ArgumentError, "You cannot pass a different core repo when running a core test" if @core_repo.present? && @core_repo != @test_repo
 
         @core_repo = @test_repo
       else
-        raise ArgumentError, "You must pass either a core repo or at least one gem repo when running a plugin test" if core_repo.blank? && gem_repos.blank?
+        raise ArgumentError, "You must pass at least one repo when running a plugin test." if repos.blank?
 
-        @core_repo = Repository.new(core_repo || "ManageIQ/manageiq@master")
+        @core_repo ||= Repository.new("ManageIQ/manageiq@master")
       end
-
-      @gem_repos = gem_repos.to_a.map { |repo| Repository.new(repo) }
     end
 
     def run

data/lib/manageiq/cross_repo/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module CrossRepo
-    VERSION = "0.3.1"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-cross_repo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake