glimmer-dsl-swt 4.17.1.1 → 4.17.2.4

data/VERSION

@@ -1 +1 @@
-4.17.1.1
+4.17.2.4

data/bin/glimmer

@@ -21,10 +21,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-if File.exist?(File.expand_path('./Gemfile'))
-  require 'bundler/setup' unless ENV['GLIMMER_BUNDLER_SETUP'].to_s.downcase == 'false'
-end
-
 require_relative '../lib/glimmer/launcher'
 
 Glimmer::Launcher.new(ARGV).launch

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.1.1 ruby lib
+# stub: glimmer-dsl-swt 4.17.2.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.1.1"
+  s.version = "4.17.2.4"
 
   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-24"
+  s.date = "2020-10-17"
   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]
@@ -78,11 +78,11 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/widget_expression.rb",
     "lib/glimmer/dsl/swt/widget_listener_expression.rb",
     "lib/glimmer/launcher.rb",
-    "lib/glimmer/package.rb",
     "lib/glimmer/rake_task.rb",
     "lib/glimmer/rake_task/list.rb",
+    "lib/glimmer/rake_task/package.rb",
     "lib/glimmer/rake_task/sample.rb",
-    "lib/glimmer/scaffold.rb",
+    "lib/glimmer/rake_task/scaffold.rb",
     "lib/glimmer/swt/color_proxy.rb",
     "lib/glimmer/swt/cursor_proxy.rb",
     "lib/glimmer/swt/display_proxy.rb",
@@ -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,39 +145,37 @@ 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<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_runtime_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
     s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_runtime_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
-    s.add_runtime_dependency(%q<rdoc>.freeze, [">= 6.2.1", "< 7.0.0"])
     s.add_runtime_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
     s.add_runtime_dependency(%q<tty-markdown>.freeze, [">= 0.6.0", "< 2.0.0"])
-    s.add_runtime_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
+    s.add_development_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
     s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_development_dependency(%q<coveralls>.freeze, ["= 0.8.23"])
     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<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
     s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
-    s.add_dependency(%q<rdoc>.freeze, [">= 6.2.1", "< 7.0.0"])
     s.add_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
     s.add_dependency(%q<tty-markdown>.freeze, [">= 0.6.0", "< 2.0.0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.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,6 +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.
 
+if ARGV.include?('--bundler') && File.exist?(File.expand_path('./Gemfile'))
+  require 'bundler'
+  Bundler.setup(:default)
+end
 require 'fileutils'
 require 'os'
 
@@ -28,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 [--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.    
     
@@ -38,7 +42,9 @@ module Glimmer
       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
+      - "--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)
     
@@ -50,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]
+    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 = /^([^\[]+)\[?([^\]]*)\]?$/
 
@@ -195,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?
@@ -202,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

@@ -19,9 +19,28 @@
 # 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 'rake'
+module Glimmer
+  module RakeTask
+    RVM_FUNCTION = <<~MULTI_LINE_STRING
+      # Load RVM into a shell session *as a function*
+      if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+      
+        # First try to load from a user install
+        source "$HOME/.rvm/scripts/rvm"
+      
+      elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      
+        # Then try to load from a root install
+        source "/usr/local/rvm/scripts/rvm"
+      
+      fi
+    MULTI_LINE_STRING
+  end
+end
 
-require_relative 'package'
+require 'rake'
+    
+require_relative 'rake_task/package'
 
 ENV['GLIMMER_LOGGER_ENABLED'] = 'false'
 require_relative '../ext/glimmer/config.rb'
@@ -29,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'      
@@ -54,34 +87,39 @@ namespace :glimmer do
   namespace :package do
     desc 'Clean by removing "dist" and "packages" directories'
     task :clean do
-      Glimmer::Package.clean
+      Glimmer::RakeTask::Package.clean
+    end
+
+    desc 'Generate gemspec'
+    task :gemspec do
+      Glimmer::RakeTask::Package.gemspec
     end
 
     desc 'Generate JAR config file'
     task :config do
-      Glimmer::Package.config
+      Glimmer::RakeTask::Package.config
     end
 
     desc 'Generate JAR file'
     task :jar do
-      Glimmer::Package.jar
+      Glimmer::RakeTask::Package.jar
     end
 
     desc 'Lock JARs'
     task :lock_jars do
-      Glimmer::Package.lock_jars
+      Glimmer::RakeTask::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)
+      Glimmer::RakeTask::Package.native(args[:type], extra_args)
     end
   end
 
   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
@@ -90,15 +128,15 @@ namespace :glimmer do
 
   desc 'Scaffold Glimmer application directory structure to build a new app'
   task :scaffold, [:app_name] do |t, args|
-    require_relative 'scaffold'
-    Scaffold.app(args[:app_name])
+    require_relative 'rake_task/scaffold'
+    Glimmer::RakeTask::Scaffold.app(args[:app_name])
   end
 
   namespace :scaffold do
     desc 'Scaffold Glimmer::UI::CustomShell subclass (full window view) under app/views (namespace is optional) [alt: scaffold:cs]'
     task :customshell, [:name, :namespace] do |t, args|
-      require_relative 'scaffold'
-      Scaffold.custom_shell(args[:name], args[:namespace])
+      require_relative 'rake_task/scaffold'
+      Glimmer::RakeTask::Scaffold.custom_shell(args[:name], args[:namespace])
     end
     
     task :cs, [:name, :namespace] => :customshell
@@ -107,8 +145,8 @@ namespace :glimmer do
     
     desc 'Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under app/views (namespace is optional) [alt: scaffold:cw]'
     task :customwidget, [:name, :namespace] do |t, args|
-      require_relative 'scaffold'
-      Scaffold.custom_widget(args[:name], args[:namespace])
+      require_relative 'rake_task/scaffold'
+      Glimmer::RakeTask::Scaffold.custom_widget(args[:name], args[:namespace])
     end
     
     task :cw, [:name, :namespace] => :customwidget
@@ -118,8 +156,8 @@ namespace :glimmer do
     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|
-        require_relative 'scaffold'
-        Scaffold.custom_shell_gem(args[:name], args[:namespace])
+        require_relative 'rake_task/scaffold'
+        Glimmer::RakeTask::Scaffold.custom_shell_gem(args[:name], args[:namespace])
       end
       
       task :cs, [:name, :namespace] => :customshell
@@ -128,8 +166,8 @@ namespace :glimmer do
       
       desc 'Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under its own Ruby gem project (namespace is required) [alt: scaffold:gem:cw]'
       task :customwidget, [:name, :namespace] do |t, args|
-        require_relative 'scaffold'
-        Scaffold.custom_widget_gem(args[:name], args[:namespace])
+        require_relative 'rake_task/scaffold'
+        Glimmer::RakeTask::Scaffold.custom_widget_gem(args[:name], args[:namespace])
       end
     
       task :cw, [:name, :namespace] => :customwidget

data/lib/glimmer/rake_task/list.rb

@@ -71,8 +71,11 @@ module Glimmer
         
         def tablify(gem_prefix, gems)
           array_of_arrays = gems.map do |gem|
+            name, namespace = gem[:name].sub(gem_prefix, '').underscore.titlecase.split
+            human_name = name
+            human_name += " (#{namespace})" unless namespace.nil?
             [
-              gem[:name].sub(gem_prefix, '').underscore.titlecase,
+              human_name,
               gem[:name],
               gem[:version],
               gem[:author].sub('Author: ', ''),

data/lib/glimmer/rake_task/package.rb

@@ -0,0 +1,132 @@
+# Copyright (c) 2007-2020 Andy Maleh
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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 'os'
+
+# TODO refactor to nest under RakeTask namespace
+module Glimmer
+  module RakeTask
+    module Package
+      class << self
+        attr_accessor :javapackager_extra_args
+        alias jpackage_extra_args :javapackager_extra_args
+        
+        def clean
+          require 'fileutils'
+          FileUtils.rm_rf('dist')
+          FileUtils.rm_rf('packages')
+        end
+        
+        def gemspec
+          system 'rake gemspec:generate'
+        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')
+            puts 'Generating JAR configuration (config/warble.rb) to use with Warbler...'
+            FileUtils.mkdir_p('config')
+            if OS.windows?
+              system "jruby -S gem install warbler -v2.0.5 --no-document" unless warbler_exists?
+            else
+              system "bash -c '#{RVM_FUNCTION}\n cd .\n jruby -S gem install warbler -v2.0.5 --no-document\n'" unless warbler_exists?
+            end
+            if system('warble config')
+              new_config = File.read('config/warble.rb').split("\n").inject('') do |output, line|
+                if line.include?('config.dirs =')
+                  line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app bin config db docs fonts icons images lib package script sounds vendor videos)')
+                end
+                if line.include?('config.includes =')
+                  line = line.sub('# ', '').sub(/=[^=\n]+$/, "= FileList['LICENSE.txt', 'VERSION']")
+                end
+                if line.include?('config.autodeploy_dir =')
+                  line = line.sub('# ', '')
+                end
+                output + "\n" + line
+              end
+              File.write('config/warble.rb', new_config)
+            else
+              puts 'Warbler executable "warble" is missing!'
+            end
+          end      
+        end
+        
+        def jar
+          FileUtils.mkdir_p('dist')
+          puts "Generating JAR with Warbler..."
+          system "jruby -S gem install warbler -v2.0.5 --no-document" unless warbler_exists?
+          system('warble')      
+        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('.'))
+          version_file = File.expand_path('./VERSION')
+          version = (File.read(version_file).strip if File.exists?(version_file) && File.file?(version_file)) rescue nil
+          license_file = File.expand_path('./LICENSE.txt')
+          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
+          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']
+          command += " #{native_extra_args} " if native_extra_args
+          puts command
+          system command      
+        end
+        
+        private
+        
+        def warbler_exists?
+          OS.windows? ? system('where warble') : system('which warble')
+        end
+      end
+    end
+  end
+end