From 7f72487799bae71ee1d8e4630c92b908686a1d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Sat, 16 Feb 2019 10:18:38 +0100
Subject: [PATCH 1/3] Bump BUNDLED WITH to bundler 2.0.1

---
 .circleci/config.yml | 1 +
 Gemfile.lock         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e1f98bc..607318c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,6 +29,7 @@ jobs:
       - run:
           name: Install dependencies
           command: |
+            gem install bundler -v 2.0.1
             bundle install --jobs 3 --retry 3 --path .bundle
 
       - run:
diff --git a/Gemfile.lock b/Gemfile.lock
index 879f281..230ab51 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,4 +76,4 @@ DEPENDENCIES
   simplecov (= 0.16.1)
 
 BUNDLED WITH
-   1.17.3
+   2.0.1

From 6fdf51afadc31343bf3c54f2ca37c553515f94c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Sat, 16 Feb 2019 10:52:56 +0100
Subject: [PATCH 2/3] Frozen string literals

---
 .rubocop.yml                           |  2 +-
 Gemfile                                |  2 ++
 README.md                              |  4 +---
 Rakefile                               |  2 ++
 lib/byebug/processors/pry_processor.rb |  2 ++
 lib/pry-byebug.rb                      |  2 ++
 lib/pry-byebug/base.rb                 |  2 ++
 lib/pry-byebug/cli.rb                  |  2 ++
 lib/pry-byebug/commands.rb             |  2 ++
 lib/pry-byebug/commands/backtrace.rb   |  2 ++
 lib/pry-byebug/commands/breakpoint.rb  |  2 ++
 lib/pry-byebug/commands/continue.rb    |  2 ++
 lib/pry-byebug/commands/down.rb        |  2 ++
 lib/pry-byebug/commands/exit_all.rb    |  2 ++
 lib/pry-byebug/commands/finish.rb      |  2 ++
 lib/pry-byebug/commands/frame.rb       |  2 ++
 lib/pry-byebug/commands/next.rb        |  2 ++
 lib/pry-byebug/commands/step.rb        |  2 ++
 lib/pry-byebug/commands/up.rb          |  2 ++
 lib/pry-byebug/control_d_handler.rb    |  2 ++
 lib/pry-byebug/helpers/breakpoints.rb  |  2 ++
 lib/pry-byebug/helpers/multiline.rb    |  2 ++
 lib/pry-byebug/helpers/navigation.rb   |  2 ++
 lib/pry-byebug/pry_ext.rb              |  2 ++
 lib/pry-byebug/pry_remote_ext.rb       |  4 +++-
 lib/pry-byebug/version.rb              |  4 +++-
 lib/pry/byebug/breakpoints.rb          |  2 ++
 pry-byebug.gemspec                     |  4 +++-
 test/base_test.rb                      |  2 ++
 test/breakpoints_test.rb               |  2 ++
 test/commands/breakpoints_test.rb      | 18 ++++++++++--------
 test/commands/frames_test.rb           | 10 ++++++----
 test/commands/stepping_test.rb         | 26 ++++++++++++++------------
 test/examples/break1.rb                |  2 ++
 test/examples/break2.rb                |  2 ++
 test/examples/deep_stepping.rb         |  4 +++-
 test/examples/echo_thread.rb           |  2 ++
 test/examples/frames.rb                |  2 ++
 test/examples/multiple.rb              |  2 ++
 test/examples/stepping.rb              |  2 ++
 test/processor_test.rb                 |  6 ++++--
 test/pry_ext_test.rb                   |  2 ++
 test/pry_remote_ext_test.rb            |  2 ++
 test/support/coverage.rb               |  2 ++
 test/test_helper.rb                    |  2 ++
 test/thread_lock_test.rb               |  2 ++
 46 files changed, 120 insertions(+), 34 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8366972..915cd66 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,7 +2,7 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
 
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
 
 Lint/Debugger:
   Exclude:
diff --git a/Gemfile b/Gemfile
index 2db1dd6..3cf675c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
diff --git a/README.md b/README.md
index a41cbe9..7c7d552 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,7 @@ puts 'Goodbye World' # Run 'next' in the console to move here.
 
 ## Requirements
 
