From b1eb6543a537f60ecee7f6225380910d20543694 Mon Sep 17 00:00:00 2001 From: gimmy Date: Wed, 30 Jun 2021 10:32:48 +0300 Subject: [PATCH 1/3] (maint) add missing fields in facter-ng.gemspec --- agent/facter-ng.gemspec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agent/facter-ng.gemspec b/agent/facter-ng.gemspec index aaee2dd2ac..5a6c4c3415 100644 --- a/agent/facter-ng.gemspec +++ b/agent/facter-ng.gemspec @@ -8,9 +8,11 @@ Gem::Specification.new do |spec| spec.version = '4.2.2' spec.authors = ['Puppet'] spec.email = ['team-nw@puppet.com'] + spec.homepage = 'https://github.com/puppetlabs/facter' spec.summary = 'Facter, a system inventory tool' spec.description = 'You can prove anything with facts!' + spec.license = 'MIT' # ruby 2.3 doesn't support `base` keyword arg dirs = From 52f51cf910095ac936b85a2d63198b63cd7af14b Mon Sep 17 00:00:00 2001 From: gimmy Date: Wed, 30 Jun 2021 10:33:52 +0300 Subject: [PATCH 2/3] (maint) update rake depenency Fixes the following warning: ``` WARNING: open-ended dependency on rake (>= 12.3.3, development) is not recommended if rake is semantically versioned, use: add_development_dependency 'rake', '~> 12.3', '>= 12.3.3' ``` --- agent/facter-ng.gemspec | 2 +- facter.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/facter-ng.gemspec b/agent/facter-ng.gemspec index 5a6c4c3415..b9e57659a5 100644 --- a/agent/facter-ng.gemspec +++ b/agent/facter-ng.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'bundler', '~> 2.0' spec.add_development_dependency 'coveralls', '~> 0.8.23' - spec.add_development_dependency 'rake', '>= 12.3.3' + spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'rubocop', '~> 0.74.0' spec.add_development_dependency 'rubycritic', '~> 4.1.0' diff --git a/facter.gemspec b/facter.gemspec index 98455baaf5..fb581debaa 100644 --- a/facter.gemspec +++ b/facter.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_development_dependency 'rake', '>= 12.3.3' + spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'rubocop', '~> 0.81.0' spec.add_development_dependency 'rubocop-performance', '~> 1.5.2' From 48e78033d3412c84a7b373db541cf0fa7f58b6de Mon Sep 17 00:00:00 2001 From: gimmy Date: Wed, 30 Jun 2021 10:35:18 +0300 Subject: [PATCH 3/3] (maint) fix gem building from source Using `gem build facter.gemspec` failed because `pathname` was not loaded Using `gem build agent/facter-ng.gemspec` failed because the paths were not taking in consideration that the build is relative to the `agent` folder. --- agent/facter-ng.gemspec | 21 +++++++++++++-------- facter.gemspec | 2 ++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/agent/facter-ng.gemspec b/agent/facter-ng.gemspec index b9e57659a5..1181736e31 100644 --- a/agent/facter-ng.gemspec +++ b/agent/facter-ng.gemspec @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'pathname' + lib = File.expand_path('../lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) @@ -15,15 +17,18 @@ Gem::Specification.new do |spec| spec.license = 'MIT' # ruby 2.3 doesn't support `base` keyword arg + # we are building from `facter/agent` so we need to move + # one level up in the `facter` folder. + root_dir = Pathname.new(File.expand_path('..', __dir__)) dirs = - Dir[File.join(__dir__, 'bin/facter-ng')] + - Dir[File.join(__dir__, 'LICENSE')] + - Dir[File.join(__dir__, 'lib/**/*.rb')] + - Dir[File.join(__dir__, 'lib/**/*.json')] + - Dir[File.join(__dir__, 'lib/**/*.conf')] + - Dir[File.join(__dir__, 'agent/**/*')] + - Dir[File.join(__dir__, 'lib/**/*.erb')] - base = Pathname.new(__dir__) + Dir[File.join(root_dir, 'bin/facter-ng')] + + Dir[File.join(root_dir, 'LICENSE')] + + Dir[File.join(root_dir, 'lib/**/*.rb')] + + Dir[File.join(root_dir, 'lib/**/*.json')] + + Dir[File.join(root_dir, 'lib/**/*.conf')] + + Dir[File.join(root_dir, 'agent/**/*')] + + Dir[File.join(root_dir, 'lib/**/*.erb')] + base = Pathname.new(root_dir) spec.files = dirs.map do |path| Pathname.new(path).relative_path_from(base).to_path end diff --git a/facter.gemspec b/facter.gemspec index fb581debaa..adb2cda54f 100644 --- a/facter.gemspec +++ b/facter.gemspec @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'pathname' + lib = File.expand_path('lib', __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)