vimamsa 0.1.14 → 0.1.16

data/lib/vimamsa/search_replace.rb

@@ -1,9 +1,3 @@
-class Grep
-  attr_accessor :history
-
-  def initialize()
-  end
-end
 
 class FileSelector
   def initialize()
@@ -85,9 +79,14 @@ class Grep
     end
     vma.kbd.add_minor_mode("bmgr", :buf_mgr, :command)
     reg_act(:grep_buffer, proc { Grep.new.run }, "Grep current buffer")
+    reg_act(:grep_refresh, proc {
+      if vma.buf.module.class == Grep
+        vma.buf.module.refresh
+      end
+    }, "Refresh current Grep buffer")
 
     bindkey "C , g", :grep_buffer
-
+    bindkey "grep ctrl-r", :grep_refresh
   end
 
   def apply_changes()
@@ -114,45 +113,54 @@ class Grep
     @line_to_id = {}
   end
 
-  def callback(search_str, b = nil)
-    debug "grep_cur_buffer(search_str)"
-    lines = vma.buf.split("\n")
-    r = Regexp.new(Regexp.escape(search_str), Regexp::IGNORECASE)
-    fpath = ""
-    fpath = vma.buf.pathname.expand_path.to_s + ":" if vma.buf.pathname
-    res_str = ""
+  def refresh
+    set_buf_contents
+  end
+
+  def set_buf_contents()
+    lines = @orig_buf.split("\n")
 
-    hlparts = []
     @grep_matches = []
+
+    res_str = ""
     lines.each_with_index { |l, i|
-      if r.match(l)
+      if @r.match(l)
         res_str << "#{i + 1}:"
         # ind = scan_indexes(l, r)
         res_str << "#{l}\n"
         @grep_matches << i + 1 # Lines start from index 1
       end
     }
-    $grep_bufid = vma.buffers.current_buf
+
+    @buf.set_content(res_str)
+
+    Gui.highlight_match(@buf, @search_str, color: cnf.match.highlight.color!)
+  end
+
+  def callback(search_str, b = nil)
+    debug "grep_cur_buffer(search_str)"
+    @r = Regexp.new(Regexp.escape(search_str), Regexp::IGNORECASE)
+    fpath = ""
+    fpath = vma.buf.pathname.expand_path.to_s + ":" if vma.buf.pathname
+
+    @search_str = search_str
     @orig_buf = vma.buf
-    b = create_new_buffer(res_str, "grep")
-    vbuf = vma.gui.view.buffer
+    @buf = create_new_buffer("", "grep")
 
-    Gui.highlight_match(b, search_str, color: cnf.match.highlight.color!)
-    b.default_mode = :grep
-    b.module = self
+    @buf.default_mode = :grep
+    @buf.module = self
 
-    vma.kbd.set_mode(:grep) #TODO: allow to work with other keybindings also
-    vma.kbd.set_default_mode(:grep)
-    b.line_action_handler = proc { |lineno|
+    vma.kbd.set_mode(:grep)
+    @buf.line_action_handler = proc { |lineno|
       debug "GREP HANDLER:#{lineno}"
       jumpto = @grep_matches[lineno]
       if jumpto.class == Integer
-        # vma.buffers.set_current_buffer($grep_bufid, update_history = true)
-        # buf.jump_to_line(jumpto)
         vma.buffers.set_current_buffer_by_id(@orig_buf.id)
         @orig_buf.jump_to_line(jumpto)
       end
     }
+
+    set_buf_contents
   end
 
   def run()

data/lib/vimamsa/terminal.rb

@@ -1,3 +1,4 @@
+
 def exec_in_terminal(cmd, autoclose = false)
   # debug "CMD:#{cmd}"
 
@@ -19,4 +20,15 @@ def exec_in_terminal(cmd, autoclose = false)
   fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
 end
 
+def command_to_buf_callback(cmd)
+  require "open3"
+  stdout, stderr, status = Open3.capture3(cmd)
+  b = create_new_buffer(stdout, cmd)
+end
+
 
+load "terminal_extra.rb" if File.exist?("terminal_extra.rb")
+def command_to_buf
+  callback = method("command_to_buf_callback")
+  gui_one_input_action("Execute command in shell, output to buffer", "Command:", "Execute", callback)
+end

data/lib/vimamsa/util.rb

@@ -1,5 +1,34 @@
 require "open3"
 
+VOWELS = %w(a e i o u)
+CONSONANTS = %w(b c d f g h j k l m n p q r s t v w x y z)
+
+def tilde_path(abspath)
+  userhome = File.expand_path("~/")
+  abspath.sub(/^#{Regexp.escape(userhome)}\//, "~/")
+end
+
+def generate_password(length)
+  password = ""
+  while password.size < length
+    i = password.size + 1
+    if i.even?
+      char = CONSONANTS.sample
+    else
+      char = VOWELS.sample
+    end
+    char.upcase! if rand < 0.2
+    password << char
+    password << (1..10).to_a.sample.to_s if rand < 0.25
+  end
+  password
+end
+
+def generate_password_to_buf(length)
+  passw = generate_password(length)
+  vma.buf.insert_txt(passw)
+end
+
 # Get all indexes for start of matching regexp
 def scan_indexes(txt, regex)
   # indexes = txt.enum_for(:scan, regex).map { Regexp.last_match.begin(0) + 1 }
@@ -23,8 +52,17 @@ def file_is_text_file(fpath)
   debug "file_is_text_file(#{fpath})"
   fpath = File.expand_path(fpath)
   return false if !File.exist?(fpath)
+  return false if !File.file?(fpath)
+
+  if File.size(fpath) < 1000e3 #smaler than 1MB
+    str = IO.read(fpath)
+    str.force_encoding("UTF-8")
+    debug "Small file with valid utf-8"
+    return true if str.valid_encoding?
+  end
+
+  #TODO: not sure if needed
   r = exec_cmd("file", fpath)
-  debug "DEBUG:#{r}"
   return true if r.match(/UTF-8.*text/)
   return true if r.match(/ASCII.*text/)
   return false
@@ -101,7 +139,7 @@ class HSafe
     hh = @h
     while !b.empty?
       x = b.pop
-      puts "x=#{x}"
+      debug "x=#{x}"
       pp b
       ok = false
       if hh.class == Hash or hh.class == Array

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.14"
+  VERSION = "0.1.16"
 end

data/vimamsa.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib","ext"]
 
   spec.add_development_dependency "bundler", "~> 2.4.21"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rake", "~> 13.1.0"
   
   spec.add_runtime_dependency 'rufo', '~> 0.16.2'
   
@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ripl-multi_line', '~> 0.3.1'
   spec.add_runtime_dependency 'gdk4', '~> 4.2.0'
   spec.add_runtime_dependency 'gtk4', '~> 4.2.0'
-  spec.add_runtime_dependency 'rake', '~> 13.1.0'
+  spec.add_runtime_dependency 'rambling-trie', '~> 2.3.1'
+  
   spec.add_runtime_dependency 'differ', '~>  0.1.2'
   spec.add_runtime_dependency 'gtksourceview5', '~> 4.2.0'
   spec.add_runtime_dependency 'parallel', '~> 1.14' #TODO: update?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rambling-trie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +255,7 @@ files:
 - lib/vimamsa/gui_menu.rb
 - lib/vimamsa/gui_select_window.rb
 - lib/vimamsa/gui_sourceview.rb
+- lib/vimamsa/gui_sourceview_autocomplete.rb
 - lib/vimamsa/gui_text.rb
 - lib/vimamsa/hook.rb
 - lib/vimamsa/hyper_plain_text.rb