RubyGems - vimamsa - Versions diffs - 0.1.9 → 0.1.10 - Mend

vimamsa 0.1.9 → 0.1.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml +4 -4
data/README.md +9 -4
data/custom_example.rb +1 -1
data/lib/vimamsa/ack.rb +3 -40
data/lib/vimamsa/buffer.rb +16 -12
data/lib/vimamsa/buffer_list.rb +31 -37
data/lib/vimamsa/debug.rb +8 -8
data/lib/vimamsa/editor.rb +24 -19
data/lib/vimamsa/encrypt.rb +2 -2
data/lib/vimamsa/file_manager.rb +9 -7
data/lib/vimamsa/gui.rb +6 -2
data/lib/vimamsa/gui_sourceview.rb +3 -2
data/lib/vimamsa/hyper_plain_text.rb +2 -2
data/lib/vimamsa/key_binding_tree.rb +6 -6
data/lib/vimamsa/main.rb +3 -3
data/lib/vimamsa/search.rb +1 -1
data/lib/vimamsa/search_replace.rb +14 -14
data/lib/vimamsa/text_transforms.rb +1 -1
data/lib/vimamsa/version.rb +1 -1
data/vimamsa.gemspec +2 -2
metadata +7 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca98d0950bc33d6c918e17c2092489ac69d5e5b722d781fe0f83736ccdfabb82
-  data.tar.gz: f4347a60b616dc3ea2575e3fe53c59397bf90d84f44fed7c28f0d792e5fc900d
+  metadata.gz: bfc14cb231bc93909b4866e08cbd4503b4f4444527c0b65b4a9edb11d863faa0
+  data.tar.gz: 7b63cdbff33cdcdbf7d6f5d025d8ec13a6f39a3ee937f716ec990bba743f3239
 SHA512:
-  metadata.gz: f3254d05d66c7dd92f79d9393986da65f9401e3b48627c620c7c9bf0cfec20c039b640a72cd70100f01757637a8af17a645228e3f0f789a0f09c6fc6ecf710ea
-  data.tar.gz: 2391bb4e5a93ae86f180a7138799323dbe01bf8ac94385d8f523f109025a13511ea3ba10a31b9b9cedd02ee495822d2b162dda6bab2b8f8b0a2c61f068f6b42c
+  metadata.gz: 2176d7aaa01be873deb8687cf2b8d75044edba4ccfc3685cf334cae973c93e15ba6dc47d9667a9848209329b043f2ba8daf049f4340ddb130538584e17b5a5de
+  data.tar.gz: afcdd6c30018dc971fc165d8ed6f63f5b2ccf109a167d0ec39cf03c150ac03d7765c4c0d83e3a6ceabaae74cf44f759144dbe5e2d9aee1b191182ca7fb622035

data/README.md CHANGED Viewed

@@ -26,11 +26,16 @@ Packages for optional features:
 sudo apt install ack-grep clang-format
 ```
-For customization, edit dot_vimamsarc.rb and copy to ~/.vimamsarc
+For customization, edit ~/.vimamsa/custom.rb
+## Screenshots
+<a href="https://samiddhi.net/vimamsa/screenshot1.png" target="_blank"><img src="https://samiddhi.net/vimamsa/screenshot1.png" width="400"/></a>
+<a href="https://samiddhi.net/vimamsa/screenshot2.png" target="_blank"><img src="https://samiddhi.net/vimamsa/screenshot2.png" width="400"/></a>
 ## Key bindings
-Key bindings are very much like in VIm. For details, see file lib/vimamsa/key_bindings.rb and lib/vimamsa/default_bindings.rb
+Key bindings are very much like in VIm. For details, see file lib/vimamsa/key_bindings.rb and lib/vimamsa/key_bindings_vimlike.rb
 Keys that work somewhat similarly as in Vim:
@@ -72,7 +77,7 @@ ctrl-x means press and hold ctrl key, press x
 </td></tr>
 <tr> <td style="text-align:center;">,b</td> <td style="text-align:left;"> Switch buffer (jump to other open file)</td></tr>
 <tr> <td style="text-align:center;">,g</td> <td style="text-align:left;">search for input string inside current buffer</td></tr>
-<tr> <td style="text-align:center;">,f</td> <td style="text-align:left;">Fuzzy filename search</td></tr>
+<tr> <td style="text-align:center;">,f</td> <td style="text-align:left;">File finder</td></tr>
 <tr> <td style="text-align:center;">space c</td> <td style="text-align:left;">insert character "c"</td></tr>
 </tbody>
 </table>
@@ -116,7 +121,7 @@ ctrl-x means press and hold ctrl key, press x
 </tbody>
 </table>
-Bindings can be customized in ~/.vimamsarc
+Bindings can be customized in ~/.vimamsa/custom.rb
 For example, to bind ctrl-n to action "create new file":
 ```
 bindkey 'C ctrl-n',  'create_new_file()'

data/custom_example.rb CHANGED Viewed

@@ -13,7 +13,7 @@
 # setcnf :tab_width, 4
 # Open this file every time the program starts
-# setcnf :startup_file, "~/Documents/main.txt"
+# setcnf :startup_file, "~/Documents/startup.txt"
 def insert_date()
   # $buffer.insert_txt("#{DateTime.now().strftime("==========\n%Y-%m-%d")}\n")

data/lib/vimamsa/ack.rb CHANGED Viewed

@@ -4,12 +4,8 @@ class FileContentSearch
   def self.start_gui()
     search_paths = vma.get_content_search_paths.join("<br/>")
-    nfo = "<html><h2>Search contents of text files</h2>
-  <div style='width:300px'>
-  <p>Hint: add empty file named .vma_project to dirs you want to search.</p>\n<p>If .vma_project exists in parent dir of current file, searches within that dir</p></div></html>"
-    nfo = "<span size='x-large'>Search contents of all files using ack</span>
-Will search the following directories:
+  nfo = "<span size='x-large'>Search contents of text files</span>
+Will search all .txt files in the following directories:
 #{search_paths}
 <span>Hint: add empty file named .vma_project to directories you want to search in.
@@ -25,6 +21,7 @@ Will search the following directories:
     fext = Set[".txt"]
     dlist = []
     for d in vma.get_content_search_paths
+      # Search for files with extension .txt and size < 200k
       dlist = dlist + Dir.glob("#{d}/**/*").select { |e| File.file?(e) and fext.include?(File.extname(e)) and File.size(e) < 200e3 }
     end
     bufstr = "Results:\n\n"
