glimmer-dsl-swt 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb75003a6ed29f05d26a63307423121409b114157a50df69501310a93fcb27fe
-  data.tar.gz: 0e14fe3b080a81f4795a6a9703bd499aaa17e0e512034cf570560238bb5841ad
+  metadata.gz: 8f75e570d4a595c012b464d8dffa7149200385d8053dc39640d5be59d8f4980c
+  data.tar.gz: 1fbd61272f851ffa8aa1f6dbcf0afa57e898147c3982f69a180018a2d5d0e6c3
 SHA512:
-  metadata.gz: ad51599c93c102b01c2a0756dbd030c705c85e7b4b2d2e2791d24a4281f01311fbddb155c08b13f6f58b3952d0340fd3403c3f47b7ec1348c86c95cf9a920fa0
-  data.tar.gz: a2f25a0ad0c9557dc41b4cf1bbbef162946d6cd112379f261cf9f862663924aed1af2006ff8ea41b13c910eed386a94c46c009d1e5727e66b1907c22e7373244
+  metadata.gz: 3c78fc793f87813acaf59b2732a362fc37da683c79b2610dc7d9d74c37ddd56ee1ac5d33209ee509d2cc1a3c62a0fb5db56b8275d88a93b6c4d7e8c5906511b0
+  data.tar.gz: 90941e2906ecc6c87e6685f8c8ff62fda790a43c3af519761011cefa56466336e5705e8deb49e25eeef60020a7cf6ab65c19c7c3f1c1a0f325158053bcf778c4

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.6.7 (JRuby 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.8 (JRuby 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/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/bin/glimmer

@@ -1,9 +1,5 @@
 #!/usr/bin/env jruby
 
-if ARGV.empty?
-  require 'rake-tui'
-  require 'tty-screen'
-end
 require_relative '../lib/glimmer/launcher'
 
 Glimmer::Launcher.new(ARGV).launch

data/lib/ext/glimmer/config.rb

@@ -1,3 +1,5 @@
+require 'glimmer/config'
+
 module Glimmer
   module Config
     DEFAULT_IMPORT_SWT_PACKAGES = [
@@ -9,6 +11,11 @@ module Glimmer
       'org.eclipse.swt.custom',
       'org.eclipse.swt.dnd',  
     ]
+    
+    # This may be configured with extra sample directories from custom widget/shell gems
+    # following the convention of a `samples/subdirectory` where subdirectory is the 
+    # custom widget/shell name or something representative of a group of samples (e.g. c_date_time).
+    SAMPLE_DIRECTORIES = []
   
     class << self
       # Tells Glimmer to import SWT packages into including class (default: true)
@@ -103,7 +110,7 @@ module Glimmer
   
 end
 
-Glimmer::Config.reset_logger!
+Glimmer::Config.reset_logger! unless ENV['GLIMMER_LOGGER_ENABLED'].to_s.downcase == 'false'
 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)
@@ -114,6 +121,7 @@ if ENV['GLIMMER_LOGGER_LEVEL']
     puts e.message
   end
 end
+
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s
   result = false

data/lib/glimmer/launcher.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
-
-require_relative 'rake_task'
+require 'os'
 
 module Glimmer
   class Launcher
@@ -100,6 +99,7 @@ module Glimmer
         if the_glimmer_lib == GLIMMER_LIB_LOCAL
           devmode_require = '-r puts_debuggerer '
         end
+        require_relative 'rake_task'
         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)
@@ -190,6 +190,9 @@ module Glimmer
         end
         puts task_lines.to_a
       else
+        require 'rake-tui'
+        require 'tty-screen'
+        require_relative 'rake_task'
         Rake::TUI.run(branding_header: nil, prompt_question: 'Select a Glimmer task to run:') do |task, tasks|
           max_task_size = tasks.map(&:name_with_args).map(&:size).max + 1
           task_name = task.name_with_args.sub('glimmer:', '')

data/lib/glimmer/rake_task.rb

@@ -2,39 +2,49 @@ require 'rake'
 
 require_relative 'package'
 
+ENV['GLIMMER_LOGGER_ENABLED'] = 'false'
+require_relative '../ext/glimmer/config.rb'
+
+Glimmer::Config::SAMPLE_DIRECTORIES << File.expand_path('../../../samples/hello', __FILE__)
+Glimmer::Config::SAMPLE_DIRECTORIES << File.expand_path('../../../samples/elaborate', __FILE__)
+
 namespace :glimmer do
   namespace :sample do
