summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-09-20 13:48:00 +0600
committerPrajakta Purohit <prajakta@chef.io>2022-09-21 06:54:07 -0700
commitd7b4d16fbe8bd4cae2cf219b4194c5a6285ce8aa (patch)
treedb64b1dbea238c569bcebd231bce635f6d1c397d
parenta40ef29edab60a2660bc9702679613cf8ac79516 (diff)
downloadchef-d7b4d16fbe8bd4cae2cf219b4194c5a6285ce8aa.tar.gz
Amending installation of the rest-client gem to bypass rakefile issue
Signed-off-by: John McCrae <john.mccrae@progress.com>
-rw-r--r--Gemfile.lock20
-rw-r--r--habitat/plan.ps112
2 files changed, 24 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b659f6cddc..d2b5585001 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,13 +27,12 @@ GIT
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
-
-GIT
- remote: https://github.com/chef/ruby-proxifier
- revision: 8b87d0b5b469adbd93eabc0d20f3e47007aef743
- branch: lcg/ruby-3
- specs:
- proxifier (1.0.3)
+ rest-client (2.1.0-x64-mingw-ucrt)
+ ffi (~> 1.15)
+ http-accept (>= 1.7.0, < 2.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 4.0)
+ netrc (~> 0.8)
GIT
remote: https://github.com/chef/ruby-shadow
@@ -41,6 +40,13 @@ GIT
branch: lcg/ruby-3.0
specs:
ruby-shadow (2.5.0)
+
+GIT
+ remote: https://github.com/chef/ruby-proxifier
+ revision: 8b87d0b5b469adbd93eabc0d20f3e47007aef743
+ branch: lcg/ruby-3
+ specs:
+ proxifier (1.0.3)
PATH
remote: .
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index 4b37b27e59..83312c4345 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -96,7 +96,17 @@ function Invoke-Build {
try {
Push-Location $git_gem
Write-BuildLine " -- installing $git_gem"
- rake install $git_gem --trace=stdout # this needs to NOT be 'bundle exec'd else bundler complains about dev deps not being installed
+ # The rest client doesn't have an 'Install' task so it bombs out when we call Rake Install for it
+ # Happily, its Rakefile ultimately calls 'gem build' to build itself with. We're doing that here.
+ if ($git_gem -match "rest-client"){
+ $gemspec_path = $git_gem.ToString() + "\rest-client.windows.gemspec"
+ gem build $gemspec_path
+ $gem_path = $git_gem.ToString() + "\rest-client*.gem"
+ gem install $gem_path
+ }
+ else {
+ rake install $git_gem --trace=stdout # this needs to NOT be 'bundle exec'd else bundler complains about dev deps not being installed
+ }
if (-not $?) { throw "unable to install $($git_gem) as a plain old gem" }
} finally {
Pop-Location