Merge pull request #264 from glennsarti/gh262-merge1.0-to-master

(GH-262) Merge 1.0 into master
puppetlabs · Jun 18, 2020 · 6e28bcc · 6e28bcc
2 parents c88f838 + 413d65a
commit 6e28bcc
Show file tree

Hide file tree

Showing 278 changed files with 2,809 additions and 22,007 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,11 @@ log/
 .DS_Store
 tmp/
 output/
+
+# Ignore the vendored gems
+vendor/hiera-eyaml
+vendor/molinillo
+vendor/puppet-lint
+vendor/puppetfile-resolver
+vendor/puppet-strings
+vendor/yard
diff --git a/.travis.yml b/.travis.yml
@@ -8,34 +8,35 @@ os:
 # OSX is REALLY slow to test
 #  - osx
 
+# safelist
+branches:
+  only:
+  - master
+  - "1.0"
+
 matrix:
   fast_finish: true
 
 env:
   matrix:
-    # 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"
-      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"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,23 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## Unreleased
 
+## 1.0.0 - ????-??-??
+
+Major release 🎉🎉 which drops support for Puppet 4
+
+> This (commit) removes Puppet 4 from the testing matrix and
+modifies the Debug Server, Language Server and Language Server Sidecar to
+terminate early with an error if run under Puppet 4.
+
+### Changed
+
+- ([GH-209](https://github.com/puppetlabs/puppet-editor-services/issues/209)) Refactor the session state to be a class and pass that instead of global modules
+- ([Commit](https://github.com/puppetlabs/puppet-editor-services/commit/f7caae3f7b0db4e1debecafe8bd4c3485a334732)) Removed vendored gems and update development and building workflows
+- ([Commit](https://github.com/puppetlabs/puppet-editor-services/commit/2f6e0fc143ddd50be5256bf9abb62d91d2e49466)) Fix Facter Helper for 1.0
+- ([GH-252](https://github.com/puppetlabs/puppet-editor-services/issues/252)) Use puppet-strings by default and remove feature flag
+- ([Commit](https://github.com/puppetlabs/puppet-editor-services/commit/bc3db27182ad47253e29a86a6cace73292b86d30)) Vendor puppet-strings and Yard
+- ([Commit](https://github.com/puppetlabs/puppet-editor-services/commit/5a4800434dbed1756148905464011f882b7e2191)) Remove support for Puppet 4
+
 ## 0.26.1 - 2020-06-04
 
 ### Added

diff --git a/Gemfile b/Gemfile
@@ -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/

diff --git a/README.md b/README.md
@@ -10,9 +10,9 @@ A ruby based implementation of a [Language Server](https://github.com/Microsoft/
 
 ## Setting up editor services for development
 
-* Ensure a modern ruby is installed (2.1+)
+* Ensure a modern ruby is installed (2.4+)
 
-  The editor services support Puppet 4.10.12 and above
+  The editor services support Puppet 5.0.0 and above
 
 * Clone this repository
 
@@ -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

diff --git a/Rakefile b/Rakefile
@@ -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
@@ -121,7 +131,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'

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,30 +5,25 @@ init:
 
 environment:
   matrix:
-  # 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"
-
   # 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