From 3c48567455f5a3ba14af8c5f9169eb7fde0b4556 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 20 Dec 2019 21:44:01 -0800 Subject: Substitute require for require_relative require_relative is significantly faster and should be used when available. Signed-off-by: Tim Smith --- lib/mixlib/shellout.rb | 6 +++--- lib/mixlib/shellout/windows.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 -- cgit v1.2.1 From 3f3abc50efaa43876b272b933b84a424af0a809c Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Sun, 29 Dec 2019 18:38:17 -0800 Subject: Remove the lockfile config Signed-off-by: Tim Smith --- .github/lock.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/lock.yml 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 -- cgit v1.2.1 From b4676a51c5c405622f3ced5a6f7e4f5a3a66ac5f Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Sun, 29 Dec 2019 18:40:43 -0800 Subject: Update the readme badge Signed-off-by: Tim Smith --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7c3cb20..69bbbf2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Mixlib::ShellOut -[![Build Status](https://badge.buildkite.com/7051b7b35cc19076c35a6e6a9e996807b0c14475ca3f3acd86.svg)](https://buildkite.com/chef-oss/chef-mixlib-shellout-master-verify) [![Gem Version](https://badge.fury.io/rb/mixlib-shellout.svg)](https://badge.fury.io/rb/mixlib-shellout) +[![Build Status](https://badge.buildkite.com/7051b7b35cc19076c35a6e6a9e996807b0c14475ca3f3acd86.svg?branch=master)](https://buildkite.com/chef-oss/chef-mixlib-shellout-master-verify) [![Gem Version](https://badge.fury.io/rb/mixlib-shellout.svg)](https://badge.fury.io/rb/mixlib-shellout) **Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md) -- cgit v1.2.1