From 68a42a725441b3d688c6e83f0850c234d676fa7a Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Mon, 24 Jul 2017 20:54:43 -0500 Subject: [PATCH] Update zeus & pry so that we can use Zeus again --- Gemfile | 2 +- Gemfile.lock | 19 ++++++++----------- gemfiles/4.2.gemfile | 2 +- gemfiles/4.2.gemfile.lock | 25 ++++++++++--------------- gemfiles/5.0.gemfile | 2 +- gemfiles/5.0.gemfile.lock | 21 +++++++++------------ 6 files changed, 30 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index c2d49bf0..8b563ee1 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'appraisal', '~> 2.0' gem 'bundler', '~> 1.1' -gem 'pry', git: 'https://github.com/pry/pry.git' +gem 'pry' gem 'pry-byebug' gem 'rake', '>= 10.5.0', '< 11' gem 'rspec', '~> 3.2' diff --git a/Gemfile.lock b/Gemfile.lock index d0259aa4..1bc13abd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: https://github.com/pry/pry.git - revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c - specs: - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - GEM remote: https://rubygems.org/ specs: @@ -19,6 +11,10 @@ GEM fssm (0.2.10) method_source (0.8.2) multi_json (1.12.1) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) @@ -39,9 +35,10 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) + slop (3.6.0) thor (0.19.4) yard (0.9.6) - zeus (0.15.12) + zeus (0.15.14) method_source (>= 0.6.7) PLATFORMS @@ -51,7 +48,7 @@ DEPENDENCIES appraisal (~> 2.0) bundler (~> 1.1) fssm - pry! + pry pry-byebug pygments.rb rake (>= 10.5.0, < 11) @@ -61,4 +58,4 @@ DEPENDENCIES zeus BUNDLED WITH - 1.13.6 + 1.14.6 diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index 6c99cc22..1b7723a1 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem "appraisal", "~> 2.0" gem "bundler", "~> 1.1" -gem "pry", :git => "https://github.com/pry/pry.git" +gem "pry" gem "pry-byebug" gem "rake", ">= 10.5.0", "< 11" gem "rspec", "~> 3.2" diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock index cb1b0672..6a7f7b4d 100644 --- a/gemfiles/4.2.gemfile.lock +++ b/gemfiles/4.2.gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: https://github.com/pry/pry.git - revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c - specs: - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - GEM remote: https://rubygems.org/ specs: @@ -55,8 +47,7 @@ GEM arel (6.0.4) bcrypt (3.1.10) builder (3.2.3) - byebug (5.0.0) - columnize (= 0.9.0) + byebug (9.0.6) coderay (1.1.1) coffee-rails (4.1.0) coffee-script (>= 2.2.0) @@ -65,7 +56,6 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - columnize (0.9.0) concurrent-ruby (1.0.5) diff-lcs (1.2.5) erubis (2.7.0) @@ -104,8 +94,12 @@ GEM posix-spawn (0.3.11) protected_attributes (1.0.9) activemodel (>= 4.0.1, < 5.0) - pry-byebug (3.2.0) - byebug (~> 5.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-byebug (3.4.2) + byebug (~> 9.0) pry (~> 0.10) pygments.rb (0.6.3) posix-spawn (~> 0.3.6) @@ -175,6 +169,7 @@ GEM json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) shoulda-context (1.2.1) + slop (3.6.0) spring (1.4.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -198,7 +193,7 @@ GEM json (>= 1.8.0) yajl-ruby (1.2.2) yard (0.8.7.6) - zeus (0.15.4) + zeus (0.15.14) method_source (>= 0.6.7) PLATFORMS @@ -222,7 +217,7 @@ DEPENDENCIES nokogiri (~> 1.8) pg protected_attributes (~> 1.0.6) - pry! + pry pry-byebug pygments.rb rails (~> 4.2.9) diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile index ac5f45c9..5eae12e2 100644 --- a/gemfiles/5.0.gemfile +++ b/gemfiles/5.0.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem "appraisal", "~> 2.0" gem "bundler", "~> 1.1" -gem "pry", :git => "https://github.com/pry/pry.git" +gem "pry" gem "pry-byebug" gem "rake", ">= 10.5.0", "< 11" gem "rspec", "~> 3.2" diff --git a/gemfiles/5.0.gemfile.lock b/gemfiles/5.0.gemfile.lock index 8e10f2ab..ffa968de 100644 --- a/gemfiles/5.0.gemfile.lock +++ b/gemfiles/5.0.gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: https://github.com/pry/pry.git - revision: 1f64463184e0a160d0b41d1a1f92b8e2f230278c - specs: - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - GEM remote: https://rubygems.org/ specs: @@ -53,7 +45,7 @@ GEM arel (7.1.4) bcrypt (3.1.11) builder (3.2.3) - byebug (9.0.5) + byebug (9.0.6) coderay (1.1.1) concurrent-ruby (1.0.5) diff-lcs (1.2.5) @@ -85,7 +77,11 @@ GEM mini_portile2 (~> 2.2.0) pg (0.18.4) posix-spawn (0.3.11) - pry-byebug (3.4.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) pygments.rb (0.6.3) @@ -148,6 +144,7 @@ GEM rspec-support (~> 3.5.0) rspec-support (3.5.0) shoulda-context (1.2.1) + slop (3.6.0) spring (1.7.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -168,7 +165,7 @@ GEM websocket-extensions (0.1.2) yajl-ruby (1.2.2) yard (0.9.5) - zeus (0.15.10) + zeus (0.15.14) method_source (>= 0.6.7) PLATFORMS @@ -187,7 +184,7 @@ DEPENDENCIES listen (~> 3.0.5) nokogiri (~> 1.8) pg - pry! + pry pry-byebug pygments.rb rails (~> 5.0.4)