Skip to content

Commit

Permalink
(maint) Remove vendored gems
Browse files Browse the repository at this point in the history
This commit removes the vendored gems from the git repository and instead
modifies Rake tasks and documentation to vendor the gems manually. Note that
the build process does vendor the gems prior to compressing into a Zip.

This is to reduce git history churn when adding or updating vendored gems. The
vendored gem content doesn't change so there's no point replicating in this
repo.
  • Loading branch information
glennsarti committed May 16, 2020
1 parent 5088c22 commit f7caae3
Show file tree
Hide file tree
Showing 207 changed files with 25 additions and 18,216 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ log/
.DS_Store
tmp/
output/

# Ignore the vendored gems
vendor/hiera-eyaml
vendor/molinillo
vendor/puppet-lint
vendor/puppetfile-resolver
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ env:
# Latest 4.x Puppet (Covers LTS too)
- PUPPET_GEM_VERSION="~> 4.0"
RUBY_VER=2.1.9
RAKE_TASK="test_languageserver test_languageserver_sidecar test_debugserver"
RAKE_TASK="gem_revendor test_languageserver test_languageserver_sidecar test_debugserver"
BUNDLER_VERSION=1.17.3
# Latest 5.x Puppet
- PUPPET_GEM_VERSION="~> 5.0"
RUBY_VER=2.4.1
RAKE_TASK="test_languageserver test_languageserver_sidecar test_debugserver"
RAKE_TASK="gem_revendor test_languageserver test_languageserver_sidecar test_debugserver"
# Latest 6.x Puppet
- PUPPET_GEM_VERSION="~> 6.0"
RUBY_VER=2.5.1
RAKE_TASK="test_languageserver test_languageserver_sidecar test_debugserver"
RAKE_TASK="gem_revendor test_languageserver test_languageserver_sidecar test_debugserver"

# Specific Puppet version testing
- PUPPET_GEM_VERSION="5.1.0"
RUBY_VER=2.4.1
RAKE_TASK="test_languageserver"
RAKE_TASK="gem_revendor test_languageserver"

# Acceptance tests.
- PUPPET_GEM_VERSION="~> 6.0"
RUBY_VER=2.5.1
RAKE_TASK="acceptance_languageserver"
RAKE_TASK="gem_revendor acceptance_languageserver"

# Ruby tasks (style). Puppet version is irrelevant
- PUPPET_GEM_VERSION="> 0.0"
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ A ruby based implementation of a [Language Server](https://github.com/Microsoft/
... < lots of text >
```

* Installed vendored gems

```
> bundle exec rake gem_revendor
... < lots of text >
```

# Language Server

## How to run the Language Server for Development
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ HEREDOC
end

desc "Create compressed files of the language and debug servers for release"
task :build do
task build: [:gem_revendor] do
require 'fileutils'
require 'archive/zip'
require 'zlib'
Expand Down
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@ environment:
# Latest 4.x Puppet (Covers LTS too)
- PUPPET_GEM_VERSION: "~> 4.0"
RUBY_VER: 21-x64
RAKE_TASK: "test_languageserver test_languageserver_sidecar test_debugserver"
RAKE_TASK: "gem_revendor test_languageserver test_languageserver_sidecar test_debugserver"

# Latest 5.x Puppet
- PUPPET_GEM_VERSION: "~> 5.0"
RUBY_VER: 24-x64
RAKE_TASK: "test_languageserver test_languageserver_sidecar test_debugserver"
RAKE_TASK: "gem_revendor test_languageserver test_languageserver_sidecar test_debugserver"

# Latest 6.x Puppet
- PUPPET_GEM_VERSION: "~> 6.0"
RUBY_VER: 25-x64
RAKE_TASK: "test_languageserver test_languageserver_sidecar test_debugserver"
RAKE_TASK: "gem_revendor test_languageserver test_languageserver_sidecar test_debugserver"

# Specific Puppet version testing
- PUPPET_GEM_VERSION: "5.1.0"
RUBY_VER: 24-x64
RAKE_TASK: test_languageserver
RAKE_TASK: "gem_revendor test_languageserver"

# Acceptance tests.
- PUPPET_GEM_VERSION: "~> 6.0"
RUBY_VER: 25-x64
RAKE_TASK: acceptance_languageserver
RAKE_TASK: "gem_revendor acceptance_languageserver"

# Ruby tasks (style, build release archives)
- PUPPET_GEM_VERSION: "> 0.0" # Version is irrelevant
Expand Down
11 changes: 0 additions & 11 deletions vendor/hiera-eyaml/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions vendor/hiera-eyaml/.travis.yml

This file was deleted.

38 changes: 0 additions & 38 deletions vendor/hiera-eyaml/CHANGES.md

This file was deleted.

18 changes: 0 additions & 18 deletions vendor/hiera-eyaml/Gemfile

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/hiera-eyaml/LICENSE.txt

This file was deleted.

4 changes: 0 additions & 4 deletions vendor/hiera-eyaml/PLUGINS.md

This file was deleted.

Loading

0 comments on commit f7caae3

Please sign in to comment.