glimmer-dsl-swt 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4290c2587a5d74bdbd39df1e1459219628abd0f867df9c972ec766d1581e786
-  data.tar.gz: a422f8c8f1cad97b8c59f72eefdbdac2bfab5076e45b4d99bacbea063f683897
+  metadata.gz: 82c0437f480a9bfc7064ec9cf10bc196a3bbb644d8fe20832c02eda79565435a
+  data.tar.gz: 418e810fad2c7f12280b78848931c743d619a8cc28f04f7a438092de9fed12e7
 SHA512:
-  metadata.gz: cfe72e5b9043ca482199ebcdb21ce5dfb3bcf5106b4adf2d1f5928d195b9ae99fbd1cd10b120ec14901052121a3cb82e5e45a203e235daaf2bd29addc6e29f60
-  data.tar.gz: 9f1d1bd197e61a8a462f5afc8d84466b0a595f0ab225999571d9fb22c8f00e078928a675a4474fde34c1274aaac252c4d23f7c7fcd38fea155a0cac8e6769767
+  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.6.3 (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/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

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/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.
@@ -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,7 +96,13 @@ 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
@@ -113,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')
-          exec command
+          if command.include?(' irb ')
+            exec command
+          else
+            system command
+          end
         end
       end
     end
@@ -159,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/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

data/samples/elaborate/contact_manager.rb

@@ -0,0 +1,121 @@
+require_relative "contact_manager/contact_manager_presenter"
+
+class ContactManager
+  include Glimmer
+
+  def initialize
+    @contact_manager_presenter = ContactManagerPresenter.new
+    @contact_manager_presenter.list
+  end
+
+  def launch
+    shell {
+      text "Contact Manager"
+      composite {
+        group {
+          grid_layout(2, false) {
+            margin_width 0
+            margin_height 0
+          }
+          layout_data :fill, :center, true, false
+          text 'Lookup Contacts'
+          font height: 24
+          
+          label {
+            layout_data :right, :center, false, false
+            text "First &Name: "
+            font height: 16
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text bind(@contact_manager_presenter, :first_name)
+            on_key_pressed {|key_event|
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+            }
+          }
+          
+          label {
+            layout_data :right, :center, false, false
+            text "&Last Name: "
+            font height: 16
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text bind(@contact_manager_presenter, :last_name)
+            on_key_pressed {|key_event|
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+            }
+          }
+          
+          label {
+            layout_data :right, :center, false, false
+            text "&Email: "
+            font height: 16
+          }
+          text {
+            layout_data :fill, :center, true, false
+            text bind(@contact_manager_presenter, :email)
+            on_key_pressed {|key_event|
+              @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+            }
+          }
+          
+          composite {
+            row_layout {
+              margin_width 0
+              margin_height 0
+            }
+            layout_data(:right, :center, false, false) {
+              horizontal_span 2
+            }
+            
+            button {
+              text "&Find"
+              on_widget_selected { @contact_manager_presenter.find }
+              on_key_pressed {|key_event|
+                @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
+              }
+            }
+            
+            button {
+              text "&List All"
+              on_widget_selected { @contact_manager_presenter.list }
+              on_key_pressed {|key_event|
+                @contact_manager_presenter.list if key_event.keyCode == swt(:cr)
+              }
+            }
+          }
+        }
+
+        table(:multi) { |table_proxy|
+          layout_data {
+            horizontal_alignment :fill
+            vertical_alignment :fill
+            grab_excess_horizontal_space true
+            grab_excess_vertical_space true
+            height_hint 200
+          }
+          table_column {
+            text "First Name"
+            width 80
+          }
+          table_column {
+            text "Last Name"
+            width 80
+          }
+          table_column {
+            text "Email"
+            width 200
+          }
+          items bind(@contact_manager_presenter, :results),
+          column_properties(:first_name, :last_name, :email)
+          on_mouse_up { |event|
+            table_proxy.edit_table_item(event.table_item, event.column_index)
+          }
+        }
+      }
+    }.open
+  end
+end
+
+ContactManager.new.launch

data/samples/elaborate/contact_manager/contact.rb

@@ -0,0 +1,11 @@
+class ContactManager
+  class Contact
+    attr_accessor :first_name, :last_name, :email
+  
+    def initialize(attribute_map)
+      @first_name = attribute_map[:first_name]
+      @last_name = attribute_map[:last_name]
+      @email = attribute_map[:email]
+    end
+  end
+end

data/samples/elaborate/contact_manager/contact_manager_presenter.rb

@@ -0,0 +1,26 @@
+require_relative "contact_repository"
+
+class ContactManager
+  class ContactManagerPresenter
+    attr_accessor :results
+    @@contact_attributes = [:first_name, :last_name, :email]
+    @@contact_attributes.each {|attribute_name| attr_accessor attribute_name}
+  
+    def initialize(contact_repository = nil)
+      @contact_repository = contact_repository || ContactRepository.new
+      @results = []
+    end
+  
+    def list
+      self.results = @contact_repository.find({})
+    end
+  
+    def find
+      filter_map = {}
+      @@contact_attributes.each do |attribute_name|
+        filter_map[attribute_name] = self.send(attribute_name) if self.send(attribute_name)
+      end
+      self.results = @contact_repository.find(filter_map)
+    end
+  end
+end

data/samples/elaborate/contact_manager/contact_repository.rb

@@ -0,0 +1,244 @@
+require_relative "contact"
+
+class ContactManager
+  class ContactRepository
+    NAMES_FIRST = %w[
+      Liam
+      Noah
+      William
+      James
+      Oliver
+      Benjamin
+      Elijah
+      Lucas
+      Mason
+      Logan
+      Alexander
+      Ethan
+      Jacob
+      Michael
+      Daniel
+      Henry
+      Jackson
+      Sebastian
+      Aiden
+      Matthew
+      Samuel
+      David
+      Joseph
+      Carter
+      Owen
+      Wyatt
+      John
+      Jack
+      Luke
+      Jayden
+      Dylan
+      Grayson
+      Levi
+      Isaac
+      Gabriel
+      Julian
+      Mateo
+      Anthony
+      Jaxon
+      Lincoln
+      Joshua
+      Christopher
+      Andrew
+      Theodore
+      Caleb
+      Ryan
+      Asher
+      Nathan
+      Thomas
+      Leo
+      Isaiah
+      Charles
+      Josiah
+      Hudson
+      Christian
+      Hunter
+      Connor
+      Eli
+      Ezra
+      Aaron
+      Landon
+      Adrian
+      Jonathan
+      Nolan
+      Jeremiah
+      Easton
+      Elias
+      Colton
+      Cameron
+      Carson
+      Robert
+      Angel
+      Maverick
+      Nicholas
+      Dominic
+      Jaxson
+      Greyson
+      Adam
+      Ian
+      Austin
+      Santiago
+      Jordan
+      Cooper
+      Brayden
+      Roman
+      Evan
+      Ezekiel
+      Xaviar
+      Jose
+      Jace
+      Jameson
+      Leonardo
+      Axel
+      Everett
+      Kayden
+      Miles
+      Sawyer
+      Jason
+      Emma
+      Olivia
+      Ava
+      Isabella
+      Sophia
+      Charlotte
+      Mia
+      Amelia
+      Harper
+      Evelyn
+      Abigail
+      Emily
+      Elizabeth
+      Mila
+      Ella
+      Avery
+      Sofia
+      Camila
+      Aria
+      Scarlett
+      Victoria
+      Madison
+      Luna
+      Grace
+      Chloe
+      Penelope
+      Layla
+      Riley
+      Zoey
+      Nora
+      Lily
+      Eleanor
+      Hannah
+      Lillian
+      Addison
+      Aubrey
+      Ellie
+      Stella
+      Natalie
+      Zoe
+      Leah
+      Hazel
+      Violet
+      Aurora
+      Savannah
+      Audrey
+      Brooklyn
+      Bella
+      Claire
+      Skylar
+      Lucy
+      Paisley
+      Everly
+      Anna
+      Caroline
+      Nova
+      Genesis
+      Emilia
+      Kennedy
+      Samantha
+      Maya
+      Willow
+      Kinsley
+      Naomi
+      Aaliyah
+      Elena
+      Sarah
+      Ariana
+      Allison
+      Gabriella
+      Alice
+      Madelyn
+      Cora
+      Ruby
+      Eva
+      Serenity
+      Autumn
+      Adeline
+      Hailey
+      Gianna
+      Valentina
+      Isla
+      Eliana
+      Quinn
+      Nevaeh
+      Ivy
+      Sadie
+      Piper
+      Lydia
+      Alexa
+      Josephine
+      Emery
+      Julia
+      Delilah
+      Arianna
+      Vivian
+      Kaylee
+      Sophie
+      Brielle
+      Madeline
+    ]
+    NAMES_LAST = %w[
+      Smith
+      Johnson
+      Williams
+      Brown
+      Jones
+      Miller
+      Davis
+      Wilson
+      Anderson
+      Taylor
+    ]
+    def initialize(contacts = nil)
+      @contacts = contacts || 1000.times.map do |n|
+        random_first_name_index = (rand*NAMES_FIRST.size).to_i
+        random_last_name_index = (rand*NAMES_LAST.size).to_i
+        first_name = NAMES_FIRST[random_first_name_index]
+        last_name = NAMES_LAST[random_last_name_index]
+        email = "#{first_name}@#{last_name}.com".downcase
+        Contact.new(
+          first_name: first_name,
+          last_name: last_name,
+          email: email
+        )
+      end
+    end
+  
+    def find(attribute_filter_map)
+      @contacts.find_all do |contact|
+        match = true
+        attribute_filter_map.keys.each do |attribute_name|
+          contact_value = contact.send(attribute_name).downcase
+          filter_value = attribute_filter_map[attribute_name].downcase
+          match = false unless contact_value.match(filter_value)
+        end
+        match
+      end
+    end
+  end
+end