Skip to content

Commit

Permalink
(GH-252) Vendor puppet-strings
Browse files Browse the repository at this point in the history
The puppet-strings (and yard) gem are not available in all instances.  This
commit vendors the gem in the Language Server so that it's always availble
  • Loading branch information
glennsarti committed May 23, 2020
1 parent 390cafc commit bc3db27
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ vendor/hiera-eyaml
vendor/molinillo
vendor/puppet-lint
vendor/puppetfile-resolver
vendor/puppet-strings
vendor/yard
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ group :development do
else
gem 'puppet', :require => false
end
# TODO: This should be vendored into Editor Services after it is no longer a feature flag
# The puppet-strings gem is not available in the Puppet Agent, but is in the PDK. We add it to the
# Gemfile here for testing and development.
gem "puppet-strings", "~> 2.0", :require => false

case RUBY_PLATFORM
when /darwin/
Expand Down
10 changes: 10 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ task :gem_revendor do
:github_repo => 'https://github.com/CocoaPods/Molinillo.git',
:github_ref => '0.6.6',
},
{
:directory => 'puppet-strings',
:github_repo => 'https://github.com/puppetlabs/puppet-strings.git',
:github_ref => 'v2.4.0',
},
{
:directory => 'yard',
:github_repo => 'https://github.com/lsegal/yard.git',
:github_ref => 'v0.9.24',
},
]

# Clean out the vendor directory first
Expand Down
2 changes: 2 additions & 0 deletions vendor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ Gem List
* hiera-eyaml (https://github.com/voxpupuli/hiera-eyaml ref v2.1.0)
* puppetfile-resolver (https://github.com/glennsarti/puppetfile-resolver.git ref 0.2.0)
* molinillo (https://github.com/CocoaPods/Molinillo.git ref 0.6.6)
* puppet-strings (https://github.com/puppetlabs/puppet-strings.git ref v2.4.0)
* yard (https://github.com/lsegal/yard.git ref v0.9.24)

0 comments on commit bc3db27

Please sign in to comment.