vimamsa 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ad35212b7d75bfd5b702943ff3ed3180f7f1bd0b3912840e9ecfdf6126e467
-  data.tar.gz: 8eff2ee35e1ecc2d791ff1fbf4a881e6aada9b38d35ce11e356b316b536bc642
+  metadata.gz: 7a71f8392835d7a5a3245366764eb79f6058ea3ded74cc1a308f021f950881ba
+  data.tar.gz: 590ea0409a43aabafe349cfcff0cb91712e2a269e334b3663b64f6b895ae666f
 SHA512:
-  metadata.gz: 440d5d3b5b537fc9d3848d0f187df77dd045cde34643db356cd88ae5591e4e8c1c8596aac50f170ef7124dbd8784deddaff2d436f46dac0a8a180ccfeae4a9aa
-  data.tar.gz: c058e9db468553e29f617186ea0d65d04014307b7797c5dad013b5b3738fab57c0f7a44e7401ae9606e88581ac4f557fad3665c6dc8f784781619a310c114b95
+  metadata.gz: 1bf328f8cbe0b69e85a9720790c8f4616e1996466ad65f6473cf1cff1173d78b9cec197145c653a5d33804571d383246492e593445da390cbe567fc6ccfbb24a
+  data.tar.gz: 799f836afc3c0e304cac07f44e1b5c96affa3f6b5775b4d654b43a81168f2ab14cb4ee1218a3345ae3189203520885fd6cc1de7ce48205e78386b060c700f8ca

data/lib/vimamsa/buffer.rb

@@ -1,5 +1,6 @@
 require "digest"
 require "tempfile"
+require "fileutils"
 require "pathname"
 require "openssl"
 require "ripl/multi_line"
@@ -79,6 +80,13 @@ class Buffer < String
     # gui_set_current_buffer(@id)
   end
 
+  def set_executable
+    if File.exists?(@fname)
+      FileUtils.chmod("+x", @fname)
+      message("Set executable: #{@fname}")
+    end
+  end
+
   def detect_file_language
     @lang = nil
     @lang = "c" if @fname.match(/\.(c|h|cpp)$/)
@@ -451,7 +459,6 @@ class Buffer < String
     return if @edit_pos_history.empty?
     @edit_pos_history_i -= 1
     @edit_pos_history_i = @edit_pos_history.size - 1 if @edit_pos_history_i < 0
-    #        Ripl.start :binding => binding
     debug "@edit_pos_history_i=#{@edit_pos_history_i}"
     set_pos(@edit_pos_history[-@edit_pos_history_i])
     center_on_current_line
@@ -568,7 +575,6 @@ class Buffer < String
     ls = @line_ends[a] if a != nil
     # if a != nil and ls != @line_ends[a]
     # puts "NO MATCH @line_ends[a]"
-    # Ripl.start :binding => binding
     # end
 
     if ls == nil
@@ -580,7 +586,6 @@ class Buffer < String
   end
 
   def get_line_end(pos)
-    #Ripl.start :binding => binding
     return @line_ends.select { |x| x > pos }.min
   end
 
@@ -1328,9 +1333,9 @@ class Buffer < String
     calculate_line_and_column_pos
   end
 
-  def execute_current_line_in_terminal()
+  def execute_current_line_in_terminal(autoclose = false)
     s = get_current_line
-    exec_in_terminal(s)
+    exec_in_terminal(s, autoclose)
   end
 
   def insert_new_line()
@@ -1350,8 +1355,18 @@ class Buffer < String
       # Indent start of new line based on last line
       last_line = line(@lpos)
       m = /^( +)([^ ]+|$)/.match(last_line)
-      debug m.inspect
-      c = c + " " * m[1].size if m
+      if m
+        c = c + " " * m[1].size if m
+      end
+      
+
+      #if tab indent
+      m = /^(\t+)([^\t]+|$)/.match(last_line)
+      if m
+        c = c + "\t" * m[1].size if m
+      end
+      
+      # debug m.inspect
     end
     if mode == BEFORE
       insert_pos = @pos
@@ -1494,7 +1509,13 @@ class Buffer < String
     return if !@visual_mode
 
     debug "COPY SELECTION"
-    set_clipboard(self[get_visual_mode_range])
+    s = self[get_visual_mode_range]
+    if x == :append
+      puts "APPEND"
+      s += "\n" + get_clipboard()
+    end
+
+    set_clipboard(s)
     end_visual_mode
     return true
   end
@@ -1639,7 +1660,6 @@ class Buffer < String
     else
       savepath = buflist.get_last_dir
     end
-    # Ripl.start :binding => binding
     gui_file_saveas(savepath)
     # calls back to file_saveas
   end

data/lib/vimamsa/editor.rb

@@ -1,16 +1,23 @@
 require "pty"
 
-def exec_in_terminal(cmd)
+def exec_in_terminal(cmd, autoclose = false)
   # puts "CMD:#{cmd}"
 
   # global to prevent garbage collect unlink
   $initf = Tempfile.new("bashinit")
   # puts $initf.path
   $initf.write(cmd)
