Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/puppet_references.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def self.build_puppet_references(commit)
]
config = PuppetReferences::Config.read
repo = PuppetReferences::Repo.new('openvox', PUPPET_DIR, nil, config['puppet']['repo'])
@version_commit = commit || repo.describe.split('-')[0]
@version_commit = commit || repo.newest_release
puts "Using tag #{@version_commit}"
real_commit = repo.checkout(@version_commit)
repo.update_bundle
Expand All @@ -55,7 +55,7 @@ def self.build_openbolt_references(commit)
config = PuppetReferences::Config.read
bolt_config = config.fetch('openbolt', {})
repo = PuppetReferences::Repo.new('openbolt', BOLT_DIR, nil, bolt_config.fetch('repo', {}))
@version_commit = commit || repo.describe.split('-')[0]
@version_commit = commit || repo.newest_release
puts "Using tag #{@version_commit}"
real_commit = repo.checkout(@version_commit)
repo.update_bundle
Expand All @@ -75,7 +75,7 @@ def self.build_facter_references(commit)
# we need the CLI docs for 3.y. We can remove this when we stop building 3.y.
version4 = Gem::Version.create('4.0.0')
repo = PuppetReferences::Repo.new('openfact', FACTER_DIR)
@version_commit = commit || repo.describe.split('-')[0]
@version_commit = commit || repo.newest_release
puts "Using tag #{@version_commit}"
real_commit = repo.checkout(@version_commit)
repo.update_bundle
Expand Down
6 changes: 6 additions & 0 deletions lib/puppet_references/repo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ def tags
@repo.tags
end

def newest_release
@repo.tags.map { |t| Gem::Version.new(t.name) rescue Gem::Version.new(0) } # rubocop:disable Style/RescueModifier
.reject(&:prerelease?)
.max.version # rubocop:disable Layout/MultilineMethodCallIndentation
end

def update_bundle
Dir.chdir(@directory) do
if Dir.exist?(@directory + '.bundle/stuff')
Expand Down