-* Required: MRI 2.2.0 or higher.
-
-* Recommended: MRI 2.3.0 or higher.
+MRI 2.3.0 or higher.
 
 ## Installation
 
diff --git a/Rakefile b/Rakefile
index f5983cd..15229be 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "chandler/tasks"
 require "rake/testtask"
diff --git a/lib/byebug/processors/pry_processor.rb b/lib/byebug/processors/pry_processor.rb
index 57a4ee1..5f29cfd 100644
--- a/lib/byebug/processors/pry_processor.rb
+++ b/lib/byebug/processors/pry_processor.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "byebug/core"
 
 module Byebug
diff --git a/lib/pry-byebug.rb b/lib/pry-byebug.rb
index 0542772..eb812c8 100644
--- a/lib/pry-byebug.rb
+++ b/lib/pry-byebug.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require "pry"
 require "pry-byebug/cli"
diff --git a/lib/pry-byebug/base.rb b/lib/pry-byebug/base.rb
index 7600b4c..903615d 100644
--- a/lib/pry-byebug/base.rb
+++ b/lib/pry-byebug/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Main container module for Pry-Byebug functionality
 #
diff --git a/lib/pry-byebug/cli.rb b/lib/pry-byebug/cli.rb
index 58cc07a..6f8cbcd 100644
--- a/lib/pry-byebug/cli.rb
+++ b/lib/pry-byebug/cli.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/base"
 require "pry-byebug/pry_ext"
 require "pry-byebug/commands"
diff --git a/lib/pry-byebug/commands.rb b/lib/pry-byebug/commands.rb
index d2790f1..c1850f5 100644
--- a/lib/pry-byebug/commands.rb
+++ b/lib/pry-byebug/commands.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/commands/backtrace"
 require "pry-byebug/commands/next"
 require "pry-byebug/commands/step"
diff --git a/lib/pry-byebug/commands/backtrace.rb b/lib/pry-byebug/commands/backtrace.rb
index 09cf0ff..1ad77d6 100644
--- a/lib/pry-byebug/commands/backtrace.rb
+++ b/lib/pry-byebug/commands/backtrace.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 
 module PryByebug
diff --git a/lib/pry-byebug/commands/breakpoint.rb b/lib/pry-byebug/commands/breakpoint.rb
index 2a16559..9a1ba30 100644
--- a/lib/pry-byebug/commands/breakpoint.rb
+++ b/lib/pry-byebug/commands/breakpoint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry/byebug/breakpoints"
 require "pry-byebug/helpers/breakpoints"
 require "pry-byebug/helpers/multiline"
diff --git a/lib/pry-byebug/commands/continue.rb b/lib/pry-byebug/commands/continue.rb
index 271a831..9de5f69 100644
--- a/lib/pry-byebug/commands/continue.rb
+++ b/lib/pry-byebug/commands/continue.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 require "pry-byebug/helpers/breakpoints"
 
diff --git a/lib/pry-byebug/commands/down.rb b/lib/pry-byebug/commands/down.rb
index a5c7866..84f7727 100644
--- a/lib/pry-byebug/commands/down.rb
+++ b/lib/pry-byebug/commands/down.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 
 module PryByebug
diff --git a/lib/pry-byebug/commands/exit_all.rb b/lib/pry-byebug/commands/exit_all.rb
index c6f7759..d040970 100644
--- a/lib/pry-byebug/commands/exit_all.rb
+++ b/lib/pry-byebug/commands/exit_all.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PryByebug
   #
   # Exit pry REPL with Byebug.stop
diff --git a/lib/pry-byebug/commands/finish.rb b/lib/pry-byebug/commands/finish.rb
index 02efc2a..3c6ac7a 100644
--- a/lib/pry-byebug/commands/finish.rb
+++ b/lib/pry-byebug/commands/finish.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 
 module PryByebug
diff --git a/lib/pry-byebug/commands/frame.rb b/lib/pry-byebug/commands/frame.rb
index 23bf1e7..c96f1e4 100644
--- a/lib/pry-byebug/commands/frame.rb
+++ b/lib/pry-byebug/commands/frame.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 
 module PryByebug