-  $initf.write("rm #{$initf.path}\n")
-  $initf.write("\nexec bash\n")
+  if autoclose
+    $initf.write("\nsleep 10; exit;\n")
+    $initf.write("rm #{$initf.path}\n")
+  else
+    $initf.write("rm #{$initf.path}\n")
+    $initf.write("\nexec bash\n")
+  end
   $initf.close
   # PTY.spawn("gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash")
+  # fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
+  # Just another execution
   fork { exec "gnome-terminal", "--tab", "--", "bash", "-i", $initf.path, "-c", "exec bash" }
 end
 
@@ -26,7 +33,7 @@ end
 
 class Editor
   attr_reader :file_content_search_paths, :file_name_search_paths, :gui
-  attr_accessor :converters, :fh, :paint_stack, :kbd 
+  attr_accessor :converters, :fh, :paint_stack, :kbd
   #attr_writer :call_func, :update_highlight
 
   def initialize()
@@ -42,7 +49,6 @@ class Editor
     @converters = {}
     @paint_stack = []
     @_plugins = {}
-
   end
 
   def open_file_listener(added)
@@ -294,6 +300,10 @@ def system_clipboard_changed(clipboard_contents)
   $clipboard = $clipboard[-([$clipboard.size, max_clipboard_items].min)..-1]
 end
 
+def get_clipboard()
+  return $clipboard[-1]
+end
+
 def set_clipboard(s)
   if !(s.class <= String) or s.size == 0
     puts s.inspect
@@ -415,7 +425,7 @@ def minibuffer_new_char(c)
 end
 
 # def readchar_new_char(c)
-  # $input_char_call_func.call(c)
+# $input_char_call_func.call(c)
 # end
 
 def minibuffer_delete()

data/lib/vimamsa/gui.rb

@@ -154,6 +154,7 @@ def gui_create_buffer(id)
   # provider.load(data: "textview { font-family: Arial; font-size: 12pt; }")
   view.style_context.add_provider(provider)
   view.wrap_mode = :char
+  view.set_tab_width(4) #TODO:add as setting
 
   $vmag.buffers[id] = view
 end

data/lib/vimamsa/key_actions.rb

@@ -48,6 +48,7 @@ reg_act(:put_file_path_to_clipboard, proc { buf.put_file_path_to_clipboard }, "P
 # reg_act(:encrypt_file, proc{buf.set_encrypted},"Set current file to encrypt on save")
 reg_act(:encrypt_file, proc { encrypt_cur_buffer }, "Set current file to encrypt on save")
 reg_act(:set_unencrypted, proc { buf.set_unencrypted }, "Set current file to save unencrypted")
+reg_act(:set_executable, proc { buf.set_executable }, "Set current file permissions to executable")
 reg_act(:close_all_buffers, proc { bufs.close_all_buffers() }, "Close all buffers")
 reg_act(:close_current_buffer, proc { bufs.close_current_buffer(true) }, "Close current buffer")
 reg_act(:comment_selection, proc { buf.comment_selection }, "")
@@ -89,7 +90,8 @@ reg_act :page_up, proc { page_up }
 reg_act :jump_to_start_of_buffer, proc { buf.jump(START_OF_BUFFER) }, "Jump to start of buffer"
 reg_act :jump_to_end_of_buffer, proc { buf.jump(END_OF_BUFFER) }, "Jump to end of buffer"
 reg_act(:auto_indent_buffer, proc { buf.indent }, "Auto format buffer")
-reg_act(:execute_current_line_in_terminal, proc { buf.execute_current_line_in_terminal }, "Execute current line in terminal")
+reg_act(:execute_current_line_in_terminal, proc { buf.execute_current_line_in_terminal }, "Execute current line in terminalL")
+reg_act(:execute_current_line_in_terminal_autoclose, proc { buf.execute_current_line_in_terminal(true) }, "Execute current line in terminal. Close after execution.")
 reg_act(:show_images, proc { hpt_scan_images() }, "Show images inserted with ⟦img:file.png⟧ syntax")
 reg_act(:delete_current_file, proc { bufs.delete_current_buffer() }, "Delete current file")
 
@@ -256,7 +258,7 @@ act_list_todo = {
   # Visual mode only:
   "V esc" => "buf.end_visual_mode",
   "V ctrl!" => "buf.end_visual_mode",
-  "V y" => "buf.copy_active_selection",
+  "V y" => "buf.copy_active_selection(:foo)",
   "V g U" => "buf.transform_selection(:upcase)",
   "V g u" => "buf.transform_selection(:downcase)",
   "V g c" => "buf.transform_selection(:capitalize)",

data/lib/vimamsa/key_bindings_vimlike.rb

@@ -189,7 +189,8 @@ default_keys = {
   # Visual mode only:
   "V esc" => "buf.end_visual_mode",
   "V ctrl!" => "buf.end_visual_mode",
-  "V y" => "buf.copy_active_selection",
+  "V y" => "buf.copy_active_selection()",
+  "V a y" => "buf.copy_active_selection(:append)",
   "V g U" => "buf.transform_selection(:upcase)",
   "V g u" => "buf.transform_selection(:downcase)",
   "V g c" => "buf.transform_selection(:capitalize)",

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/vimamsa.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib","ext"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.2.33"
   spec.add_development_dependency "rake", "~> 13.0"
   
   spec.add_runtime_dependency 'rufo', '~> 0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement