byebug 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d46be2dda181855988404a2aff8d7bc0c01873
-  data.tar.gz: 51485fdf716aec89695f1b6bff72dfab4d326ebd
+  metadata.gz: 52c0fcdcfc3ae1fc8b58305e8a97b7e43c42718a
+  data.tar.gz: af47dacc0c4077a5ad12cf93df94d79a741f5230
 SHA512:
-  metadata.gz: e59c28c8f7ded85eaca1a7ef0af86c3226ac2db743c30f8b14326efa4584c9b4f5708c5b6019dff559e69a9b51d139504cf2b4bdaecbb0f93f69446bd33a32cd
-  data.tar.gz: ae2afdb68a86af438860f730477ee2af4a5ecb7b65c07171f27cc40028ecfcc664d526f9bcf964148b4bb38b864daee5ff369cf480612a949f6c4817c37a599f
+  metadata.gz: a61071fab34b13caceaea5e0b6883748c169c50d5c25a81bc16442a8f60cb34e055ff06e0f9b3200a619fd686615de4931c2c46bec0ab91f9ded756464cc59e9
+  data.tar.gz: 7e59c4643528ac5f7ff2817f0b69ea7b769fa38887f277cd05b9328103b894c5033fcf56026fd5077352ba3f665b782de6649a01d91c4e2c322ab3f679f0a2d5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.6.1
+
+* Windows compatibiliy: compilation and terminal width issues
+
+
 ## 1.6.0
 
 * `byebug` placed at the end of a block or method call now works as expected

data/ext/byebug/extconf.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION < "2.0"
 end
 
 if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
-  $CFLAGS = ' -std=c99 -Wall -Werror'
+  $CFLAGS = '-Wall -Werror'
   $CFLAGS += ' -g3' if ENV['debug']
 end
 

data/lib/byebug/command.rb

@@ -148,6 +148,22 @@ module Byebug
         settings_map[name] ||= {}
         settings_map[name][:setter] = block
       end
+
+      def command_exists?(command)
+        ENV['PATH'].split(File::PATH_SEPARATOR).any? {
+          |d| File.exists? File.join(d, command) }
+      end
+
+      def terminal_width
+        if ENV['COLUMNS'] =~ /^\d+$/
+          ENV['COLUMNS'].to_i
+        elsif STDIN.tty? && command_exists?('stty')
+          `stty size`.scan(/\d+/)[1].to_i
+        else
+          nil
+        end
+      end
+
     end
 
     # Register default settings
@@ -159,7 +175,7 @@ module Byebug
     register_setting_var(:listsize, 10)
     register_setting_var(:stack_trace_on_error, false)
     register_setting_var(:tracing_plus, false)
-    cols = `stty size`.scan(/\d+/)[1].to_i
+    cols = terminal_width || 80
     register_setting_var(:width, cols > 10 ? cols : 80)
     Byebug::ARGV = ARGV.clone unless defined? Byebug::ARGV
     register_setting_var(:argv, Byebug::ARGV)

data/lib/byebug/processor.rb

@@ -205,30 +205,33 @@ module Byebug
       end
 
       ##
-      # Handle byebug commands.
+      # Splits a command line of the form "cmd1 ; cmd2 ; ... ; cmdN" into an
+      # array of commands: [cmd1, cmd2, ..., cmdN]
       #
-      def process_commands(context, file, line)
-        state, commands = always_run(context, file, line, 1)
-        $state = Command.settings[:testing] ? state : nil
-
-        splitter = lambda do |str|
-          str.split(/;/).inject([]) do |m, v|
-            if m.empty?
-              m << v
+      def split_commands(cmd_line)
+        cmd_line.split(/;/).inject([]) do |m, v|
+          if m.empty?
+            m << v
+          else
+            if m.last[-1] == ?\\
+              m.last[-1,1] = ''
+              m.last << ';' << v
             else
-              if m.last[-1] == ?\\
-                m.last[-1,1] = ''
-                m.last << ';' << v
-              else
-                m << v
-              end
+              m << v
             end
-            m
           end
+          m
         end
+      end
 
-        preloop(commands, context)
+      ##
+      # Handle byebug commands.
+      #
+      def process_commands(context, file, line)
+        state, commands = always_run(context, file, line, 1)
+        $state = Command.settings[:testing] ? state : nil
 
+        preloop(commands, context)
         if Command.settings[:autolist] == 0
           CommandProcessor.print_location_and_text(file, line)
         end
@@ -245,14 +248,14 @@ module Byebug
             else
               @last_cmd = input
             end
-            splitter[input].each do |cmd|
+            split_commands(input).each do |cmd|
               one_cmd(commands, context, cmd)
               postcmd(commands, context, cmd)
             end
           end
         end
         postloop(commands, context)
-      end # process_commands
+      end
 
       ##
       # Executes a single byebug command

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - David Rodríguez