diff options
| author | Tim Smith <tsmith@chef.io> | 2019-12-29 18:41:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-29 18:41:25 -0800 |
| commit | d10751d427cf5a52c41dbcfbd2bd46552f8fee1d (patch) | |
| tree | eeaddf83908a3dd057a45c972a7db426a1ad93db | |
| parent | d9d131bdcb85458a25882d0cc65de51e5b193a75 (diff) | |
| parent | b4676a51c5c405622f3ced5a6f7e4f5a3a66ac5f (diff) | |
| download | mixlib-shellout-d10751d427cf5a52c41dbcfbd2bd46552f8fee1d.tar.gz | |
Merge pull request #199 from chef/relative
Substitute require for require_relative
| -rw-r--r-- | .github/lock.yml | 1 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | lib/mixlib/shellout.rb | 6 | ||||
| -rw-r--r-- | lib/mixlib/shellout/windows.rb | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/.github/lock.yml b/.github/lock.yml deleted file mode 100644 index 66d5d49..0000000 --- a/.github/lock.yml +++ /dev/null @@ -1 +0,0 @@ -daysUntilLock: 60 @@ -1,5 +1,5 @@ # Mixlib::ShellOut -[](https://buildkite.com/chef-oss/chef-mixlib-shellout-master-verify) [](https://badge.fury.io/rb/mixlib-shellout) +[](https://buildkite.com/chef-oss/chef-mixlib-shellout-master-verify) [](https://badge.fury.io/rb/mixlib-shellout) **Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md) diff --git a/lib/mixlib/shellout.rb b/lib/mixlib/shellout.rb index 9345eea..f366956 100644 --- a/lib/mixlib/shellout.rb +++ b/lib/mixlib/shellout.rb @@ -19,7 +19,7 @@ require "etc" require "tmpdir" require "fcntl" -require "mixlib/shellout/exceptions" +require_relative "shellout/exceptions" module Mixlib @@ -29,10 +29,10 @@ module Mixlib DEFAULT_READ_TIMEOUT = 600 if RUBY_PLATFORM =~ /mswin|mingw32|windows/ - require "mixlib/shellout/windows" + require_relative "shellout/windows" include ShellOut::Windows else - require "mixlib/shellout/unix" + require_relative "shellout/unix" include ShellOut::Unix end diff --git a/lib/mixlib/shellout/windows.rb b/lib/mixlib/shellout/windows.rb index 09c97c5..d5eff79 100644 --- a/lib/mixlib/shellout/windows.rb +++ b/lib/mixlib/shellout/windows.rb @@ -19,7 +19,7 @@ # require "win32/process" -require "mixlib/shellout/windows/core_ext" +require_relative "windows/core_ext" module Mixlib class ShellOut |