glimmer-dsl-swt 4.17.2.0 → 4.17.3.0

data/VERSION

@@ -1 +1 @@
-4.17.2.0
+4.17.3.0

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.2.0 ruby lib
+# stub: glimmer-dsl-swt 4.17.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.2.0"
+  s.version = "4.17.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-09-25"
+  s.date = "2020-10-18"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -120,6 +120,8 @@ Gem::Specification.new do |s|
     "samples/hello/hello_combo.rb",
     "samples/hello/hello_computed.rb",
     "samples/hello/hello_computed/contact.rb",
+    "samples/hello/hello_custom_shell.rb",
+    "samples/hello/hello_custom_widget.rb",
     "samples/hello/hello_drag_and_drop.rb",
     "samples/hello/hello_list_multi_selection.rb",
     "samples/hello/hello_list_single_selection.rb",
@@ -143,10 +145,10 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.0"])
+    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.1"])
     s.add_runtime_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
-    s.add_runtime_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.1"])
+    s.add_runtime_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
     s.add_runtime_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
     s.add_runtime_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
     s.add_runtime_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
@@ -162,10 +164,10 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
     s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.0"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.1"])
     s.add_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
-    s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.1"])
+    s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
     s.add_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
     s.add_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
     s.add_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])

data/lib/ext/glimmer/config.rb

@@ -144,6 +144,7 @@ Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   result ||= method == 'dispose' && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
   result ||= ['drag_source_proxy', 'drop_target_proxy'].include?(method) && is_a?(Glimmer::UI::CustomWidget)
   result ||= method == 'post_initialize_child'
+  result ||= method == 'handle'
   result ||= method.end_with?('=')
   result ||= ['finish_edit!', 'search', 'all_tree_items', 'depth_first_search'].include?(method) && is_a?(Glimmer::UI::CustomWidget) && body_root.respond_to?(method)
 end

data/lib/glimmer-dsl-swt.rb

@@ -22,6 +22,12 @@
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 # External requires
+if !['', 'false'].include?(ENV['GLIMMER_BUNDLER_SETUP'].to_s.strip.downcase)
+  bundler_group = ENV['GLIMMER_BUNDLER_SETUP'].to_s.strip.downcase
+  bundler_group = 'default' if bundler_group == 'true'
+  require 'bundler'
+  Bundler.setup(bundler_group)
+end
 require 'java'
 require 'puts_debuggerer' if ("#{ENV['pd']}#{ENV['PD']}").to_s.downcase.include?('true')
 require 'glimmer'

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -80,6 +80,7 @@ module Glimmer
         selected_table_items = [parent.swt_widget.getItems.first].to_java(TableItem) if selected_table_items.empty? && !parent.swt_widget.getItems.empty?
         parent.swt_widget.setSelection(selected_table_items) unless selected_table_items.empty?
         parent.sort
+        parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end
     end
   end

data/lib/glimmer/launcher.rb

@@ -19,7 +19,10 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'bundler/setup' if ARGV.include?('--bundler') && File.exist?(File.expand_path('./Gemfile'))
+if ARGV.include?('--bundler') && File.exist?(File.expand_path('./Gemfile'))
+  require 'bundler'
+  Bundler.setup(:default)
+end
 require 'fileutils'
 require 'os'
 
@@ -29,7 +32,7 @@ module Glimmer
     
     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 [--bundler] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
+      Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
       Runs Glimmer applications and tasks.    
     
@@ -39,8 +42,9 @@ module Glimmer
       Optionally, extra Glimmer options, JRuby options, and/or environment variables may be passed in.
     
       Glimmer options:
-      - "--bundler"         : Activates Glimmer gems with `bundler/setup` to ensure they match Gemfile (passes -G to jruby on app run)
-      - "--quiet"           : Does not announce file path of Glimmer application being launched
+      - "--bundler=GROUP"   : Activates gems in Bundler default group in Gemfile
+      - "--pd=BOOLEAN"      : Requires puts_debuggerer to enable pd method
+      - "--quiet=BOOLEAN"   : 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)
     
@@ -52,9 +56,11 @@ module Glimmer
 
     GLIMMER_LIB_LOCAL = File.expand_path(File.join('lib', 'glimmer-dsl-swt.rb'))
     GLIMMER_LIB_GEM = 'glimmer-dsl-swt'
-    GLIMMER_OPTIONS = %w[--log-level --quiet --bundler]
+    GLIMMER_OPTIONS = %w[--log-level --quiet --bundler --pd]
     GLIMMER_OPTION_ENV_VAR_MAPPING = {
-      '--log-level' => 'GLIMMER_LOGGER_LEVEL'
+      '--log-level' => 'GLIMMER_LOGGER_LEVEL'   ,
+      '--bundler'   => 'GLIMMER_BUNDLER_SETUP'  ,
+      '--pd'        => 'PD'  ,
     }
     REGEX_RAKE_TASK_WITH_ARGS = /^([^\[]+)\[?([^\]]*)\]?$/
 
@@ -105,7 +111,6 @@ module Glimmer
 
       def launch(application, jruby_options: [], env_vars: {}, glimmer_options: {})
         jruby_options_string = jruby_options.join(' ') + ' ' if jruby_options.any?
-        bundler_require = '-G' if glimmer_options['--bundler']
         env_vars = env_vars.merge(glimmer_option_env_vars(glimmer_options))
         env_vars_string = env_vars.map do |k,v| 
           if OS.windows? && ENV['PROMPT'] # detect command prompt (or powershell)
@@ -137,7 +142,7 @@ module Glimmer
           @@mutex.synchronize do
             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 #{bundler_require} #{jruby_options_string}#{jruby_os_specific_options} #{devmode_require}-r #{the_glimmer_lib} -S #{application}"
+          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)
@@ -198,6 +203,9 @@ module Glimmer
     
     def display_tasks
       if OS.windows?
+        require 'rake'
+        Rake::TaskManager.record_task_metadata = true
+        require_relative 'rake_task'
         tasks = Rake.application.tasks
         task_lines = tasks.reject do |task|
           task.comment.nil?
@@ -205,8 +213,6 @@ module Glimmer
           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

data/lib/glimmer/rake_task.rb

@@ -48,6 +48,20 @@ require_relative '../ext/glimmer/config.rb'
 require 'puts_debuggerer' if ("#{ENV['pd']}#{ENV['PD']}").to_s.downcase.include?('true')
 
 namespace :glimmer do
+  desc 'Runs Glimmer app or custom shell gem in the current directory, unless app_path is specified, then runs it instead (app_path is optional)'
+  task :run, [:app_path] do |t, args|
+    require_relative 'launcher'
+    if args[:app_path].nil?
+      require 'fileutils'
+      current_directory_name = File.basename(FileUtils.pwd)
+      assumed_shell_script = File.join('.', 'bin', current_directory_name)      
+      assumed_shell_script = Dir.glob('./bin/*').detect {|f| File.file?(f)} if !File.exist?(assumed_shell_script)
+      Glimmer::Launcher.new([assumed_shell_script]).launch
+    else
+      Glimmer::Launcher.new([args[:app_path]]).launch
+    end
+  end
+  
   namespace :sample do
     task :requires do      
       require_relative 'rake_task/sample'      
@@ -76,6 +90,16 @@ namespace :glimmer do
       Glimmer::RakeTask::Package.clean
     end
 
+    desc 'Generate gemspec'
+    task :gemspec do
+      Glimmer::RakeTask::Package.gemspec
+    end
+
+    desc 'Generate gem'
+    task :gem do
+      Glimmer::RakeTask::Package.gem
+    end
+
     desc 'Generate JAR config file'
     task :config do
       Glimmer::RakeTask::Package.config
@@ -100,11 +124,15 @@ namespace :glimmer 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:gemspec'].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(args)
+    if OS.linux?
+      Rake::Task['glimmer:package:gem'].execute
+    else
+      Rake::Task['glimmer:package:native'].execute(args)
+    end
   end
 
   desc 'Scaffold Glimmer application directory structure to build a new app'
@@ -134,6 +162,12 @@ namespace :glimmer do
     task :custom_widget, [:name, :namespace] => :customwidget
     task :"custom-widget", [:name, :namespace] => :customwidget
     