diff --git a/lib/pry-byebug/commands/next.rb b/lib/pry-byebug/commands/next.rb
index 1945829..89cbbd4 100644
--- a/lib/pry-byebug/commands/next.rb
+++ b/lib/pry-byebug/commands/next.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 require "pry-byebug/helpers/multiline"
 
diff --git a/lib/pry-byebug/commands/step.rb b/lib/pry-byebug/commands/step.rb
index fcd8764..5073917 100644
--- a/lib/pry-byebug/commands/step.rb
+++ b/lib/pry-byebug/commands/step.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 
 module PryByebug
diff --git a/lib/pry-byebug/commands/up.rb b/lib/pry-byebug/commands/up.rb
index 619632a..ee92d4a 100644
--- a/lib/pry-byebug/commands/up.rb
+++ b/lib/pry-byebug/commands/up.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-byebug/helpers/navigation"
 
 module PryByebug
diff --git a/lib/pry-byebug/control_d_handler.rb b/lib/pry-byebug/control_d_handler.rb
index bb3611d..e1d179d 100644
--- a/lib/pry-byebug/control_d_handler.rb
+++ b/lib/pry-byebug/control_d_handler.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 original_handler = Pry.config.control_d_handler
 
 Pry.config.control_d_handler = proc do |eval_string, pry_instance|
diff --git a/lib/pry-byebug/helpers/breakpoints.rb b/lib/pry-byebug/helpers/breakpoints.rb
index 763061e..35fc38b 100644
--- a/lib/pry-byebug/helpers/breakpoints.rb
+++ b/lib/pry-byebug/helpers/breakpoints.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "byebug"
 
 module PryByebug
diff --git a/lib/pry-byebug/helpers/multiline.rb b/lib/pry-byebug/helpers/multiline.rb
index 9209588..4c1df33 100644
--- a/lib/pry-byebug/helpers/multiline.rb
+++ b/lib/pry-byebug/helpers/multiline.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PryByebug
   module Helpers
     #
diff --git a/lib/pry-byebug/helpers/navigation.rb b/lib/pry-byebug/helpers/navigation.rb
index d3b095b..e11b016 100644
--- a/lib/pry-byebug/helpers/navigation.rb
+++ b/lib/pry-byebug/helpers/navigation.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PryByebug
   module Helpers
     #
diff --git a/lib/pry-byebug/pry_ext.rb b/lib/pry-byebug/pry_ext.rb
index abfdd96..03c3400 100644
--- a/lib/pry-byebug/pry_ext.rb
+++ b/lib/pry-byebug/pry_ext.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "byebug/processors/pry_processor"
 
 class << Pry
diff --git a/lib/pry-byebug/pry_remote_ext.rb b/lib/pry-byebug/pry_remote_ext.rb
index c4a880d..82da98c 100644
--- a/lib/pry-byebug/pry_remote_ext.rb
+++ b/lib/pry-byebug/pry_remote_ext.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pry-remote"
 
 module PryRemote
@@ -38,5 +40,5 @@ def teardown_with_pry_byebug
 # 'next' on the last line of a program won't hit Byebug::PryProcessor#run,
 # which normally handles cleanup.
 at_exit do
-  PryByebug.current_remote_server.teardown if PryByebug.current_remote_server
+  PryByebug.current_remote_server&.teardown
 end
diff --git a/lib/pry-byebug/version.rb b/lib/pry-byebug/version.rb
index 09c7e64..0435c8d 100644
--- a/lib/pry-byebug/version.rb
+++ b/lib/pry-byebug/version.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 #
 # Main container module for Pry-Byebug functionality
 #
 module PryByebug
-  VERSION = "3.6.0".freeze
+  VERSION = "3.6.0"
 end
diff --git a/lib/pry/byebug/breakpoints.rb b/lib/pry/byebug/breakpoints.rb
index c3e67f9..271c13d 100644
--- a/lib/pry/byebug/breakpoints.rb
+++ b/lib/pry/byebug/breakpoints.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Pry
   module Byebug
     #
diff --git a/pry-byebug.gemspec b/pry-byebug.gemspec
index 60b2b33..81cab91 100644
--- a/pry-byebug.gemspec
+++ b/pry-byebug.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.dirname(__FILE__) + "/lib/pry-byebug/version"
 
 Gem::Specification.new do |gem|
@@ -17,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.executables = []
 
   # Dependencies
-  gem.required_ruby_version = ">= 2.2.0"
+  gem.required_ruby_version = ">= 2.3.0"
 
   gem.add_runtime_dependency "byebug", "~> 10.0"
   gem.add_runtime_dependency "pry", "~> 0.10"
diff --git a/test/base_test.rb b/test/base_test.rb
index 98d01c2..b6a2836 100644
--- a/test/base_test.rb
+++ b/test/base_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 #
diff --git a/test/breakpoints_test.rb b/test/breakpoints_test.rb
index 92c367a..f0b0ffb 100644
--- a/test/breakpoints_test.rb
+++ b/test/breakpoints_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 #
diff --git a/test/commands/breakpoints_test.rb b/test/commands/breakpoints_test.rb
index 1c7254f..b99d84d 100644
--- a/test/commands/breakpoints_test.rb
+++ b/test/commands/breakpoints_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 #
@@ -50,10 +52,10 @@ class SettingBreakpointsTestByLineNumber < BreakpointsTest
   def setup
     super
 
-    @input.add("break 6")
+    @input.add("break 8")
     redirect_pry_io(@input, @output) { load test_file("break1") }
-    @line = 6
-    @regexp = /  Breakpoint (?<id>\d+): #{test_file('break1')} @ 6 \(Enabled\)/
+    @line = 8
+    @regexp = /  Breakpoint (?<id>\d+): #{test_file('break1')} @ 8 \(Enabled\)/
   end
 
   include BreakpointSpecs
@@ -68,7 +70,7 @@ def setup
 
     @input.add("break Break1Example#a")
     redirect_pry_io(@input, @output) { load test_file("break1") }
-    @line = RUBY_VERSION >= "2.5.0" ? 6 : 5
+    @line = RUBY_VERSION >= "2.5.0" ? 8 : 7
     @regexp = /  Breakpoint (?<id>\d+): Break1Example#a \(Enabled\)/
   end
 
@@ -84,7 +86,7 @@ def setup
 
     @input.add("break Break1Example#c!")
     redirect_pry_io(@input, @output) { load test_file("break1") }
-    @line = RUBY_VERSION >= "2.5.0" ? 16 : 15
+    @line = RUBY_VERSION >= "2.5.0" ? 18 : 17
     @regexp = /  Breakpoint (?<id>\d+): Break1Example#c! \(Enabled\)/
   end
 
@@ -100,7 +102,7 @@ def setup
 
     @input.add("break #b")
     redirect_pry_io(@input, @output) { load test_file("break2") }
-    @line = 7
+    @line = 9
     @regexp = /  Breakpoint (?<id>\d+): Break2Example#b \(Enabled\)/
   end
 
@@ -152,7 +154,7 @@ class BreakInsideMultilineInput < BreakpointsTest
   def setup
     super
 
-    @input.add("2.times do |i|", "break 16 if i > 0", "end")
+    @input.add("2.times do |i|", "break 18 if i > 0", "end")
 
     redirect_pry_io(@input, @output) { load test_file("break1") }
   end
@@ -162,6 +164,6 @@ def test_it_is_ignored
   end
 
   def test_lets_input_be_properly_evaluated
-    assert_match(/=> 16/, @output.string)
+    assert_match(/=> 18/, @output.string)
   end
 end
diff --git a/test/commands/frames_test.rb b/test/commands/frames_test.rb
index b6ffa3c..63903a8 100644
--- a/test/commands/frames_test.rb
+++ b/test/commands/frames_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 require "stringio"
 
@@ -17,7 +19,7 @@ class FramesTest < MiniTest::Spec
     end
 
     it "shows current line" do
-      output.string.must_match(/=> \s*6: \s*method_b/)
+      output.string.must_match(/=> \s*8: \s*method_b/)
     end
   end
 
@@ -29,7 +31,7 @@ class FramesTest < MiniTest::Spec
     end
 
     it "shows current line" do
-      output.string.must_match(/=> \s*11: \s*end/)
+      output.string.must_match(/=> \s*13: \s*end/)
     end
   end
 
@@ -42,7 +44,7 @@ class FramesTest < MiniTest::Spec
       let(:input) { InputTester.new("frame 1", "frame 0") }
 
       it "shows current line" do
