vimamsa 0.1.1 → 0.1.6

data/lib/vimamsa/search.rb

@@ -6,10 +6,6 @@ def execute_search(input_str)
   return $search.set(input_str, "simple", $buffer)
 end
 
-def invoke_search()
-  start_minibuffer_cmd("", "", :execute_search)
-end
-
 def invoke_search()
   nfo = ""
   

data/lib/vimamsa/search_replace.rb

@@ -115,7 +115,7 @@ def gui_replace_callback(vals)
   search_str = vals["search"]
   replace_str = vals["replace"]
   puts "gui_replace_callback: #{search_str} => #{replace_str}"
-  qt_select_window_close(0)
+  gui_select_window_close(0)
   buf_replace(search_str, replace_str)
 end
 
@@ -152,7 +152,6 @@ def buf_replace(search_str, replace_str)
     else
       $buffer.set_content(repbuf)
       $buffer.set_pos(tmppos)
-      # $do_center = 1 #TODO
       message("Replacing #{search_str} with #{replace_str}.")
     end
   end

data/lib/vimamsa/util.rb

@@ -43,7 +43,7 @@ def read_file(text, path)
 
   #TODO: Should put these as option:
   content.gsub!(/\r\n/, "\n")
-  content.gsub!(/\t/, "    ")
+  # content.gsub!(/\t/, "    ")
   content.gsub!(/\b/, "")
 
   #    content = filter_buffer(content)

data/lib/vimamsa/version.rb

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

data/vimamsa.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["sami.sieranoja@gmail.com"]
 
   spec.summary       = %q{Vimamsa}
-  spec.description   = %q{Vimamsa.}
+  spec.description   = %q{Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK.}
   spec.homepage = "https://github.com/SamiSieranoja/vimamsa"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib","ext"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   
   spec.add_runtime_dependency 'rufo', '~> 0.5'
   
@@ -29,9 +29,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ripl-multi_line', '~> 0.3.1'
   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 'parallel', '~> 1.14'
+  spec.add_runtime_dependency 'listen', '~> 3.4'
 
   spec.extensions = ["ext/vmaext/extconf.rb"]
   spec.licenses    = ['GPL-3.0+']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2021-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: differ
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: gtksourceview3
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +150,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-description: Vimamsa.
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+description: Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby
+  and GTK.
 email:
 - sami.sieranoja@gmail.com
 executables:
@@ -146,14 +175,13 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".vma_project"
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - exe/vimamsa
-- ext/vimamsa/extconf.rb
-- ext/vimamsa/vimamsa.c
 - ext/vmaext/extconf.rb
 - ext/vmaext/vmaext.c
 - lang/hyperplaintext.lang
@@ -164,16 +192,22 @@ files:
 - lib/vimamsa/buffer_list.rb
 - lib/vimamsa/constants.rb
 - lib/vimamsa/debug.rb
-- lib/vimamsa/default_key_bindings.rb
 - lib/vimamsa/easy_jump.rb
 - lib/vimamsa/editor.rb
 - lib/vimamsa/encrypt.rb
 - lib/vimamsa/file_finder.rb
 - lib/vimamsa/file_history.rb
 - lib/vimamsa/file_manager.rb
+- lib/vimamsa/gui.rb
+- lib/vimamsa/gui_gtk_sourceview.rb
+- lib/vimamsa/gui_menu.rb
+- lib/vimamsa/gui_select_window.rb
+- lib/vimamsa/gui_sourceview.rb
 - lib/vimamsa/hook.rb
 - lib/vimamsa/hyper_plain_text.rb
+- lib/vimamsa/key_actions.rb
 - lib/vimamsa/key_binding_tree.rb
+- lib/vimamsa/key_bindings_vimlike.rb
 - lib/vimamsa/macro.rb
 - lib/vimamsa/main.rb
 - lib/vimamsa/rbvma.rb
@@ -206,8 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Vimamsa

data/ext/vimamsa/extconf.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-#
-
-require 'mkmf'
-
-module_name = "vimamsa"
-extension_name = 'vimamsa'
-
-dir_config(extension_name)       # The destination
-create_makefile(extension_name)  # Create Makefile
-

data/ext/vimamsa/vimamsa.c

