glimmer-dsl-swt 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c0437f480a9bfc7064ec9cf10bc196a3bbb644d8fe20832c02eda79565435a
-  data.tar.gz: 418e810fad2c7f12280b78848931c743d619a8cc28f04f7a438092de9fed12e7
+  metadata.gz: 8fa25c1d494d14eac00319e494d3b2f12c9a6b344c084b02a1dde9f60c2f44a5
+  data.tar.gz: 648c050a1a25a284e972beb5c129047ef6cbf8fabb1a80981408d900afed0c25
 SHA512:
-  metadata.gz: dadb4107a2480af548a5e1f79f60b44a798e0ae2aa130e14dae4e1878d7211418c53ab88be39cb8adcfe42a1fc3846b46e06f5e90dccb984299896eef90f15a9
-  data.tar.gz: f902727a93b33a3aa0f013484b44f648fc2f991766f612ebb4e093c932389032417f8fe038de17609f7a28e3324d158419a1e502d07cd822b104658a7b4fb33c
+  metadata.gz: dc9dedb03e9251f0a88e5530a642c062899be1651b26d2314258925375b871a3e5736141a1ee5b8dfacde1bc7a1d606d4ce00ac8affc8bf160b06f4aa7141306
+  data.tar.gz: 00416f75c6c00dc163501209a20839cd23fb51921a5335f8ffff7009bf013cca11ccb54389a55367c0ccbb1b0f1bb1641c61141d376a5c5792584567bd1d7937

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.4 (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.5 (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.4
+0.6.5

data/bin/glimmer

@@ -1,5 +1,9 @@
 #!/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/glimmer/launcher.rb

@@ -6,34 +6,26 @@ module Glimmer
   class Launcher
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
-    TEXT_USAGE_PREFIX = <<~MULTI_LINE_STRING
+    TEXT_USAGE = <<~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.
-    
-      Either a single task or one or more applications may be specified.
-    
-      When a task is specified, it runs via rake. Some tasks take arguments in square brackets.
-    
-      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
+      Runs Glimmer applications and tasks.    
     
       When applications are specified, they are run using JRuby, 
       automatically preloading the glimmer Ruby gem and SWT jar dependency.
     
-      Optionally, extra Glimmer options, JRuby options and environment variables may be passed in.
+      Optionally, extra Glimmer options, JRuby options, and/or environment variables may be passed in.
     
       Glimmer options:
       - "--quiet"           : Does not announce file path of Glimmer application being launched
       - "--debug"           : Displays extra debugging information, passes "--debug" to JRuby, and enables debug logging
       - "--log-level=VALUE" : Sets Glimmer's Ruby logger level ("ERROR" / "WARN" / "INFO" / "DEBUG"; default is none)
     
-      Example: glimmer samples/hello_world.rb
+      Tasks are run via rake. Some tasks take arguments in square brackets.
     
-      This runs the Glimmer application samples/hello_world.rb
+      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
 
     GLIMMER_LIB_LOCAL = File.expand_path(File.join('lib', 'glimmer-dsl-swt.rb'))
@@ -180,14 +172,33 @@ module Glimmer
     end
 
     def display_usage
-      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
+      puts TEXT_USAGE
+      display_tasks
+    end
+    
+    def display_tasks
+      if OS.windows?
+        tasks = Rake.application.tasks
+        task_lines = tasks.reject do |task|
+          task.comment.nil?
+        end.map do |task|
+          max_task_size = tasks.map(&:name_with_args).map(&:size).max + 1
+          task_name = task.name_with_args.sub('glimmer:', '')
+          line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
+          bound = TTY::Screen.width - 6
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
+        end
+        puts task_lines.to_a
+      else
+        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:', '')
+          line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
+          bound = TTY::Screen.width - 6
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
+        end    
       end
-    end    
+    end
 
     def extract_application_paths(options)
       options.select do |option|

data/lib/glimmer/rake_task.rb

@@ -41,16 +41,20 @@ namespace :glimmer do
         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 => ' '
-        )        
+        if array_of_arrays.empty?
+          puts "No Glimmer Hello Samples match the query."
+        else
+          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
       end
       
       task :elaborate, [:query] => :requires do |t, args|
@@ -61,16 +65,20 @@ namespace :glimmer do
         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 => ' '
-        )        
+        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
   
@@ -137,7 +145,6 @@ namespace :glimmer do
     Rake::Task['glimmer:package:native'].execute(args)
   end
 
-
   desc 'Scaffold Glimmer application directory structure to build a new app'
   task :scaffold, [:app_name] do |t, args|
     require_relative 'scaffold'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  name: rake-tui
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: