glimmer 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ac7dc0e7c7beab5855763da9b232037f6561b93c0b8240db5a96fc74a3e026
-  data.tar.gz: 934ff722e09b38eec4c4ede3c369f910ead8d070bbb151f42ec59feac7d66328
+  metadata.gz: e6264cb7899c16ec9e6df0a24fc1365d1cd116633c6ce20010723badd50e4041
+  data.tar.gz: 98e5d5bb061edaae3a139540c6e0b7721bdba5c703a4cb7ce26e3232e85f62f4
 SHA512:
-  metadata.gz: abd9390fb32d7e5aaa099d8002527371825d7109e69adeb1fc91e2440dd8b92010691839983bcbed177ce27d5b7c469f9294a62a77261b971eba301986e0e3ae
-  data.tar.gz: c75edc6edce8909868465a75d26ba9cd054192ac256d34f2bc8f271e129326e504e91c3ca1f84b7a0be1c0079f609ab05995e21091002a4aa2d29d8f91a38d28
+  metadata.gz: d33841165b7d420be235057b4a95cf6f7a7ec6f4b3d04b7fcedd7e5233cdf2d3b3597bc83694fae30288ebf2f32741b9d1a0941be98472c1270190f2146a0890
+  data.tar.gz: 627a9b85c3709fd097e7b2cbb54266091e9c83f5a2005a5d9e97fa3bff1c68b6a32d76f67f70f67f19f44254a12c65d3f22b064cd6351c42e1f7fcf11503b825

data/README.markdown

@@ -1,4 +1,4 @@
-# Glimmer 0.5.10 Beta (JRuby Desktop UI DSL + Data-Binding)
+# Glimmer 0.5.11 Beta (JRuby Desktop UI DSL + Data-Binding)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
 
 Glimmer is a native-UI cross-platform desktop development library written in Ruby. Glimmer's main innovation is a JRuby DSL that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust platform-native Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support to greatly facilitate synchronizing the UI with domain models. As a result, that achieves true decoupling of object oriented components, enabling developers to solve business problems without worrying about UI concerns, or alternatively drive development UI-first, and then write clean business components test-first afterwards.
@@ -70,7 +70,7 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
 ## Table of Contents
 
 <!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