-        output.string.must_match(/=> \s*6: \s*method_b/)
+        output.string.must_match(/=> \s*8: \s*method_b/)
       end
     end
 
@@ -50,7 +52,7 @@ class FramesTest < MiniTest::Spec
       let(:input) { InputTester.new("frame 0") }
 
       it "shows current line" do
-        output.string.must_match(/=> \s*11: \s*end/)
+        output.string.must_match(/=> \s*13: \s*end/)
       end
     end
   end
diff --git a/test/commands/stepping_test.rb b/test/commands/stepping_test.rb
index 7ed98a7..1508d15 100644
--- a/test/commands/stepping_test.rb
+++ b/test/commands/stepping_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 #
@@ -30,7 +32,7 @@ def setup
   end
 
   def test_stops_at_the_next_statement
-    assert_match(/\=> \s*7:/, @output.string)
+    assert_match(/\=> \s*9:/, @output.string)
   end
 end
 
@@ -46,7 +48,7 @@ def setup
   end
 
   def test_stops_a_correct_number_of_steps_after
-    assert_match(/\=> \s*12:/, @output.string)
+    assert_match(/\=> \s*14:/, @output.string)
   end
 end
 
@@ -62,7 +64,7 @@ def setup
   end
 
   def test_stops_at_the_next_line_in_the_current_frame
-    assert_match(/\=> \s*24:/, @output.string)
+    assert_match(/\=> \s*26:/, @output.string)
   end
 end
 
@@ -78,7 +80,7 @@ def setup
   end
 
   def test_advances_the_correct_number_of_lines
-    assert_match(/\=> \s*25:/, @output.string)
+    assert_match(/\=> \s*27:/, @output.string)
   end
 end
 
@@ -102,8 +104,8 @@ def setup
   end
 
   def test_it_is_ignored
-    assert_match(/\=> \s*6:/, @output.string)
-    refute_match(/\=> \s*24:/, @output.string)
+    assert_match(/\=> \s*8:/, @output.string)
+    refute_match(/\=> \s*26:/, @output.string)
   end
 
   def test_lets_input_be_properly_evaluated
@@ -118,12 +120,12 @@ class FinishCommand < SteppingTest
   def setup
     super
 
-    @input.add("break 19", "continue", "finish")
+    @input.add("break 21", "continue", "finish")
     redirect_pry_io(@input, @output) { load test_file("stepping") }
   end
 
   def test_advances_until_the_end_of_the_current_frame
-    assert_match(/\=> \s*15:/, @output.string)
+    assert_match(/\=> \s*17:/, @output.string)
   end
 end
 
@@ -134,12 +136,12 @@ class ContinueCommandWithoutArguments < SteppingTest
   def setup
     super
 
-    @input.add("break 14", "continue")
+    @input.add("break 16", "continue")
     redirect_pry_io(@input, @output) { load test_file("stepping") }
   end
 
   def test_advances_until_the_next_breakpoint
-    assert_match(/\=> \s*14:/, @output.string)
+    assert_match(/\=> \s*16:/, @output.string)
   end
 end
 
@@ -150,11 +152,11 @@ class ContinueCommandWithALineArgument < SteppingTest
   def setup
     super
 
-    @input.add("continue 14")
+    @input.add("continue 16")
     redirect_pry_io(@input, @output) { load test_file("stepping") }
   end
 
   def test_advances_until_the_specified_line
-    assert_match(/\=> \s*14:/, @output.string)
+    assert_match(/\=> \s*16:/, @output.string)
   end
 end
diff --git a/test/examples/break1.rb b/test/examples/break1.rb
index 097e00b..0aca1ac 100644
--- a/test/examples/break1.rb
+++ b/test/examples/break1.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # A toy example for testing break commands.
 #
diff --git a/test/examples/break2.rb b/test/examples/break2.rb
index 0da353e..b8e579a 100644
--- a/test/examples/break2.rb
+++ b/test/examples/break2.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Another toy example for testing break commands.
 #
diff --git a/test/examples/deep_stepping.rb b/test/examples/deep_stepping.rb
index 39ea777..ea1bbea 100644
--- a/test/examples/deep_stepping.rb
+++ b/test/examples/deep_stepping.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 #
 # Toy program for testing binding.pry initialization
 #
 
-new_str = "string".gsub!(/str/) do |_|
+new_str = "string".gsub(/str/) do |_|
   binding.pry
 end
 
diff --git a/test/examples/echo_thread.rb b/test/examples/echo_thread.rb
index 827c9eb..fc485c8 100644
--- a/test/examples/echo_thread.rb
+++ b/test/examples/echo_thread.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "socket"
 
 client, server = Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
diff --git a/test/examples/frames.rb b/test/examples/frames.rb
index a540a89..a5c986e 100644
--- a/test/examples/frames.rb
+++ b/test/examples/frames.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Toy class for testing frame commands
 #
diff --git a/test/examples/multiple.rb b/test/examples/multiple.rb
index eb1b041..a43187b 100644
--- a/test/examples/multiple.rb
+++ b/test/examples/multiple.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 5.times do
   binding.pry
 end
diff --git a/test/examples/stepping.rb b/test/examples/stepping.rb
index 71047ce..788bc44 100644
--- a/test/examples/stepping.rb
+++ b/test/examples/stepping.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 binding.pry
 
 #
diff --git a/test/processor_test.rb b/test/processor_test.rb
index 7cb7466..be2fd2d 100644
--- a/test/processor_test.rb
+++ b/test/processor_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 #
@@ -19,7 +21,7 @@ class ProcessorTest < Minitest::Spec
       after { clean_remove_const(:SteppingExample) }
 
       it "stops execution at the first line after binding.pry" do
-        output.string.must_match(/\=>  6:/)
+        output.string.must_match(/\=>  8:/)
       end
     end
 
@@ -31,7 +33,7 @@ class ProcessorTest < Minitest::Spec
       end
 
       it "stops execution at the first line after binding.pry" do
-        output.string.must_match(/\=> 7:/)
+        output.string.must_match(/\=>  9:/)
       end
     end
   end
diff --git a/test/pry_ext_test.rb b/test/pry_ext_test.rb
index 8be25ae..81ec829 100644
--- a/test/pry_ext_test.rb
+++ b/test/pry_ext_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class PryExtTest < MiniTest::Spec
diff --git a/test/pry_remote_ext_test.rb b/test/pry_remote_ext_test.rb
index 25491b4..5bfe497 100644
--- a/test/pry_remote_ext_test.rb
+++ b/test/pry_remote_ext_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class PryRemoteExtTest < MiniTest::Spec
diff --git a/test/support/coverage.rb b/test/support/coverage.rb
index 68a2171..ce12aea 100644
--- a/test/support/coverage.rb
+++ b/test/support/coverage.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Starts code coverage tracking.
 #
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 552fbcf..cdb8617 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "support/coverage"
 
 require "minitest/autorun"
diff --git a/test/thread_lock_test.rb b/test/thread_lock_test.rb
index 711f8ea..b86ee46 100644
--- a/test/thread_lock_test.rb
+++ b/test/thread_lock_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 require "timeout"
 

From b9e0999821ba4e8e406572fba5120a191dceb7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Sat, 16 Feb 2019 10:35:16 +0100
Subject: [PATCH 3/3] Allow (and require) byebug 11

---
 Gemfile.lock       | 4 ++--
 pry-byebug.gemspec | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 230ab51..e3cf8ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     pry-byebug (3.6.0)
-      byebug (~> 10.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
 
 GEM
@@ -10,7 +10,7 @@ GEM
   specs:
     addressable (2.4.0)
     ast (2.4.0)
-    byebug (10.0.2)
+    byebug (11.0.0)
     chandler (0.7.0)
       netrc
       octokit (>= 2.2.0)
diff --git a/pry-byebug.gemspec b/pry-byebug.gemspec
index 81cab91..b656dc8 100644
--- a/pry-byebug.gemspec
+++ b/pry-byebug.gemspec
@@ -21,6 +21,6 @@ Gem::Specification.new do |gem|
   # Dependencies
   gem.required_ruby_version = ">= 2.3.0"
 
-  gem.add_runtime_dependency "byebug", "~> 10.0"
+  gem.add_runtime_dependency "byebug", "~> 11.0"
   gem.add_runtime_dependency "pry", "~> 0.10"
 end