bake-test-external 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791c0c350e3852586ef33ee7429401c2bee16dab8c3dc0d9ed0e3f2429918e49
-  data.tar.gz: d6ac9f1a645aae0d99e8603e4e4a7de9d45254329322f75de3e9b7b36b3b2a6b
+  metadata.gz: 47a071dbbd5823bf15e24a29988176668f249f0a5449e527ae7ea6353e1e8a93
+  data.tar.gz: d4fc771066257b210e74233c5456cacea65707f4fe5708685400065cd09bc67f
 SHA512:
-  metadata.gz: be388ba6c468398997d234b911f2a1963b1db2ade17f2939025ec1db8c112f22f12d5a819916d28c2fe29e15698686393091cdf4fa70c711781a2015e9c9e695
-  data.tar.gz: 2526de1dc326f168acee41f7afc32dec21265ec41247f49cd21c7ca1296ed92224d1db6225a4d944888b2f1fc1f6e636f20441eba472173d5ba693f86aff2315
+  metadata.gz: ab045efb381fcd9e61f7d00eeb056e634cfd42292122104154908959dc39dd0dd74e27350a550032991deae542cabc7a9975eaa2083e25cf4cf8ba82b105fc14
+  data.tar.gz: e1d4e308a5e717dd1fd95b58b25dc60ab4606dcb399d1f2d5928f03603d22f1770711bb6c4c8d2a7fc6c7c809e091b959425068aacce6cc582e94b34de1845aa

data/bake/test/external.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 # Copyright, 2022, by Akshay Birajdar.
 # Copyright, 2022, by Hiroaki Osawa.
 
@@ -21,6 +21,7 @@ def external(input: nil, gemspec: self.find_gemspec)
 	
 	input&.each do |key, config|
 		config = config.transform_keys(&:to_sym)
+		config[:env] ||= {}
 		
 		Bundler.with_unbundled_env do
 			clone_and_test(gemspec.name, key, config)
@@ -44,6 +45,7 @@ end
 
 def clone_and_test(name, key, config)
 	path = clone_repository(name, key, config)
+	
 	test_repository(path, config) or abort("External tests #{key} failed!")
 end
 
@@ -67,13 +69,12 @@ def clone_repository(name, key, config)
 		end
 		
 		command << url << path
-		system(*command)
+		system(config[:env], *command)
 		
 		# I tried using `bundle config --local local.async ../` but it simply doesn't work.
 		# system("bundle", "config", "--local", "local.async", __dir__, chdir: path)
 		
-		gemfile_paths = ["#{path}/Gemfile", "#{path}/gems.rb"]
-		gemfile_path = gemfile_paths.find{|path| File.exist?(path)}
+		gemfile_path = self.gemfile_path(path, config)
 		
 		File.open(gemfile_path, 'r+') do |file|
 			pattern = /gem.*?['"]#{name}['"]/
@@ -90,7 +91,7 @@ def clone_repository(name, key, config)
 			end
 		end
 
-		system("bundle", "install", chdir: path)
+		system(config[:env], "bundle", "install", chdir: path)
 	end
 	
 	return path
@@ -99,5 +100,49 @@ end
 def test_repository(path, config)
 	command = config.fetch(:command, DEFAULT_COMMAND)
 	
-	system(*command, chdir: path)
+	Array(command).each do |line|
+		system(config[:env], *line, chdir: path)
+	end
+end
+
+GEMFILE_NAMES = ["Gemfile", "gems.rb"]
+
+def resolve_gemfile_path(root, config)
+	if config_path = config[:gemfile]
+		path = File.join(root, config_path)
+		
+		unless File.exist?(path)
+			raise ArgumentError, "Specified gemfile path does not exist: #{config_path.inspect}!"
+		end
+		
+		# We consider this to be a custom gemfile path:
+		return false, path
+	end
+	
+	GEMFILE_NAMES.each do |name|
+		path = File.join(root, name)
+		
+		if File.exist?(path)
+			# We consider this to be a default gemfile path:
+			return true, path
+		end
+	end
+	
+	raise ArgumentError, "Could not find gem file in #{root.inspect}!"
+end
+
+def gemfile_path(root, config)
+	config.fetch(:cached_gemfile_path) do
+		root = File.expand_path(root, @root)
+		default, path = self.resolve_gemfile_path(root, config)
+		
+		config[:cached_gemfile_path] = path
+		
+		# Custom gemfile paths should be set explicitly:
+		unless default
+			config[:env]['BUNDLE_GEMFILE'] = path
+		end
+		
+		return path
+	end
 end

data/lib/bake/test/external/version.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 
 module Bake
 	module Test
 		module External
-			VERSION = "0.3.3"
+			VERSION = "0.4.0"
 		end
 	end
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2022, by Samuel Williams.  
+Copyright, 2022-2024, by Samuel Williams.  
 Copyright, 2022, by Akshay Birajdar.  
 Copyright, 2022, by Hiroaki Osawa.  
 

data/readme.md

@@ -37,4 +37,4 @@ This project uses the [Developer Certificate of Origin](https://developercertifi
 
 ### Contributor Covenant
 
-This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-test-external
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -39,7 +39,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-07-15 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -70,6 +70,7 @@ licenses:
 - MIT
 metadata:
   funding_uri: https://github.com/sponsors/ioquatix/
+  source_code_uri: https://github.com/ioquatix/bake-test-external.git
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -78,14 +79,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.6
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Run external test suites to check for breakage.