+    desc 'Desktopify a web app'
+    task :desktopify, [:app_name, :website] do |t, args|
+      require_relative 'rake_task/scaffold'
+      Glimmer::RakeTask::Scaffold.desktopify(args[:app_name], args[:website])
+    end
+    
     namespace :gem do
       desc 'Scaffold Glimmer::UI::CustomShell subclass (full window view) under its own Ruby gem + app project (namespace is required) [alt: scaffold:gem:cs]'
       task :customshell, [:name, :namespace] do |t, args|

data/lib/glimmer/rake_task/package.rb

@@ -35,6 +35,22 @@ module Glimmer
           FileUtils.rm_rf('packages')
         end
         
+        def gemspec
+          system 'rake gemspec:generate'
+        end
+        
+        def gem
+          system 'rake build'
+        end
+        
+        def lock_jars
+          puts 'Locking gem jar-dependencies by downloading and storing in vendor/jars...'
+          FileUtils.mkdir_p('vendor/jars')
+          command = "lock_jars --vendor-dir vendor/jars"
+          puts command
+          system command      
+        end
+        
         def config
           project_name = File.basename(File.expand_path('.'))
           if !File.exists?('config/warble.rb')
@@ -72,18 +88,13 @@ module Glimmer
           system('warble')      
         end
         
-        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..."
+          puts "Generating native executable with javapackager/jpackage..."          
+          java_version = `java -version`
+          puts "WARNING! Glimmer Packaging Pre-Requisite Java Version 1.8.0_241 Is Not Found!" unless java_version.include?('1.8.0_241')
           require 'facets/string/titlecase'
           require 'facets/string/underscore'
+          require 'facets/string/camelcase'
           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
@@ -93,7 +104,7 @@ module Glimmer
           human_name = project_name.underscore.titlecase
           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 = "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.camelcase(:upper)}\" -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

data/lib/glimmer/rake_task/scaffold.rb

@@ -121,10 +121,20 @@ module Glimmer
         MULTI_LINE_STRING
     
         def app(app_name)
+          common_app(app_name)
+        end
+        
+        def desktopify(app_name, website)
+          common_app(app_name, :desktopify, website: website)
+        end
+        
+        def common_app(app_name, shell_type = :app, shell_options = {})
           gem_name = file_name(app_name)
           gem_summary = human_name(app_name)
+          return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -r git-glimmer -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+          return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           rm_rf 'lib'
           write '.gitignore', GITIGNORE
@@ -132,13 +142,17 @@ module Glimmer
           write '.ruby-gemset', app_name
           write 'VERSION', '1.0.0'
           write 'LICENSE.txt', "Copyright (c) #{Time.now.year} #{app_name}"
-          write 'Gemfile', GEMFILE
+          write 'Gemfile', gemfile(shell_type)
           write 'Rakefile', gem_rakefile(app_name, nil, gem_name)
           mkdir 'app'
           write "app/#{file_name(app_name)}.rb", app_main_file(app_name)
           mkdir 'app/models'
           mkdir 'app/views'
-          custom_shell('AppView', current_dir_name, :app)
+          if shell_type == :desktopify
+            custom_shell('AppView', current_dir_name, shell_type, shell_options)
+          else
+            custom_shell('AppView', current_dir_name, shell_type)
+          end
             
           mkdir_p 'package/windows'
           icon_file = "package/windows/#{human_name(app_name)}.ico"
@@ -155,14 +169,17 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
         
-          mkdir 'bin'
-          write "bin/#{file_name(app_name)}", app_bin_file(app_name)
+          mkdir_p "app/#{file_name(app_name)}"
+          write "app/#{file_name(app_name)}/launch.rb", app_launch_file(app_name)
+          mkdir_p 'bin'
+          write "bin/#{file_name(app_name)}", app_bin_command_file(app_name)
+          FileUtils.chmod 0755, "bin/#{file_name(app_name)}"
           if OS.windows?
             system "bundle"
             system "rspec --init"
           else
-            system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"
-          end      
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"          
+          end
           write 'spec/spec_helper.rb', spec_helper_file
           if OS.windows?
             system "glimmer package[image]"
@@ -172,23 +189,25 @@ module Glimmer
             if OS.mac?
               system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app"
             else
-              system "glimmer bin/#{file_name(app_name)}"
+              system "glimmer run"
             end
-          end
+          end        
         end
     
-        def custom_shell(custom_shell_name, namespace, shell_type = nil)
+        def custom_shell(custom_shell_name, namespace, shell_type = nil, shell_options = {})
           namespace ||= current_dir_name
           root_dir = File.exists?('app') ? 'app' : 'lib'
           parent_dir = "#{root_dir}/views/#{file_name(namespace)}"
+          return puts("The file '#{parent_dir}/#{file_name(custom_shell_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_shell_name)}.rb")
           mkdir_p parent_dir unless File.exists?(parent_dir)
-          write "#{parent_dir}/#{file_name(custom_shell_name)}.rb", custom_shell_file(custom_shell_name, namespace, shell_type)
+          write "#{parent_dir}/#{file_name(custom_shell_name)}.rb", custom_shell_file(custom_shell_name, namespace, shell_type, shell_options)
         end
     
         def custom_widget(custom_widget_name, namespace)
           namespace ||= current_dir_name
           root_dir = File.exists?('app') ? 'app' : 'lib'
           parent_dir = "#{root_dir}/views/#{file_name(namespace)}"
+          return puts("The file '#{parent_dir}/#{file_name(custom_widget_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_widget_name)}.rb")
           mkdir_p parent_dir unless File.exists?(parent_dir)
           write "#{parent_dir}/#{file_name(custom_widget_name)}.rb", custom_widget_file(custom_widget_name, namespace)
         end
@@ -210,8 +229,10 @@ module Glimmer
             return puts('Namespace is required! Usage: glimmer scaffold:gem:customshell[name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
             namespace = 'glimmer'
           end
+          return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -r git-glimmer -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+          return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           write '.gitignore', GITIGNORE
           write '.ruby-version', RUBY_VERSION        
@@ -222,9 +243,13 @@ module Glimmer
           append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
           mkdir 'lib/views'
           custom_shell(custom_shell_name, namespace, :gem)
-          mkdir 'bin'
-          write "bin/#{gem_name}", gem_bin_file(gem_name, custom_shell_name, namespace)
-          write "bin/#{file_name(custom_shell_name)}", gem_bin_command_file(gem_name)
+          
+          mkdir_p "lib/#{file_name(namespace)}/#{file_name(custom_shell_name)}"
+          write "lib/#{file_name(namespace)}/#{file_name(custom_shell_name)}/launch.rb", gem_launch_file(gem_name, custom_shell_name, namespace)
+          mkdir_p 'bin'
+          write "bin/#{gem_name}", gem_bin_command_file(gem_name, custom_shell_name, namespace)
+          FileUtils.chmod 0755, "bin/#{gem_name}"
+          write "bin/#{file_name(custom_shell_name)}", gem_bin_command_file(gem_name, custom_shell_name, namespace)
           FileUtils.chmod 0755, "bin/#{file_name(custom_shell_name)}"
           if OS.windows?
             system "bundle"
@@ -257,7 +282,7 @@ module Glimmer
             if OS.mac?
               system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
             else
-              system "bin/#{file_name(custom_shell_name)}"
+              system "glimmer run"
             end        
           end
           puts "Finished creating #{gem_name} Ruby gem."
@@ -278,8 +303,10 @@ module Glimmer
             namespace = 'glimmer'
           end
           
+          return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
           system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
           system "jruby -r git-glimmer -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+          return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
           cd gem_name
           write '.gitignore', GITIGNORE
           write '.ruby-version', RUBY_VERSION        
@@ -342,6 +369,22 @@ module Glimmer
         def compact_name(gem_name)
           gem_name.underscore.camelcase.downcase
         end
+        
+        def gemfile(shell_type)
+          if shell_type == :desktopify
+            lines = GEMFILE.split("\n")
+            require_glimmer_dsl_swt_index = lines.index(lines.detect {|l| l.include?("gem 'glimmer-dsl-swt'") })
+            lines[(require_glimmer_dsl_swt_index + 1)..(require_glimmer_dsl_swt_index + 1)] = [
+              "",
+              "# Enable Chromium Browser Glimmer Custom Widget gem if needed (e.g. Linux needs it to support HTML5 Video), and use `browser(:chromium)` in GUI.",
+              "# gem 'glimmer-cw-browser-chromium', '>= 0'",
+              "",
+            ]
+            lines.join("\n")
+          else
+            GEMFILE
+          end
+        end
     
         def app_main_file(app_name)
           <<~MULTI_LINE_STRING
@@ -378,40 +421,68 @@ module Glimmer
           MULTI_LINE_STRING
         end
     
-        def app_bin_file(app_name)
+        def app_launch_file(app_name)
           <<~MULTI_LINE_STRING
-            require_relative '../app/#{file_name(app_name)}'
+            require_relative '../#{file_name(app_name)}'
             
             #{class_name(app_name)}.new.open
           MULTI_LINE_STRING
         end
     
-        def gem_bin_file(gem_name, custom_shell_name, namespace)
-          # TODO change this so that it does not mix Glimmer unto the main object
+        def app_bin_command_file(app_name)
           <<~MULTI_LINE_STRING
-            require_relative '../lib/#{gem_name}'
+            #!/usr/bin/env jruby
             
-            class #{class_name(custom_shell_name)}App
-              include Glimmer
+            runner = File.expand_path("../../app/#{file_name(app_name)}/launch.rb", __FILE__)
             
-              def open
-                #{dsl_widget_name(custom_shell_name)}.open
+            # Detect if inside a JAR file or not
+            if runner.include?('uri:classloader')
+              require runner
+            else
+              require 'glimmer/launcher'
+              
+              launcher = Glimmer::Launcher.new([runner] + ARGV)
+              launcher.launch
+            end            
+          MULTI_LINE_STRING
+        end
+        
+        def gem_launch_file(gem_name, custom_shell_name, namespace)
+          # TODO change this so that it does not mix Glimmer unto the main object
+          <<~MULTI_LINE_STRING
+            require_relative '../../#{gem_name}'
+            
+            module #{class_name(namespace)}
+              class #{class_name(custom_shell_name)}
+                class App
+                  include Glimmer
+                
+                  def open
+                    #{dsl_widget_name(custom_shell_name)}.open
+                  end
+                end
               end
             end
             
-            #{class_name(custom_shell_name)}App.new.open
+            #{class_name(namespace)}::#{class_name(custom_shell_name)}::App.new.open
           MULTI_LINE_STRING
         end
     
-        def gem_bin_command_file(gem_name)
+        def gem_bin_command_file(gem_name, custom_shell_name, namespace)
           <<~MULTI_LINE_STRING
             #!/usr/bin/env jruby
             
-            require 'glimmer/launcher'
+            runner = File.expand_path("../../lib/#{file_name(namespace)}/#{file_name(custom_shell_name)}/launch.rb", __FILE__)
             
-            runner = File.expand_path("../#{gem_name}", __FILE__)
-            launcher = Glimmer::Launcher.new([runner] + ARGV)
-            launcher.launch
+            # Detect if inside a JAR file or not
+            if runner.include?('uri:classloader')
+              require runner
+            else
+              require 'glimmer/launcher'
+              
+              launcher = Glimmer::Launcher.new([runner] + ARGV)
+              launcher.launch
+            end                        
           MULTI_LINE_STRING
         end
     
@@ -422,7 +493,8 @@ module Glimmer
           lines.insert(require_rake_line_index, "require 'glimmer/launcher'")
           gem_files_line_index = lines.index(lines.detect {|l| l.include?('# dependencies defined in Gemfile') })
           if custom_shell_name
-            lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*', 'app/**/*', 'bin/**/*', 'vendor/**/*', 'package/**/*']")
+            lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'app/**/*', 'bin/**/*', 'config/**/*', 'db/**/*', 'docs/**/*', 'fonts/**/*', 'icons/**/*', 'images/**/*', 'lib/**/*', 'package/**/*', 'script/**/*', 'sounds/**/*', 'vendor/**/*', 'videos/**/*']")
+            # the second executable is needed for warbler as it matches the gem name, which is the default expected file (alternatively in the future, we could do away with it and configure warbler to use the other file)
             lines.insert(gem_files_line_index+1, "  gem.executables = ['#{gem_name}', '#{file_name(custom_shell_name)}']")
             lines.insert(gem_files_line_index+2, "  gem.require_paths = ['vendor', 'lib', 'app']")
           else
