lldbrun 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bab398d5fe28131405572ed92aa8a4425185a27e4009b7a65a479d7b96f7f92
-  data.tar.gz: 2c321eea4051b3c8eb6f47385dd2db9699a73f3aab48511e208ddca188232fba
+  metadata.gz: 51bc8f7923be8eb61169fe83a3c19936863cdaed70b9d66655944338e565b87f
+  data.tar.gz: 3154dd190e1b5309f8031b1914e80434e6094aff49a72215d18b5a8a61ddef90
 SHA512:
-  metadata.gz: c85794d9270602bde05e49ab6532674277e3186c6e6e11ff23ccbc9cb4579372e107c7c4993e9d0985bc299e362864d4cd291ea3780025ad4010e5e650bf5881
-  data.tar.gz: 3ad747e56ab0f0021523f4b5127e0c0f553ebf6589a21a170c30468390eade8b9fd3511f3a88a09ecd31dfdb7af49605b5e3f192f2dc0a183acecb7716864ce6
+  metadata.gz: 892eff775bc6cd59237c7b750c3ac74a3424326e6dfec706d3c2544b19aa5c6f23ca89be80a7d77a27c6d5e1a73d73e8f8c56cd3f8a4d682267869c5a18e3d48
+  data.tar.gz: 822ab9b19204104817f3b3a87be8e131dcbf77cc76d00ebca003357a3ffb2ec878451c3b77a262b70645d85f823bffa9b46a71d8743b3c4d7cf1763b8406427d

data/lib/lldbrun/ParserARGV.rb

@@ -2,14 +2,17 @@ require 'byebug'
 module Lldbrun
   class ParserARGV
 
-    DEFAULT_LLDB      = ''
-    DEFAULT_START_DIR = `pwd`.strip
+    COUNT_LLDB_VERSIONS  = 99
+    DEFAULT_LLDB         = 'lldb'
+    DEFAULT_LLDB_OPTIONS = ''
+    DEFAULT_START_DIR    = `pwd`.strip
     
-    PARAMETER_FILE_PATH = '-f'
-    PARAMETER_SCAN_DIR  = '-s'
-    PARAMETER_HELP      = '-h'
-    PARAMETER_RUN       = '-r'
-    PARAMETER_LLDB      = '-l'
+    PARAMETER_FILE_PATH    = '-f'
+    PARAMETER_SCAN_DIR     = '-s'
+    PARAMETER_HELP         = '-h'
+    PARAMETER_RUN          = '-r'
+    PARAMETER_LLDB         = '-e'
+    PARAMETER_LLDB_OPTIONS = '-l'
 
     attr_reader :argv, :params
     
@@ -25,18 +28,22 @@ module Lldbrun
       params[PARAMETER_FILE_PATH] or DEFAULT_START_DIR
     end
 
-    def param_lldb
-      params[PARAMETER_LLDB] or DEFAULT_LLDB
-    end
-
     def param_scan_dir
       params[PARAMETER_SCAN_DIR] or DEFAULT_START_DIR
     end
 
+    def param_lldb_options
+      params[PARAMETER_LLDB_OPTIONS] or DEFAULT_LLDB_OPTIONS
+    end
+
     def param_auto_run?
       params[PARAMETER_RUN] ? params[PARAMETER_RUN] == 'true' : true
     end
 
+    def param_lldb
+      params[PARAMETER_LLDB] or search_lldb
+    end
+
     private
 
     def check_info
@@ -72,5 +79,36 @@ module Lldbrun
       p 'LLDBRUN:  BAD PARAMETERS'
       info
     end
+
+    def search_lldb
+      versions = {}
+      COUNT_LLDB_VERSIONS.times do |number|
+        version = number < 10 ? '' : "-#{number.to_s.split('').join('.')}"
+        versions[number] = "lldb#{version}" if which?("lldb#{version}")
+      end
+      set_lldb_version(versions)
+    end
+
+    def set_lldb_version(versions)
+      number_version, lldb_command = versions.sort.last
+      lldb_not_found unless number_version
+      warning_lldb_version(lldb_command) if number_version < 40
+      params[PARAMETER_LLDB] = lldb_command
+    end
+
+    def warning_lldb_version(lldb_command)
+      p "---------------------------------------------------------------------------------------------------------------------------"
+      p "WARNING!!! PROBABLY YOUR CURRENT VERSION #{lldb_command} MAYBE < lldb-4.0. THIS MAY BE PROBLEM. PLEASE INSTALL lldb-4.0 end above"
+      p "---------------------------------------------------------------------------------------------------------------------------"
+    end
+
+    def lldb_not_found
+      p "LLDB NOT FOUND!!! PLEASE INSTALL LLDB"
+      exit 1
+    end
+
+    def which?(command)
+      system("which #{command} >/dev/null")
+    end
   end
 end

data/lib/lldbrun/ParserPoint.rb

@@ -21,7 +21,7 @@ module Lldbrun
     private
 
     def lldb_run_command
-      "lldb #{argv_parser.param_file_path}"
+      "#{argv_parser.param_lldb} #{argv_parser.param_file_path}"
     end
 
     def generate_start_command
@@ -45,7 +45,7 @@ module Lldbrun
     end
 
     def lldb_standard_params
-      ' ' << argv_parser.param_lldb
+      ' ' << argv_parser.param_lldb_options
     end
 
     def lldb_run

data/lib/lldbrun/version.rb

@@ -1,3 +1,3 @@
 module Lldbrun
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lldbrun
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Oleh Hudeichuk