glimmer 0.7.5 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.8.1

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -38,13 +38,16 @@ module Glimmer
       def populate_tree(model_tree_root_node, parent, tree_properties)
         # TODO make it change things by delta instead of removing all
         selected_tree_item_model = parent.swt_widget.getSelection.map(&:getData).first
-        parent.all_tree_items.each do |tree_item|
+        old_tree_items = parent.all_tree_items
+        old_tree_item_expansion_by_data = old_tree_items.reduce({}) {|hash, ti| hash.merge(ti.getData => ti.getExpanded)}
+        old_tree_items.each do |tree_item|
           tree_item.getData('observer_registrations').each do |key, observer_registration|
             observer_registration.unregister
-          end
-        end
+          end          
+        end        
         parent.swt_widget.removeAll
         populate_tree_node(model_tree_root_node, parent.swt_widget, tree_properties)
+        parent.all_tree_items.each { |ti| ti.setExpanded(!!old_tree_item_expansion_by_data[ti.getData]) }
         tree_item_to_select = parent.depth_first_search {|ti| ti.getData == selected_tree_item_model}
         parent.swt_widget.setSelection(tree_item_to_select)
       end

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

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/shell_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class DialogExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'dialog' and
+            (parent.nil? or parent.is_a?(Glimmer::SWT::ShellProxy))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          args = [parent] + args unless parent.nil?
+          args += [:dialog_trim, :application_modal]
+          Glimmer::SWT::ShellProxy.send(:new, *args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/launcher.rb

@@ -8,7 +8,7 @@ module Glimmer
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
     TEXT_USAGE_PREFIX = <<~MULTI_LINE_STRING
-      Usage: glimmer [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
+      Usage: glimmer [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
       Runs Glimmer applications/tasks.
     
@@ -27,8 +27,9 @@ module Glimmer
       Optionally, extra Glimmer options, JRuby options and environment variables may be passed in.
     
       Glimmer options:
-      - "--debug"           : Displays extra debugging information and passes "--debug" to JRuby
-      - "--log-level=VALUE" : Sets Glimmer's Ruby logger level ("ERROR" / "WARN" / "INFO" / "DEBUG"; default is "WARN")
+      - "--quiet"           : Does not announce file path of Glimmer application being launched
+      - "--debug"           : Displays extra debugging information, passes "--debug" to JRuby, and enables debug logging
+      - "--log-level=VALUE" : Sets Glimmer's Ruby logger level ("ERROR" / "WARN" / "INFO" / "DEBUG"; default is none)
     
       Example: glimmer samples/hello_world.rb
     
@@ -37,7 +38,7 @@ module Glimmer
 
     GLIMMER_LIB_LOCAL = File.expand_path(File.join(__FILE__, '..', '..', 'glimmer.rb'))
     GLIMMER_LIB_GEM = 'glimmer'
-    GLIMMER_OPTIONS = %w[--log-level]
+    GLIMMER_OPTIONS = %w[--log-level --quiet]
     GLIMMER_OPTION_ENV_VAR_MAPPING = {
       '--log-level' => 'GLIMMER_LOGGER_LEVEL'
     }
@@ -77,8 +78,8 @@ module Glimmer
       end
 
       def glimmer_option_env_vars(glimmer_options)
-        glimmer_options.reduce({}) do |hash, pair|
-          hash.merge(GLIMMER_OPTION_ENV_VAR_MAPPING[pair.first] => pair.last)
+        GLIMMER_OPTION_ENV_VAR_MAPPING.reduce({}) do |hash, pair|
+          glimmer_options[pair.first] ? hash.merge(GLIMMER_OPTION_ENV_VAR_MAPPING[pair.first] => glimmer_options[pair.first]) : hash
         end
       end
 
@@ -108,7 +109,7 @@ module Glimmer
           Rake::Task[rake_task].invoke(*rake_task_args)
         else
           @@mutex.synchronize do
-            puts "Launching Glimmer Application: #{application}" unless application.to_s.match(/(irb)|(gladiator)/)
+            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}"
           puts command if jruby_options_string.to_s.include?('--debug')
@@ -123,6 +124,8 @@ module Glimmer
     attr_reader :jruby_options
 
     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)
       @env_vars = extract_env_vars(raw_options)
       @glimmer_options = extract_glimmer_options(raw_options)
@@ -140,7 +143,7 @@ module Glimmer
     private
 
     def launch_application
-      load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile'))
+      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(
@@ -188,8 +191,8 @@ module Glimmer
       end.each do |glimmer_option|
         options.delete(glimmer_option)
       end.reduce({}) do |hash, glimmer_option_string|
-        match = glimmer_option_string.match(/^([^=]+)=?(.*)$/)
-        hash.merge(match[1] => match[2])
+        match = glimmer_option_string.match(/^([^=]+)=?(.+)?$/)
+        hash.merge(match[1] => (match[2] || 'true'))
       end
     end
   end

data/lib/glimmer/rake_task.rb

@@ -76,9 +76,9 @@ namespace :glimmer do
       Scaffold.custom_widget(args[:custom_widget_name], args[:namespace])
     end
     
-    desc 'Scaffold a Glimmer::UI::CustomShell subclass (represents a full window view) under its own Ruby gem project (namespace is required)'
-    task :custom_shell_gem, [:custom_widget_name, :namespace] do |t, args|
-      Scaffold.custom_shell_gem(args[:custom_widget_name], args[:namespace])
+    desc 'Scaffold a Glimmer::UI::CustomShell subclass (represents a full window view) under its own Ruby gem + app project (namespace is required)'
+    task :custom_shell_gem, [:custom_shell_name, :namespace] do |t, args|
+      Scaffold.custom_shell_gem(args[:custom_shell_name], args[:namespace])
     end
     
     desc 'Scaffold a Glimmer::UI::CustomWidget subclass (represents a part of a view) under its own Ruby gem project (namespace is required)'

data/lib/glimmer/scaffold.rb

@@ -77,7 +77,7 @@ class Scaffold
     GEMFILE_APP = <<~MULTI_LINE_STRING
       # frozen_string_literal: true
       
-      source "https://rubygems.org"
+      source 'https://rubygems.org'
       
       git_source(:github) {|repo_name| "https://github.com/\#{repo_name}" }
       
@@ -91,23 +91,23 @@ class Scaffold
     GEMFILE_GEM = <<~MULTI_LINE_STRING
       # frozen_string_literal: true
       
-      source "https://rubygems.org"
+      source 'https://rubygems.org'
       
       git_source(:github) {|repo_name| "https://github.com/\#{repo_name}" }
       
       gem 'glimmer', '~> #{VERSION}'
       
       group :development do
-        gem "rspec", "~> 3.5.0"
-        gem "jeweler", "2.3.9"
-        gem "simplecov", ">= 0"
+        gem 'rspec', '~> 3.5.0'
+        gem 'jeweler', '2.3.9'
+        gem 'simplecov', '>= 0'
       end
     MULTI_LINE_STRING
 
     RAKEFILE = <<~MULTI_LINE_STRING
       require 'glimmer/rake_task'
       
-      ## Uncomment the following section if you would like to customize javapackager
+      ## Use the following configuration if you would like to customize javapackager
       ## arguments for `glimmer package` command.
       #
       # Glimmer::Package.javapackager_extra_args =
@@ -146,7 +146,7 @@ class Scaffold
       write "app/#{file_name(app_name)}.rb", app_main_file(app_name)
       mkdir 'app/models'
       mkdir 'app/views'
-      custom_shell('AppView', current_dir_name)
+      custom_shell('AppView', current_dir_name, :app)
       if OS.mac?
         mkdir_p 'package/macosx'
         icon_file = "package/macosx/#{human_name(app_name)}.icns"
@@ -155,18 +155,18 @@ class Scaffold
       end
       mkdir 'bin'
       write "bin/#{file_name(app_name)}", app_bin_file(app_name)
-      FileUtils.chmod 0755, "bin/#{app_name.underscore}"
+      FileUtils.chmod 0755, "bin/#{file_name(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
     end
 
-    def custom_shell(custom_shell_name, namespace)
+    def custom_shell(custom_shell_name, namespace, shell_type = nil)
       namespace ||= current_dir_name
       root_dir = File.exists?('app') ? 'app' : 'lib'
       parent_dir = "#{root_dir}/views/#{file_name(namespace)}"
       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)
+      write "#{parent_dir}/#{file_name(custom_shell_name)}.rb", custom_shell_file(custom_shell_name, namespace, shell_type)
     end
 
     def custom_widget(custom_widget_name, namespace)
@@ -179,7 +179,7 @@ class Scaffold
 
     def custom_shell_gem(custom_shell_name, namespace)
       gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
-      gem_summary = "Glimmer Custom Widget - #{human_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)})"
@@ -193,11 +193,22 @@ class Scaffold
       write '.ruby-gemset', gem_name
       write 'VERSION', '1.0.0'
       write 'Gemfile', GEMFILE_GEM      
-      write 'Rakefile', gem_rakefile
+      write 'Rakefile', gem_rakefile(custom_shell_name, namespace)
       append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
       mkdir 'lib/views'
-      custom_shell(custom_shell_name, namespace)
-      system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n'"
+      custom_shell(custom_shell_name, namespace, :gem)
+      mkdir 'bin'
+      write "bin/#{gem_name}", gem_bin_file(gem_name, custom_shell_name, namespace)
+      write "bin/#{file_name(custom_shell_name)}", gem_bin_command_file(gem_name)
+      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}"
+      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.'
@@ -207,7 +218,7 @@ class Scaffold
 
     def custom_widget_gem(custom_widget_name, namespace)
       gem_name = "glimmer-cw-#{compact_name(custom_widget_name)}"
-      gem_summary = "Glimmer Custom Widget - #{human_name(custom_widget_name)}"
+      gem_summary = "#{human_name(custom_widget_name)} - Glimmer Custom Widget"
       if namespace
         gem_name += "-#{compact_name(namespace)}"
         gem_summary += " (#{human_name(namespace)})"
@@ -253,19 +264,20 @@ class Scaffold
     end
 
     def class_name(app_name)
-      app_name.camelcase(:upper)
+      app_name.underscore.camelcase(:upper)
     end
 
     def file_name(app_name)
       app_name.underscore
     end
+    alias dsl_widget_name file_name
 
     def human_name(app_name)
       app_name.underscore.titlecase
     end
 
     def compact_name(gem_name)
-      gem_name.camelcase.downcase
+      gem_name.underscore.camelcase.downcase
     end
 
     def app_main_file(app_name)
@@ -280,14 +292,13 @@ class Scaffold
           include Glimmer
         
           APP_ROOT = File.expand_path('../..', __FILE__)        
-          VERSION = File.read(File.expand_path('VERSION', APP_ROOT))
+          VERSION = File.read(File.join(APP_ROOT, 'VERSION'))
+          LICENSE = File.read(File.join(APP_ROOT, 'LICENSE.txt'))          
                     
           def open
             app_view.open
           end
         end
-        
-        #{class_name(app_name)}.new.open
       MULTI_LINE_STRING
     end
 
@@ -307,22 +318,66 @@ class Scaffold
     def app_bin_file(app_name)
       <<~MULTI_LINE_STRING
         #!/usr/bin/env ruby
-
+        
         require_relative '../app/#{file_name(app_name)}'
+        
+        #{class_name(app_name)}.new.open
       MULTI_LINE_STRING
     end
 
-    def gem_rakefile
+    def gem_bin_file(gem_name, custom_shell_name, namespace)
+      <<~MULTI_LINE_STRING
+        #!/usr/bin/env ruby
+        
+        require_relative '../lib/#{gem_name}'
+        
+        include Glimmer
+        
+        #{dsl_widget_name(custom_shell_name)}.open
+      MULTI_LINE_STRING
+    end
+
+    def gem_bin_command_file(gem_name)
+      <<~MULTI_LINE_STRING
+        #!/usr/bin/env ruby
+        
+        require 'glimmer/launcher'
+        
+        runner = File.expand_path("../#{gem_name}", __FILE__)
+        launcher = Glimmer::Launcher.new([runner] + ARGV)
+        launcher.launch
+      MULTI_LINE_STRING
+    end
+
+    def gem_rakefile(custom_shell_name = nil, namespace = nil)
       rakefile_content = File.read('Rakefile')
       lines = rakefile_content.split("\n")
       require_rake_line_index = lines.index(lines.detect {|l| l.include?("require 'rake'") })
       lines.insert(require_rake_line_index, "require 'glimmer/launcher'")
       gem_files_line_index = lines.index(lines.detect {|l| l.include?('# dependencies defined in Gemfile') })
-      lines.insert(gem_files_line_index, "  gem.files = Dir['lib/**/*.rb']")
+      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+1, "  gem.executables = ['#{file_name(custom_shell_name)}']")
+      else
+        lines.insert(gem_files_line_index, "  gem.files = Dir['lib/**/*.rb']")
+      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]")
-      lines << "\nrequire 'glimmer/rake_task'\n"
-      lines.join("\n")
+      lines << "\nrequire 'glimmer/rake_task'\n"       
+      file_content = lines.join("\n")
+      if custom_shell_name
+        file_content << <<~MULTI_LINE_STRING  
+          Glimmer::Package.javapackager_extra_args =
+            " -name '#{human_name(custom_shell_name)}'" +
+            " -title '#{human_name(custom_shell_name)}'" +
+            " -Bmac.CFBundleName='#{human_name(custom_shell_name)}'" +
+            " -Bmac.CFBundleIdentifier='org.#{namespace ? compact_name(namespace) : compact_name(custom_shell_name)}.application.#{compact_name(custom_shell_name)}'" 
+            # " -BlicenseType=" +
+            # " -Bmac.category=" +
+            # " -Bmac.signing-key-developer-id-app="
+        MULTI_LINE_STRING
+      end
+      file_content
     end
 
     def spec_helper_file
@@ -346,52 +401,137 @@ class Scaffold
       lines.join("\n")
     end
 
-    def custom_shell_file(custom_shell_name, namespace)
+    def custom_shell_file(custom_shell_name, namespace, shell_type)    
       namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
 
-      <<~MULTI_LINE_STRING
-        #{namespace_type} #{class_name(namespace)}
-          class #{class_name(custom_shell_name)}
-            include Glimmer::UI::CustomShell
-        
-            ## Add options like the following to configure CustomShell by outside consumers
-            #
-            # options :title, :background_color
-            # option :width, 320
-            # option :height, 240
-        
-            ## Uncomment before_body block to pre-initialize variables to use in body
-            #
-            #
-            # before_body {
-            # 
-            # }
-        
-            ## Uncomment after_body block to setup observers for widgets in body
-            #
-            # after_body {
-            # 
-            # }
+      custom_shell_file_content = <<-MULTI_LINE_STRING
+#{namespace_type} #{class_name(namespace)}
+  class #{class_name(custom_shell_name)}
+    include Glimmer::UI::CustomShell
+    
+      MULTI_LINE_STRING
+      
+      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'))
         
-            ## 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 320, 240
-                text "#{human_name(namespace)} - #{human_name(custom_shell_name)}"
-                grid_layout
-                label {
-                  text "Hello, World!"
-                  font height: 40
-                  layout_data :center, :center, true, true
-                }
+        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
+    option :greeting, default: 'Hello, World!'
+
+    ## Use before_body block to pre-initialize variables to use in body
+    #
+    #
+      MULTI_LINE_STRING
+      
+      if %i[gem app].include?(shell_type)
+        custom_shell_file_content += <<-MULTI_LINE_STRING
+    before_body {
+      Display.setAppName('#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}')
+      Display.setAppVersion(VERSION)
+      @display = display {
+        on_about {
+          display_about_dialog
+        }
+        on_preferences {
+          display_preferences_dialog
+        }
+      }
+    }
+        MULTI_LINE_STRING
+      else
+        custom_shell_file_content += <<-MULTI_LINE_STRING
+    # 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 320, 240
+        text "#{human_name(namespace)} - #{human_name(custom_shell_name)}"
+        grid_layout
+        label(:center) {
+          text bind(self, :greeting)
+          font height: 40
+          layout_data :fill, :center, true, true
+        }
+      }
+    }
+      MULTI_LINE_STRING
+
+      if %i[gem app].include?(shell_type)
+        custom_shell_file_content += <<-MULTI_LINE_STRING
+
+    def display_about_dialog
+      message_box = MessageBox.new(swt_widget)
+      message_box.setText("About")
+      message = "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\n\n"
+      message += LICENSE
+      message_box.setMessage(message)
+      message_box.open
+    end
+    
+    def display_preferences_dialog
+      dialog(swt_widget) {
+        text 'Preferences'
+        grid_layout {
+          margin_height 5
+          margin_width 5
+        }
+        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
               }
             }
-        
           end
-        end
+        }
+      }.open
+    end
+        MULTI_LINE_STRING
+      end
+      
+      custom_shell_file_content += <<-MULTI_LINE_STRING
+  end
+end
       MULTI_LINE_STRING
     end
 
@@ -406,16 +546,16 @@ class Scaffold
             ## Add options like the following to configure CustomWidget by outside consumers
             #
             # options :custom_text, :background_color
-            # option :foreground_color, :red
+            # option :foreground_color, default: :red
         
-            ## Uncomment before_body block to pre-initialize variables to use in body
+            ## Use before_body block to pre-initialize variables to use in body
             #
             #
             # before_body {
             # 
             # }
         
-            ## Uncomment after_body block to setup observers for widgets in body
+            ## Use after_body block to setup observers for widgets in body
             #
             # after_body {
             #