@@ -1,174 +0,0 @@
-#include <ruby.h>
-// #include <gtk/gtk.h>
-#include "ruby/ruby.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#warning "C Preprocessor got here!"
-
-typedef struct node {
-int i;
-void * next;
-} node;
-
-
-void add_to_list(unsigned char c, int i, struct node ** t) {
-    struct node * n;
-    struct node * np;
-
-    n =(struct node*) calloc(1,sizeof(struct node)); //TODO: free
-    n->i = i;
-    if(!t[c]) {
-        t[c] = n;
-    }
-    else {
-        np = t[c];
-        while (np->next) {
-            np = np->next;
-        }
-        np->next = n;
-    }
-}
-
-void dump_list(struct node**t) {
-    for(int i=0;i < 256; i++) {
-        if(t[i]) {
-            printf ("\n%c: ", (char) i);
-            struct node * n = t[i];
-            do {
-                printf ("%d ", n->i);
-            }
-            while (n = n->next);
-        }
-    }
-}
-
-float calc_sub_score(unsigned char* s1, unsigned char* s2, int i1, int i2) {
-
-    int s1_len = strlen(s1);
-    int s2_len = strlen(s2);
-    float sub_score = 1;
-    float score_inc = 1;
-    float score_inc_multip = 0.63212;
-    //float score_inc_multip = 0.23212;
-
-
-    // From i2 to zero
-    int i_s1 = i1-1;
-    //printf("{");
-    for (int i_s2=i2-1; i_s2 >= 0 && i_s1 >= 0;) {
-        if(s1[i_s1] == s2[i_s2]) {
-            //printf("%c",s1[i_s1]);
-            i_s1--; i_s2--;
-            sub_score += score_inc;
-            score_inc = 1;
-        }
-        else {i_s2--; score_inc = score_inc*score_inc_multip;}
-    }
-
-
-    // From i2 to end
-    score_inc = 1;
-    i_s1 = i1+1;
-    //printf("%c",s1[i1]);
-    for (int i_s2=i2+1; i_s2 < s2_len && i_s1 < s1_len;) {
-        if(s1[i_s1] == s2[i_s2]) {
-            //printf("%c",s1[i_s1]);
-            i_s1++; i_s2++;
-            sub_score += score_inc;
-            score_inc = 1;
-        }
-        else {i_s2++;score_inc = score_inc*score_inc_multip;}
-    }
-
-
-    //printf("}");
-    return sub_score;
-
-}
-
-float srn_dst(char * s1_sgn, char * s2_sgn) {
-    unsigned char* s1;
-    unsigned char* s2;
-    s1 = (unsigned char *) s1_sgn;
-    s2 = (unsigned char *) s2_sgn;
-    struct node** t;
-    int len_s1 = strlen(s1);
-    int len_s2 = strlen(s2);
-    t = (struct node**) calloc(256,sizeof(struct node*));
-    float score=0;
-    node * nA;
-    node * nB;
-    //printf("l1,2: %d %d\n",len_s1,len_s2);
-
-    for(int i_s2=0;i_s2 < strlen(s2); i_s2++) {
-        add_to_list(s2[i_s2],i_s2,t);
-    }
-
-    for(int i_s1=0;i_s1 < strlen(s1); i_s1++) {
-        struct node * n = t[s1[i_s1]];
-        if (n)  {
-            float max_score = 0;
-            unsigned char c = s1[i_s1];
-            do {
-                float sub_score = calc_sub_score(s1,s2,i_s1,n->i);
-                if(sub_score > max_score) {max_score = sub_score;}
-                //printf(" i=%d %c %d [%f] \n",i_s1,c,n->i,sub_score);
-            } while(n = n->next);
-            score += max_score;
-        }
-    }
-
-    //dump_list(t);
-    float p =0.01;
-    score = (1-p)*score/(len_s1*len_s1) +p*score/(len_s1*len_s2);
-
-    // Free memory
-    for(int i=0;i<256;i++) {
-        if(t[i]) {
-            // node * nA = t[i];
-            // node * nB;
-            nA = t[i];
-            do {
-                nB = nA->next;
-                free(nA);
-                nA = nB;
-            } while (nA);
-        }
-    }
-    free(t);
-
-    return score;
-}
-
-void srn_dst_wrap(void *y) {
-  void **x = (void **)y;
-  char *a = (char *)x[0];
-  char *b = (char *)x[1];
-  float *d = (float *)x[2];
-  *d = srn_dst(a, b);
-  // printf("00000 A:%s B:%s %f\n",a,b,*d);
-}
-
-VALUE _srn_dst(VALUE self, VALUE s1, VALUE s2) {
-  VALUE ret;
-  float d;
-  void **ptr = malloc(sizeof(void *) * 3);
-  ptr[0] = (void *)StringValueCStr(s1);
-  ptr[1] = (void *)StringValueCStr(s2);
-  ptr[2] = (void *)&d;
-  rb_thread_call_without_gvl(srn_dst_wrap, ptr, NULL, NULL);
-  // d = srn_dst(StringValueCStr(s1), StringValueCStr(s2));
-  ret = rb_float_new(d);
-  free(ptr);
-  return ret;
-}
-
-void Init_vimamsa(void) {
-  printf("Init_vimamsa\n");
-  rb_define_global_function("srn_dst", _srn_dst, 2);
-}
-
-