@@ -438,7 +510,7 @@ module Glimmer
                 " -name '#{human_name(custom_shell_name)}'" +
                 " -title '#{human_name(custom_shell_name)}'" +
                 " -Bmac.CFBundleName='#{human_name(custom_shell_name)}'" +
-                " -Bmac.CFBundleIdentifier='org.#{namespace ? compact_name(namespace) : compact_name(custom_shell_name)}.application.#{compact_name(custom_shell_name).capitalize}'" 
+                " -Bmac.CFBundleIdentifier='org.#{namespace ? compact_name(namespace) : compact_name(custom_shell_name)}.application.#{compact_name(custom_shell_name).camelcase(:upper)}'" 
                 # " -BlicenseType=" +
                 # " -Bmac.category=" +
                 # " -Bmac.signing-key-developer-id-app="
@@ -468,7 +540,7 @@ module Glimmer
           lines.join("\n")
         end
     
-        def custom_shell_file(custom_shell_name, namespace, shell_type)    
+        def custom_shell_file(custom_shell_name, namespace, shell_type, shell_options = {})
           namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
     
           custom_shell_file_content = <<-MULTI_LINE_STRING
@@ -493,14 +565,14 @@ module Glimmer
         # options :title, :background_color
         # option :width, default: 320
         # option :height, default: 240
-        option :greeting, default: 'Hello, World!'
+        #{'# ' if shell_type == :desktopify}option :greeting, default: 'Hello, World!'
     
         ## Use before_body block to pre-initialize variables to use in body
         #
         #
           MULTI_LINE_STRING
           
-          if %i[gem app].include?(shell_type)
+          if %i[gem app desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
         before_body {
           Display.setAppName('#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}')
@@ -510,7 +582,7 @@ module Glimmer
               display_about_dialog
             }
             on_preferences {
-              display_preferences_dialog
+              #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
             }
           }
         }
@@ -537,40 +609,72 @@ module Glimmer
         body {
           shell {
             # Replace example content below with custom shell content
-            minimum_size 320, 240
+            minimum_size #{shell_type == :desktopify ? '1024, 768' : '320, 240'}
             image File.join(APP_ROOT, 'package', 'windows', "#{human_name(shell_type == :gem ? custom_shell_name : current_dir_name)}.ico") if OS.windows?
             text "#{human_name(namespace)} - #{human_name(custom_shell_name)}"
+          
+          MULTI_LINE_STRING
+            
+          if shell_type == :desktopify
+            custom_shell_file_content += <<-MULTI_LINE_STRING            
+            browser {
+              url "#{shell_options[:website]}"              
+            }            
+            MULTI_LINE_STRING
+          else
+            custom_shell_file_content += <<-MULTI_LINE_STRING
             grid_layout
             label(:center) {
               text bind(self, :greeting)
               font height: 40
               layout_data :fill, :center, true, true
-            }
+            }            
+            MULTI_LINE_STRING
+          end
+          
+          if %i[gem app desktopify].include?(shell_type)
+            custom_shell_file_content += <<-MULTI_LINE_STRING
+            
             menu_bar {
               menu {
                 text '&File'
+                menu_item {
+                  text '&About...'
+                  on_widget_selected {
+                    display_about_dialog
+                  }
+                }
                 menu_item {
                   text '&Preferences...'
                   on_widget_selected {
-                    display_preferences_dialog
+                    #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
                   }
                 }
               }
             }
+            MULTI_LINE_STRING
+          end
+
+            custom_shell_file_content += <<-MULTI_LINE_STRING
           }
         }
-          MULTI_LINE_STRING
-    
-          if %i[gem app].include?(shell_type)
+            MULTI_LINE_STRING
+          
+          if %i[gem app desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
     
         def display_about_dialog
           message_box(body_root) {
             text 'About'
-            message "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\\n\\n\#{LICENSE}"
+            message "#{human_name(namespace)}#{" - #{human_name(custom_shell_name)}" if shell_type == :gem} \#{VERSION}\\n\\n\#{LICENSE}"
           }.open
         end
         
+            MULTI_LINE_STRING
+          end
+          
+          if %i[gem app].include?(shell_type)
+            custom_shell_file_content += <<-MULTI_LINE_STRING
         def display_preferences_dialog
           dialog(swt_widget) {
             text 'Preferences'