Merge pull request #495 from gregsher88/master

#491 - Remove chef/mixin/language references to support Chef 14
lusis · Mar 21, 2019 · f17b392 · f17b392
2 parents d4c2749 + 1d9406c
commit f17b392
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG for chef-logstash
 
+## 1.0.1
+
+* MINOR - Removed chef/mixin/language references to support Chef 14
+* MINOR - Pinned version for 'cucumber-core' and 'gherkin' in Gemfile
+* MINOR - Update Ubuntu version in specs
+
 ## 1.0.0
 
 * MAJOR - Get tests passing on Chef 12.7

diff --git a/Gemfile b/Gemfile
@@ -22,5 +22,7 @@ group :kitchen_vagrant do
   gem 'vagrant-wrapper'
 end
 
+gem 'cucumber-core', '3.2.0'
+gem 'gherkin', '5.1.0'
 gem 'rake'
 gem 'serverspec'
diff --git a/metadata.rb b/metadata.rb
@@ -6,7 +6,7 @@
 description      'Installs/Configures logstash'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 
-version          '1.0.0'
+version          '1.0.1'
 
 %w(ubuntu debian redhat centos scientific amazon fedora).each do |os|
   supports os

diff --git a/providers/config.rb b/providers/config.rb
@@ -6,10 +6,6 @@
 #
 # Copyright 2014, John E. Vincent
 
-require 'chef/mixin/shell_out'
-require 'chef/mixin/language'
-include Chef::Mixin::ShellOut
-
 def load_current_resource
   @instance  = new_resource.instance
   @basedir = Logstash.get_attribute_or_default(node, @instance, 'basedir')

diff --git a/providers/curator.rb b/providers/curator.rb
@@ -6,10 +6,6 @@
 #
 # Copyright 2014, John E. Vincent
 
-require 'chef/mixin/shell_out'
-require 'chef/mixin/language'
-include Chef::Mixin::ShellOut
-
 def load_current_resource
   @instance = new_resource.instance || 'default'
   @days_to_keep = new_resource.days_to_keep || Logstash.get_attribute_or_default(node, @instance, 'curator_days_to_keep')

diff --git a/providers/instance.rb b/providers/instance.rb
@@ -7,9 +7,6 @@
 # Copyright 2014, John E. Vincent
 
 require 'pathname'
-require 'chef/mixin/shell_out'
-require 'chef/mixin/language'
-include Chef::Mixin::ShellOut
 
 def load_current_resource
   @name = new_resource.name || 'default'

diff --git a/providers/pattern.rb b/providers/pattern.rb
@@ -6,10 +6,6 @@
 #
 # Copyright 2014, John E. Vincent
 
-require 'chef/mixin/shell_out'
-require 'chef/mixin/language'
-include Chef::Mixin::ShellOut
-
 def load_current_resource
   @instance  = new_resource.instance
   @basedir   = Logstash.get_attribute_or_default(node, @instance, 'basedir')

diff --git a/providers/plugins.rb b/providers/plugins.rb
@@ -6,10 +6,6 @@
 #
 # Copyright 2014, John E. Vincent
 
-require 'chef/mixin/shell_out'
-require 'chef/mixin/language'
-include Chef::Mixin::ShellOut
-
 def load_current_resource
   @name = new_resource.name || 'contrib'
   @instance = new_resource.instance || 'default'

diff --git a/providers/service.rb b/providers/service.rb
@@ -7,9 +7,6 @@
 # Copyright 2014, John E. Vincent
 
 require 'pathname'
-require 'chef/mixin/shell_out'
-require 'chef/mixin/language'
-include Chef::Mixin::ShellOut
 
 def load_current_resource
   @instance = new_resource.instance

diff --git a/test/unit/spec/spec_helper.rb b/test/unit/spec/spec_helper.rb
@@ -16,7 +16,7 @@
 
 ::UBUNTU_OPTS = {
   platform:  'ubuntu',
-  version:   '12.04',
+  version:   '14.04',
   log_level: ::LOG_LEVEL
 }