-- [Glimmer 0.5.10 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
+- [Glimmer 0.5.11 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
   - [Examples](#examples)
     - [Hello World](#hello-world)
     - [Tic Tac Toe](#tic-tac-toe)
@@ -163,14 +163,14 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.5.10
+jgem install glimmer -v 0.5.11
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.5.10'
+gem 'glimmer', '~> 0.5.11'
 ```
 
 And, then run:
@@ -1753,6 +1753,15 @@ Gladiator has been made available in [Glimmer's gem](https://rubygems.org/gems/g
 
 If you cloned this project and followed [CONTRIBUTING.md](CONTRIBUTING.md) instructions, you may invoke via `bin/gladiator` instead. 
 
+Gotcha:
+
+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
+```
+
 ## In Production
 
 The following production apps have been built with Glimmer:
@@ -1885,15 +1894,22 @@ To use:
 ```ruby
 require_relative '../app/my_application.rb'
 ```
-- (Optional) If you'd like to include an icon for your app (.icns format on the Mac), place it under `package/macosx` matching your application local directory name (e.g. 'MathBowling.icns' for MathBowling). You may generate your Mac icon easily using tools like Image2Icon (http://www.img2icnsapp.com/) or manually using the Mac terminal command `iconutil` (iconutil guide: https://applehelpwriter.com/tag/iconutil/)
-- (Optional) You may optionally add the following to `Rakefile` to configure extra arguments for javapackager: `Glimmer::Packager.javapackager_extra_args = "..."` (Useful to avoid re-entering extra arguments on every run of rake task.)
+- Include Icon (Optional): If you'd like to include an icon for your app (.icns format on the Mac), place it under `package/macosx` matching the humanized application local directory name (e.g. 'Math Bowling.icns' [containing space] for MathBowling or math_bowling). You may generate your Mac icon easily using tools like Image2Icon (http://www.img2icnsapp.com/) or manually using the Mac terminal command `iconutil` (iconutil guide: https://applehelpwriter.com/tag/iconutil/)
+- Include Version (Optional): Create a `VERSION` file in your application and fill it your app version on one line (e.g. `1.1.0`)
+- Include License (Optional): Create a `LICENSE.txt` file in your application and fill it up with your license (e.g. MIT). It will show up to people when installing your app. Note that, you may optionally also specify license type, but you'd have to do so manually via `-BlicenseType=MIT` shown in an [example below](#javapackager-extra-arguments).
+- Extra args (Optional): You may optionally add the following to `Rakefile` to configure extra arguments for javapackager: `Glimmer::Packager.javapackager_extra_args = "..."` (Useful to avoid re-entering extra arguments on every run of rake task.). Read about them in [their section below](#javapackager-extra-arguments).
 
 Now, you can run the following rake command to package your app into a Mac DMG file (using both Warbler and javapackager):
 ```
 rake glimmer:package
 ```
 
-This will generate a JAR file under `./dist` directory, which is then used to generate a DMG file (and pkg/app) under `./packages/bundles`. Both will match your application local directory name (e.g. `MathBowling.jar` and `MathBowling-1.0.dmg` for `~/code/MathBowling`)
+This will generate a JAR file under `./dist` directory, which is then used to generate a DMG file (and pkg/app) under `./packages/bundles`. 
+JAR file name will match your application local directory name (e.g. `MathBowling.jar` for `~/code/MathBowling`)
+DMG file name will match the humanized local directory name + dash + application version (e.g. `Math Bowling-1.0.dmg` for `~/code/MathBowling` with version 1.0 or unspecified)
+
+THe rake task will automatically set "mac.CFBundleIdentifier" to ="org.#{project_name}.application.#{project_name}". 
+You may override by configuring as an extra argument for javapackger (e.g. Glimmer::Package.javapackager_extra_args = " -Bmac.CFBundleIdentifier=org.andymaleh.application.MathBowling")
 
 ### Defaults
 
@@ -1926,7 +1942,7 @@ The Glimmer rake task allows passing extra options to javapackager via:
 Example (Rakefile):
 
 ```ruby
-Glimmer::Package.javapackager_extra_args = '-srcfiles "LICENSE.txt" -BlicenseFile="LICENSE.txt" -BlicenseType="MIT" -Bmac.CFBundleVersion="1.0.0" -Bmac.category="arithmetic" -Bmac.signing-key-developer-id-app="Andy Maleh"'
+Glimmer::Package.javapackager_extra_args = '-BlicenseType="MIT" -Bmac.category="arithmetic" -Bmac.signing-key-developer-id-app="Andy Maleh"'
 ```
 
 Example (env var):
@@ -1983,12 +1999,13 @@ Now, when you run `rake glimmer:package`, it builds a self-signed DMG file. When
 
 1. Specifying License File
 
-The javapackager documentation states that a license file may be specified with "-BlicenseFile" javapackager option. However, in order for that to work, one must specify as a source file via "-srcfiles" javapackager option.
+The javapackager documentation states that a license file may be specified with "-BlicenseFile" javapackager option. However, in order for that to work, one must specify as a source file via "-srcfiles" javapackager option. 
+Keep that in mind if you are not going to rely on the default `LICENSE.txt` support.
 
 Example:
 
 ```ruby
-Glimmer::Package.javapackager_extra_args = '-srcfiles "LICENSE.txt" -BlicenseFile="LICENSE.txt" -BlicenseType="MIT"'
+Glimmer::Package.javapackager_extra_args = '-srcfiles "ACME.txt" -BlicenseFile="ACME.txt" -BlicenseType="ACME"'
 ```
 
 2. Mounted DMG Residue

data/lib/glimmer/rake_task.rb

@@ -28,14 +28,19 @@ namespace :glimmer do
     require 'facets/string/titlecase'
     require 'facets/string/underscore'
     project_name = File.basename(File.expand_path('.'))
+    version_file = File.expand_path('./VERSION')
+    version = (File.read(version_file).strip if File.exists?(version_file) && File.file?(version_file)) rescue nil
+    license_file = File.expand_path('./LICENSE.txt')
+    license = (File.read(license_file).strip if File.exists?(license_file) && File.file?(license_file)) rescue nil
     human_name = project_name.underscore.titlecase
     system('mkdir -p dist')
     puts "Generating JAR with Warbler..."
     system('warble')
-    command = "javapackager -deploy -native -outdir packages -outfile #{project_name} -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{project_name}\" -title \"#{human_name}\" -BjvmOptions=-XstartOnFirstThread"
-    command += " -Bmac.CFBundleName=\"#{human_name}\""
-    command += " #{Glimmer::Package.javapackager_extra_args}" if Glimmer::Package.javapackager_extra_args
-    command += " #{ENV['JAVAPACKAGER_EXTRA_ARGS']}" if ENV['JAVAPACKAGER_EXTRA_ARGS']
+    command = "javapackager -deploy -native -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -BjvmOptions=-XstartOnFirstThread -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" "
+    command += " -BappVersion=#{version} -Bmac.CFBundleVersion=#{version} " if version
+    command += " -srcfiles LICENSE.txt -BlicenseFile=LICENSE.txt " if license
+    command += " #{Glimmer::Package.javapackager_extra_args} " if Glimmer::Package.javapackager_extra_args
+    command += " #{ENV['JAVAPACKAGER_EXTRA_ARGS']} " if ENV['JAVAPACKAGER_EXTRA_ARGS']
     puts "Generating DMG/PKG/APP/JNLP with javapackager..."
     puts command
     system command

data/lib/glimmer/ui/video.rb

@@ -54,9 +54,7 @@ module Glimmer
                 </style>
               </head>
               <body>
-                <video id="video" #{browser_video_width} #{browser_video_height} #{browser_video_loop} #{browser_video_controls} #{browser_video_autoplay}>
-                  <source id="source" src="#{source}" type="video/mp4">
-                Your browser does not support the video tag.
+                <video id="video" src="#{source}" #{browser_video_width} #{browser_video_height} #{browser_video_loop} #{browser_video_controls} #{browser_video_autoplay}>
                 </video>
               </body>
             </html>
@@ -89,6 +87,16 @@ module Glimmer
         end
       end
 
+      def file=(a_file)
+        options[:file] = a_file
+        set_video_source
+      end
+
+      def url=(a_url)
+        options[:url] = a_url
+        set_video_source
+      end
+
       def play
         video_action('play')
       end
@@ -198,6 +206,12 @@ module Glimmer
         'loaded' => 'canplay',
       }
 
+      def set_video_source
+        run_on_completed do
+          video_attribute_set('src', source)
+        end
+      end
+
       def video_action(action)
         run_on_completed do
           swt_widget.execute("document.getElementById('video').#{action}()")

data/samples/gladiator.rb

@@ -58,7 +58,7 @@ class Gladiator
         @selected_child&.write_dirty_content
         new_child = Gladiator::File.new(selected_path)
         begin
-          if new_child.lines.any?
+          unless new_child.dirty_content.nil?
             self.selected_child&.stop_filewatcher
             self.selected_child = new_child
             self.selected_child.start_filewatcher
@@ -144,6 +144,7 @@ class Gladiator
 
     def comment_line!
       old_lines = lines
+      return if old_lines.size < 1
       old_selection_count = self.selection_count
       old_caret_position = self.caret_position
       old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
@@ -177,13 +178,14 @@ class Gladiator
     end
 
     def indent!
+      new_lines = lines
       old_lines = lines
+      return if old_lines.size < 1
       old_selection_count = self.selection_count
       old_caret_position = self.caret_position
       old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
       old_caret_position_line_caret_position = caret_position_for_line_index(old_caret_position_line_index)
       old_end_caret_line_index = end_caret_position_line_index(caret_position, selection_count)
-      new_lines = lines
       delta = 2
       line_indices_for_selection(caret_position, selection_count).each do |the_line_index|
         the_line = old_lines[the_line_index]
@@ -200,13 +202,14 @@ class Gladiator
     end
 
     def outdent!
+      new_lines = lines
       old_lines = lines
+      return if old_lines.size < 1
       old_selection_count = self.selection_count
       old_caret_position = self.caret_position
       old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
       old_caret_position_line_caret_position = caret_position_for_line_index(old_caret_position_line_index)
       old_end_caret_line_index = end_caret_position_line_index(caret_position, selection_count)
-      new_lines = lines
       delta = 0
       line_indices_for_selection(caret_position, selection_count).each do |the_line_index|
         the_line = old_lines[the_line_index]
@@ -231,6 +234,7 @@ class Gladiator
 
     def kill_line!
       new_lines = lines
+      return if new_lines.size < 2
       line_indices = line_indices_for_selection(caret_position, selection_count)
       new_lines = new_lines[0...line_indices.first] + new_lines[(line_indices.last+1)...new_lines.size]
       old_caret_position = self.caret_position
@@ -239,13 +243,14 @@ class Gladiator
     end
 
     def duplicate_line!
+      new_lines = lines
       old_lines = lines
+      return if old_lines.size < 1
       old_selection_count = self.selection_count
       old_caret_position = self.caret_position
       old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
       old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position_line_index)
       old_end_caret_line_index = end_caret_position_line_index(caret_position, selection_count)
-      new_lines = lines
       the_line_indices = line_indices_for_selection(caret_position, selection_count)
       the_lines = lines_for_selection(caret_position, selection_count)
       delta = the_lines.join("\n").size + 1
@@ -292,14 +297,15 @@ class Gladiator
     end
 
     def ensure_find_next
+      return if find_text.to_s.empty? || dirty_content.to_s.strip.size < 1
       find_next unless dirty_content[caret_position, find_text.size] == find_text
     end
 
-    def replace_next
-      return if find_text.to_s.empty?
+    def replace_next!
+      return if find_text.to_s.empty? || dirty_content.to_s.strip.size < 1
       ensure_find_next
       new_dirty_content = dirty_content
-      new_dirty_content[caret_position, find_text.size] = replace_text
+      new_dirty_content[caret_position, find_text.size] = replace_text.to_s
       self.dirty_content = new_dirty_content
       find_next
     end
@@ -322,6 +328,7 @@ class Gladiator
 
     def move_up!
       old_lines = lines
+      return if old_lines.size < 2
       old_selection_count = self.selection_count
       old_caret_position = self.caret_position
       old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
@@ -345,6 +352,7 @@ class Gladiator
 
     def move_down!
       old_lines = lines
+      return if old_lines.size < 2
       old_selection_count = self.selection_count
       old_caret_position = self.caret_position
       old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
@@ -435,8 +443,8 @@ class Gladiator
       return if config_yaml.to_s.strip.empty?
       @config = YAML.load(config_yaml)
       Gladiator::Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
-      Gladiator::Dir.local_dir.selected_child.caret_position  = Gladiator::Dir.local_dir.selected_child.caret_position_for_caret_position_start_of_line(@config[:caret_position]) if @config[:caret_position]
-      Gladiator::Dir.local_dir.selected_child.top_index = @config[:top_index] if @config[:top_index]
+      Gladiator::Dir.local_dir.selected_child&.caret_position  = Gladiator::Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position]) if @config[:caret_position]
+      Gladiator::Dir.local_dir.selected_child&.top_index = @config[:top_index] if @config[:top_index]
     end
   end
 
@@ -610,7 +618,7 @@ class Gladiator
             }
     	     on_key_pressed { |key_event|
               if key_event.keyCode == swt(:cr)
-                Gladiator::Dir.local_dir.selected_child.replace_next
+                Gladiator::Dir.local_dir.selected_child.replace_next!
               elsif key_event.keyCode == swt(:esc)
                 @text.swt_widget.setFocus
               end
@@ -707,4 +715,11 @@ class Gladiator
   end
 end
 
+include Glimmer
+at_exit do
+  async_exec do
+    Gladiator::Dir.local_dir.selected_child&.write_dirty_content
+  end
+end
+
 Gladiator.new.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement