summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-08-21 11:53:52 -0700
committerGitHub <noreply@github.com>2020-08-21 11:53:52 -0700
commit00fb154643af384cccbc1283a79ed1bbb8ce9ecf (patch)
tree9943c620e176c73a40ca89b3e87d3f36a81f3bbd
parentee3ee1d984806be954c2ebd528f64ab01cceb4d6 (diff)
parentbc8d2a726855ab2ed2ba025580b79cfff0dd8478 (diff)
downloadmixlib-cli-00fb154643af384cccbc1283a79ed1bbb8ce9ecf.tar.gz
Merge pull request #78 from chef/requires
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile2
-rw-r--r--Rakefile4
-rw-r--r--lib/mixlib/cli.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index a5b7655..a1c1772 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,6 @@ end
group :debug do
gem "pry"
gem "pry-byebug"
- gem "pry-stack_explorer"
+ gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6
gem "rb-readline"
end
diff --git a/Rakefile b/Rakefile
index bcbe224..1d5a2f5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,7 +24,7 @@ rescue LoadError
end
begin
- require "yard"
+ require "yard" unless defined?(YARD)
YARD::Rake::YardocTask.new(:docs)
rescue LoadError
puts "yard is not available. bundle install first to make sure all dependencies are installed."
@@ -33,7 +33,7 @@ end
task :console do
require "irb"
require "irb/completion"
- require "mixlib/cli"
+ require "mixlib/cli" unless defined?(Mixlib::CLI)
ARGV.clear
IRB.start
end
diff --git a/lib/mixlib/cli.rb b/lib/mixlib/cli.rb
index 30efbd3..f69eb04 100644
--- a/lib/mixlib/cli.rb
+++ b/lib/mixlib/cli.rb
@@ -16,7 +16,7 @@
# limitations under the License.
#
-require "optparse"
+require "optparse" unless defined?(OptionParser)
require_relative "cli/formatter"
module Mixlib