vimamsa 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edba3dbb2734fa7d7c9993b0eabd14db7deaf479967adf8892cfa55b80d27581
-  data.tar.gz: d9f9d082135e9379cbca81331f068b715a24c38c9e1afdbd41b491b21e3f58a0
+  metadata.gz: 06e99c11af9802815672e7b3cc220668fe9a0d6837760ff1cd5ca8b029ca04bc
+  data.tar.gz: b61f32cdaebc0cce856e832567787da9a9d041ed46000463d226959aee492373
 SHA512:
-  metadata.gz: bbf0f4a8285e870acec56488904f63af46c14eabfbcb8ec93e61acf6822074613a35507824efc60f560bec128727f37045d8a208b1618adeb326258617e2e5eb
-  data.tar.gz: 6891310332870fb8639dacda25d6fceb4adcfd292aea70dcd49bed96f2350aa5f41d6978f94bfea2a8e751b63b9f52ced790b34c14c4bd606d7037d3d99282e6
+  metadata.gz: d26574ac402e3f2de520d84db614c26a8760bbbae75fa422dd44d0af2145df2ffcfea8fd8c5f8d45735c0367f36ab85d895660822d7f471a6ba7db2bd5e3513a
+  data.tar.gz: 3e95a3a334284bf3143e67283354c064e23afe2b3332cb5c2f4fc98fe4f80adeee2c4ee39b3759f95b72ff543269e8705d54162e8b04acc5448e41e522360600

data/README.md

@@ -1,35 +1,129 @@
 # Vimamsa
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/vimamsa`. To experiment with that code, run `bin/console` for an interactive prompt.
+Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby and GTK. 
 
-TODO: Delete this and the text above, and describe your gem
+
+## Requirements
+ - Ruby 2.0+
+ - GTK 3
 
 ## Installation
 
-Add this line to your application's Gemfile:
 
-```ruby
-gem 'vimamsa'
+On Ubuntu:
+```
+sudo apt install ruby-dev
+sudo gem install vimamsa
 ```
 
-And then execute:
+Run:
+```
+vimamsa
+```
 
-    $ bundle
+Packages for optional features:
+```
+sudo apt install ack-grep clang-format
+```
 
-Or install it yourself as:
+For customization, edit dot_vimamsarc.rb and copy to ~/.vimamsarc
 
-    $ gem install vimamsa
+## Key bindings
 
-## Usage
+Key bindings are very much like in VIm. For details, see file lib/vimamsa/key_bindings.rb and lib/vimamsa/default_bindings.rb
 
-TODO: Write usage instructions here
+Keys that work somewhat similarly as in Vim:
 
-## Development
+In Command mode: 
+```
+j k l h w b p P G f F ; 0 $ v i o  J * / a A I u ctrl-r x 
+zz dd dw gg <linenum>G r<char>
+```
+
+In Visual mode:
+```
+d y gU gu 
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Keys that work differently to Vim are documented in the tables below
+
+Syntax:  
+ctrl! means press and immediate release of ctrl key. Triggered by key up event.  
+ctrl-x means press and hold ctrl key, press x  
+
+<table>
+<colgroup>
+<col style="text-align:center;"/>
+<col style="text-align:left;"/>
+</colgroup>
+
+<thead> <tr> <th style="text-align:center;" colspan="4">Command mode keys</th> </tr> </thead>
+
+<tbody>
+<tr><th>Key</th><th>Action</th></tr>
+<tr><td style="text-align:center;">ctrl!</td>     <td style="text-align:left;">switch between command and insert modes</td> </tr>
+<tr> <td style="text-align:center;">z</td> <td style="text-align:left;"> enter into BROWSE mode</td></tr>
+<tr>     <td style="text-align:center;">shift!</td>     <td style="text-align:left;">save file</td> </tr>
+<tr>     <td style="text-align:center;">s</td>     <td style="text-align:left;">Easy jump (Similar to Vim EasyMotion https://github.com/easymotion/vim-easymotion ) </td> </tr>
+<tr> <td style="text-align:center;">tab</td> <td style="text-align:left;">switch betwen current and previous buffer/file</td></tr>
+<tr> <td style="text-align:center;">enter</td> <td style="text-align:left;"> (when cursor on link) open url in browser </td></tr>
+<tr> <td style="text-align:center;">enter</td> <td style="text-align:left;">(when cursor on /path/to/file.txt:linenum ) open file in editor, jump to linenum </td></tr>
+<tr> <td style="text-align:center;">,a</td> <td style="text-align:left;">Search for string using ack
+</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;">space c</td> <td style="text-align:left;">insert character "c"</td></tr>
+</tbody>
+</table>
+
+<table>
+<colgroup>
+<col style="text-align:center;"/>
+<col style="text-align:left;"/>
+</colgroup>
+
+<thead> <tr> <th style="text-align:center;" colspan="4">Insert mode keys (similar to bash or emacs)</th> </tr> </thead>
+
+<tbody>
+<tr> <td style="text-align:center;">ctrl! OR esc</td> <td style="text-align:left;">Switch to command mode</td></tr>
+<tr> <td style="text-align:center;">ctrl-n</td> <td style="text-align:left;">Move to next line</td></tr>
+<tr> <td style="text-align:center;">ctrl-p</td> <td style="text-align:left;">Move to previous line</td></tr>
+<tr> <td style="text-align:center;">ctrl-a</td> <td style="text-align:left;">Move beginning of line</td></tr>
+<tr> <td style="text-align:center;">ctrl-e</td> <td style="text-align:left;">Move to end of line</td></tr>
+<tr> <td style="text-align:center;">ctrl-b</td> <td style="text-align:left;">Move backward one char</td></tr>
+<tr> <td style="text-align:center;">ctrl-f</td> <td style="text-align:left;">Move forward one char</td></tr>
+<tr> <td style="text-align:center;">alt-f</td> <td style="text-align:left;">Move forward one word</td></tr>
+<tr> <td style="text-align:center;">alt-b</td> <td style="text-align:left;">Move backward one word</td></tr>
+</tbody>
+</table>
+
+
+<table>
+<colgroup>
+<col style="text-align:center;"/>
+<col style="text-align:left;"/>
+</colgroup>
+
+<thead> <tr> <th style="text-align:center;" colspan="4">Browse mode keys</th> </tr> </thead>
+
+<tbody>
+<tr> <td style="text-align:center;">h</td> <td style="text-align:left;">jump to previous buffer in history</td></tr>
+<tr> <td style="text-align:center;">l</td> <td style="text-align:left;">jump to next buffer in history</td></tr>
+<tr> <td style="text-align:center;">q</td> <td style="text-align:left;">jump to previous edited position</td></tr>
+<tr> <td style="text-align:center;">w</td> <td style="text-align:left;">jump to next edited position</td></tr>
+<tr> <td style="text-align:center;">j OR esc</td> <td style="text-align:left;">switch from browse to command mode</td></tr>
+</tbody>
+</table>
+
+Bindings can be customized in ~/.vimamsarc  
+For example, to bind ctrl-n to action "create new file":  
+```
+bindkey 'C ctrl-n',  'create_new_file()'
+```
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+## Current limitations
+ - UTF8 only
+ - Line endings with "\n"
 
-## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/vimamsa.

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 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'
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sami Sieranoja
@@ -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
@@ -150,7 +150,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-description: Vimamsa.
+description: Vi/Vim -inspired experimental GUI-oriented text editor written with Ruby
+  and GTK.
 email:
 - sami.sieranoja@gmail.com
 executables:
@@ -160,14 +161,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
@@ -220,8 +220,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);
-}
-
-