glimmer-dsl-swt 4.18.7.5 → 4.19.0.2

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -368,7 +368,7 @@ These proxy objects have an API and provide some convenience methods, some of wh
 
 Glimmer SWT proxies come with the instance method `#swt_widget`, which returns the actual SWT `Widget` object wrapped by the Glimmer widget proxy. It is useful in cases you'd like to do some custom SWT programming outside of Glimmer.
 
-##### Shell widget proxy methods
+##### Shell Widget Proxy Methods
 
 Shell widget proxy has extra methods specific to SWT Shell:
 - `#open`: Opens the shell, making it visible and active, and starting the SWT Event Loop (you may learn more about it here: https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/Display.html). If shell was already open, but hidden, it makes the shell visible.
@@ -1040,6 +1040,10 @@ shell(:no_resize) {
 }
 ```
 
+##### Fill Screen Window
+
+SWT Shell can open and fill the screen with this style `swt(:fill_screen)`. This makes it have the size of the display, thus filling the screen. Keep in mind that this is different from being maximized (which is a special window state, not just filling the screen).
+
 ### Widget Properties
 
 Widget properties such as text value, enablement, visibility, and layout details are set within the widget block using methods matching SWT widget property names in lower snakecase. You may refer to SWT widget guide for details on available widget properties:
@@ -3471,7 +3475,7 @@ shell { |app_shell|
 }.open
 ```
 
-If you use a Custom Shell as the top-level app shell, you may invoke the class method `::launch` instead to avoid building an app class yourself or including Glimmer into the top-level namespace (e.g. `Tetris.launch` instead of `include Glimmer; tetris.open`)
+If you use a Custom Shell as the top-level app shell, you may invoke the class method `.launch` instead to avoid building an app class yourself or including Glimmer into the top-level namespace (e.g. `Tetris.launch` instead of `include Glimmer; tetris.open`)
 
 You may check out [Hello, Custom Shell!](GLIMMER_SAMPLES.md#hello-custom-shell) for another example.
 

data/docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md

@@ -20,6 +20,12 @@ You may choose to generate a specific type of packaging instead by addionally pa
 glimmer package[msi]
 ```
 
+Make sure to surround with double-quotes when running from ZShell (zsh):
+
+```
+glimmer "package[msi]"
+```
+
 - Available Mac packaging types are `dmg`, `pkg`, and `image` (image means a pure Mac `app` without a setup program). Keep in mind that the packages you produce are compatible with the same MacOS you are on or older.
 - Available Windows packaging types are `msi`, `exe`, and `image` (image means a Windows application directory without a setup program). Learn more about Windows packaging are [over here](#windows-application-packaging).
 
@@ -190,7 +196,7 @@ Currently, `Glimmer::RakeTask::Package.javapackager_extra_args` is only honored
 You can get around that in zsh by running glimmer package commands with `bash -c` prefix:
 
 ```
-bash -c 'glimmer package'
+bash -c 'source ~/.glimmer_source; glimmer package'
 ```
 
 4. Java on Windows System PATH

data/docs/reference/GLIMMER_SAMPLES.md

@@ -2,7 +2,9 @@
   - [Hello Samples](#hello-samples)
     - [Hello, World!](#hello-world)
     - [Hello, Tab!](#hello-tab)
+    - [Hello, C Tab!](#hello-c-tab)
     - [Hello, Combo!](#hello-combo)
+    - [Hello, C Combo!](#hello-c-combo)
     - [Hello, List Single Selection!](#hello-list-single-selection)
     - [Hello, List Multi Selection!](#hello-list-multi-selection)
     - [Hello, Computed!](#hello-computed)
@@ -101,6 +103,20 @@ Code:
 ![Hello Tab English](/images/glimmer-hello-tab-english.png)
 ![Hello Tab French](/images/glimmer-hello-tab-french.png)
 
+#### Hello, C Tab!
+
+This sample demonstrates custom tab widget usage via the `c_tab_folder` and `c_tab_item` variations of `tab_folder` and `tab_item`, which can customize fonts/background/foreground colors for tabs and display additional tabs that do not fit in the window via a drop down.
+
+Code:
+
+[samples/hello/hello_c_tab.rb](/samples/hello/hello_c_tab.rb)
+
+![Hello C Tab](/images/glimmer-hello-c-tab.png)
+![Hello C Tab Extra Tabs](/images/glimmer-hello-c-tab-extra-tabs.png)
+![Hello C Tab Other Tab](/images/glimmer-hello-c-tab-other-tab.png)
+
+Country flag images were made by [Freepik](https://www.flaticon.com/authors/freepik) from [www.flaticon.com](http://www.flaticon.com)
+
 #### Hello, Combo!
 
 This sample demonstrates combo data-binding.
@@ -112,6 +128,17 @@ Code:
 ![Hello Combo](/images/glimmer-hello-combo.png)
 ![Hello Combo Expanded](/images/glimmer-hello-combo-expanded.png)
 
+#### Hello, C Combo!
+
+This sample demonstrates the custom combo variation on combo, which allows the adjustment of the combo height based on font height or layout data.
+
+Code:
+
+[samples/hello/hello_c_combo.rb](/samples/hello/hello_c_combo.rb)
+
+![Hello Combo](/images/glimmer-hello-c-combo.png)
+![Hello Combo Expanded](/images/glimmer-hello-c-combo-expanded.png)
+
 #### Hello, List Single Selection!
 
 This sample demonstrates list single-selection data-binding.

data/lib/glimmer-dsl-swt.rb

@@ -42,3 +42,11 @@ require 'facets/hash/symbolize_keys'
 require 'ext/glimmer/config'
 require 'ext/glimmer'
 require 'glimmer/dsl/swt/dsl'
+
+if defined?(::IRB)
+  begin
+    Kernel.send(:remove_method, :y)
+  rescue
+    # No Op
+  end
+end

data/lib/glimmer/data_binding/widget_binding.rb

@@ -53,7 +53,7 @@ module Glimmer
             return
           end
           # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
-          unless ((value == evaluate_property) rescue false) # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
+          if @async_exec || !((value == evaluate_property) rescue false) # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
             @widget.set_attribute(@property, value)
           end
         end

data/lib/glimmer/dsl/swt/c_tab_item_expression.rb

@@ -0,0 +1,58 @@
+# Copyright (c) 2007-2021 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 'glimmer'
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/c_tab_item_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class CTabItemExpression < StaticExpression
+        include ParentExpression
+  
+        include_package 'org.eclipse.swt.custom'
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          initial_condition = (keyword == 'c_tab_item') and parent.respond_to?(:swt_widget)
+          if initial_condition
+            if parent.swt_widget.is_a?(CTabFolder)
+              return true
+            else
+              Glimmer::Config.logger.error {"c_tab_item widget may only be used directly under a c_tab_folder widget!"}
+            end
+          end
+          false
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::CTabItemProxy.new(parent, args)
+        end
+        
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb

@@ -29,12 +29,13 @@ module Glimmer
     module SWT
       class ComboSelectionDataBindingExpression < Expression
         include_package 'org.eclipse.swt.widgets'
+        include_package 'org.eclipse.swt.custom'
   
         def can_interpret?(parent, keyword, *args, &block)
           keyword == 'selection' and
             block.nil? and
             parent.respond_to?(:swt_widget) and
-            parent.swt_widget.is_a?(Combo) and
+            (parent.swt_widget.is_a?(Combo) || parent.swt_widget.is_a?(CCombo)) and
             args.size == 1 and
             args[0].is_a?(DataBinding::ModelBinding) and
             args[0].evaluate_options_property.is_a?(Array)

data/lib/glimmer/dsl/swt/tab_item_expression.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2021 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
@@ -7,10 +7,10 @@
 # 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
@@ -48,7 +48,11 @@ module Glimmer
         def interpret(parent, keyword, *args, &block)
           Glimmer::SWT::TabItemProxy.new(parent, args)
         end
+        
       end
+      
     end
+    
   end
+  
 end

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -30,7 +30,7 @@ module Glimmer
       class WidgetExpression < Expression
         include ParentExpression
 
-        EXCLUDED_KEYWORDS = %w[shell display tab_item] + Glimmer::SWT::Custom::Shape.keywords - ['text']
+        EXCLUDED_KEYWORDS = %w[shell display tab_item c_tab_item] + Glimmer::SWT::Custom::Shape.keywords - ['text']
 
         def can_interpret?(parent, keyword, *args, &block)
           !EXCLUDED_KEYWORDS.include?(keyword) and

data/lib/glimmer/launcher.rb

@@ -35,7 +35,7 @@ module Glimmer
     
     TEXT_USAGE = <<~MULTI_LINE_STRING
       Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}
-      Usage: glimmer [--bundler] [--pd] [--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])
     
       Runs Glimmer applications and tasks.
     
@@ -67,8 +67,6 @@ module Glimmer
     }
     REGEX_RAKE_TASK_WITH_ARGS = /^([^\[]+)\[?([^\]]*)\]?$/
 
-    @@mutex = Mutex.new
-
     class << self
       def platform_os
         OPERATING_SYSTEMS_SUPPORTED.detect {|os| OS.send("#{os}?")}
@@ -83,14 +81,12 @@ module Glimmer
       end
 
       def glimmer_lib
-        @@mutex.synchronize do
-          unless @glimmer_lib
-            @glimmer_lib = GLIMMER_LIB_GEM
-            glimmer_gem_listing = `jgem list #{GLIMMER_LIB_GEM}`.split("\n").map {|l| l.split.first}
-            if !glimmer_gem_listing.include?(GLIMMER_LIB_GEM) && File.exists?(GLIMMER_LIB_LOCAL)
-              @glimmer_lib = GLIMMER_LIB_LOCAL
-              puts "[DEVELOPMENT MODE] (detected #{@glimmer_lib})"
-            end
+        unless @glimmer_lib
+          @glimmer_lib = GLIMMER_LIB_GEM
+          glimmer_gem_listing = `jgem list #{GLIMMER_LIB_GEM}`.split("\n").map {|l| l.split.first}
+          if !glimmer_gem_listing.include?(GLIMMER_LIB_GEM) && File.exists?(GLIMMER_LIB_LOCAL)
+            @glimmer_lib = GLIMMER_LIB_LOCAL
+            puts "[DEVELOPMENT MODE] (detected #{@glimmer_lib})"
           end
         end
         @glimmer_lib
@@ -115,17 +111,12 @@ 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 do |k,v|
-          if OS.windows? && ENV['PROMPT'] # detect command prompt (or powershell)
-            "set #{k}=#{v} && "
-          else
-            "export #{k}=#{v} && "
-          end
-        end.join
+        env_vars.each do |k,v|
+          ENV[k] = v
+        end
         the_glimmer_lib = glimmer_lib
-        devmode_require = nil
         if the_glimmer_lib == GLIMMER_LIB_LOCAL
-          devmode_require = '-r puts_debuggerer '
+          require 'puts_debuggerer'
         end
         require_relative 'rake_task'
         rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
@@ -142,20 +133,9 @@ module Glimmer
           puts "Running Glimmer rake task: #{rake_task}" if jruby_options_string.to_s.include?('--debug')
           Rake::Task[rake_task].invoke(*rake_task_args)
         else
-          @@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 #{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')
-          if command.include?(' irb ')
-            exec command
-          else
-            system command
-          end
+          puts "Launching Glimmer Application: #{application}" if jruby_options_string.to_s.include?('--debug') || glimmer_options['--quiet'].to_s.downcase != 'true'
+          require the_glimmer_lib
+          load File.expand_path(application)
         end
       end
     end
@@ -168,14 +148,14 @@ module Glimmer
     def initialize(raw_options)
       raw_options << '--quiet' if !caller.join("\n").include?('/bin/glimmer:') && !raw_options.join.include?('--quiet=')
       raw_options << '--log-level=DEBUG' if raw_options.join.include?('--debug') && !raw_options.join.include?('--log-level=')
-      @application_paths = extract_application_paths(raw_options)
+      @application_path = extract_application_path(raw_options)
       @env_vars = extract_env_vars(raw_options)
       @glimmer_options = extract_glimmer_options(raw_options)
       @jruby_options = raw_options
     end
 
     def launch
-      if @application_paths.empty?
+      if @application_path.nil?
         display_usage
       else
         launch_application
@@ -185,18 +165,13 @@ module Glimmer
     private
 
     def launch_application
-      load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile')) && caller.join("\n").include?('/bin/glimmer:')
-      threads = @application_paths.map do |application_path|
-        Thread.new do
-          self.class.launch(
-            application_path,
-            jruby_options: @jruby_options,
-            env_vars: @env_vars,
-            glimmer_options: @glimmer_options
-          )
-        end
-      end
-      threads.each(&:join)
+      load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile')) && caller.join("\n").include?('/bin/glimmer_runner.rb:')
+      self.class.launch(
+        @application_path,
+        jruby_options: @jruby_options,
+        env_vars: @env_vars,
+        glimmer_options: @glimmer_options
+      )
     end
 
     def display_usage
@@ -232,10 +207,11 @@ module Glimmer
       end
     end
 
-    def extract_application_paths(options)
-      options.select do |option|
+    # Extract application path (which can also be a rake task, basically a non-arg)
+    def extract_application_path(options)
+      application_path = options.detect do |option|
         !option.start_with?('-') && !option.include?('=')
-      end.each do |application_path|
+      end.tap do
         options.delete(application_path)
       end
     end

data/lib/glimmer/rake_task.rb

@@ -100,7 +100,7 @@ namespace :glimmer do
 
     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(' ')
+      extra_args = ARGV.partition {|arg| arg.start_with?('package')}.last.to_a.join(' ')
       Glimmer::RakeTask::Package.native(args[:type], extra_args)
     end
   end

data/lib/glimmer/rake_task/package.rb

@@ -90,8 +90,12 @@ module Glimmer
         
         def native(native_type=nil, native_extra_args)
           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')
+          java_version = `jruby -v`
+          if java_version.include?('1.8.0_241')
+            puts "Java Version 1.8.0_241 Detected!"
+          else
+            puts "WARNING! Glimmer Packaging Pre-Requisite Java Version 1.8.0_241 Is Not Found!"
+          end
           require 'facets/string/titlecase'
           require 'facets/string/underscore'
           require 'facets/string/camelcase'
@@ -121,6 +125,7 @@ module Glimmer
             puts "Neither javapackager nor jpackage exist in your Java installation. Please ensure javapackager or jpackage is available in PATH environment variable."
             return
           end
+          Rake.application.load_rakefile # make sure to load potential javapackager_extra_args config in app Rakefile
           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

data/lib/glimmer/rake_task/scaffold.rb

@@ -149,8 +149,8 @@ module Glimmer
           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'
+          mkdir_p "app/#{file_name(app_name)}/model"
+          mkdir_p "app/#{file_name(app_name)}/view"
           if shell_type == :desktopify
             custom_shell('AppView', current_dir_name, shell_type, shell_options)
           else
@@ -185,7 +185,7 @@ module Glimmer
           end
           write 'spec/spec_helper.rb', spec_helper_file
           if OS.windows?
-            system "glimmer package[image]"
+            system "glimmer \"package[image]\"" # TODO handle Windows with batch file
             system "\"packages/bundles/#{human_name(app_name)}/#{human_name(app_name)}.exe\""
           else
             system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer package\n'"
@@ -200,7 +200,7 @@ module Glimmer
         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)}"
+          parent_dir = "#{root_dir}/#{file_name(namespace)}/view"
           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, shell_options)
@@ -209,7 +209,7 @@ module Glimmer
         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)}"
+          parent_dir = "#{root_dir}/#{file_name(namespace)}/view"
           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)
@@ -218,7 +218,7 @@ module Glimmer
         def custom_shape(custom_shape_name, namespace)
           namespace ||= current_dir_name
           root_dir = File.exists?('app') ? 'app' : 'lib'
-          parent_dir = "#{root_dir}/views/#{file_name(namespace)}"
+          parent_dir = "#{root_dir}/#{file_name(namespace)}/view"
           return puts("The file '#{parent_dir}/#{file_name(custom_shape_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_shape_name)}.rb")
           mkdir_p parent_dir unless File.exists?(parent_dir)
           write "#{parent_dir}/#{file_name(custom_shape_name)}.rb", custom_shape_file(custom_shape_name, namespace)
@@ -253,15 +253,12 @@ module Glimmer
           write 'Gemfile', GEMFILE
           write 'Rakefile', gem_rakefile(custom_shell_name, namespace, gem_name)
           append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
-          mkdir 'lib/views'
           custom_shell(custom_shell_name, namespace, :gem)
           
-          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 "lib/#{gem_name}"
+          write "lib/#{gem_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)
+          write "bin/#{file_name(custom_shell_name)}", app_bin_command_file(gem_name, custom_shell_name, namespace)
           FileUtils.chmod 0755, "bin/#{file_name(custom_shell_name)}"
           if OS.windows?
             system "bundle"
@@ -287,12 +284,12 @@ module Glimmer
           puts "Created #{current_dir_name}/#{icon_file}"
           
           if OS.windows?
-            system "glimmer package[image]"
+            system "glimmer package[image]" # TODO handle windows properly with batch file
             system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
           else
             system "bash -c '#{RVM_FUNCTION}\n cd .\n glimmer package\n'"
             if OS.mac?
-              system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
+              system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app"
             else
               system "glimmer run"
             end
@@ -327,7 +324,6 @@ module Glimmer
           write 'Gemfile', GEMFILE
           write 'Rakefile', gem_rakefile
           append "lib/#{gem_name}.rb", gem_main_file(custom_widget_name, namespace)
-          mkdir 'lib/views'
           custom_widget(custom_widget_name, namespace)
           if OS.windows?
             system "bundle"
@@ -366,7 +362,6 @@ module Glimmer
           write 'Gemfile', GEMFILE
           write 'Rakefile', gem_rakefile
           append "lib/#{gem_name}.rb", gem_main_file(custom_shape_name, namespace)
-          mkdir 'lib/views'
           custom_shape(custom_shape_name, namespace)
           if OS.windows?
             system "bundle"
@@ -443,7 +438,7 @@ module Glimmer
     
             require 'bundler/setup'
             Bundler.require(:default)
-            require 'views/#{file_name(app_name)}/app_view'
+            require '#{file_name(app_name)}/view/app_view'
     
             class #{class_name(app_name)}
               include Glimmer
@@ -451,17 +446,14 @@ module Glimmer
               APP_ROOT = File.expand_path('../..', __FILE__)
               VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
               LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
-                        
-              def open
-                app_view.open
-              end
             end
           MULTI_LINE_STRING
         end
     
         def gem_main_file(custom_widget_name, namespace = nil)
-          custom_widget_file_path = "views"
-          custom_widget_file_path += "/#{file_name(namespace)}" if namespace
+          custom_widget_file_path = ''
+          custom_widget_file_path += "#{file_name(namespace)}/" if namespace
+          custom_widget_file_path += "view"
           custom_widget_file_path += "/#{file_name(custom_widget_name)}"
     
           <<~MULTI_LINE_STRING
@@ -476,15 +468,20 @@ module Glimmer
           <<~MULTI_LINE_STRING
             require_relative '../#{file_name(app_name)}'
             
-            #{class_name(app_name)}.new.open
+            #{class_name(app_name)}::View::AppView.launch
           MULTI_LINE_STRING
         end
     
-        def app_bin_command_file(app_name)
+        def app_bin_command_file(app_name_or_gem_name, custom_shell_name=nil, namespace=nil)
+          if custom_shell_name.nil?
+            runner = "File.expand_path('../../app/#{file_name(app_name_or_gem_name)}/launch.rb', __FILE__)"
+          else
+            runner = "File.expand_path('../../lib/#{app_name_or_gem_name}/launch.rb', __FILE__)"
+          end
           <<~MULTI_LINE_STRING
             #!/usr/bin/env jruby
             
-            runner = File.expand_path("../../app/#{file_name(app_name)}/launch.rb", __FILE__)
+            runner = #{runner}
             
             # Detect if inside a JAR file or not
             if runner.include?('uri:classloader')
@@ -501,39 +498,9 @@ module Glimmer
         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(namespace)}::#{class_name(custom_shell_name)}::App.new.open
-          MULTI_LINE_STRING
-        end
-    
-        def gem_bin_command_file(gem_name, custom_shell_name, namespace)
-          <<~MULTI_LINE_STRING
-            #!/usr/bin/env jruby
-            
-            runner = File.expand_path("../../lib/#{file_name(namespace)}/#{file_name(custom_shell_name)}/launch.rb", __FILE__)
+            require_relative '../#{gem_name}'
             
-            # 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
+            #{class_name(namespace)}::View::#{class_name(custom_shell_name)}.launch
           MULTI_LINE_STRING
         end
     
@@ -546,8 +513,8 @@ module Glimmer
           if custom_shell_name
             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']")
+            lines.insert(gem_files_line_index+1, "  gem.require_paths = ['vendor', 'lib', 'app']")
+            lines.insert(gem_files_line_index+2, "  gem.executables = ['#{file_name(custom_shell_name)}']") if custom_shell_name
           else
             lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*']")
           end
@@ -595,270 +562,276 @@ module Glimmer
           namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
     
           custom_shell_file_content = <<-MULTI_LINE_STRING
-    #{namespace_type} #{class_name(namespace)}
-      class #{class_name(custom_shell_name)}
-        include Glimmer::UI::CustomShell
-        
+#{namespace_type} #{class_name(namespace)}
+  module View
+    class #{class_name(custom_shell_name)}
+      include Glimmer::UI::CustomShell
+    
           MULTI_LINE_STRING
           
           if shell_type == :gem
             custom_shell_file_content += <<-MULTI_LINE_STRING
-        APP_ROOT = File.expand_path('../../../..', __FILE__)
-        VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
-        LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
-            
+      APP_ROOT = File.expand_path('../../../..', __FILE__)
+      VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
+      LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))
+          
             MULTI_LINE_STRING
           end
           
           custom_shell_file_content += <<-MULTI_LINE_STRING
-        ## Add options like the following to configure CustomShell by outside consumers
-        #
-        # options :title, :background_color
-        # option :width, default: 320
-        # option :height, default: 240
-        #{'# ' if shell_type == :desktopify}option :greeting, default: 'Hello, World!'
-    
-        ## Use before_body block to pre-initialize variables to use in body
-        #
-        #
+      ## Add options like the following to configure CustomShell by outside consumers
+      #
+      # options :title, :background_color
+      # option :width, default: 320
+      # option :height, default: 240
+      #{'# ' 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 desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
-        before_body {
-          Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
-          Display.app_version = VERSION
-          @display = display {
-            on_about {
-              display_about_dialog
-            }
-            on_preferences {
-              #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
-            }
+      before_body {
+        Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
+        Display.app_version = VERSION
+        @display = display {
+          on_about {
+            display_about_dialog
+          }
+          on_preferences {
+            #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
           }
         }
+      }
             MULTI_LINE_STRING
           else
             custom_shell_file_content += <<-MULTI_LINE_STRING
-        # before_body {
-        #
-        # }
+      # before_body {
+      #
+      # }
             MULTI_LINE_STRING
           end
     
           custom_shell_file_content += <<-MULTI_LINE_STRING
-    
-        ## Use after_body block to setup observers for widgets in body
-        #
-        # after_body {
-        #
-        # }
-    
-        ## Add widget content inside custom shell body
-        ## Top-most widget must be a shell or another custom shell
-        #
-        body {
-          shell {
-            # Replace example content below with custom shell content
-            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)}"
-          
+  
+      ## Use after_body block to setup observers for widgets in body
+      #
+      # after_body {
+      #
+      # }
+  
+      ## Add widget content inside custom shell body
+      ## Top-most widget must be a shell or another custom shell
+      #
+      body {
+        shell(#{':fill_screen' if shell_type == :desktopify}) {
+          # Replace example content below with custom shell content
+          minimum_size #{shell_type == :desktopify ? '768, 432' : '420, 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]}"
-            }
+          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
-            }
+          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_bar {
+            menu {
+              text '&File'
+              menu_item {
+                text '&About...'
+                on_widget_selected {
+                  display_about_dialog
                 }
-                menu_item {
-                  text '&Preferences...'
-                  on_widget_selected {
-                    #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
-                  }
+              }
+              menu_item {
+                text '&Preferences...'
+                on_widget_selected {
+                  #{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 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)}" if shell_type == :gem} \#{VERSION}\\n\\n\#{LICENSE}"
-          }.open
-        end
-        
+  
+      def display_about_dialog
+        message_box(body_root) {
+          text 'About'
+          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'
-            grid_layout {
-              margin_height 5
-              margin_width 5
+      def display_preferences_dialog
+        dialog(swt_widget) {
+          text 'Preferences'
+          grid_layout {
+            margin_height 5
+            margin_width 5
+          }
+          group {
+            row_layout {
+              type :vertical
+              spacing 10
             }
-            group {
-              row_layout {
-                type :vertical
-                spacing 10
-              }
-              text 'Greeting'
-              font style: :bold
-              [
-                'Hello, World!',
-                'Howdy, Partner!'
-              ].each do |greeting_text|
-                button(:radio) {
-                  text greeting_text
-                  selection bind(self, :greeting) { |g| g == greeting_text }
-                  layout_data {
-                    width 160
-                  }
-                  on_widget_selected { |event|
-                    self.greeting = event.widget.getText
-                  }
+            text 'Greeting'
+            font style: :bold
+            [
+              'Hello, World!',
+              'Howdy, Partner!'
+            ].each do |greeting_text|
+              button(:radio) {
+                text greeting_text
+                selection bind(self, :greeting) { |g| g == greeting_text }
+                layout_data {
+                  width 160
                 }
-              end
-            }
-          }.open
-        end
+                on_widget_selected { |event|
+                  self.greeting = event.widget.getText
+                }
+              }
+            end
+          }
+        }.open
+      end
             MULTI_LINE_STRING
           end
           
           custom_shell_file_content += <<-MULTI_LINE_STRING
-      end
     end
+  end
+end
           MULTI_LINE_STRING
         end
     
         def custom_widget_file(custom_widget_name, namespace)
           namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
     
-          <<~MULTI_LINE_STRING
-            #{namespace_type} #{class_name(namespace)}
-              class #{class_name(custom_widget_name)}
-                include Glimmer::UI::CustomWidget
-            
-                ## Add options like the following to configure CustomWidget by outside consumers
-                #
-                # options :custom_text, :background_color
-                # option :foreground_color, default: :red
-            
-                ## Use before_body block to pre-initialize variables to use in body
-                #
-                #
-                # before_body {
-                #
-                # }
-            
-                ## Use after_body block to setup observers for widgets in body
-                #
-                # after_body {
-                #
-                # }
-            
-                ## Add widget content under custom widget body
-                ##
-                ## If you want to add a shell as the top-most widget,
-                ## consider creating a custom shell instead
-                ## (Glimmer::UI::CustomShell offers shell convenience methods, like show and hide)
-                #
-                body {
-                  # Replace example content below with custom widget content
-                  label {
-                    background :red
-                  }
-                }
-            
-              end
-            end
+          <<-MULTI_LINE_STRING
+#{namespace_type} #{class_name(namespace)}
+  module View
+    class #{class_name(custom_widget_name)}
+      include Glimmer::UI::CustomWidget
+  
+      ## Add options like the following to configure CustomWidget by outside consumers
+      #
+      # options :custom_text, :background_color
+      # option :foreground_color, default: :red
+  
+      ## Use before_body block to pre-initialize variables to use in body
+      #
+      #
+      # before_body {
+      #
+      # }
+  
+      ## Use after_body block to setup observers for widgets in body
+      #
+      # after_body {
+      #
+      # }
+  
+      ## Add widget content under custom widget body
+      ##
+      ## If you want to add a shell as the top-most widget,
+      ## consider creating a custom shell instead
+      ## (Glimmer::UI::CustomShell offers shell convenience methods, like show and hide)
+      #
+      body {
+        # Replace example content below with custom widget content
+        label {
+          background :red
+        }
+      }
+  
+    end
+  end
+end
           MULTI_LINE_STRING
         end
         
         def custom_shape_file(custom_shape_name, namespace)
           namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
     
-          <<~MULTI_LINE_STRING
-            #{namespace_type} #{class_name(namespace)}
-              class #{class_name(custom_shape_name)}
-                include Glimmer::UI::CustomShape
-            
-                ## Add options like the following to configure CustomShape by outside consumers
-                #
-                # options :option1, option2, option3
-                option :background_color, default: :red
-                option :size_width, default: 100
-                option :size_height, default: 100
-                option :location_x, default: 0
-                option :location_y, default: 0
-            
-                ## Use before_body block to pre-initialize variables to use in body
-                #
-                #
-                # before_body {
-                #
-                # }
-            
-                ## Use after_body block to setup observers for shapes in body
-                #
-                # after_body {
-                #
-                # }
-            
-                ## Add shape content under custom shape body
-                #
-                body {
-                  # Replace example content below with custom shape content
-                  shape(location_x, location_y) {
-                    path {
-                      background background_color
-                      cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*0.65 - size_width*0.66, 0 - size_height*0.33, size_width/2 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
-                    }
-                    path {
-                      background background_color
-                      cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*1.35 - size_width*0.66, 0 - size_height*0.33, size_width*1.5 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
-                    }
-                  }
-                }
-            
-              end
-            end
+          <<-MULTI_LINE_STRING
+#{namespace_type} #{class_name(namespace)}
+  module View
+    class #{class_name(custom_shape_name)}
+      include Glimmer::UI::CustomShape
+  
+      ## Add options like the following to configure CustomShape by outside consumers
+      #
+      # options :option1, option2, option3
+      option :background_color, default: :red
+      option :size_width, default: 100
+      option :size_height, default: 100
+      option :location_x, default: 0
+      option :location_y, default: 0
+  
+      ## Use before_body block to pre-initialize variables to use in body
+      #
+      #
+      # before_body {
+      #
+      # }
+  
+      ## Use after_body block to setup observers for shapes in body
+      #
+      # after_body {
+      #
+      # }
+  
+      ## Add shape content under custom shape body
+      #
+      body {
+        # Replace example content below with custom shape content
+        shape(location_x, location_y) {
+          path {
+            background background_color
+            cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*0.65 - size_width*0.66, 0 - size_height*0.33, size_width/2 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
+          }
+          path {
+            background background_color
+            cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*1.35 - size_width*0.66, 0 - size_height*0.33, size_width*1.5 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
+          }
+        }
+      }
+  
+    end
+  end
+end
           MULTI_LINE_STRING
         end