glimmer-cs-gladiator 0.8.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11730722d7270481d6ddd3b4ddccf2cea3e4e845896ef78528bb20caf5cdc29a
-  data.tar.gz: 25f8fa48610d54e44dc6d848fe0d583a6857995fe09d021512e6d63202188e2a
+  metadata.gz: a2bd61ab016bc1d3992e56c082f137a5ed81941806fd20249c3a94020cb9970c
+  data.tar.gz: 293d2e2c7928fd5098e9f831b92cda26fc293bba8fdc5d8f11f06ef965877660
 SHA512:
-  metadata.gz: 8af3c74194e99143bbefd4bf04b5c1077377264a274cd18075ea0eeebf68d5559a597adc59070e6d978aa4fada54e8e3c915fdd56ccf1a620ce1931d2ed9ad01
-  data.tar.gz: 3c8e99fac4c80e4ede247883fb9b96c1823b24d69f0f3518abcbcf4a78c9889f78d161b7655a39f67615614d68b766e22504ac2dc1c9840b2a145e6fe3dcfc9e
+  metadata.gz: 468c13aaba846681e204d56e730b3a4c673fbee65f85423817f3580560bfb6c0361655504dfcffbcfe1c44aab184b1db637aa2e07713bf6f77a1f288579e8672
+  data.tar.gz: 99929299b521b244b8d4912a4fec64f7b6e0bd630b3e4e49a257ad7247391187dcb5a0dcb85ff06726170fb706d1998b8f496fe38f40996c93316cf444798186

data/CHANGELOG.md

@@ -1,7 +1,50 @@
 # Change Log
 
+## 0.9.2
+
+- Ensure cleaning filewatcher/thread resources when closing a project dir/file
+- Fix issue with `gladiator` function command produced by `gladiator-setup` not forwarding arguments in
+- Fix issue with making changes to file through Find/Replace not persisting if I close Gladiator right afterwards unless I focus/unfocus open text editor
+- Fix issue with not being able to open a project by passing project directory as first argument to `gladiator` command
+- Fix issue with sometimes not remembering last open tabs when opening Gladiator
+- Fix issues with renaming files in file explorer not reflecting change in open tab file name
+- Fix minor issue with leaving `'-J-Xrs'` option in `bin/gladiator`
+- Fix issue with Scratchpad not running content anymore
+- Fix issue of stopping file watcher for open files that still need watching
+
+## 0.9.1
+
+- Upgrade to glimmer-dsl-swt 4.20.15.4
+- Fix issue with keyboard shortcuts not working in first tab (also fix scroll-jittering when performing CMD+] and CMD+[ in first tab)
+- Change Quit Project keyboard shortcut to ALT+F4
+- In app mode (packaged version), show "Open Project..." shell again after closing last open project
+
+## 0.9.0
+
+- Upgrade to glimmer-dsl-swt 4.19.0.0
+- Updated quit project accelerator (keyboard shortcut) to ALT+F4
+
+## 0.8.3
+
+- Switch Scratchpad evaling to loading a temporary local file under `project_dir/.gladiator-scratchpad` for a more realistic Ruby running experience
+- Fix issue with detecting current gladiator window when handling keyboard shortcuts
+- Fix issue with Scratchpad opening twice when called twice instead of reusing the existing Scratchpad
+- Fix issue with closed tabs not closing their file streams/watchers, including the Scratchpad temporary file
+
+## 0.8.2
+
+- Add a right click menu on text editor area with undo redo | cut, copy, paste, delete | select all
+- Replaced error message_box with a more readable error dialog for running Ruby code
+- Update Ruby Run menu item command to run against the top level binding receiver (ensuring no weird errors when including Glimmer)
+- In app mode, display an "Open Project..." button
+- In app mode, set gladiator icon on initial shell
+- Fix full line selection on Windows (SHIFT+HOME or SHIFT+END)
+- Fix issue with display saving original file before changes when running in app mode, making changes to an open project, and then closing
+- Fix caret position after formatting dirty content (when pasting a string that has extra empty spaces for example)
+
 ## 0.8.1
 
+- Package Gladiator as a Windows MSI file
 - Fix issue with HOME and END taking to beginning of file and end of file on Windows instead of beginning of line and end of line
 - Fix opening first tab on Windows (shows up as blank, but second tab shows up fine)
 - Fix issue with losing focus on changing tabs on Windows via Windows default tab switching shortcuts of CTRL+PGUP & CTRL+PGDN

data/LICENSE.txt

@@ -1,20 +1,20 @@
-Copyright (c) 2020-2021 Andy Maleh
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2020-2021 Andy Maleh
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,19 +1,19 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.8.1 - [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-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.9.2 - [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 DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample beta project under on-going development that demonstrates how to build a text editor in Ruby using [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library).
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) (short for Glimmer Editor) is a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample beta project under on-going development that demonstrates how to build a text editor in Ruby using [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.
+[Gladiator](https://rubygems.org/gems/glimmer-cs-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](https://rubygems.org/gems/glimmer-cs-gladiator) to develop all my [open-source projects](https://github.com/AndyObtiva) since May of 2020.
 
-You may now [download](#download) a packaged version of Gladiator.
+You may now [download](#download) a packaged version of [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator).
 
 ## Features
 
-Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL/CTRL=ALT on Windows/Linux)
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL/CTRL=ALT on Windows/Linux)
 
 ![Gladiator Demo](images/glimmer-gladiator.gif)
 
@@ -45,16 +45,16 @@ Gladiator currently supports the following text editing features (including keyb
 ### Navigation Area
 
 - Show current text editor file name
-- Show file navigation stats (Caret Position / Line Position / Selection Count / Top Pixel)
+0- Show file navigation stats (Caret Position / Line Position / Selection Count / Top Pixel)
 - Jump to Line (CMD+L)
 - Find & Replace (CMD+F)
 
 ### Menus
 
 - File Menu:
+  - Open Scratchpad for running arbitrary Ruby/Glimmer code (saves a temporary file to `project_dir/.gladiator-scratchpad`) (CMD+SHIFT+S)
   - Open Project (CMD+O)
-  - Quit Project (CMD+ALT+Q)
-  - New Scratchpad for running arbitrary Ruby/Glimmer code without saving to disk (CMD+SHIFT+S)
+  - Quit Project (ALT+F4)
 - View Menu
   - Split Pane
     - Orientation change to Horizontal/Vertical (CMD+SHIFT+O)
@@ -105,9 +105,9 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Platforms
 
-- Mac: Gladiator works best on the Mac. This is the platform it is most used on and receives the most maintenance for.
-- Windows: Gladiator works fine on Windows, but has a few minor issues.
-- Linux: Gladiator works with handicaps on Linux (performing some text editing operations causes scroll jitter). Contributers could help fix.
+- Mac: [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) works best on the Mac. This is the platform it is most used on and receives the most maintenance for.
+- Windows: [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) works OK on Windows, but has a few annoying issues.
+- Linux: [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) works with handicaps on Linux (performing some text editing operations causes scroll jitter). Contributers could help fix.
 
 ## Pre-requisites
 
@@ -117,17 +117,21 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Download
 
-[Download Gladiator Mac DMG Installer](https://www.dropbox.com/s/uklftb8q16czgo6/Gladiator-0.8.1.dmg?dl=1)
+[Download Gladiator 0.9.2 Mac DMG Installer (x64 Catalina & Older)](https://www.dropbox.com/s/8gvthczqhb9szwp/Gladiator-0.9.2.dmg?dl=1)
 
-[Download Gladiator Windows MSI Installer](https://www.dropbox.com/s/uuvo5h6golzmr82/Gladiator-0.8.1.msi?dl=1)
+[Download Gladiator 0.9.2 Windows MSI Installer (x64 Windows 10)](https://www.dropbox.com/s/xxik700jh0utn8q/Gladiator-0.9.2.msi?dl=1)
+
+[Download Gladiator 0.9.1 Mac DMG Installer (x64 Big Sur & Older)](https://www.dropbox.com/s/s9yp6qtelh85qko/Gladiator-0.9.1.dmg?dl=1)
+
+The packaged version starts with a dialog asking you what project to open. [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) does not fully show up until you have selected a project directory.
 
 Otherwise, if you prefer a command line version, then follow the Setup Instructions below.
 
 ## Setup Instructions
 
-Note: if you encounter any issues, check if they are documented in [TODO.md](TODO.md), [issues](https://github.com/AndyObtiva/glimmer-cs-gladiator/issues), or [pull requests](https://github.com/AndyObtiva/glimmer-cs-gladiator/pulls) as they might be on my radar to fix. Otherwise, please report as an [issue](https://github.com/AndyObtiva/glimmer-cs-gladiator/issues) or better yet fix and submit a [pull request](https://github.com/AndyObtiva/glimmer-cs-gladiator/pulls).
+Note: if you encounter any issues, check if they are documented in [TODO.md](TODO.md), [issues](https://github.com/AndyObtiva/glimmer-cs-gladiator/issues), or [pull requests](https://github.com/AndyObtiva/glimmer-cs-gladiator/pulls) as they might be on my radar to fix. Otherwise, please report as an [issue](https://github.com/AndyObtiva/glimmer-cs-gladiator/issues) or better yet fix and submit a [pull request](https://github.com/AndyObtiva/glimmer-cs-gladiator/pulls). Also, try going back to a [previous version of the gem](https://rubygems.org/gems/glimmer-cs-gladiator/versions) until you find one that works. Keep in mind this is open-source software provided as is, so there are no guarantees of functionality. If you would like such guarantees, you are welcome to [hire me full-time](https://www.linkedin.com/in/andymaleh/).
 
-Install Gladiator gem by running (`jgem`, `jruby -S gem`, or `gem` directly if you have [RVM](https://rvm.io/)):
+Install [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) gem by running (`jgem`, `jruby -S gem`, or `gem` directly if you have [RVM](https://rvm.io/)):
 
 ```
 jgem install glimmer-cs-gladiator
@@ -137,7 +141,7 @@ Or add to a JRuby project Bundler `Gemfile` under the `:developement` group:
 
 ```
 group :development do
-  gem 'glimmer-cs-gladiator'
+  gem 'glimmer-cs-gladiator', '> 0'
 end
 ```
 
@@ -147,19 +151,18 @@ Run (`jruby -S bundle` or `bundle` directly if you have [RVM](https://rvm.io/)):
 jruby -S bundle
 ```
 
-Afterwards, to ensure system wide availablility of the `gladiator` command, run this command in an environment that has JRuby:
+Afterwards, if you are using [RVM](https://rvm.io/) and want to ensure system wide availablility of the `gladiator` command across Ruby versions, run this command in an environment that has JRuby (not needed without [RVM](https://rvm.io/)):
 
 ```
 gladiator-setup
+source ~/.gladiator_source
 ```
 
-Finally, start a new terminal session or source .gladiator_source:
+You should be able to run `gladiator` from anywhere now.
 
-```
-source ~/.gladiator_source
-```
+You can pass a project path as a first argument to open a particular project.
 
-You should be able to run `gladiator` from anywhere now, even cross-rubies in [RVM](https://rvm.io).
+Alternatively, open in app mode (gives you a dialog to open any project) by passing `APP_MODE=true` argument/env-var.
 
 ## Usage
 
@@ -191,11 +194,11 @@ Note: If you cloned this project and bundle installed, you may invoke via `bin/g
 
 ### Glimmer Custom Shell Reuse
 
-To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application, add the
+To reuse [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) as a Glimmer Custom Shell inside another Glimmer application, add the
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '>= 0.8.1'
+gem 'glimmer-cs-gladiator', '>= 0.9.2'
 ```
 
 Run:
@@ -204,11 +207,17 @@ Run:
 jruby -S bundle
 ```
 
-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.
+And, then instantiate the [Gladiator](https://rubygems.org/gems/glimmer-cs-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
 
-Gladiator opens with the current directory as the root by default.
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) supports these environment variable options.
+
+### LOCAL_DIR
+
+(String / default: `'.'`)
+
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) opens with the current directory as the root by default.
 If you would like to open another directory, set `LOCAL_DIR` environment variable.
 
 Example:
@@ -217,26 +226,51 @@ Example:
 LOCAL_DIR="/Users/User/code" gladiator
 ```
 
-Opens Gladiator with "/Users/User/code" as the root directory.
+Opens [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) with "/Users/User/code" as the root directory.
+
+### APP_MODE
+
+(`true` or `false` / default: `false` from terminal/command-line and `true` from [packaged Gladiator](#download))
+
+Specifies whether to run in app mode, thus providing a dialog to open any project path instead of starting with a specific project from the get-go.
+
+Example:
+
+```
+APP_MODE=true gladiator
+```
 
 ## Configuration
 
-Gladiator automatically saves configuration data in a `.gladiator` file at the directory it is run from. It may be edited to add extra ignore paths.
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) automatically saves configuration data in a `.gladiator` file at the directory it is run from. It may be edited to add extra ignore paths.
 
 It currently remembers:
 - Last opened files (in both split panes if split)
 - Window size and position
 - Ignore Paths under `Glimmer::Gladiator::Dir::IGNORE_PATHS` (default: `['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist']`)
 
-## Gotcha
+## Gotchas
 
-Gladiator repetitively displays a signaling error that is harmless in practice:
+### Signaling Error
+
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) repetitively displays a signaling error that is harmless in practice:
 ```
 The signal HUP is in use by the JVM and will not work correctly on this platform
 The signal INT is in use by the JVM and will not work correctly on this platform
 The signal TERM is in use by the JVM and will not work correctly on this platform
 ```
 
+### App Is Not Responding
+
+If you run the `gladiator` command from the root directory or some parent directory to many projects, it assumes that is
+the project directory and attempts to pre-load all files (just part of [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator)'s architectural design and assumptions for optimizing use per project), taking a very long time and not responding for quite a while.
+
+To avoid this problem, always make sure you are running the `gladiator` command from a single project's directory.
+
+Also, if you encounter this issue with projects that contain a lot of extra files that you do not need to edit, you
+could later open the generated `.gladiator` file at the root of the project directory and add unnecessary subdirectories
+to the `ignore_paths` array.
+
 ## TODO
 
 [TODO.md](TODO.md)

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.2

data/bin/gladiator

@@ -1,34 +1,31 @@
-#!/usr/bin/env jruby
-
-# Copyright (c) 2020-2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'glimmer/launcher'
-
-gladiator_runner = File.expand_path('../glimmer-cs-gladiator', __FILE__)
-launcher = Glimmer::Launcher.new([gladiator_runner, '-J-Xrs'] + ARGV)
-launcher.application_paths.to_a.each do |file|
-  if file != gladiator_runner
-    launcher.application_paths.delete(file)
-    ENV['LOCAL_DIR'] ||= file
-  end
-end
-launcher.launch
+#!/usr/bin/env jruby
+
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/launcher'
+
+gladiator_runner = File.expand_path('../glimmer-cs-gladiator', __FILE__)
+launcher = Glimmer::Launcher.new([gladiator_runner] + ARGV)
+local_dir = ARGV.find {|arg| !arg.include?('=') }
+local_dir = File.expand_path(local_dir) if local_dir
+ENV['LOCAL_DIR'] ||= local_dir if local_dir != gladiator_runner
+launcher.launch

data/bin/gladiator-setup

@@ -1,80 +1,80 @@
-#!/usr/bin/env ruby
-
-# Copyright (c) 2020-2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-version = File.read(File.expand_path('../VERSION', __dir__))
-puts "== Gladiator (Glimmer Editor) Version #{version.strip} =="
-
-ruby = `which jruby`.to_s.strip
-if ruby.empty?
-  return puts('jruby is not available. Make sure you have jruby installed and available in path environment (or selected if using RVM)')
-end
-
-rvm_command = `which rvm`
-if rvm_command.to_s.strip.empty?
-  command = "#{ruby} #{File.expand_path('../gladiator', __FILE__)}"
-else
-  rvm = `rvm current`.strip
-  command = "rvm #{rvm} do #{ruby} #{File.expand_path('../gladiator', __FILE__)}"
-end
-
-gladiator_script = <<~SHELL_SCRIPT
-  function gladiator()
-  {
-    #{command}
-  }
-SHELL_SCRIPT
-
-
-require 'fileutils'
-home_dir = `echo ~`.strip
-FileUtils.mkdir_p("#{home_dir}/bin")
-gladiator_script_file = "#{home_dir}/.gladiator_source"
-gladiator_script_file_bash = "$HOME/.gladiator_source"
-File.write(gladiator_script_file, gladiator_script)
-
-[
-  ['.bash_profile', '.bashrc'],
-  ['.zprofile', '.zshrc']
-].each do |profile_and_fallback|
-  shell_profile_file_name = profile_and_fallback.first
-  shell_profile_file_name = profile_and_fallback.last if !File.exist?("#{home_dir}/#{shell_profile_file_name}")
-  shell_profile_file = "#{home_dir}/#{shell_profile_file_name}"
-  FileUtils.touch(shell_profile_file)
-  shell_profile = File.read(shell_profile_file)
-  gladiator_source_statement = "source \"#{gladiator_script_file_bash}\""
-  unless shell_profile.split("\n").detect {|line| line.include?(gladiator_source_statement) }
-    File.write(shell_profile_file, "#{shell_profile}\n#{gladiator_source_statement}")
-  end
-  puts "~/#{shell_profile_file_name} has been modified to source the `gladiator` function from ~/.gladiator_source"
-end
-
-puts <<~OUTPUT
-  
-  Before using `gladiator`, start a new shell session (open a new terminal tab) or run:
-  
-  source ~/.gladiator_source
-  
-  Afterwards, you may run the following command from anywhere to start Gladiator (Glimmer Editor):
-  
-  gladiator
-OUTPUT
+#!/usr/bin/env ruby
+
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+version = File.read(File.expand_path('../VERSION', __dir__))
+puts "== Gladiator (Glimmer Editor) Version #{version.strip} =="
+
+ruby = `which jruby`.to_s.strip
+if ruby.empty?
+  return puts('jruby is not available. Make sure you have jruby installed and available in path environment (or selected if using RVM)')
+end
+
+rvm_command = `which rvm`
+if rvm_command.to_s.strip.empty?
+  command = "#{ruby} #{File.expand_path('../gladiator', __FILE__)}"
+else
+  rvm = `rvm current`.strip
+  command = "rvm #{rvm} do #{ruby} #{File.expand_path('../gladiator', __FILE__)}"
+end
+
+gladiator_script = <<~SHELL_SCRIPT
+  function gladiator()
+  {
+    #{command} $@
+  }
+SHELL_SCRIPT
+
+
+require 'fileutils'
+home_dir = `echo ~`.strip
+FileUtils.mkdir_p("#{home_dir}/bin")
+gladiator_script_file = "#{home_dir}/.gladiator_source"
+gladiator_script_file_bash = "$HOME/.gladiator_source"
+File.write(gladiator_script_file, gladiator_script)
+
+[
+  ['.bash_profile', '.bashrc'],
+  ['.zprofile', '.zshrc']
+].each do |profile_and_fallback|
+  shell_profile_file_name = profile_and_fallback.first
+  shell_profile_file_name = profile_and_fallback.last if !File.exist?("#{home_dir}/#{shell_profile_file_name}")
+  shell_profile_file = "#{home_dir}/#{shell_profile_file_name}"
+  FileUtils.touch(shell_profile_file)
+  shell_profile = File.read(shell_profile_file)
+  gladiator_source_statement = "source \"#{gladiator_script_file_bash}\""
+  unless shell_profile.split("\n").detect {|line| line.include?(gladiator_source_statement) }
+    File.write(shell_profile_file, "#{shell_profile}\n#{gladiator_source_statement}")
+  end
+  puts "~/#{shell_profile_file_name} has been modified to source the `gladiator` function from ~/.gladiator_source"
+end
+
+puts <<~OUTPUT
+  
+  Before using `gladiator`, start a new shell session in the same directory (open a new terminal tab and go to the same directory) or run:
+  
+  source ~/.gladiator_source
+  
+  Afterwards, you may run the following command from anywhere to start Gladiator (Glimmer Editor):
+  
+  gladiator
+OUTPUT

data/bin/glimmer-cs-gladiator

@@ -1,22 +1,22 @@
-# Copyright (c) 2020-2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require_relative '../lib/glimmer-cs-gladiator/launch'
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_relative '../lib/glimmer-cs-gladiator/launch'