glimmer-cs-gladiator 0.8.1 → 0.9.2

data/glimmer-cs-gladiator.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-cs-gladiator 0.8.1 ruby lib
+# stub: glimmer-cs-gladiator 0.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.8.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2021-02-07"
+  s.date = "2021-12-10"
   s.description = "Gladiator (short for Glimmer Editor) is a Glimmer sample project under on-going development. It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using Glimmer to build a text editor. Gladiator is also a personal tool for shaping an editor exactly the way I like. I leave building truly professional text editors to software tooling experts who would hopefully use Glimmer one day.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer-cs-gladiator".freeze, "gladiator".freeze, "gladiator-setup".freeze]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/models/glimmer/gladiator/dir.rb",
     "lib/models/glimmer/gladiator/file.rb",
     "lib/views/glimmer/gladiator.rb",
+    "lib/views/glimmer/gladiator/file_edit_menu.rb",
     "lib/views/glimmer/gladiator/file_explorer_tree.rb",
     "lib/views/glimmer/gladiator/file_lookup_list.rb",
     "lib/views/glimmer/gladiator/gladiator_menu_bar.rb",
@@ -45,36 +46,30 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/AndyObtiva/glimmer-cs-gladiator".freeze
   s.licenses = ["MIT".freeze]
   s.post_install_message = "\nTo make the gladiator command available system-wide (especially with RVM), make sure you run this command with jruby in path: gladiator-setup\n\n".freeze
-  s.rubygems_version = "3.0.6".freeze
+  s.rubygems_version = "3.1.6".freeze
   s.summary = "Gladiator (Glimmer Editor) - Glimmer Custom Shell - Text Editor Built in Ruby".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 5.0.0.0"])
-      s.add_runtime_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
-      s.add_runtime_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
-      s.add_development_dependency(%q<warbler>.freeze, ["= 2.0.5"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 5.0.0.0"])
-      s.add_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
-      s.add_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
-      s.add_dependency(%q<warbler>.freeze, ["= 2.0.5"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.16.0"])
+    s.add_runtime_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
+    s.add_runtime_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+    s.add_development_dependency(%q<warbler>.freeze, ["= 2.0.5"])
+    s.add_development_dependency(%q<jruby-jars>.freeze, ["= 9.2.19.0"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 5.0.0.0"])
+    s.add_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.16.0"])
     s.add_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
     s.add_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
     s.add_dependency(%q<warbler>.freeze, ["= 2.0.5"])
+    s.add_dependency(%q<jruby-jars>.freeze, ["= 9.2.19.0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end

data/lib/glimmer-cs-gladiator/launch.rb

@@ -1,6 +1,6 @@
-require_relative '../glimmer-cs-gladiator'
-
-include Glimmer
-
-local_dir = ENV['LOCAL_DIR'] || '.'
-gladiator(project_dir_path: local_dir).open
+require_relative '../glimmer-cs-gladiator'
+
+include Glimmer
+
+local_dir = ENV['LOCAL_DIR'] || '.'
+gladiator(project_dir_path: local_dir).open

data/lib/glimmer-cs-gladiator.rb

@@ -1,30 +1,30 @@
-$LOAD_PATH.unshift(File.expand_path('..', __FILE__))
-
-require 'glimmer-dsl-swt'
-require 'filewatcher'
-require 'clipboard'
-require 'puts_debuggerer'
-require 'views/glimmer/gladiator'
-
-# Custom Composite Initializer (avoid default margins)
-Glimmer::SWT::WidgetProxy::DEFAULT_INITIALIZERS['composite'] = lambda do |composite|
-  if composite.get_layout.nil?
-    layout = GridLayout.new
-    composite.layout = layout
-  end
-end
-
-# Custom LayoutProxy initialize method (avoid default margins)
-module Glimmer
-  module SWT
-    class LayoutProxy
-      def initialize(underscored_layout_name, widget_proxy, args)
-        @underscored_layout_name = underscored_layout_name
-        @widget_proxy = widget_proxy
-        args = SWTProxy.constantify_args(args)
-        @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
-        @widget_proxy.swt_widget.setLayout(@swt_layout)
-      end
-    end
-  end
-end
+$LOAD_PATH.unshift(File.expand_path('..', __FILE__))
+
+require 'glimmer-dsl-swt'
+require 'filewatcher'
+require 'clipboard'
+require 'puts_debuggerer'
+require 'views/glimmer/gladiator'
+
+# Custom Composite Initializer (avoid default margins)
+Glimmer::SWT::WidgetProxy::DEFAULT_INITIALIZERS['composite'] = lambda do |composite|
+  if composite.get_layout.nil?
+    layout = GridLayout.new
+    composite.layout = layout
+  end
+end
+
+# Custom LayoutProxy initialize method (avoid default margins)
+module Glimmer
+  module SWT
+    class LayoutProxy
+      def initialize(underscored_layout_name, widget_proxy, args)
+        @underscored_layout_name = underscored_layout_name
+        @widget_proxy = widget_proxy
+        args = SWTProxy.constantify_args(args)
+        @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
+        @widget_proxy.swt_widget.setLayout(@swt_layout)
+      end
+    end
+  end
+end

data/lib/models/glimmer/gladiator/command.rb

@@ -1,112 +1,112 @@
-module Glimmer
-  class Gladiator
-    class Command
-      include Glimmer
-      
-      class << self
-        include Glimmer
-        
-        def command_history
-          @command_history ||= {}
-        end
-        
-        def command_history_for(file)
-          # keeping a first command to make redo support work by remembering next command after undoing all
-          command_history[file] ||= [Command.new(file)]
-        end
-        
-        def do(file, method = nil, *args, command: nil)
-          if command.nil?
-            command ||= Command.new(file, method, *args)
-            command.previous_command = command_history_for(file).last
-            unless command_history_for(file).last.method == :change_content! && method == :change_content!
-              command_history_for(file).last.next_command = command
-            end
-            command.do
-            command_history_for(file) << command unless command_history_for(file).last.method == :change_content! && method == :change_content!          
-          else
-            command_history_for(file) << command
-          end
-        end
-        
-        def undo(file)
-          return if command_history_for(file).size <= 1
-          command = command_history_for(file).pop
-          command&.undo
-        end
-        
-        def redo(file)
-          command = command_history_for(file).last
-          command&.redo
-        end
-        
-        def clear(file)
-          command_history[file] = [Command.new(file)]
-        end
-      end
-    
-      attr_accessor :file, :method, :args, :previous_command, :next_command, 
-                    :file_dirty_content, :file_caret_position, :file_selection_count, :previous_file_dirty_content, :previous_file_caret_position, :previous_file_selection_count
-    
-      def initialize(file, method = nil, *args)
-        @file = file
-        @method = method
-        @args = args
-      end
-      
-      
-      def native?
-        @method.nil?
-      end
-      
-      def do
-        return if native?
-        backup
-        execute
-      end
-      
-      def undo
-        return if native?
-        restore
-      end
-      
-      def redo
-        return if next_command.nil?# || next_command.native?
-        @file.dirty_content = next_command.file_dirty_content.clone
-        @file.caret_position = next_command.file_caret_position
-        @file.selection_count = next_command.file_selection_count
-        Command.do(next_command.file, command: next_command)
-      end
-      
-      def backup
-        @previous_file_dirty_content = @file.dirty_content.clone
-        @previous_file_caret_position = @file.caret_position
-        @previous_file_selection_count = @file.selection_count
-        if @method == :change_content!
-          @previous_file_caret_position = @file.last_caret_position
-          @previous_file_selection_count = @file.last_selection_count
-        end
-      end
-      
-      def restore
-        @file.dirty_content = @previous_file_dirty_content.clone
-        @file.caret_position = @previous_file_caret_position
-        @file.selection_count = @previous_file_selection_count
-      end
-      
-      def execute
-        @file.start_command
-        @file.send(@method, *@args)
-        @file.end_command
-        @file_dirty_content = @file.dirty_content.clone
-        @file_caret_position = @file.caret_position
-        @file_selection_count = @file.selection_count
-        if previous_command.method == :change_content! && @method == :change_content!
-          previous_command.file_dirty_content = @file_dirty_content
-          previous_command.file_caret_position = @file_caret_position
-          previous_command.file_selection_count = @file_selection_count
-        end
-      end
-    end
-  end
-end
+module Glimmer
+  class Gladiator
+    class Command
+      include Glimmer
+      
+      class << self
+        include Glimmer
+        
+        def command_history
+          @command_history ||= {}
+        end
+        
+        def command_history_for(file)
+          # keeping a first command to make redo support work by remembering next command after undoing all
+          command_history[file] ||= [Command.new(file)]
+        end
+        
+        def do(file, method = nil, *args, command: nil)
+          if command.nil?
+            command ||= Command.new(file, method, *args)
+            command.previous_command = command_history_for(file).last
+            unless command_history_for(file).last.method == :change_content! && method == :change_content!
+              command_history_for(file).last.next_command = command
+            end
+            command.do
+            command_history_for(file) << command unless command_history_for(file).last.method == :change_content! && method == :change_content!
+          else
+            command_history_for(file) << command
+          end
+        end
+        
+        def undo(file)
+          return if command_history_for(file).size <= 1
+          command = command_history_for(file).pop
+          command&.undo
+        end
+        
+        def redo(file)
+          command = command_history_for(file).last
+          command&.redo
+        end
+        
+        def clear(file)
+          command_history[file] = [Command.new(file)]
+        end
+      end
+    
+      attr_accessor :file, :method, :args, :previous_command, :next_command,
+                    :file_dirty_content, :file_caret_position, :file_selection_count, :previous_file_dirty_content, :previous_file_caret_position, :previous_file_selection_count
+    
+      def initialize(file, method = nil, *args)
+        @file = file
+        @method = method
+        @args = args
+      end
+      
+      
+      def native?
+        @method.nil?
+      end
+      
+      def do
+        return if native?
+        backup
+        execute
+      end
+      
+      def undo
+        return if native?
+        restore
+      end
+      
+      def redo
+        return if next_command.nil?# || next_command.native?
+        @file.dirty_content = next_command.file_dirty_content.clone
+        @file.caret_position = next_command.file_caret_position
+        @file.selection_count = next_command.file_selection_count
+        Command.do(next_command.file, command: next_command)
+      end
+      
+      def backup
+        @previous_file_dirty_content = @file.dirty_content.clone
+        @previous_file_caret_position = @file.caret_position
+        @previous_file_selection_count = @file.selection_count
+        if @method == :change_content!
+          @previous_file_caret_position = @file.last_caret_position
+          @previous_file_selection_count = @file.last_selection_count
+        end
+      end
+      
+      def restore
+        @file.dirty_content = @previous_file_dirty_content.clone
+        @file.caret_position = @previous_file_caret_position
+        @file.selection_count = @previous_file_selection_count
+      end
+      
+      def execute
+        @file.start_command
+        @file.send(@method, *@args)
+        @file.end_command
+        @file_dirty_content = @file.dirty_content.clone
+        @file_caret_position = @file.caret_position
+        @file_selection_count = @file.selection_count
+        if previous_command.method == :change_content! && @method == :change_content!
+          previous_command.file_dirty_content = @file_dirty_content
+          previous_command.file_caret_position = @file_caret_position
+          previous_command.file_selection_count = @file_selection_count
+        end
+      end
+    end
+  end
+end

data/lib/models/glimmer/gladiator/dir.rb

@@ -6,7 +6,7 @@ module Glimmer
       include Glimmer
       include Glimmer::DataBinding::ObservableModel
       
-      IGNORE_PATHS = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist']
+      IGNORE_PATHS = ['.gladiator', '.gladiator-scratchpad', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist']
 
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path
@@ -16,7 +16,7 @@ module Glimmer
         @project_dir = project_dir
         if is_local_dir
           @filewatcher = Filewatcher.new(path)
-          Thread.new(@filewatcher) do |fw|
+          @filewatcher_thread = Thread.new(@filewatcher) do |fw|
             begin
               fw.watch do |filename, event|
                 # TODO do fine grained processing of events for enhanced performance (e.g. dir refresh vs file change)
@@ -109,6 +109,19 @@ module Glimmer
       def selected_child_path_history
         @selected_child_path_history ||= []
       end
+      
+      def close
+        all_children_files.each(&:close)
+        stop_filewatcher
+      end
+      
+      def stop_filewatcher
+        @filewatcher&.stop
+        @filewatcher_thread&.kill
+        @filewatcher_thread = nil
+        @filewatcher&.finalize
+        @filewatcher = nil
+      end
   
       def pause_refresh
         @refresh_paused = true
@@ -177,7 +190,8 @@ module Glimmer
         # scratchpad scenario
         if selected_path.empty? # Scratchpad
           @selected_child&.write_dirty_content
-          return (self.selected_child = File.new)
+          @scratchpad = (self.selected_child = File.new('', project_dir)) if @scratchpad.nil? || @scratchpad.closed?
+          return @scratchpad
         end
         full_selected_path = selected_path.include?(project_dir.path) ? selected_path : ::File.join(project_dir.path, selected_path)
         return if ::Dir.exist?(full_selected_path) ||
@@ -188,7 +202,6 @@ module Glimmer
           new_child = find_child_file(selected_path)
           begin
             unless new_child.dirty_content.nil?
-              self.selected_child&.stop_filewatcher
               selected_child_path_history << new_child.path if new_child && !selected_child_path_history.include?(new_child.path)
               self.selected_child = new_child
               self.selected_child.start_filewatcher