summaryrefslogtreecommitdiff
path: root/lib/chef/local_mode.rb
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-02-28 19:31:46 -0800
committerTim Smith <tsmith@chef.io>2019-02-28 19:31:46 -0800
commit9a2a0f148ade4c88fa44ef893c716e277a89c846 (patch)
treef521dee4f8ed6c1729c56c7875f141fe3885b60b /lib/chef/local_mode.rb
parent7d5ed61a31075b4dec51b00dcdd252cdb41558a9 (diff)
downloadchef-9a2a0f148ade4c88fa44ef893c716e277a89c846.tar.gz
Remove checks for old versions of Ruby
Some of this supports older versions of Ruby 2.1/2.2 and others support Ruby 1.8 Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef/local_mode.rb')
-rw-r--r--lib/chef/local_mode.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/chef/local_mode.rb b/lib/chef/local_mode.rb
index 5630a54335..457144c612 100644
--- a/lib/chef/local_mode.rb
+++ b/lib/chef/local_mode.rb
@@ -1,6 +1,6 @@
#
# Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +14,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
require "chef/config"
-if Chef::Platform.windows?
- if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.1")
- require "chef/monkey_patches/webrick-utils"
- end
-end
+require "chef/monkey_patches/webrick-utils" if Chef::Platform.windows?
class Chef
module LocalMode