+    task :requires do
+      require 'text-table'
+      require 'facets/string/titlecase'
+      require 'facets/string/underscore'
+      
+      require_relative 'launcher'        
+    end
+    
+    task :glimmer_gems do
+      glimmer_gem_lib_files = Dir.glob(File.join(Gem.dir, 'gems', '*')).to_a.select do |gem_path| 
+        !!File.basename(gem_path).match(/glimmer-cw|glimmer-cs|glimmer-dsl/)
+      end.map do |gem_path|
+        Dir.glob(File.join(gem_path, 'lib/*.rb')).detect {|lib| gem_path.include?(File.basename(lib, '.rb')) }
+      end.uniq do |gem_lib_file|
+        File.basename(gem_lib_file)
+      end
+      glimmer_gem_lib_files.each {|file| require file.sub(/\.rb$/, '')}    
+    end
+  
     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|
+    task :run, [:name] => [:requires, :glimmer_gems] 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 = Glimmer::Config::SAMPLE_DIRECTORIES.map {|dir| Dir.glob(File.join(dir, '*.rb'))}.reduce(:+).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| 
+    task :list, [:query] => [:requires, :glimmer_gems] do |t, args|
+      Glimmer::Config::SAMPLE_DIRECTORIES.each do |dir|
+        sample_group_name = File.basename(dir)
+        human_sample_group_name = sample_group_name.underscore.titlecase
+        array_of_arrays = Dir.glob(File.join(dir, '*.rb')).map do |path| 
           File.basename(path, '.rb')
         end.select do |path| 
           args[:query].nil? || path.include?(args[:query])
@@ -42,10 +52,10 @@ namespace :glimmer do
           [path, path.underscore.titlecase, "#{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run[#{path}]"]
         end.sort
         if array_of_arrays.empty?
-          puts "No Glimmer Hello Samples match the query."
+          puts "No Glimmer #{human_sample_group_name} Samples match the query."
         else
           puts 
-          puts "  Glimmer Hello Samples (run all via: #{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run:hello):"
+          puts "  Glimmer #{human_sample_group_name} Samples:"
           puts Text::Table.new(
             :head => %w[Name Description Run],
             :rows => array_of_arrays,
@@ -56,36 +66,12 @@ namespace :glimmer do
           )        
         end
       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
-        if array_of_arrays.empty?
-          puts "No Glimmer Elaborate Samples match the query."
-        else
-          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      
     end
-  
+    
     desc 'Outputs code for a Glimmer internal sample [included in gem] (name is required)'
-    task :code, [:name] => :requires do |t, args|
+    task :code, [:name] => [:requires, :glimmer_gems] do |t, args|
       require 'tty-markdown' unless OS.windows?
-      samples = (Dir.glob(File.expand_path('../../../samples/hello/*.rb', __FILE__)) + Dir.glob(File.expand_path('../../../samples/elaborate/*.rb', __FILE__))).sort
+      samples = Glimmer::Config::SAMPLE_DIRECTORIES.map {|dir| Dir.glob(File.join(dir, '*.rb'))}.reduce(:+).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'))
       code = ([sample] + sample_additional_files).map do |file|
@@ -103,14 +89,6 @@ namespace :glimmer do
       puts code
     end
     
-    task :requires do
-      require 'text-table'
-      require 'facets/string/titlecase'
-      require 'facets/string/underscore'
-      
-      require_relative 'launcher'        
-    end
-  
   end
 
   namespace :package do

data/lib/glimmer/swt/style_constantizable.rb

@@ -18,6 +18,7 @@ module Glimmer
         end
  
         def constant_value_none
+          # TODO instead of raising error try a convention instead like CLASSNAME::NONE by default
           raise 'Not implemented! Mixer must implement!'
         end
         

data/lib/glimmer/swt/widget_proxy.rb

@@ -65,6 +65,14 @@ module Glimmer
         end,
       }
       
+      KEYWORD_ALIASES = {
+        'radio'          => 'button',
+        'checkbox'       => 'button',
+        'check'          => 'button',
+        'toggle'         => 'button',
+        'arrow'          => 'button',
+      }
+      
       class << self
         def create(keyword, parent, args)
           widget_proxy_class(keyword).new(keyword, parent, args)
@@ -72,6 +80,7 @@ module Glimmer
         
         def widget_proxy_class(keyword)
           begin
+            keyword = KEYWORD_ALIASES[keyword] if KEYWORD_ALIASES[keyword]
             class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
             Glimmer::SWT.const_get(class_name)
           rescue
@@ -312,7 +321,7 @@ module Glimmer
 
       # This supports widgets in and out of basic SWT
       def self.swt_widget_class_for(underscored_widget_name)
-        underscored_widget_name = 'button' if %w[radio checkbox check toggle arrow].include?(underscored_widget_name)
+        underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement