glimmer-dsl-swt 0.5.6 → 0.6.4

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