From 53ca0d31d05aacaf6dd2baaf258dd66722eca7e5 Mon Sep 17 00:00:00 2001 From: donoghuc Date: Wed, 25 Mar 2020 08:57:34 -0700 Subject: [PATCH] sad face --- agentless-catalog-executor.gemspec | 6 +++--- lib/ace/configurer.rb | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/agentless-catalog-executor.gemspec b/agentless-catalog-executor.gemspec index f0a91c8..f59ec3c 100644 --- a/agentless-catalog-executor.gemspec +++ b/agentless-catalog-executor.gemspec @@ -19,14 +19,14 @@ Gem::Specification.new do |spec| spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - - spec.add_dependency "bolt", "~> 1.31" + spec.add_dependency "bolt", "1.48.0" + spec.add_dependency "puppet", "6.12.0" # server-side dependencies cargo culted from https://github.com/puppetlabs/bolt/blob/4418da408643aa7eb5ed64f4c9704b941ea878dc/Gemfile#L10-L16 spec.add_dependency "hocon", ">= 1.2.5" spec.add_dependency "json-schema", ">= 2.8.0" spec.add_dependency "puma", ">= 3.12.0" - spec.add_dependency "rack", ">= 2.0.5" + spec.add_dependency "rack", "2.1.2" spec.add_dependency "rails-auth", ">= 2.1.4" spec.add_dependency "sinatra", ">= 2.0.4" diff --git a/lib/ace/configurer.rb b/lib/ace/configurer.rb index b86aeb9..901a532 100644 --- a/lib/ace/configurer.rb +++ b/lib/ace/configurer.rb @@ -1,5 +1,12 @@ # frozen_string_literal: true +require 'puppet' +# NOTE: Changes in puppet code loading results in simply requiring `puppet/configurer` no longer +# possible. The following requires can make ruby load, however selectively loading code from puppet +# will likely lead to issues in the future. Instead, just load puppet here. +# require 'puppet/util/autoload' +# require 'puppet/parser/compiler' +# require 'puppet/parser' require 'puppet/configurer' module ACE