@@ -33,8 +30,6 @@ Will search the following directories:
       ind = scan_indexes(txt, /#{instr}/i)
       if !ind.empty?
         for x in ind
-        # Ripl.start :binding => binding
           starti = x - 30
           endi = x + 30
           starti = 0 if starti < 0
@@ -68,38 +63,6 @@ Will search the following directories:
   gui_one_input_action(nfo, "Search:", "search", callback)
 end
-def ack_buffer(instr, b = nil)
-  instr = Shellwords.escape(instr)
-  bufstr = ""
-  for path in vma.get_content_search_paths
-    bufstr += run_cmd("ack -Q --type-add=gd=.gd -k --nohtml --nojs --nojson '#{instr}' #{path}")
-  end
-  if bufstr.size > 5
-    create_new_file(nil, bufstr)
-  else
-    message("No results for input:#{instr}")
-  end
-end
-def gui_ack()
-  search_paths = vma.get_content_search_paths.join("<br/>")
-  nfo = "<html><h2>Search contents of all files using ack</h2>
-  <div style='width:300px'>
-  <p>Hint: add empty file named .vma_project to dirs you want to search.</p>\n<p>If .vma_project exists in parent dir of current file, searches within that dir</p></div></html>"
-  nfo = "<span size='x-large'>Search contents of all files using ack</span>
-Will search the following directories:
-#{search_paths}
-<span>Hint: add empty file named .vma_project to directories you want to search in.
- If .vma_project exists in parent directory of current file, searches within that directory.
-  </span>"
-  callback = proc { |x| ack_buffer(x) }
-  gui_one_input_action(nfo, "Search:", "search", callback)
-end
 def ack_buffer(instr, b = nil)
   instr = Shellwords.escape(instr)
   bufstr = ""

data/lib/vimamsa/buffer.rb CHANGED Viewed

@@ -320,6 +320,7 @@ class Buffer < String
     @dirname = File.dirname(@fname)
     userhome = File.expand_path("~")
     @subtitle = @dirname.gsub(/^#{userhome}/, "~")
+    vma.buffers.last_dir = @dirname
     detect_file_language
   end
@@ -574,8 +575,7 @@ class Buffer < String
   def comment_linerange(r)
     com_str = get_com_str()
-    #lines = $buffer[r].split(/(\n)/).each_slice(2).map { |x| x[0] }
-    lines = $buffer[r].lines
+    lines = self[r].lines
     mod = ""
     lines.each { |line|
       m = line.match(/^(\s*)(\S.*)/)
@@ -637,14 +637,14 @@ class Buffer < String
       elsif op == :uncomment
         uncomment_linerange(first..last)
       end
-      $buffer.end_visual_mode
+      self.end_visual_mode
     end
   end
   def uncomment_linerange(r)
     com_str = get_com_str()
-    #r=$buffer.line_range($buffer.lpos, 2)
-    lines = $buffer[r].split(/(\n)/).each_slice(2).map { |x| x[0] }
+    #r=self.line_range(self.lpos, 2)
+    lines = self[r].split(/(\n)/).each_slice(2).map { |x| x[0] }
     mod = lines.collect { |x| x.sub(/^(\s*)(#{com_str}\s?)/, '\1') + "\n" }.join()
     replace_range(r, mod)
   end
@@ -1356,7 +1356,7 @@ class Buffer < String
     d2 = [@pos, INSERT, 1, char]
     add_delta(d1, true)
     add_delta(d2, true)
-    debug "DELTAS:#{$buffer.deltas.inspect} "
+    debug "DELTAS:#{self.deltas.inspect} "
   end
   def insert_txt_at(c, pos)
@@ -1449,7 +1449,6 @@ class Buffer < String
     for d in deltas
       add_delta(d, true, true)
     end
-    # $buffer.update_content(IO.read('test.txt'))
   end
   def need_redraw!
@@ -1685,7 +1684,7 @@ class Buffer < String
     # If current file has fname, save to that fname
     # Else search for previously open files and save to the directory of
     # the last viewed file that has a filename
-    # $buffers[$buffer_history.reverse[1]].fname
+    # selffers[$buffer_history.reverse[1]].fname
     if @fname
       savepath = File.dirname(@fname)
@@ -1747,7 +1746,7 @@ class Buffer < String
   def indent()
     file = Tempfile.new("out")
     infile = Tempfile.new("in")
-    file.write($buffer.to_s)
+    file.write(self.to_s)
     file.flush
     bufc = "FOO"
@@ -1773,12 +1772,17 @@ class Buffer < String
     else
       return
     end
-    $buffer.update_content(bufc)
+    self.update_content(bufc)
     center_on_current_line #TODO: needed?
     file.close; file.unlink
     infile.close; infile.unlink
   end
+  def close()
+    idx = vma.buffers.get_buffer_by_id(@id)
+    vma.buffers.close_buffer(idx)
+  end
   def backup()
     fname = @fname
     return if !@fname
@@ -1799,7 +1803,7 @@ end
 #TODO
 def write_to_file(savepath, s)
   if is_path_writable(savepath)
-    IO.write(savepath, $buffer.to_s)
+    IO.write(savepath, self.to_s)
   else
     message("PATH NOT WRITABLE: #{savepath}")
   end
@@ -1814,7 +1818,7 @@ def is_path_writable(fpath)
 end
 def backup_all_buffers()
-  for buf in $buffers
+  for buf in selffers
     buf.backup
   end
   message("Backup all buffers")

data/lib/vimamsa/buffer_list.rb CHANGED Viewed

@@ -1,9 +1,8 @@
 def save_buffer_list()
   message("Save buffer list")
   buffn = get_dot_path("buffers.txt")
   f = File.open(buffn, "w")
-  bufstr = $buffers.collect { |buf| buf.fname }.inspect
+  bufstr = vma.buffers.collect { |buf| buf.fname }.inspect
   f.write(bufstr)
   f.close()
 end
@@ -21,18 +20,23 @@ def load_buffer_list()
 end
 class BufferList < Array
-  attr_reader :current_buf
+  attr_reader :current_buf, :last_dir
+  def initialize()
+    @last_dir = File.expand_path(".")
+    super
+  end
+  # lastdir = File.expand_path(".") if lastdir.nil?
   def <<(_buf)
     super
-    $buffer = _buf
+    vma.buf = _buf
     @current_buf = self.size - 1
     $buffer_history << @current_buf
     @recent_ind = 0
-    $hook.call(:change_buffer, $buffer)
-    gui_set_current_buffer($buffer.id)
-    gui_set_cursor_pos($buffer.id, $buffer.pos)
+    $hook.call(:change_buffer, vma.buf)
+    gui_set_current_buffer(vma.buf.id)
+    gui_set_cursor_pos(vma.buf.id, vma.buf.pos)
   end
   def switch()
@@ -58,12 +62,11 @@ class BufferList < Array
     buf_idx = self.index { |b| b.fname == fname }
     return buf_idx
   end
-   def get_buffer_by_id(id)
+  def get_buffer_by_id(id)
     buf_idx = self.index { |b| b.id == id }
     return buf_idx
   end
   def add_current_buf_to_history()
     @recent_ind = 0
@@ -74,11 +77,11 @@ class BufferList < Array
   def set_current_buffer(buffer_i, update_history = true)
     buffer_i = self.size -1 if buffer_i > self.size
     buffer_i = 0 if buffer_i < 0
-    $buffer = self[buffer_i]
-    return if !$buffer
+    vma.buf = self[buffer_i]
+    return if !vma.buf
     @current_buf = buffer_i
     debug "SWITCH BUF2. bufsize:#{self.size}, curbuf: #{@current_buf}"
-    fpath = $buffer.fname
+    fpath = vma.buf.fname
     if fpath and fpath.size > 50
       fpath = fpath[-50..-1]
     end
@@ -87,31 +90,25 @@ class BufferList < Array
       add_current_buf_to_history
     end
-    $hook.call(:change_buffer, $buffer)
-    $buffer.set_active
+    $hook.call(:change_buffer, vma.buf)
+    vma.buf.set_active
-    gui_set_current_buffer($buffer.id)
-    gui_set_window_title($buffer.title,$buffer.subtitle)
+    gui_set_current_buffer(vma.buf.id)
+    gui_set_window_title(vma.buf.title, vma.buf.subtitle)
+    if vma.buf.fname
+      @last_dir = File.dirname(vma.buf.fname)
+    end
     # hpt_scan_images() if $debug # experimental
   end
+  def last_dir=(d)
+    @last_dir = d
+  end
   def get_last_dir
-    lastdir = nil
-    if $buffer.fname
-      lastdir = File.dirname($buffer.fname)
-    else
-      for bufid in $buffer_history.reverse[1..-1]
-        bf = $buffers[bufid]
-        debug "FNAME:#{bf.fname}"
-        if bf.fname
-          lastdir = File.dirname(bf.fname)
-          break
-        end
-      end
-    end
-    lastdir = File.expand_path(".") if lastdir.nil?
-    return lastdir
+    return @last_dir
   end
   def get_recent_buffers()
@@ -145,26 +142,23 @@ class BufferList < Array
     $buffer_history = bh.reverse
   end
   # Close buffer in the background
   # TODO: if open in another widget
   def close_other_buffer(buffer_i)
     return if self.size <= buffer_i
     return if @current_buf == buffer_i
     bufname = self[buffer_i].basename
     message("Closed buffer #{bufname}")
     self.slice!(buffer_i)
     $buffer_history = $buffer_history.collect { |x| r = x; r = x - 1 if x > buffer_i; r = nil if x == buffer_i; r }.compact
   end
   def close_buffer(buffer_i, from_recent = false)
     return if buffer_i.nil?
     return if self.size <= buffer_i
     bufname = self[buffer_i].basename
     message("Closed buffer #{bufname}")
     recent = get_recent_buffers

data/lib/vimamsa/debug.rb CHANGED Viewed

@@ -81,19 +81,19 @@ end
 def run_test(test_id)
   target_results = read_file("", "tests/test_#{test_id}_output.txt")
-  old_buffer = $buffer
-  $buffer = Buffer.new("", "")
+  old_buffer = vma.buf
+  vma.buf = Buffer.new("", "")
   load "tests/test_#{test_id}.rb"
-  test_ok = $buffer.to_s.strip == target_results.strip
+  test_ok = vma.buf.to_s.strip == target_results.strip
   puts "##################"
   puts target_results
   puts "##################"
-  puts $buffer.to_s
+  puts vma.buf.to_s
   puts "##################"
   puts "TEST OK" if test_ok
   puts "TEST FAILED" if !test_ok
   puts "##################"
-  $buffer = old_buffer
+  vma.buf = old_buffer
 end
 #TODO: remove?
@@ -121,7 +121,7 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
     # puts buf.current_line()
     # puts "======================"
-    render_buffer($buffer)
+    render_buffer(vma.buf)
     gui_sleep(rand() / 2)
     if rand() < (1 / 40.0)
@@ -130,9 +130,9 @@ def run_random_jump_test__tmpl(test_time = 60 * 60 * 10)
     gui_trigger_event
     buf.insert_txt("X") if rand() > 0.25
-    render_buffer($buffer)
+    render_buffer(vma.buf)
-    $buffers.set_current_buffer(rand($buffers.size)) if rand > 0.25
+    vma.buffers.set_current_buffer(rand(vma.buffers.size)) if rand > 0.25
     step += 1
   end
 end

data/lib/vimamsa/editor.rb CHANGED Viewed

@@ -165,11 +165,11 @@ class Editor
     else
       buffer = Buffer.new(" \n")
     end
-    $buffers << buffer
+    vma.buffers << buffer
     # load_theme($cnf[:theme])
-    # render_buffer($buffer, 1) #TODO
+    # render_buffer(vma.buf, 1) #TODO
     # gui_select_buffer_init #TODO
     # gui_file_finder_init #TODO
@@ -197,6 +197,10 @@ class Editor
   def buf()
     return $buffer
   end
+  def buf=(aa)
+    $buffer=aa
+  end
   def buffers()
     return $buffers
@@ -256,7 +260,7 @@ class Editor
   # Register converter
   def reg_conv(converter, converter_id)
     @converters[converter_id] = converter
-    reg_act(converter_id, proc { $buffer.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
+    reg_act(converter_id, proc { vma.buf.convert_selected_text(converter_id) }, "Converter #{converter_id}", { :scope => [:selection] })
   end
   def apply_conv(converter_id, txt)
@@ -268,7 +272,7 @@ class Editor
     r = @file_content_search_paths.clone
     p = find_project_dir_of_cur_buffer()
     if p.nil?
-      p = buf.dirname # Search dir of current file by default
+      p = vma.buffers.last_dir
     end
     if p and !@file_content_search_paths.include?(p)
@@ -303,7 +307,7 @@ end
 def open_file_dialog()
   path = ""
-  path = $buffer.fname if $buffer.fname
+  path = vma.buf.fname if vma.buf.fname
   gui_open_file_dialog(File.dirname(path))
 end
@@ -339,8 +343,8 @@ end
 def set_cursor_pos(new_pos)
   buf.set_pos(new_pos)
-  #render_buffer($buffer)
-  debug "New pos: #{new_pos}lpos:#{$buffer.lpos} cpos:#{$buffer.cpos}"
+  #render_buffer(vma.buf)
+  debug "New pos: #{new_pos}lpos:#{vma.buf.lpos} cpos:#{vma.buf.cpos}"
 end
 def set_last_command(cmd)
@@ -361,7 +365,7 @@ end
 def repeat_last_find()
   return if !defined? $last_find_command
-  $buffer.jump_to_next_instance_of_char($last_find_command[:char],
+  vma.buf.jump_to_next_instance_of_char($last_find_command[:char],
                                         $last_find_command[:direction])
 end
@@ -397,10 +401,10 @@ end
 def diff_buffer()
   bufstr = ""
-  orig_path = $buffer.fname
+  orig_path = vma.buf.fname
   infile = Tempfile.new("out")
   infile = Tempfile.new("in")
-  infile.write($buffer.to_s)
+  infile.write(vma.buf.to_s)
   infile.flush
   cmd = "diff -w '#{orig_path}' #{infile.path}"
   # debug cmd
@@ -446,7 +450,7 @@ def minibuffer_new_char(c)
     $minibuffer.insert_txt(c)
     debug "MINIBUFFER: #{c}"
   end
-  #$buffer = $minibuffer
+  #vma.buf = $minibuffer
 end
 # def readchar_new_char(c)
@@ -499,7 +503,8 @@ def create_new_file(filename = nil, file_contents = "\n")
   debug "NEW FILE CREATED"
   buffer = Buffer.new(file_contents)
   # gui_set_current_buffer(buffer.id) #TODO: remove?
-  $buffers << buffer
+  vma.buffers << buffer
+  vma.kbd.set_mode_to_default
   return buffer
 end
@@ -517,7 +522,7 @@ end
 def load_buffer(fname)
   return if !File.exist?(fname)
-  existing_buffer = $buffers.get_buffer_by_filename(fname)
+  existing_buffer = vma.buffers.get_buffer_by_filename(fname)
   if existing_buffer != nil
     $buffer_history << existing_buffer
     return
@@ -529,8 +534,8 @@ def load_buffer(fname)
   debug("DONE LOAD: #{fname}")
   #buf = filter_buffer(buffer)
   #    debug("END FILTER: #{fname}")
-  $buffers << buffer
-  #$buffer_history << $buffers.size - 1
+  vma.buffers << buffer
+  #$buffer_history << vma.buffers.size - 1
 end
 def jump_to_file(filename, linenum = nil, charn = nil)
@@ -561,11 +566,11 @@ end
 def open_new_file(filename, file_contents = "")
   #TODO: expand path
   filename = File.expand_path(filename)
-  b = $buffers.get_buffer_by_filename(filename)
+  b = vma.buffers.get_buffer_by_filename(filename)
   # File is already opened to existing buffer
   if b != nil
     message "Switching to: #{filename}"
-    $buffers.set_current_buffer(b)
+    vma.buffers.set_current_buffer(b)
   else
     message "New file opened: #{filename}"
     fname = filename
@@ -680,8 +685,8 @@ end
 def find_project_dir_of_cur_buffer()
   # Find "project dir" of current file. If currently editing file in path "/foo/bar/baz/fn.txt" and file named "/foo/bar/.vma_project" exists, then dir /foo/bar is treated as project dir and subject to e.g. ack search.
   pdir = nil
-  if $buffer.fname
-    pdir = find_project_dir_of_fn($buffer.fname)
+  if vma.buf.fname
+    pdir = find_project_dir_of_fn(vma.buf.fname)
   end
   # debug "Proj dir of current file: #{pdir}"
   return pdir

data/lib/vimamsa/encrypt.rb CHANGED Viewed

@@ -33,7 +33,7 @@ class Encrypt
 end
 def decrypt_cur_buffer(password, b = nil)
-  $buffer.decrypt(password)
+  vma.buf.decrypt(password)
 end
 def encrypt_cur_buffer()
@@ -42,6 +42,6 @@ def encrypt_cur_buffer()
 end
 def encrypt_cur_buffer_callback(password,b=nil)
-  $buffer.set_encrypted(password)
+  vma.buf.set_encrypted(password)
 end

data/lib/vimamsa/file_manager.rb CHANGED Viewed

@@ -1,4 +1,3 @@
 class FileManager
   @@cur
@@ -28,14 +27,14 @@ class FileManager
     # bindkey "C o", :delete_state
-    $kbd.add_minor_mode("fexp", :file_exp, :command)
+    vma.kbd.add_minor_mode("fexp", :file_exp, :command)
     bindkey "fexp o m", :fexp_sort_mtime
     bindkey "fexp o f", :fexp_sort_fname
     # bindkey "fexp l", [:fexp_right, proc { debug "==fexp_right==" }, ""]
     bindkey "fexp h", :fexp_chdir_parent
-    bindkey "fexp esc", [:fexp_quit, proc { $kbd.set_mode(:command) }, ""]
+    bindkey "fexp esc", [:fexp_quit, proc { FileManager.cur.quit }, ""]
     bindkey "fexp enter", :fexp_select
     bindkey "fexp l", :fexp_select
@@ -66,6 +65,8 @@ class FileManager
   def dir_to_buf(dirpath, b = nil)
     # File.stat("testfile").mtime
+    vma.buffers.last_dir = dirpath
     dirpath = File.expand_path(dirpath)
     @header = []
     @header << "#{dirpath}"
@@ -92,9 +93,7 @@ class FileManager
       end
     end
-    # sort_by = :mtime
-    # sort_by = :name
-    # Ripl.start :binding => binding
     @cfiles.sort_by! { |x| x[1].mtime }.reverse! if @sort_by == :mtime
     @cfiles.sort_by! { |x| x[1].size }.reverse! if @sort_by == :size
     @cfiles.sort_by! { |x| x[0] } if @sort_by == :name
@@ -140,6 +139,9 @@ class FileManager
     else
       open_with_default_program(fn)
     end
-    # debug l.inspect
+  end
+  def quit
+    @buf.close
   end
 end

data/lib/vimamsa/gui.rb CHANGED Viewed

@@ -407,7 +407,7 @@ class VMAgui
     $sw2 = sw
     sw.set_size_request(-1, 12)
-    view = VSourceView.new()
+    view = VSourceView.new(nil, nil)
     view.set_highlight_current_line(false)
     view.set_show_line_numbers(false)
     # view.set_buffer(buf1)
@@ -515,7 +515,11 @@ class VMAgui
   def init_window
     @window = Gtk::Window.new(:toplevel)
-    @window.set_default_size(650, 850)
+    sh = @window.screen.height
+    sw = @window.screen.width
+    # TODO:Maximise vertically
+    @window.set_default_size((sw * 0.45).to_i, sh - 20)
     @window.title = "Multiple Views"
     @window.show_all
     @vpaned = Gtk::Paned.new(:vertical)

data/lib/vimamsa/gui_sourceview.rb CHANGED Viewed

@@ -15,7 +15,8 @@ class VSourceView < GtkSource::View
   # end
-  def initialize(title = nil,bufo=nil)
+  # def initialize(title = nil,bufo=nil)
+  def initialize(title,bufo)
     # super(:toplevel)
     @highlight_matching_brackets = true
     super()
@@ -68,7 +69,7 @@ class VSourceView < GtkSource::View
     end
     signal_connect "button-release-event" do |widget, event|
-      $buffer.set_pos(buffer.cursor_position)
+      vma.buf.set_pos(buffer.cursor_position)
       false
     end
     @curpos_mark = nil

data/lib/vimamsa/hyper_plain_text.rb CHANGED Viewed

@@ -3,8 +3,8 @@ def hpt_check_cur_word(w)
   m = w.match(/⟦(.*)⟧/)
   if m
     fpfx = m[1]
-    if $buffer.fname
-      dn = File.dirname($buffer.fname)
+    if vma.buf.fname
+      dn = File.dirname(vma.buf.fname)
       fcands = []
       if fpfx[0] != "/"

data/lib/vimamsa/key_binding_tree.rb CHANGED Viewed

@@ -15,7 +15,7 @@
 # 'C , r v b'=> 'revert_buffer',
 #
 # In insert mode: press and hold ctrl, press "a"
-# 'I ctrl-a'=> '$buffer.jump(BEGINNING_OF_LINE)',
+# 'I ctrl-a'=> 'vma.buf.jump(BEGINNING_OF_LINE)',
 #
 $cnf = {} # TODO
@@ -485,17 +485,17 @@ class KeyBindingTree
         #   like '20j' => go to next line 20 times.
       end
     rescue SyntaxError
-      debug("SYNTAX ERROR with eval cmd #{action}: " + $!.to_s)
+      message("SYNTAX ERROR with eval cmd #{action}: " + $!.to_s)
       # rescue NoMethodError
       # debug("NoMethodError with eval cmd #{action}: " + $!.to_s)
       # rescue NameError
       # debug("NameError with eval cmd #{action}: " + $!.to_s)
       # raise
     rescue Exception => e
-      debug "BACKTRACE"
-      debug e.backtrace
-      debug e.inspect
-      debug "BACKTRACE END"
+      puts "BACKTRACE"
+      puts e.backtrace
+      puts e.inspect
+      puts "BACKTRACE END"
       if $!.class == SystemExit
         exit
       else

data/lib/vimamsa/main.rb CHANGED Viewed

@@ -37,15 +37,15 @@ $experimental = false
 # Return currently active buffer
 def buf()
-  return $buffer
+  return vma.buf
 end
 def bufs()
-  return $buffers
+  return vma.buffers
 end
 def buflist()
-  return $buffers
+  return vma.buffers
 end
 require "vimamsa/editor.rb"

data/lib/vimamsa/search.rb CHANGED Viewed

@@ -3,7 +3,7 @@ def execute_search(input_str)
   $search = Search.new
   eval_str="execute_search(#{input_str.dump})"
   $macro.overwrite_current_action(eval_str)
-  return $search.set(input_str, "simple", $buffer)
+  return $search.set(input_str, "simple", vma.buf)
 end
 def invoke_search()

data/lib/vimamsa/search_replace.rb CHANGED Viewed

@@ -70,10 +70,10 @@ end
 def grep_cur_buffer(search_str, b = nil)
   debug "grep_cur_buffer(search_str)"
-  lines = $buffer.split("\n")
+  lines = vma.buf.split("\n")
   r = Regexp.new(Regexp.escape(search_str), Regexp::IGNORECASE)
   fpath = ""
-  fpath = $buffer.pathname.expand_path.to_s + ":" if $buffer.pathname
+  fpath = vma.buf.pathname.expand_path.to_s + ":" if vma.buf.pathname
   res_str = ""
   $grep_matches = []
@@ -84,7 +84,7 @@ def grep_cur_buffer(search_str, b = nil)
       $grep_matches << i + 1 # Lines start from index 1
     end
   }
-  $grep_bufid = $buffers.current_buf
+  $grep_bufid = vma.buffers.current_buf
   b = create_new_file(nil, res_str)
   # set_current_buffer(buffer_i, update_history = true)
   # @current_buf = buffer_i
@@ -93,7 +93,7 @@ def grep_cur_buffer(search_str, b = nil)
     debug "GREP HANDLER:#{lineno}"
     jumpto = $grep_matches[lineno]
     if jumpto.class == Integer
-      $buffers.set_current_buffer($grep_bufid, update_history = true)
+      vma.buffers.set_current_buffer($grep_bufid, update_history = true)
       buf.jump_to_line(jumpto)
     end
   }
@@ -136,21 +136,21 @@ def invoke_replace()
 end
 def buf_replace(search_str, replace_str)
-  if $buffer.visual_mode?
-    r = $buffer.get_visual_mode_range
-    txt = $buffer[r]
+  if vma.buf.visual_mode?
+    r = vma.buf.get_visual_mode_range
+    txt = vma.buf[r]
     txt.gsub!(search_str, replace_str)
-    $buffer.replace_range(r, txt)
-    $buffer.end_visual_mode
+    vma.buf.replace_range(r, txt)
+    vma.buf.end_visual_mode
   else
-    repbuf = $buffer.to_s.clone
+    repbuf = vma.buf.to_s.clone
     repbuf.gsub!(search_str, replace_str)
-    tmppos = $buffer.pos
-    if repbuf == $buffer.to_s.clone
+    tmppos = vma.buf.pos
+    if repbuf == vma.buf.to_s.clone
       message("NO CHANGE. Replacing #{search_str} with #{replace_str}.")
     else
-      $buffer.set_content(repbuf)
-      $buffer.set_pos(tmppos)
+      vma.buf.set_content(repbuf)
+      vma.buf.set_pos(tmppos)
       message("Replacing #{search_str} with #{replace_str}.")
     end
   end

data/lib/vimamsa/text_transforms.rb CHANGED Viewed

@@ -3,7 +3,7 @@ class Converter
     @obj = obj
     @type = type
     if id != nil
-      $vma.reg_conv(self, id)
+      vma.reg_conv(self, id)
     end
   end

data/lib/vimamsa/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/vimamsa.gemspec CHANGED Viewed

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'gdk3', '~> 3.4'
   spec.add_runtime_dependency 'gtk3', '~> 3.4'
   spec.add_runtime_dependency 'differ', '~> 0.1'
-  spec.add_runtime_dependency 'gtksourceview3', '~> 3.4'
-  # spec.add_runtime_dependency 'gtksourceview4'
+  # spec.add_runtime_dependency 'gtksourceview3', '~> 3.4'
+  spec.add_runtime_dependency 'gtksourceview4'
   spec.add_runtime_dependency 'parallel', '~> 1.14'
   spec.add_runtime_dependency 'listen', '~> 3.4'

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: gtksourceview3
+  name: gtksourceview4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement