glimmer-dsl-swt 0.5.5 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0281642708bc9fc3c57d913c1b1a33e4f9699e6999d290467bbaf02b706319cb'
-  data.tar.gz: 9499e48b14742b2034321631edc06be69212fc0c762a13727ad70cf880d86b6f
+  metadata.gz: c4290c2587a5d74bdbd39df1e1459219628abd0f867df9c972ec766d1581e786
+  data.tar.gz: a422f8c8f1cad97b8c59f72eefdbdac2bfab5076e45b4d99bacbea063f683897
 SHA512:
-  metadata.gz: 7ad2211fa73e076d2993e3e487547cf486c96f500406666f6e9c3a16351c87f118337478b29fea0bd469d937ae7225520fc2efb55259db94766a97313990f9cc
-  data.tar.gz: 66312d638303de3ed1e6c100e4d4bec21c7b6e52203cfc2ef9368b2df7bb0662d08859f96be50fa4928dad10c88b112e71510c75de71f48ee818c7818c0dbbbd
+  metadata.gz: cfe72e5b9043ca482199ebcdb21ce5dfb3bcf5106b4adf2d1f5928d195b9ae99fbd1cd10b120ec14901052121a3cb82e5e45a203e235daaf2bd29addc6e29f60
+  data.tar.gz: 9f1d1bd197e61a8a462f5afc8d84466b0a595f0ab225999571d9fb22c8f00e078928a675a4474fde34c1274aaac252c4d23f7c7fcd38fea155a0cac8e6769767

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.5.5 (Desktop GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.6.3 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.2.12.0
+jruby-9.2.13.0

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.6.3

data/bin/girb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 trap "SIGINT" do
   # No Op for irb

data/bin/glimmer

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env jruby
 
 require_relative '../lib/glimmer/launcher'
 

data/lib/ext/glimmer/config.rb

@@ -105,7 +105,6 @@ end
 Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   method = method_symbol.to_s
   result = false
-  result ||= method.start_with?('on_swt_') && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
   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'

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

@@ -0,0 +1,23 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/swt/cursor_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # cursor expression
+      # Note: Cannot be a static expression because it clashes with cursor property expression
+      class CursorExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'cursor' and
+            (parent.nil? or !parent.respond_to?('cursor')) and
+            args.size == 1 and
+            (args.first.is_a?(Integer) or textual?(args.first))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::CursorProxy.new(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,9 @@ module Glimmer
           tree_items_data_binding
           table_items_data_binding
           data_binding
+          cursor
+          font
+          image
           property
           block_property
           widget

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

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/font_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # font expression
+      # Note: Cannot be a static expression because it clashes with font property expression
+      class FontExpression < Expression
+        include TopLevelExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'font' and     
+            (parent.nil? || !parent.respond_to?('font')) and
+            args.size == 1 and 
+            args.first.is_a?(Hash)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::FontProxy.new(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/swt/image_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # image expression
+      # Note: Cannot be a static expression because it clashes with image property expression
+      class ImageExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'image' and
+            (parent.nil? or !parent.respond_to?('image'))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::ImageProxy.new(*args)
+        end
+      end
+    end
+  end
+end

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

@@ -16,7 +16,15 @@ module Glimmer
 
         def interpret(parent, keyword, *args, &block)
           potential_parent = args.first
-          parent = args.shift if potential_parent.is_a?(Shell) || (potential_parent.respond_to?(:swt_widget) && potential_parent.swt_widget.is_a?(Shell))
+          potential_parent = potential_parent.swt_widget if potential_parent.respond_to?(:swt_widget)
+          parent = nil          
+          if potential_parent.is_a?(Shell)
+            args.shift
+            parent = potential_parent
+          elsif potential_parent.is_a?(Widget)
+            args.shift
+            parent = potential_parent.shell
+          end
           Glimmer::SWT::MessageBoxProxy.new(parent, Glimmer::SWT::SWTProxy[args])
         end
       end

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

@@ -17,14 +17,14 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          begin
-            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
-            widget_class = Glimmer::SWT.const_get(class_name)
-          rescue
-            widget_class = Glimmer::SWT::WidgetProxy
-          end
-          widget_class.new(keyword, parent, args)
+          Glimmer::SWT::WidgetProxy.create(keyword, parent, args)
         end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+        
       end
     end
   end

data/lib/glimmer/launcher.rb

@@ -13,7 +13,7 @@ module Glimmer
     
       When a task is specified, it runs via rake. Some tasks take arguments in square brackets.
     
-      Available tasks are below (you may also lookup by adding `require 'glimmer/rake_task'` in Rakefile and running rake -T):
+      Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
     MULTI_LINE_STRING
 
     TEXT_USAGE_SUFFIX = <<~MULTI_LINE_STRING
@@ -96,6 +96,10 @@ module Glimmer
           devmode_require = '-r puts_debuggerer '
         end
         rake_tasks = Rake.application.tasks.map(&:to_s).map {|t| t.sub('glimmer:', '')}
+         
+        # handle a bash quirk with calling package[msi] while there is a "packages" directory locally (it passes package[msi] as packages)
+        application = 'package[msi]' if application == 'packages'
+        
         potential_rake_task_parts = application.match(REGEX_RAKE_TASK_WITH_ARGS)
         application = potential_rake_task_parts[1]
         rake_task_args = potential_rake_task_parts[2].split(',')
@@ -110,7 +114,7 @@ module Glimmer
           end
           command = "#{env_vars_string} jruby #{jruby_options_string}#{jruby_os_specific_options} #{devmode_require}-r #{the_glimmer_lib} -S #{application}"
           puts command if jruby_options_string.to_s.include?('--debug')
-          system command
+          exec command
         end
       end
     end

data/lib/glimmer/package.rb

@@ -6,6 +6,7 @@ module Glimmer
   module Package
     class << self
       attr_accessor :javapackager_extra_args
+      alias jpackage_extra_args :javapackager_extra_args
       
       def clean
         require 'fileutils'
@@ -41,7 +42,16 @@ module Glimmer
         system('warble')      
       end
       
-      def native
+      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..."
         require 'facets/string/titlecase'
         require 'facets/string/underscore'
         project_name = File.basename(File.expand_path('.'))
@@ -51,14 +61,28 @@ module Glimmer
         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
-        command = "javapackager -deploy -native -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}\" -BsystemWide=#{OS.mac?} "
-        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
+        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']
-        puts "Generating DMG/PKG/APP/JNLP with javapackager..."
+        command += " #{native_extra_args} " if native_extra_args
         puts command
         system command      
       end

data/lib/glimmer/rake_task.rb

@@ -19,17 +19,25 @@ namespace :glimmer do
       Glimmer::Package.jar
     end
 
-    desc 'Generate Native files (DMG/PKG/APP on the Mac, EXE on Windows, RPM/DEB on Linux)'
-    task :native do
-      Glimmer::Package.native
+    desc 'Lock JARs'
+    task :lock_jars do
+      Glimmer::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)
     end
   end
 
-  desc 'Package app for distribution (generating config, jar, and native files)'
-  task :package 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:lock_jars'].execute
     Rake::Task['glimmer:package:config'].execute
     Rake::Task['glimmer:package:jar'].execute
-    Rake::Task['glimmer:package:native'].execute
+    Rake::Task['glimmer:package:native'].execute(args)
   end
 
 

data/lib/glimmer/scaffold.rb

@@ -73,24 +73,11 @@ class Scaffold
       
       # Glimmer
       dist
-      packages      
+      packages
+      vendor/jars
     MULTI_LINE_STRING
 
-    GEMFILE_APP = <<~MULTI_LINE_STRING
-      # frozen_string_literal: true
-      
-      source 'https://rubygems.org'
-      
-      git_source(:github) {|repo_name| "https://github.com/\#{repo_name}" }
-      
-      gem 'glimmer-dsl-swt', '~> #{VERSION}'
-      
-      group :test do
-        gem 'rspec'
-      end
-    MULTI_LINE_STRING
-
-    GEMFILE_GEM = <<~MULTI_LINE_STRING
+    GEMFILE = <<~MULTI_LINE_STRING
       # frozen_string_literal: true
       
       source 'https://rubygems.org'
@@ -101,24 +88,12 @@ class Scaffold
       
       group :development do
         gem 'rspec', '~> 3.5.0'
+        gem 'git-glimmer', '1.7.0'
         gem 'jeweler', '2.3.9'
         gem 'simplecov', '>= 0'
       end
     MULTI_LINE_STRING
 
-    RAKEFILE = <<~MULTI_LINE_STRING
-      require 'glimmer/rake_task'
-      
-      ## Use the following configuration if you would like to customize javapackager
-      ## arguments for `glimmer package` command.
-      #
-      # Glimmer::Package.javapackager_extra_args =
-      #   " -BlicenseType=" +
-      #   " -Bmac.CFBundleIdentifier=" +
-      #   " -Bmac.category=" +
-      #   " -Bmac.signing-key-developer-id-app="
-    MULTI_LINE_STRING
-
     RVM_FUNCTION = <<~MULTI_LINE_STRING
       # Load RVM into a shell session *as a function*
       if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
@@ -135,31 +110,54 @@ class Scaffold
     MULTI_LINE_STRING
 
     def app(app_name)
-      mkdir app_name
-      cd app_name
+      gem_name = file_name(app_name)
+      gem_summary = human_name(app_name)
+      system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+      cd gem_name
+      rm_rf 'lib'
       write '.gitignore', GITIGNORE
       write '.ruby-version', RUBY_VERSION        
       write '.ruby-gemset', app_name
       write 'VERSION', '1.0.0'
       write 'LICENSE.txt', "Copyright (c) #{Time.now.year} #{app_name}"
-      write 'Gemfile', GEMFILE_APP
-      write 'Rakefile', RAKEFILE
+      write 'Gemfile', GEMFILE
+      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 OS.mac?
-        mkdir_p 'package/macosx'
-        icon_file = "package/macosx/#{human_name(app_name)}.icns"
-        cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
-      end
+        
+      mkdir_p 'package/windows'
+      icon_file = "package/windows/#{human_name(app_name)}.ico"
+      cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
+      mkdir_p 'package/macosx'
+      icon_file = "package/macosx/#{human_name(app_name)}.icns"
+      cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+    
+      mkdir_p 'package/linux'
+      icon_file = "package/linux/#{human_name(app_name)}.png"
+      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)
-      system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-      system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app"
-      # TODO generate rspec test suite
+      write 'spec/spec_helper.rb', spec_helper_file
+      if OS.windows?
+        system "bundle"
+        system "glimmer package[image]"
+        system "\"packages/bundles/#{human_name(app_name)}/#{human_name(app_name)}.exe\""
+      else
+        system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
+        if OS.mac?
+          system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app"
+        else
+          system "glimmer bin/#{file_name(app_name)}"
+        end
+      end
     end
 
     def custom_shell(custom_shell_name, namespace, shell_type = nil)
@@ -179,22 +177,22 @@ class Scaffold
     end
 
     def custom_shell_gem(custom_shell_name, namespace)
-      return puts('Namespace is required! Usage: glimmer scaffold:custom_shell_gem[custom_shell_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
       gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
       gem_summary = "#{human_name(custom_shell_name)} - Glimmer Custom Shell"
       if namespace
         gem_name += "-#{compact_name(namespace)}"
         gem_summary += " (#{human_name(namespace)})"
       else
+        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
-      system "jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+      system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
       cd gem_name
       write '.gitignore', GITIGNORE
       write '.ruby-version', RUBY_VERSION        
       write '.ruby-gemset', gem_name
       write 'VERSION', '1.0.0'
-      write 'Gemfile', GEMFILE_GEM      
+      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'
@@ -203,14 +201,35 @@ class Scaffold
       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)
       FileUtils.chmod 0755, "bin/#{file_name(custom_shell_name)}"
-      if OS.mac?
-        mkdir_p 'package/macosx'
-        icon_file = "package/macosx/#{human_name(custom_shell_name)}.icns"
-        cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
-        puts "Created #{current_dir_name}/#{icon_file}"
+      write 'spec/spec_helper.rb', spec_helper_file
+
+      mkdir_p 'package/windows'
+      icon_file = "package/windows/#{human_name(custom_shell_name)}.ico"
+      cp File.expand_path('../../../icons/scaffold_app.ico', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+        
+      mkdir_p 'package/macosx'
+      icon_file = "package/macosx/#{human_name(custom_shell_name)}.icns"
+      cp File.expand_path('../../../icons/scaffold_app.icns', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
+      mkdir_p 'package/linux'
+      icon_file = "package/linux/#{human_name(custom_shell_name)}.png"
+      cp File.expand_path('../../../icons/scaffold_app.png', __FILE__), icon_file
+      puts "Created #{current_dir_name}/#{icon_file}"
+      
+      if OS.windows?
+        system "bundle"
+        system "glimmer package[image]"
+        system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
+      else
+        system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
+        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)}"
+        end        
       end
-      system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n glimmer package\n'"
-      system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app"
       puts "Finished creating #{gem_name} Ruby gem."
       puts 'Edit Rakefile to configure gem details.'
       puts 'Run `rake` to execute specs.'
@@ -228,19 +247,23 @@ class Scaffold
       else
         namespace = 'glimmer'
       end
-      system "jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
+      system "jruby -r git-glimmer -S jeweler --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}" 
       cd gem_name
       write '.gitignore', GITIGNORE
       write '.ruby-version', RUBY_VERSION        
       write '.ruby-gemset', gem_name
       write 'VERSION', '1.0.0'
-      write 'Gemfile', GEMFILE_GEM      
+      write 'Gemfile', GEMFILE
       write 'Rakefile', gem_rakefile
       write 'spec/spec_helper.rb', spec_helper_file
       append "lib/#{gem_name}.rb", gem_main_file(custom_widget_name, namespace)
       mkdir 'lib/views'
       custom_widget(custom_widget_name, namespace)
-      system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n'"
+      if OS.windows?
+        system "bundle"
+      else
+        system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n'"
+      end
       puts "Finished creating #{gem_name} Ruby gem."
       puts 'Edit Rakefile to configure gem details.'
       puts 'Run `rake` to execute specs.'
@@ -338,7 +361,7 @@ class Scaffold
 
     def gem_bin_command_file(gem_name)
       <<~MULTI_LINE_STRING
-        #!/usr/bin/env ruby
+        #!/usr/bin/env jruby
         
         require 'glimmer/launcher'
         
@@ -355,10 +378,11 @@ class Scaffold
       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/**/*.rb', 'bin/**/*']")
+        lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*', 'app/**/*', 'bin/**/*', 'vendor/**/*', 'package/**/*']")
         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
-        lines.insert(gem_files_line_index, "  gem.files = Dir['lib/**/*.rb']")
+        lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'lib/**/*']")
       end
       spec_pattern_line_index = lines.index(lines.detect {|l| l.include?('spec.pattern =') })
       lines.insert(spec_pattern_line_index+1, "  spec.ruby_opts = [Glimmer::Launcher.jruby_swt_options]")
@@ -383,7 +407,7 @@ class Scaffold
       content = File.read('spec/spec_helper.rb')
       lines = content.split("\n")
       require_line_index = lines.index(lines.detect {|l| l.include?(current_dir_name) })
-      lines[require_line_index...require_line_index] = [
+      lines[require_line_index..require_line_index] = [
         "require 'bundler/setup'",
         'Bundler.require(:default, :development)',
       ]
@@ -412,9 +436,9 @@ class Scaffold
       
       if shell_type == :gem
         custom_shell_file_content += <<-MULTI_LINE_STRING
-    GEM_ROOT = File.expand_path('../../../..', __FILE__)
-    VERSION = File.read(File.join(GEM_ROOT, 'VERSION'))
-    LICENSE = File.read(File.join(GEM_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
@@ -470,6 +494,7 @@ class Scaffold
       shell {
         # Replace example content below with custom shell content
         minimum_size 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)}"
         grid_layout
         label(:center) {
@@ -477,6 +502,17 @@ class Scaffold
           font height: 40
           layout_data :fill, :center, true, true
         }
+        menu_bar {
+          menu {
+            text '&File'
+            menu_item {
+              text '&Preferences...'
+              on_widget_selected {
+                display_preferences_dialog
+              }
+            }
+          }
+        }
       }
     }
       MULTI_LINE_STRING

data/lib/glimmer/swt/cursor_proxy.rb

@@ -0,0 +1,45 @@
+require 'glimmer/error'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.graphics.Cursor
+    #
+    # Invoking `#swt_cursor` returns the SWT Cursor object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern
+    class CursorProxy
+      CURSOR_STYLES = org.eclipse.swt.SWT.constants.select {|c| c.to_s.downcase.start_with?('cursor_')}.map {|c| c.to_s.downcase.sub('cursor_', '').to_sym}
+      ERROR_INVALID_CURSOR_STYLE = " is an invalid cursor style! Valid values are #{CURSOR_STYLES.map(&:to_s).join(", ")}"
+
+      include_package 'org.eclipse.swt.graphics'
+
+      attr_reader :swt_cursor, :cursor_style
+
+      # Builds a new CursorProxy from passed in cursor SWT style (e.g. :appstarting, :hand, or :help)
+      #
+      # Cursor SWT styles are those that begin with "CURSOR_" prefix
+      #
+      # They are expected to be passed in in short form without the prefix (but would work with the prefix too)
+      def initialize(cursor_style)
+        @cursor_style = cursor_style
+        @cursor_style = SWTProxy.reverse_lookup(@cursor_style).detect { |symbol| symbol.to_s.downcase.start_with?('cursor_') } if cursor_style.is_a?(Integer)
+        @cursor_style = @cursor_style.to_s.downcase
+        @cursor_style = @cursor_style.sub(/^cursor\_/, '') if @cursor_style.start_with?('cursor_')
+        detect_invalid_cursor_style
+        @swt_cursor = DisplayProxy.instance.swt_display.get_system_cursor(SWTProxy[swt_style])
+      end
+      
+      def swt_style
+        @swt_style ||= @cursor_style.upcase.start_with?('CURSOR_') ? @cursor_style : "CURSOR_#{@cursor_style}"
+      end
+
+      private
+
+      def detect_invalid_cursor_style
+        raise Error, cursor_style.to_s + ERROR_INVALID_CURSOR_STYLE unless CURSOR_STYLES.include?(cursor_style.to_s.downcase.to_sym)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/display_proxy.rb

@@ -35,16 +35,26 @@ module Glimmer
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
       end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
+      end      
 
       def method_missing(method, *args, &block)
-        swt_display.send(method, *args, &block)
+        if can_handle_observation_request?(method)
+          handle_observation_request(method, &block)
+        else
+          swt_display.send(method, *args, &block)
+        end
       rescue => e
         Glimmer::Config.logger.debug {"Neither DisplayProxy nor #{swt_display.class.name} can handle the method ##{method}"}
         super
       end
       
       def respond_to?(method, *args, &block)
-        super || swt_display.respond_to?(method, *args, &block)
+        super || 
+          can_handle_observation_request?(method) ||        
+          swt_display.respond_to?(method, *args, &block)
       end
 
       def can_handle_observation_request?(observation_request)
@@ -61,6 +71,7 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
+        observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)

data/lib/glimmer/swt/font_proxy.rb

@@ -6,11 +6,10 @@ module Glimmer
   module SWT
     # Proxy for org.eclipse.swt.graphics.Font
     #
-    # This class is meant to be used with WidgetProxy to manipulate
-    # an SWT widget font.
+    # This class can be optionally used with WidgetProxy to manipulate
+    # an SWT widget font (reusing its FontData but building a new Font)
     #
-    # It is not meant to create new SWT fonts form scratch without
-    # a widget proxy.
+    # Otherwise, if no WidgetProxy is passed to constructor, it builds new FontData
     #
     # Invoking `#swt_font` returns the SWT Font object wrapped by this proxy
     #
@@ -21,7 +20,7 @@ module Glimmer
 
       include_package 'org.eclipse.swt.graphics'
 
-      attr_reader :widget_proxy, :swt_font
+      attr_reader :widget_proxy, :swt_font, :font_properties
 
       # Builds a new font proxy from passed in widget_proxy and font_properties hash,
       #
@@ -31,8 +30,9 @@ module Glimmer
       #
       # Style (:style value) can only be one of FontProxy::FONT_STYLES values:
       # that is :normal, :bold, or :italic
-      def initialize(widget_proxy, font_properties)
+      def initialize(widget_proxy = nil, font_properties)
         @widget_proxy = widget_proxy
+        @font_properties = font_properties
         detect_invalid_font_property(font_properties)
         font_properties[:style] = SWTProxy[*font_properties[:style]]
         font_data_args = [:name, :height, :style].map do |font_property_name|
@@ -57,7 +57,7 @@ module Glimmer
       private
 
       def font_datum
-        @font_datum ||= @widget_proxy.swt_widget.getFont.getFontData[0]
+        @font_datum ||= @widget_proxy ? @widget_proxy.swt_widget.getFont.getFontData[0] : FontData.new
       end
 
       def detect_invalid_font_property(font_properties)

data/lib/glimmer/swt/image_proxy.rb

@@ -8,7 +8,7 @@ module Glimmer
     class ImageProxy
       include_package 'org.eclipse.swt.graphics'
       
-      attr_reader :jar_file_path, :image_data
+      attr_reader :file_path, :jar_file_path, :image_data, :swt_image
 
       # Initializes a proxy for an SWT Image object
       #
@@ -17,31 +17,24 @@ module Glimmer
       # and returns an image object.
       def initialize(*args)
         @args = args
-        @jar_file_path = @args.first if @args.first.is_a?(String) && @args.size == 1
-        
-      end
-
-      def swt_image
-        unless @swt_image
-          if @jar_file_path
-            file_path = @jar_file_path
-            if file_path.start_with?('uri:classloader')
-              file_path = file_path.sub(/^uri\:classloader\:/, '').sub('//', '/') # the latter sub is needed for Mac
-              object = java.lang.Object.new
-              file_input_stream = object.java_class.resource_as_stream(file_path)
-              buffered_file_input_stream = java.io.BufferedInputStream.new(file_input_stream)
-            end
-            @image_data = ImageData.new(buffered_file_input_stream || file_path)
-            @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
-          else
-            @swt_image = Image.new(*@args)
+        @file_path = @args.first if @args.first.is_a?(String) && @args.size == 1        
+        if @file_path
+          if @file_path.start_with?('uri:classloader')
+            @jar_file_path = @file_path
+            @file_path = @jar_file_path.sub(/^uri\:classloader\:/, '').sub('//', '/') # the latter sub is needed for Mac
+            object = java.lang.Object.new
+            file_input_stream = object.java_class.resource_as_stream(file_path)
+            buffered_file_input_stream = java.io.BufferedInputStream.new(file_input_stream)
           end
-        end
-        @swt_image
+          @image_data = ImageData.new(buffered_file_input_stream || @file_path)
+          @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
+        else
+          @swt_image = Image.new(*@args)
+          @image_data = @swt_image.image_data
+        end        
       end
-      
+
       def scale_to(width, height)
-        return @swt_image if image_data.nil?
         scaled_image_data = image_data.scaledTo(width, height)
         device = swt_image.device
         swt_image.dispose

data/lib/glimmer/swt/layout_proxy.rb

@@ -45,6 +45,8 @@ module Glimmer
         @widget_proxy = widget_proxy
         args = SWTProxy.constantify_args(args)
         @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
+        @swt_layout.marginWidth = 15 if @swt_layout.respond_to?(:marginWidth)
+        @swt_layout.marginHeight = 15 if @swt_layout.respond_to?(:marginHeight)
         @widget_proxy.swt_widget.setLayout(@swt_layout)
       end
 

data/lib/glimmer/swt/message_box_proxy.rb

@@ -14,16 +14,22 @@ module Glimmer
       attr_reader :swt_widget
       
       def initialize(parent, style)
-        parent = parent.swt_widget if parent.respond_to?(:swt_widget) && parent.swt_widget.is_a?(Shell)
-        @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget if parent.nil?
-        @swt_widget = MessageBox.new(parent, style)
+        if parent.nil?
+          @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
+        end
+        @swt_widget = MessageBox.new(parent, style)        
       end
       
       def open
-        @swt_widget.open
-        @temporary_parent&.dispose
+        @swt_widget.open.tap do |result|
+          @temporary_parent&.dispose
+        end
       end
       
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::MessageBoxExpression.new, &block)
+      end            
+      
       # TODO refactor the following methods to put in a JavaBean mixin or somethin (perhaps contribute to OSS project too)
       
       def attribute_setter(attribute_name)
@@ -44,6 +50,18 @@ module Glimmer
 
       def get_attribute(attribute_name)
         @swt_widget.send(attribute_getter(attribute_name))
+      end
+      
+      def method_missing(method, *args, &block)
+        swt_widget.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{swt_widget.class.name} can handle the method ##{method}"}
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || 
+          swt_widget.respond_to?(method, *args, &block)
       end      
     end
   end

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -1,21 +1,16 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/swt_proxy'
 
 module Glimmer
   module SWT
-    class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy
-      def initialize(underscored_widget_name, parent, args)
-        unless args.first.is_a?(Numeric)
-          args.unshift(:h_scroll)
-          args.unshift(:v_scroll)
-        end
-        super
-        swt_widget.expand_horizontal = true
-        swt_widget.expand_vertical = true
-      end
-      
+    class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy    
       def post_initialize_child(child)
         swt_widget.content = child.swt_widget        
       end
+      
+      def post_add_content
+        swt_widget.set_min_size(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]))
+      end      
     end
   end
 end

data/lib/glimmer/swt/style_constantizable.rb

@@ -106,7 +106,17 @@ module Glimmer
         def deconstruct(integer)
           constant_source_class.constants.reduce([]) do |found, c|
             constant_value = constant_source_class.const_get(c) rescue -1
-            is_found = constant_value.is_a?(Integer) && (constant_value & integer) == constant_value
+            is_found = constant_value.is_a?(Integer) && (integer & constant_value) == integer
+            is_found ? found += [c] : found
+          end
+        end
+
+        # Reverse engineer a style integer into a symbol
+        # Useful for debugging
+        def reverse_lookup(integer)
+          constant_source_class.constants.reduce([]) do |found, c|
+            constant_value = constant_source_class.const_get(c) rescue -1
+            is_found = constant_value.is_a?(Integer) && integer == constant_value
             is_found ? found += [c] : found
           end
         end

data/lib/glimmer/swt/table_proxy.rb

@@ -85,7 +85,55 @@ module Glimmer
                 }
                 table_editor_widget_proxy
               end,
-            }
+            },
+            checkbox: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                checkbox(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            },
+            radio: {
+              widget_value_property: :selection,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
+                table_proxy.table_editor.minimumHeight = 25
+                radio(*args) {
+                  selection model.send(property)
+                  focus true
+                  on_widget_selected {
+                    table_proxy.finish_edit! 
+                  }
+                  on_focus_lost {
+                    table_proxy.finish_edit! 
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+              end,
+            }            
           }      
         end
       end
@@ -276,7 +324,7 @@ module Glimmer
           new_value = @table_editor_widget_proxy&.swt_widget&.send(widget_value_property)
           if table_item.isDisposed
             @cancel_edit.call
-          elsif new_value && !action_taken && !@edit_in_progress && !@cancel_in_progress
+          elsif !new_value.nil? && !action_taken && !@edit_in_progress && !@cancel_in_progress
             action_taken = true
             @edit_in_progress = true
             if new_value == model.send(model_editing_property)

data/lib/glimmer/swt/widget_proxy.rb

@@ -22,21 +22,39 @@ module Glimmer
       include Packages
 
       DEFAULT_STYLES = {
-        "text"        => [:border],
-        "table"       => [:virtual, :border, :full_selection],
-        "tree"       =>  [:virtual, :border, :h_scroll, :v_scroll],
-        "spinner"     => [:border],
-        "styled_text" => [:border],
-        "list"        => [:border, :v_scroll],
-        "button"      => [:push],
-        "menu_item"   => [:push],
-        "drag_source" => [:drop_copy],
-        "drop_target" => [:drop_copy],
+        "arrow"               => [:arrow],
+        "button"              => [:push],
+        "checkbox"            => [:check],
+        "drag_source"         => [:drop_copy],
+        "drop_target"         => [:drop_copy],
+        "list"                => [:border, :v_scroll],
+        "menu_item"           => [:push],
+        "radio"               => [:radio],
+        "scrolled_composite"  => [:border, :h_scroll, :v_scroll],
+        "spinner"             => [:border],
+        "styled_text"         => [:border],
+        "table"               => [:virtual, :border, :full_selection],
+        "text"                => [:border],
+        "toggle"              => [:toggle],
+        "tree"                => [:virtual, :border, :h_scroll, :v_scroll],
       }
 
       DEFAULT_INITIALIZERS = {
         "composite" => lambda do |composite|
-          composite.setLayout(GridLayout.new)
+          layout = GridLayout.new
+          layout.marginWidth = 15
+          layout.marginHeight = 15
+          composite.layout = layout
+        end,
+        "scrolled_composite" => lambda do |scrolled_composite|
+          scrolled_composite.expand_horizontal = true
+          scrolled_composite.expand_vertical = true
+        end,
+        "shell" => lambda do |shell|
+          layout = FillLayout.new
+          layout.marginWidth = 15
+          layout.marginHeight = 15
+          shell.layout = layout
         end,
         "table" => lambda do |table|
           table.setHeaderVisible(true)
@@ -49,19 +67,47 @@ module Glimmer
           group.setLayout(GridLayout.new)
         end,
       }
+      
+      class << self
+        def create(keyword, parent, args)
+          widget_proxy_class(keyword).new(keyword, parent, args)
+        end
+        
+        def widget_proxy_class(keyword)
+          begin
+            class_name = "#{keyword.camelcase(:upper)}Proxy".to_sym
+            Glimmer::SWT.const_get(class_name)
+          rescue
+            Glimmer::SWT::WidgetProxy
+          end        
+        end
+        
+        def underscored_widget_name(swt_widget)
+          swt_widget.class.name.split(/::|\./).last.underscore        
+        end
+      end
 
-      attr_reader :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
+      attr_reader :parent_proxy, :swt_widget, :drag_source_proxy, :drop_target_proxy, :drag_source_style, :drag_source_transfer, :drop_target_transfer
 
       # Initializes a new SWT Widget
       #
       # Styles is a comma separate list of symbols representing SWT styles in lower case
-      def initialize(underscored_widget_name, parent, args)
-        styles, extra_options = extract_args(underscored_widget_name, args)
-        swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
-        @swt_widget = swt_widget_class.new(parent.swt_widget, style(underscored_widget_name, styles), *extra_options)
-        @swt_widget.set_data('proxy', self)
+      def initialize(*init_args, swt_widget: nil)      
+        if swt_widget.nil?
+          underscored_widget_name, parent, args = init_args
+          @parent_proxy = parent
+          styles, extra_options = extract_args(underscored_widget_name, args)
+          swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
+          @swt_widget = swt_widget_class.new(@parent_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
+        else
+          @swt_widget = swt_widget
+          underscored_widget_name = self.class.underscored_widget_name(@swt_widget)
+          parent_proxy_class = self.class.widget_proxy_class(self.class.underscored_widget_name(@swt_widget.parent))
+          @parent_proxy = parent_proxy_class.new(swt_widget: swt_widget.parent)
+        end
+        @swt_widget.set_data('proxy', self)          
         DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
-        parent.post_initialize_child(self)
+        @parent_proxy.post_initialize_child(self)
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -69,6 +115,11 @@ module Glimmer
         # No Op by default
       end
 
+      # Subclasses may override to perform post add_content work
+      def post_add_content
+        # No Op by default
+      end
+
       def extract_args(underscored_widget_name, args)
         @arg_extractor_mapping ||= {
           'menu_item' => lambda do |args|
@@ -264,6 +315,7 @@ module Glimmer
 
       # This supports widgets in and out of basic SWT
       def self.swt_widget_class_for(underscored_widget_name)
+        underscored_widget_name = 'button' if %w[radio checkbox toggle arrow].include?(underscored_widget_name)
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
@@ -607,6 +659,15 @@ module Glimmer
               value
             end
           end,
+          :cursor => lambda do |value|
+            cursor_proxy = nil
+            if value.is_a?(CursorProxy)
+              cursor_proxy = value
+            elsif value.is_a?(Symbol) || value.is_a?(String) || value.is_a?(Integer)
+              cursor_proxy = CursorProxy.new(value)
+            end
+            cursor_proxy ? cursor_proxy.swt_cursor : value
+          end,
           :foreground => color_converter,
           :font => lambda do |value|
             if value.is_a?(Hash)

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   name: puts_debuggerer
   type: :runtime
   prerelease: false
@@ -65,7 +65,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  name: git-glimmer
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -294,6 +308,8 @@ files:
 - bin/girb_runner.rb
 - bin/glimmer
 - icons/scaffold_app.icns
+- icons/scaffold_app.ico
+- icons/scaffold_app.png
 - lib/ext/glimmer.rb
 - lib/ext/glimmer/config.rb
 - lib/glimmer-dsl-swt.rb
@@ -309,6 +325,7 @@ files:
 - lib/glimmer/dsl/swt/color_expression.rb
 - lib/glimmer/dsl/swt/column_properties_expression.rb
 - lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
+- lib/glimmer/dsl/swt/cursor_expression.rb
 - lib/glimmer/dsl/swt/custom_widget_expression.rb
 - lib/glimmer/dsl/swt/data_binding_expression.rb
 - lib/glimmer/dsl/swt/dialog_expression.rb
@@ -316,6 +333,8 @@ files:
 - lib/glimmer/dsl/swt/dnd_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
+- lib/glimmer/dsl/swt/font_expression.rb
+- lib/glimmer/dsl/swt/image_expression.rb
 - lib/glimmer/dsl/swt/layout_data_expression.rb
 - lib/glimmer/dsl/swt/layout_expression.rb
 - lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
@@ -341,6 +360,7 @@ files:
 - lib/glimmer/rake_task/list.rb
 - lib/glimmer/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
+- lib/glimmer/swt/cursor_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/dnd_proxy.rb
 - lib/glimmer/swt/font_proxy.rb