manageiq-cross_repo 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38eb0b95370e949b880cb5f8b21c790fd351cbaa323aecb5ac5e92d981b61eb
-  data.tar.gz: 657c13c434c3ea924479366261c10ee995772eb55ac3dc6a8edeb5ded0fcbd33
+  metadata.gz: 3ff6896410d55e14769981d4ee061c8557c409743968d191944476ea861c35d6
+  data.tar.gz: 78a605b9ea4cfe657219b957cd3ef9444c026209aa4e62ce5d5598664a5760f5
 SHA512:
-  metadata.gz: 2943f4aec0723d7636e59096f0919d6fb9458e97dfebc5f12dff1e6fc143885f2c220608d93a210a307b969e08898575b961a7d3d477f31923ebd8b668937304
-  data.tar.gz: 5fcf9c9822b685b53f099570081426c457d6cd6499bc76adfe682106102ea8012e66feb4b1dcbf4d27663a8b3fcfc39771b4d0c868e4e3e2ae3e01788c1b85ee
+  metadata.gz: 98dcd86001183007093fef2b42335af5975672dc8a3bda97eb16bb6d8daa89f9d6b9e0e610bb0795098a202c3ffbb3e00d4fb6420932b26065413322820dedd6
+  data.tar.gz: 6745a6f57b19d966f43b5684cc23a03c631f771f7610c8fe41da018b0acb1b65dc34f43e71dbadc483806b89256684e074b54beb968f006ff3fb959e4003b591

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,6 +147,19 @@ module ManageIQ::CrossRepo
       url && File.join(url, "tarball", sha)
     end
 
+    def open_tarball_url(url)
+      archive = 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

data/lib/manageiq/cross_repo/runner.rb

@@ -73,7 +73,11 @@ module ManageIQ::CrossRepo
       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)

data/lib/manageiq/cross_repo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-cross_repo
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ManageIQ CrossRepo testing library