summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-06-28 20:49:12 -0700
committerGitHub <noreply@github.com>2021-06-28 20:49:12 -0700
commitdbd61b4db889dbc6b8dec6eab77bd5be35afbf4e (patch)
tree218311a50c245f9ba5d00bf74663ef9751198a3d
parent79f818176f5b71169637ff5b8d3fe04eedf0f087 (diff)
parentc8dcb9d4985a14e779ff4bc47e9ce740a28bb2dd (diff)
downloadchef-dbd61b4db889dbc6b8dec6eab77bd5be35afbf4e.tar.gz
Merge pull request #11756 from chef/mp/fix-pry
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock14
2 files changed, 13 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 4872842a5a..d012e2ab26 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,9 +25,10 @@ group(:omnibus_package) do
end
group(:omnibus_package, :pry) do
- gem "pry"
+ gem "pry", "= 0.13.0" # Locked because pry-byebug is broken with 13+
+ # some work is ongoing? https://github.com/deivid-rodriguez/pry-byebug/issues/343
# byebug does not install on freebsd on ruby 3.0
- # gem "pry-byebug"
+ gem "pry-byebug" unless RUBY_PLATFORM =~ /freebsd/i
gem "pry-stack_explorer"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 61bef50948..e602460916 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 507e9f69d57b99da1d5adc64e668cf19d31f1f2d
+ revision: 662529d2ea179b9faf6d1c0bed497a37ce62cf9a
branch: master
specs:
chefstyle (2.0.5)
@@ -136,6 +136,7 @@ GEM
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
+ byebug (11.1.3)
chef-telemetry (1.0.29)
chef-config
concurrent-ruby (~> 1.0)
@@ -159,7 +160,7 @@ GEM
diff-lcs (1.3)
erubi (1.10.0)
erubis (2.7.0)
- faraday (1.4.2)
+ faraday (1.4.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -265,9 +266,12 @@ GEM
tty-color (~> 0.5)
plist (3.6.0)
proxifier (1.0.3)
- pry (0.14.1)
+ pry (0.13.0)
coderay (~> 1.1)
method_source (~> 1.0)
+ pry-byebug (3.9.0)
+ byebug (~> 11.0)
+ pry (~> 0.13.0)
pry-stack_explorer (0.6.1)
binding_of_caller (~> 1.0)
pry (~> 0.13)
@@ -404,6 +408,7 @@ PLATFORMS
ruby
x64-mingw32
x86-mingw32
+ x86_64-linux
DEPENDENCIES
appbundler
@@ -417,7 +422,8 @@ DEPENDENCIES
fauxhai-ng
inspec-core-bin (~> 4.24)
ohai!
- pry
+ pry (= 0.13.0)
+ pry-byebug
pry-stack_explorer
rake
rb-readline