glimmer-dsl-swt 0.5.6 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db01899522fb71b0c6248500a33dea99db22fb65290a05ad08ace90b8b0abf8
-  data.tar.gz: 4cc5bc3f816a1b452e29e36d178ce9c77addfee660abd89bdf047f6d21660508
+  metadata.gz: 82c0437f480a9bfc7064ec9cf10bc196a3bbb644d8fe20832c02eda79565435a
+  data.tar.gz: 418e810fad2c7f12280b78848931c743d619a8cc28f04f7a438092de9fed12e7
 SHA512:
-  metadata.gz: ecbb06bef3ba8d11c71107b1f68ce8be3a1beb8147cf845f346a7561d193252a7774cd9460b3b05b1f664e502c8ca6cdf1a7cd444561834783e1097d29b5890a
-  data.tar.gz: 74c311becb1cc511005cc6c92804f81001757cb0a04f927f7b07811f1a3f5fcd6dd5d3a48e9504777d452781899b953432ee512abc72ba90858bd7aadbd7c3ea
+  metadata.gz: dadb4107a2480af548a5e1f79f60b44a798e0ae2aa130e14dae4e1878d7211418c53ab88be39cb8adcfe42a1fc3846b46e06f5e90dccb984299896eef90f15a9
+  data.tar.gz: f902727a93b33a3aa0f013484b44f648fc2f991766f612ebb4e093c932389032417f8fe038de17609f7a28e3324d158419a1e502d07cd822b104658a7b4fb33c

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.5.6 (Desktop GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.6.4 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.2.12.0
+jruby-9.2.13.0

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.4

data/bin/girb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 trap "SIGINT" do
   # No Op for irb

data/bin/glimmer

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 require_relative '../lib/glimmer/launcher'
 

data/lib/ext/glimmer/config.rb

@@ -100,7 +100,11 @@ if ENV['GLIMMER_LOGGER_LEVEL']
   # if glimmer log level is being overridden for debugging purposes, then disable async logging making logging immediate
   Glimmer::Config.logging_appender_options = Glimmer::Config.logging_appender_options.merge(async: false, auto_flushing: 1)
   Glimmer::Config.logging_devices = [:stdout]
-  Glimmer::Config.logger.level = ENV['GLIMMER_LOGGER_LEVEL']
+  begin
+    Glimmer::Config.logger.level = ENV['GLIMMER_LOGGER_LEVEL'].strip
+  rescue => e
+    puts e.message
+  end
 end
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s

data/lib/glimmer/Rakefile

@@ -0,0 +1,5 @@
+# This Rakefile gets used from Glimmer::Launcher when the current directory for running the `glimmer` command 
+# does not have a Rakefile (e.g. during scaffolding). 
+# It is not needed when running from inside a scaffolded app or gem, or an app with a Rakefile that has
+# `require 'glimmer/rake_task'`
+require 'glimmer/rake_task'

data/lib/glimmer/dsl/swt/cursor_expression.rb

@@ -0,0 +1,23 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/swt/cursor_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # cursor expression
+      # Note: Cannot be a static expression because it clashes with cursor property expression
+      class CursorExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'cursor' and
+            (parent.nil? or !parent.respond_to?('cursor')) and
+            args.size == 1 and
+            (args.first.is_a?(Integer) or textual?(args.first))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::CursorProxy.new(*args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swt/dsl.rb

@@ -24,6 +24,9 @@ module Glimmer
           tree_items_data_binding
           table_items_data_binding
           data_binding
+          cursor
+          font
+          image
           property
           block_property
           widget

data/lib/glimmer/dsl/swt/font_expression.rb

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/font_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # font expression
+      # Note: Cannot be a static expression because it clashes with font property expression
+      class FontExpression < Expression
+        include TopLevelExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'font' and     
+            (parent.nil? || !parent.respond_to?('font')) and
+            args.size == 1 and 
+            args.first.is_a?(Hash)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::FontProxy.new(*args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swt/image_expression.rb

@@ -0,0 +1,21 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/swt/image_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # image expression
+      # Note: Cannot be a static expression because it clashes with image property expression
+      class ImageExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'image' and
+            (parent.nil? or !parent.respond_to?('image'))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::ImageProxy.new(*args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swt/message_box_expression.rb

@@ -16,7 +16,15 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           potential_parent = args.first
-          parent = args.shift if potential_parent.is_a?(Shell) || (potential_parent.respond_to?(:swt_widget) && potential_parent.swt_widget.is_a?(Shell))
+          potential_parent = potential_parent.swt_widget if potential_parent.respond_to?(:swt_widget)
+          parent = nil          
+          if potential_parent.is_a?(Shell)
+            args.shift
+            parent = potential_parent
+          elsif potential_parent.is_a?(Widget)
+            args.shift
+            parent = potential_parent.shell
+          end
           Glimmer::SWT::MessageBoxProxy.new(parent, Glimmer::SWT::SWTProxy[args])
         end
       end

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -17,14 +17,14 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          begin
-            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
-            widget_class = Glimmer::SWT.const_get(class_name)
-          rescue
-            widget_class = Glimmer::SWT::WidgetProxy
-          end
-          widget_class.new(keyword, parent, args)
+          Glimmer::SWT::WidgetProxy.create(keyword, parent, args)
         end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+        
       end
     end
   end

data/lib/glimmer/launcher.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 require_relative 'rake_task'
 
 module Glimmer
@@ -5,6 +7,7 @@ module Glimmer
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
     TEXT_USAGE_PREFIX = <<~MULTI_LINE_STRING
+      Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}      
       Usage: glimmer [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
       Runs Glimmer applications/tasks.
@@ -13,7 +16,7 @@ module Glimmer
     
       When a task is specified, it runs via rake. Some tasks take arguments in square brackets.
     
-      Available tasks are below (you may also lookup by adding `require 'glimmer/rake_task'` in Rakefile and running rake -T):
+      Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
     MULTI_LINE_STRING
 
     TEXT_USAGE_SUFFIX = <<~MULTI_LINE_STRING
@@ -73,6 +76,10 @@ module Glimmer
         end
         @glimmer_lib
       end
+      
+      def dev_mode?
+        glimmer_lib == GLIMMER_LIB_LOCAL
+      end
 
       def glimmer_option_env_vars(glimmer_options)
         GLIMMER_OPTION_ENV_VAR_MAPPING.reduce({}) do |hash, pair|
@@ -89,13 +96,23 @@ module Glimmer
       def launch(application, jruby_options: [], env_vars: {}, glimmer_options: {})
         jruby_options_string = jruby_options.join(' ') + ' ' if jruby_options.any?
         env_vars = env_vars.merge(glimmer_option_env_vars(glimmer_options))
-        env_vars_string = env_vars.map {|k,v| "#{k}=#{v}"}.join(' ')
+        env_vars_string = env_vars.map do |k,v| 
+          if OS.windows? && ENV['PROMPT'] # detect command prompt (or powershell)
+            "set #{k}=#{v} && "
+          else
+            "export #{k}=#{v} && "
+          end
+        end.join
         the_glimmer_lib = glimmer_lib
         devmode_require = nil
         if the_glimmer_lib == GLIMMER_LIB_LOCAL
           devmode_require = '-r puts_debuggerer '
         end
         rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
+         
+        # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
+        application = 'package[msi]' if application == 'packages'
+        
         potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
         application = potential_rake_task_parts[1]
         rake_task_args = potential_rake_task_parts[2].split(',')
@@ -109,8 +126,16 @@ module Glimmer
             puts "Launching Glimmer Application: #{application}" if jruby_options_string.to_s.include?('--debug') || glimmer_options['--quiet'].to_s.downcase != 'true'
           end
           command = "#{env_vars_string} jruby #{jruby_options_string}#{jruby_os_specific_options} #{devmode_require}-r #{the_glimmer_lib} -S #{application}"
+          if !env_vars_string.empty? && OS.windows?
+            command = "bash -c \"#{command}\"" if ENV['SHELL'] # do in Windows Git Bash only
+            command = "cmd /C \"#{command}\"" if ENV['PROMPT'] # do in Windows Command Prompt only (or Powershell)
+          end
           puts command if jruby_options_string.to_s.include?('--debug')
-          system command
+          if command.include?(' irb ')
+            exec command
+          else
+            system command
+          end
         end
       end
     end
@@ -155,11 +180,14 @@ module Glimmer
     end
 
     def display_usage
-      rake_tasks = `rake -T`.gsub('rake glimmer:', 'glimmer ').split("\n").select {|l| l.start_with?('glimmer ')}
-      puts TEXT_USAGE_PREFIX
-      puts rake_tasks.join("\n")
-      puts TEXT_USAGE_SUFFIX
-    end
+      rakefile_dir = File.exist?('Rakefile') ? '.' : File.dirname(__FILE__)
+      FileUtils.cd(rakefile_dir) do
+        rake_tasks = `rake -T`.gsub('rake glimmer:', 'glimmer ').split("\n").select {|l| l.start_with?('glimmer ')}
+        puts TEXT_USAGE_PREFIX
+        puts rake_tasks.join("\n")
+        puts TEXT_USAGE_SUFFIX
+      end
+    end    
 
     def extract_application_paths(options)
       options.select do |option|

data/lib/glimmer/package.rb

@@ -6,6 +6,7 @@ module Glimmer
   module Package
     class << self
       attr_accessor :javapackager_extra_args
+      alias jpackage_extra_args :javapackager_extra_args
       
       def clean
         require 'fileutils'
@@ -41,7 +42,16 @@ module Glimmer
         system('warble')      
       end
       
-      def native
+      def lock_jars
+        puts 'Locking gem jar-dependencies by downloading & storing in vendor/jars...'
+        FileUtils.mkdir_p('vendor/jars')
+        command = "lock_jars --vendor-dir vendor/jars"
+        puts command
+        system command      
+      end
+      
+      def native(native_type=nil, native_extra_args)
+        puts "Generating native executable with javapackager/jpackage..."
         require 'facets/string/titlecase'
         require 'facets/string/underscore'
         project_name = File.basename(File.expand_path('.'))
@@ -51,14 +61,28 @@ module Glimmer
         license = (File.read(license_file).strip if File.exists?(license_file) && File.file?(license_file)) rescue nil
         copyright = license.split("\n").first
         human_name = project_name.underscore.titlecase
-        command = "javapackager -deploy -native -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" -BinstalldirChooser=true -Bvendor=\"#{human_name}\" -Bwin.menuGroup=\"#{human_name}\" -BsystemWide=#{OS.mac?} "
-        command += " -BjvmOptions=-XstartOnFirstThread " if OS.mac?
-        command += " -BappVersion=#{version} -Bmac.CFBundleVersion=#{version} " if version
-        command += " -srcfiles LICENSE.txt -BlicenseFile=LICENSE.txt " if license
-        command += " -Bcopyright=\"#{copyright}\" " if copyright
+        icon = "package/#{OS.mac? ? 'macosx' : 'windows'}/#{human_name}.#{OS.mac? ? 'icns' : 'ico'}"
+        if (`javapackager`.to_s.include?('Usage: javapackager') rescue nil)
+          command = "javapackager -deploy -native #{native_type} -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" -BinstalldirChooser=true -Bvendor=\"#{human_name}\" -Bwin.menuGroup=\"#{human_name}\" "
+          command += " -BsystemWide=false " if OS.windows?
+          command += " -BjvmOptions=-XstartOnFirstThread " if OS.mac?
+          command += " -BappVersion=#{version} -Bmac.CFBundleVersion=#{version} " if version
+          command += " -srcfiles LICENSE.txt -BlicenseFile=LICENSE.txt " if license
+          command += " -Bcopyright=\"#{copyright}\" " if copyright
+        elsif (`jpackage`.to_s.include?('Usage: jpackage') rescue nil)
+          command = "jpackage --type #{native_type} --dest 'packages/bundles' --input 'dist' --main-class JarMain --main-jar '#{project_name}.jar' --name '#{human_name}' --vendor '#{human_name}' --icon '#{icon}' "
+          command += " --win-per-user-install --win-dir-chooser --win-menu --win-menu-group '#{human_name}' " if OS.windows?
+          command += " --java-options '-XstartOnFirstThread' --mac-package-name '#{human_name}' --mac-package-identifier 'org.#{project_name}.application.#{project_name}' " if OS.mac?
+          command += " --app-version \"#{version}\" " if version
+          command += " --license-file LICENSE.txt " if license
+          command += " --copyright \"#{copyright}\" " if copyright
+        else
+          puts "Neither javapackager nor jpackage exist in your Java installation. Please ensure javapackager or jpackage is available in PATH environment variable."
+          return
+        end
         command += " #{javapackager_extra_args} " if javapackager_extra_args
         command += " #{ENV['JAVAPACKAGER_EXTRA_ARGS']} " if ENV['JAVAPACKAGER_EXTRA_ARGS']
-        puts "Generating DMG/PKG/APP/JNLP with javapackager..."
+        command += " #{native_extra_args} " if native_extra_args
         puts command
         system command      
       end

data/lib/glimmer/rake_task.rb

@@ -3,6 +3,103 @@ require 'rake'
 require_relative 'package'
 
 namespace :glimmer do
+  namespace :sample do
+    desc 'Runs a Glimmer internal sample [included in gem]. If no name is supplied, it runs all samples.'
+    task :run, [:name] => :requires do |t, args|
+      name = args[:name]
+      name = name.underscore.downcase unless name.nil?
+      samples = (Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)) + Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__))).sort
+      samples = samples.select {|path| path.include?("#{name}.rb")} unless name.nil?      
+      Rake::Task['glimmer:sample:code'].invoke(name) if samples.size == 1
+      Glimmer::Launcher.new(samples << '--quiet=false').launch
+    end
+    
+    namespace :run do    
+      task :hello do
+        samples = Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)).sort
+        Glimmer::Launcher.new(samples << '--quiet=false').launch        
+      end    
+      
+      task :elaborate do
+        samples = Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__)).sort
+        Glimmer::Launcher.new(samples << '--quiet=false').launch        
+      end    
+    end
+  
+    desc 'Lists Glimmer internal samples [included in gem]. Filters by query if specified (query is optional)'
+    task :list, [:query] do |t, args|
+      Rake::Task['glimmer:sample:list:hello'].invoke(args[:query])
+      Rake::Task['glimmer:sample:list:elaborate'].invoke(args[:query])
+    end
+    
+    namespace :list do
+      task :hello, [:query] => :requires do |t, args|
+        array_of_arrays = Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)).map do |path| 
+          File.basename(path, '.rb')
+        end.select do |path| 
+          args[:query].nil? || path.include?(args[:query])
+        end.map do |path| 
+          [path, path.underscore.titlecase, "#{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run[#{path}]"]
+        end.sort
+        puts 
+        puts "  Glimmer Hello Samples (run all via: #{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run:hello):"
+        puts Text::Table.new(
+          :head => %w[Name Description Run],
+          :rows => array_of_arrays,
+          :horizontal_padding    => 1,
+          :vertical_boundary     => ' ',
+          :horizontal_boundary   => ' ',
+          :boundary_intersection => ' '
+        )        
+      end
+      
+      task :elaborate, [:query] => :requires do |t, args|
+        array_of_arrays = Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__)).map do |path| 
+          File.basename(path, '.rb')
+        end.select do |path| 
+          args[:query].nil? || path.include?(args[:query])
+        end.map do |path| 
+          [path, path.underscore.titlecase, "#{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run[#{path}]"]
+        end.sort
+        puts 
+        puts "  Glimmer Elaborate Samples (run all via: #{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run:elaborate):"
+        puts Text::Table.new(
+          :head => %w[Name Description Run],
+          :rows => array_of_arrays,
+          :horizontal_padding    => 1,
+          :vertical_boundary     => ' ',
+          :horizontal_boundary   => ' ',
+          :boundary_intersection => ' '
+        )        
+      end      
+    end
+  
+    desc 'Outputs code for a Glimmer internal sample [included in gem] (name is required)'
+    task :code, [:name] => :requires do |t, args|
+      samples = (Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)) + Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__))).sort
+      sample = samples.detect {|path| path.include?("#{args[:name].to_s.underscore.downcase}.rb")}
+      sample_additional_files = Dir.glob(File.join(sample.sub('.rb', ''), '**', '*.rb'))
+      ([sample] + sample_additional_files).each do |file|
+        puts
+        puts "# #{file}"
+        puts
+        puts File.read(file)
+        puts
+        puts '# # #'
+        puts
+      end
+    end
+    
+    task :requires do
+      require 'text-table'
+      require 'facets/string/titlecase'
+      require 'facets/string/underscore'
+      
+      require_relative 'launcher'        
+    end
+  
+  end
+
   namespace :package do
     desc 'Clean by removing "dist" and "packages" directories'
     task :clean do
@@ -19,17 +116,25 @@ namespace :glimmer do
       Glimmer::Package.jar
     end
 
-    desc 'Generate Native files (DMG/PKG/APP on the Mac, EXE on Windows, RPM/DEB on Linux)'
-    task :native do
-      Glimmer::Package.native
+    desc 'Lock JARs'
+    task :lock_jars do
+      Glimmer::Package.lock_jars
+    end
+
+    desc 'Generate Native files. type can be dmg/pkg on the Mac, msi/exe on Windows, and rpm/deb on Linux (type is optional)'
+    task :native, [:type] do |t, args|
+      extra_args = ARGV.partition {|arg| arg.include?('package:native')}.last.to_a.join(' ')
+      Glimmer::Package.native(args[:type], extra_args)
     end
   end
 
-  desc 'Package app for distribution (generating config, jar, and native files)'
-  task :package do
+  desc 'Package app for distribution (generating config, jar, and native files) (type is optional)'
+  task :package, [:type] do |t, args|
+    Rake::Task['gemspec:generate'].execute
+    Rake::Task['glimmer:package:lock_jars'].execute
     Rake::Task['glimmer:package:config'].execute
     Rake::Task['glimmer:package:jar'].execute
-    Rake::Task['glimmer:package:native'].execute
+    Rake::Task['glimmer:package:native'].execute(args)
   end