diakonos 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930f2f93739226857f62e39e39a0236e40b4aac2fd89208b47a5df3ba5db9372
-  data.tar.gz: fc967fd5b22694895f13ea1551fe366ce5fe656a4ac2ded8304b04594464580b
+  metadata.gz: 4545c77e496e0e0c6ff937533229561af94ab385d972e3496909a4fe5005065d
+  data.tar.gz: d29e22867110489b76e8bb3c1c6472313d101d7ad6fe4056950b693a10888fa8
 SHA512:
-  metadata.gz: 8d8c2e2c406726e490d44149d00b5be4ac650feebee4d30433eace1096d23f791edd375c8ea65585ed4e9e9041601223bd53b41e081be3d55a234023152b29a3
-  data.tar.gz: e23410cd82d3ff4e7c720f5612c9e746c30302ad0380d8637fe33b7e245375721353ed9177861cfe8330f84d0009015dda3140c07886d5bc0c246550765f1022
+  metadata.gz: d879ffec3cbb1b929e933c8787285ecd94bf86f18942e9ffde6de4cef72eab7916f870ea4609c7802eafa0768fa7d23a8d855e0bb376b5044da89ed7bbf2773f
+  data.tar.gz: 7bd4318931af575436d9816ae1bb58f5656ad44095ba2877fb5dfef877153908d3f034a0bc09846d80a8ba137c531c3be8ae33fbeed15886f7a3b9a49c54d45b

data/CHANGELOG

@@ -1,6 +1,12 @@
 Diakonos Changelog
 ------------------
 
+0.9.9
+
+- List main culprits (directories) when fuzzy file finder encounters too many files
+- Add support for extension configuration settings
+- Make compatible with Ruby 3.2 (re: File.exists?)
+
 0.9.8
 
 - Handle symlink cycles when fuzzy file finding (file open)

data/diakonos.conf

@@ -918,8 +918,8 @@ lang.javascript.indent.size 2
 lang.javascript.indent.auto true
 lang.javascript.indent.roundup false
 #lang.javascript.indent.using_tabs true
-lang.javascript.indent.indenters (\{)
-lang.javascript.indent.unindenters (\})
+lang.javascript.indent.indenters ([{(])
+lang.javascript.indent.unindenters ([})])
 lang.javascript.indent.preventers (\".+?[^\\]\")|('.+?[^\\]')|(\/\/.*)
 lang.javascript.indent.ignore ^(.+:|\s*?)$
 lang.javascript.indent.closers true

data/lib/diakonos/about.rb

@@ -30,7 +30,7 @@ module Diakonos
         f.puts %{
 # About Diakonos
 
-Licence:        MIT Licence
+Licence:        GNU GPL v3
 Copyright:      Copyright (c) 2004-#{ Time.now.year } Pistos
 
 ## Version
@@ -43,6 +43,7 @@ Ruby Version:   #{ ::RUBY_VERSION }
 ## Paths
 
 Home dir:       #{ @diakonos_home }
+Session dir:    #{ @session.dir }
 
 ### Installation
 

data/lib/diakonos/buffer/display.rb

@@ -32,6 +32,9 @@ module Diakonos
         end
       end
 
+      if open_match_text
+        # $diakonos.debug_log "OPEN\t" + [ open_index, open_token_class, open_match_text ].inspect
+      end
       [ open_index, open_token_class, open_match_text ]
     end
 
@@ -55,6 +58,9 @@ module Diakonos
         end
       end
 
+      if close_match_text
+        # $diakonos.debug_log "CLOSE\t" + [close_index, close_match_text].inspect
+      end
       [close_index, close_match_text]
     end
 

data/lib/diakonos/buffer/file.rb

@@ -9,7 +9,7 @@ module Diakonos
         name = @name
       end
 
-      if @read_only && FileTest.exists?( @name ) && FileTest.exists?( name ) && ( File.stat( @name ).ino == File.stat( name ).ino )
+      if @read_only && FileTest.exist?( @name ) && FileTest.exist?( name ) && ( File.stat( @name ).ino == File.stat( name ).ino )
         $diakonos.set_iline "#{name} cannot be saved since it is read-only."
       else
         @read_only = false
@@ -18,7 +18,7 @@ module Diakonos
         else
           proceed = true
 
-          if prompt_overwrite && FileTest.exists?( name )
+          if prompt_overwrite && FileTest.exist?( name )
             proceed = false
             choice = $diakonos.get_choice(
               "Overwrite existing '#{name}'?",

data/lib/diakonos/buffer.rb

@@ -55,7 +55,7 @@ module Diakonos
         @lines[ 0 ] = ""
       else
         @name = File.expand_path( @name )
-        if FileTest.exists? @name
+        if FileTest.exist? @name
           @lines = IO.readlines( @name )
           if ( @lines.length == 0 ) || ( @lines[ -1 ][ -1..-1 ] == "\n" )
             @lines.push ""

data/lib/diakonos/config.rb

@@ -21,8 +21,8 @@ module Diakonos
       if ! @testing
         @diakonos_conf = @config_filename || "#{@diakonos_home}/diakonos.conf"
 
-        if ! FileTest.exists?( @diakonos_conf )
-          if FileTest.exists?( @global_diakonos_conf )
+        if ! FileTest.exist?( @diakonos_conf )
+          if FileTest.exist?( @global_diakonos_conf )
             puts "No personal configuration file found."
             puts "Would you like to copy the system-wide configuration file (#{@global_diakonos_conf}) to use"
             $stdout.print "as a basis for your personal configuration (recommended)? (y/n)"; $stdout.flush
@@ -43,7 +43,7 @@ module Diakonos
               puts "You download one from https://git.sr.ht/~pistos/diakonos/blob/master/diakonos.conf"
             end
 
-            if ! FileTest.exists?( @diakonos_conf )
+            if ! FileTest.exist?( @diakonos_conf )
               puts "Terminating due to lack of configuration file."
               exit 1
             end
@@ -161,7 +161,7 @@ module Diakonos
 
     # @return [ConfigFile, ConfigFileUnreadable]
     def legitimize_config_filename!(prospective_filename, including_config_file)
-      if File.exists?(prospective_filename)
+      if File.exist?(prospective_filename)
         ConfigFile.new(
           File.realpath(prospective_filename),
           including_config_file
@@ -200,7 +200,7 @@ module Diakonos
         case command
         when "include"
           self.parse_configuration_file( File.expand_path( arg ), config_file )
-        when 'load_extension'
+        when "load_extension"
           @extensions.load( arg ).each do |conf_file|
             parse_configuration_file conf_file
           end
@@ -327,6 +327,7 @@ module Diakonos
         when "context.separator", /^lang\..+?\.indent\.ignore\.charset$/,
             /^lang\.(.+?)\.tokens\.([^.]+)\.change_to$/,
             /^lang\.(.+?)\.column_delimiters$/,
+            /^extension\.(.+?)\.(.+?)/,
             "view.nonfilelines.character",
             'diff_command', 'session.default_session',
             'clipboard.external'

data/lib/diakonos/functions/buffers.rb

@@ -184,6 +184,7 @@ module Diakonos
           filename = nil
           do_open = false
         else
+          # TODO: Maybe a bug here, re: paths relative to session dir (external file find)
           existing_buffer = @buffers.find { |b| b.name == filename }
         end
 
@@ -304,13 +305,14 @@ module Diakonos
           directories: @session.dir,
           ceiling: @settings['fuzzy_file_find.max_files'] || 8192,
           ignores: @fuzzy_ignores,
-          recursive: @settings['fuzzy_file_find.recursive']
+          recursive: @settings['fuzzy_file_find.recursive'],
+          sorted: true
         )
 
         finder_block = lambda { |input|
           break  if input =~ %r{^/}
 
-          matches = finder.find(input).sort_by { |m| m[:path] }
+          matches = finder.find(input)
           with_list_file do |list|
             list.puts matches.map { |m| m[:path] }
           end

data/lib/diakonos/readline.rb

@@ -120,6 +120,7 @@ module Diakonos
     end
 
     def redraw_input
+      # TODO: Gracefully handle when `input` is nil
       input = @input[ @view_y...(@view_y + Curses::cols) ]
 
       curx = @window.curx

data/lib/diakonos/sessions.rb

@@ -249,7 +249,7 @@ module Diakonos
     end
 
     def cleanup_session
-      if @session && Session.pid_session?(@session.filename) && File.exists?(@session.filename)
+      if @session && Session.pid_session?(@session.filename) && File.exist?(@session.filename)
         File.delete @session.filename
       end
     end

data/lib/diakonos/vendor/fuzzy_file_finder.rb

@@ -125,9 +125,11 @@ class FuzzyFileFinder
     @roots = root_dirnames.map { |d| Directory.new(d, true) }
     @shared_prefix = determine_shared_prefix
     @shared_prefix_re = Regexp.new("^#{Regexp.escape(shared_prefix)}" + (shared_prefix.empty? ? "" : "/"))
+    @sorted = params[:sorted]
 
     @files = []
     @directories = {}  # To detect link cycles
+    @dirs_with_many = []
 
     rescan!
   end
@@ -201,11 +203,17 @@ class FuzzyFileFinder
   # Array. If +max+ is nil, all matches will be returned.
   def find(pattern, max=nil)
     results = []
+
     search(pattern) do |match|
       results << match
       break if max && results.length >= max
     end
-    return results
+
+    if @sorted
+      results.sort_by { |m| m[:path] }
+    else
+      results
+    end
   end
 
   # Displays the finder object in a sane, non-explosive manner.
@@ -222,9 +230,22 @@ class FuzzyFileFinder
       if ! @directories[real_dir]
         @directories[real_dir] = true
 
-        Dir.entries(directory.name).each do |entry|
+        Dir.entries(directory.name)
+        .tap { |_entries|
+          if _entries.length > ceiling/10
+            @dirs_with_many << [_entries.length, directory.name]
+            $diakonos.log "[#{self.class}] Many dir entries: #{_entries.length} in #{directory.name}"
+          end
+        }.each do |entry|
           next  if entry[0,1] == "."
-          raise TooManyEntries if files.length > ceiling
+          if files.length > ceiling
+            raise TooManyEntries.new(%{
+              Directories with many entries:
+
+              #{@dirs_with_many.map { |d| d.join("\t") }.join("\n")}
+
+            })
+          end
 
           full = File.join(directory.name, entry)
           next  if ignore?(full)

data/lib/diakonos/version.rb

@@ -1,6 +1,6 @@
 module Diakonos
-  VERSION       = '0.9.8'
-  LAST_MODIFIED = 'September 20, 2020'
+  VERSION       = '0.9.10'
+  LAST_MODIFIED = '2023-09-14'
 
   def self.parse_version( s )
     if s

data/lib/diakonos.rb

@@ -6,9 +6,9 @@
 # :title: Diakonos
 #
 # Author:: Pistos
-# Copyright (c) 2004-2021 Pistos
+# Copyright (c) 2004-2023 Pistos
 #
-# This software is released under the MIT licence.
+# This software is released under the GNU GPL licence v3.
 # See the LICENCE file included with this program, or
 # http://www.opensource.org/licenses/mit-license.php
 #
@@ -237,7 +237,7 @@ module Diakonos
     end
 
     def mkdir( dir )
-      if ! FileTest.exists?( dir )
+      if ! FileTest.exist?( dir )
         Dir.mkdir dir
       end
     end
@@ -473,7 +473,7 @@ module Diakonos
           FileUtils.rmdir d
         rescue Errno::ENOTEMPTY
         end
-        if File.exists? d
+        if File.exist? d
           $stderr.puts "(#{d} not removed)"
         end
       end
@@ -550,7 +550,7 @@ module Diakonos
         tagfile = "./tags"
       end
 
-      if ! FileTest.exists? tagfile
+      if ! FileTest.exist? tagfile
         set_iline "(tags file not found)"
       else
         IO.foreach( tagfile ) do |line_|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diakonos
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.10
 platform: ruby
 authors:
 - Pistos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.4
 description: Diakonos is a console text editor for the masses.
 email: diakonos dawt pistos aet purepistos dawt net
 executables:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Console text editor for the masses