glimmer-cs-gladiator 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d7db15419bc0913d01e3e15634e12833a1f36a7fc3160e2a7835ab6560832af
-  data.tar.gz: 6e55a2c18985603a0b6438198fad5959bcea27b65a8e43b8a810fd42ec5fda76
+  metadata.gz: 1111b445263923138023d8a6944c2e9e97acabee157bf51b3ebe6b198a082f1d
+  data.tar.gz: 9eb85280093b99e302eccfe2d5ca63728d52cf76c823917a5317fc6b0c2ad771
 SHA512:
-  metadata.gz: bae9a2b2eb76cf9ca64ec0d76216fa8aa7c12e97805dbfee42dace54deceedba6eeb1579b65cbdb7c1ad595a44e5768ac372619db804f5fbc240ee52afbecb4d
-  data.tar.gz: 56186b8a8d31dc8974ff4f35afd4f7a37d4932cea6b1c4517832ae760ec1f6c5d0092c6048a5f333bf1e438bd514ccd2db3a6ca0ac45d35a519d35194861c251
+  metadata.gz: d3439fc60d40194cdf87431cdd886c43c16e75e0855040acd84017127b3f2b3f1d6a89b2b52bf9f69b39c7fc82defc87b499a14cdb1c19608f1765ebe6b12209
+  data.tar.gz: 4235750d7d134285f32e1b7961041232bfe8f31f9260836fbd067f1cc6fb81752d79f61bc5171bfe6da39d59fe6dd6ff96d65d87e88630156dc46f8ca5e8d699

data/README.md

@@ -1,10 +1,10 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.2.4 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
-## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer#custom-shell-gem)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.3.0 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
 
-Gladiator (short for Glimmer Editor) is a [Glimmer](https://github.com/AndyObtiva/glimmer) sample project under on-going development that demonstrates how to build a text editor in [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).
+Gladiator (short for Glimmer Editor) is a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample project under on-going development that demonstrates how to build a text editor in [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library).
 It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using [Glimmer](https://github.com/AndyObtiva/glimmer).
 Gladiator is also a personal tool for shaping an editor exactly the way I like, with all the keyboard shortcuts I prefer. 
 I leave building truly professional text editors to software tooling experts who would hopefully use [Glimmer](https://github.com/AndyObtiva/glimmer) one day. Otherwise, I have been happily using Gladiator to develop all my [open-source projects](https://github.com/AndyObtiva) since May of 2020.
@@ -39,9 +39,9 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Pre-requisites
 
-- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library): '>= 0.1.0', '< 2.0.0' (dependency included in Ruby gem).
-- [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
-- [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
+- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library): '>= 4.17.2.0', '< 5.0.0.0' (dependency included in Ruby gem).
+- [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
+- [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
 
 ## Setup Instructions
 
@@ -99,7 +99,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.2.4'
+gem 'glimmer-cs-gladiator', '~> 0.3.0'
 ```
 
 Run:
@@ -108,7 +108,7 @@ Run:
 jruby -S bundle
 ```
 
-And, then instantiate the Gladiator [custom shell](https://github.com/AndyObtiva/glimmer#custom-shells) in your [Glimmer](https://github.com/AndyObtiva/glimmer) application via the `gladiator` keyword assuming you already have `include Glimmer` in your class, module, or main object.
+And, then instantiate the Gladiator [custom shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shells) in your [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) application via the `gladiator` keyword assuming you already have `include Glimmer` in your class, module, or main object.
 
 ## Env Var Options
 
@@ -132,6 +132,7 @@ It currently remembers:
 - Caret position
 - Top line position
 - Opened tabs
+- Ignore Paths
 
 ## Gotcha
 
@@ -164,6 +165,6 @@ Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further detail
 
 --
 
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library)
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library)
 
 Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/glimmer-cs-gladiator.rb

@@ -4,3 +4,26 @@ 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/dir.rb

@@ -11,7 +11,7 @@ module Glimmer
         def local_dir
           unless @local_dir
             @local_dir = new(ENV['LOCAL_DIR'] || '.', true)
-            @local_dir.refresh
+#             @local_dir.refresh
             @filewatcher = Filewatcher.new(@local_dir.path)
             @thread = Thread.new(@filewatcher) do |fw| 
               fw.watch do |filename, event|
@@ -26,7 +26,7 @@ module Glimmer
         end        
       end
   
-      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path
+      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path, :is_local_dir
       attr_writer :all_children
   
@@ -34,6 +34,7 @@ module Glimmer
         @is_local_dir = is_local_dir
         self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
+        @ignore_paths = ['packages', 'tmp']
         self.filtered_path_options = []
       end
 
@@ -59,7 +60,12 @@ module Glimmer
       end
 
       def retrieve_children
-        @children = ::Dir.glob(::File.join(@path, '*')).map do |p| 
+        @children = ::Dir.glob(::File.join(@path, '*')).reject do |p|
+          # TODO make sure to configure ignore_paths in a preferences dialog 
+          Dir.local_dir.ignore_paths.reduce(false) do |result, ignore_path|
+            result || p.include?(ignore_path)
+          end
+        end.map do |p| 
           ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)
         end.sort_by do |c| 
           c.path.to_s.downcase 

data/lib/views/glimmer/gladiator.rb

@@ -150,7 +150,8 @@ module Glimmer
       local_dir = ENV['LOCAL_DIR'] || '.'
       @config_file_path = ::File.join(local_dir, '.gladiator')
       @config = {}
-      Dir.local_dir.all_children # pre-caches children
+      load_config_ignore_paths
+#       Dir.local_dir.all_children # pre-caches children            
     }
 
     ## Uncomment after_body block to setup observers for widgets in body
@@ -236,7 +237,12 @@ module Glimmer
         text "Gladiator - #{::File.expand_path(Dir.local_dir.path)}"
         minimum_size 520, 250
         size 1440, 900 
-        grid_layout 2, false
+        grid_layout(2, false)
+        on_swt_show {
+          swt_widget.setSize(@config[:shell_width], @config[:shell_height]) if @config[:shell_width] && @config[:shell_height]
+          swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]          
+          @loaded_config = true
+        }
         on_swt_close {
           Dir.local_dir.selected_child&.write_dirty_content
         }
@@ -432,7 +438,7 @@ module Glimmer
               text 'Find:'
             }
             @find_text = text {
-              layout_data(:fill, :fill, true, false) {
+              layout_data(:fill, :center, true, false) {
                 minimum_width 400
               }
               text bind(Dir.local_dir, 'selected_child.find_text')
@@ -511,11 +517,26 @@ module Glimmer
       }
     }
     
+    def load_config_ignore_paths
+      # TODO eliminate duplication with load_config
+      if ::File.exists?(@config_file_path)
+        config_yaml = ::File.read(@config_file_path)
+        return if config_yaml.to_s.strip.empty?
+        @config = YAML.load(config_yaml)
+        Dir.local_dir.ignore_paths = @config[:ignore_paths] if @config[:ignore_paths]
+        Dir.local_dir.ignore_paths ||= ['packages', 'tmp']
+      else
+        @loaded_config = true
+      end
+    end
+    
     def load_config
       if ::File.exists?(@config_file_path)
         config_yaml = ::File.read(@config_file_path)
         return if config_yaml.to_s.strip.empty?
         @config = YAML.load(config_yaml)
+        Dir.local_dir.ignore_paths = @config[:ignore_paths] if @config[:ignore_paths]
+        Dir.local_dir.ignore_paths ||= ['packages', 'tmp']
         open_file_paths1 = @config[:open_file_paths1] || @config[:open_file_paths]
         open_file_paths2 = @config[:open_file_paths2]
         open_file_paths1.to_a.each do |file_path|
@@ -529,11 +550,6 @@ module Glimmer
         Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
         Dir.local_dir.selected_child&.caret_position  = Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
         Dir.local_dir.selected_child&.top_index = @config[:top_index].to_i if @config[:top_index]
-        body_root.on_swt_show {
-          swt_widget.setSize(@config[:shell_width], @config[:shell_height]) if @config[:shell_width] && @config[:shell_height]
-          swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]          
-          @loaded_config = true
-        }
       else
         @loaded_config = true
       end
@@ -557,6 +573,7 @@ module Glimmer
         shell_y: swt_widget&.getBounds&.y,
         open_file_paths1: open_file_paths1,
         open_file_paths2: open_file_paths2,
+        ignore_paths: Dir.local_dir.ignore_paths
       }
       config_yaml = YAML.dump(@config)
       ::File.write(@config_file_path, config_yaml) unless config_yaml.to_s.empty?

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 4.17.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0.0
   name: glimmer-dsl-swt
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 4.17.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
   name: filewatcher
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,8 +51,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.4
   name: clipboard
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -65,8 +65,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,8 +79,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.9
   name: jeweler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -93,8 +93,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: simplecov
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Gladiator (Glimmer Editor) - Glimmer Custom Shell