deivid-rodriguez · deivid-rodriguez · Feb 19, 2019 · Feb 16, 2019 · Feb 16, 2019 · Feb 16, 2019
diff --git 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/.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
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,15 +2,15 @@ PATH
   remote: .
   specs:
     pry-byebug (3.6.0)
-      byebug (~> 10.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
 
 GEM
   remote: https://rubygems.org/
   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)
@@ -76,4 +76,4 @@ DEPENDENCIES
   simplecov (= 0.16.1)
 
 BUNDLED WITH
-   1.17.3
+   2.0.1
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Pry
   module Byebug
     #

diff --git 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,8 +19,8 @@ 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 "byebug", "~> 11.0"
   gem.add_runtime_dependency "pry", "~> 0.10"
 end
diff --git 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
@@ -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
@@ -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
@@ -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,15 +44,15 @@ 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
 
     describe "jump to current frame" do
       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