glimmer-dsl-swt 4.17.0.0 → 4.17.2.2

data/VERSION

@@ -1 +1 @@
-4.17.0.0
+4.17.2.2

data/glimmer-dsl-swt.gemspec

@@ -0,0 +1,187 @@
+# Generated by juwelier
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: glimmer-dsl-swt 4.17.2.2 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "glimmer-dsl-swt".freeze
+  s.version = "4.17.2.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["AndyMaleh".freeze]
+  s.date = "2020-10-14"
+  s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
+  s.email = "andy.am@gmail.com".freeze
+  s.executables = ["glimmer".freeze, "girb".freeze]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    "CHANGELOG.md",
+    "LICENSE.txt",
+    "README.md",
+    "RUBY_VERSION",
+    "VERSION",
+    "bin/girb",
+    "bin/girb_runner.rb",
+    "bin/glimmer",
+    "glimmer-dsl-swt.gemspec",
+    "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",
+    "lib/glimmer/Rakefile",
+    "lib/glimmer/data_binding/list_selection_binding.rb",
+    "lib/glimmer/data_binding/observable_widget.rb",
+    "lib/glimmer/data_binding/shine.rb",
+    "lib/glimmer/data_binding/table_items_binding.rb",
+    "lib/glimmer/data_binding/tree_items_binding.rb",
+    "lib/glimmer/data_binding/widget_binding.rb",
+    "lib/glimmer/dsl/swt/async_exec_expression.rb",
+    "lib/glimmer/dsl/swt/bind_expression.rb",
+    "lib/glimmer/dsl/swt/block_property_expression.rb",
+    "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",
+    "lib/glimmer/dsl/swt/display_expression.rb",
+    "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",
+    "lib/glimmer/dsl/swt/menu_bar_expression.rb",
+    "lib/glimmer/dsl/swt/menu_expression.rb",
+    "lib/glimmer/dsl/swt/message_box_expression.rb",
+    "lib/glimmer/dsl/swt/observe_expression.rb",
+    "lib/glimmer/dsl/swt/property_expression.rb",
+    "lib/glimmer/dsl/swt/rgb_expression.rb",
+    "lib/glimmer/dsl/swt/rgba_expression.rb",
+    "lib/glimmer/dsl/swt/shell_expression.rb",
+    "lib/glimmer/dsl/swt/swt_expression.rb",
+    "lib/glimmer/dsl/swt/sync_exec_expression.rb",
+    "lib/glimmer/dsl/swt/tab_item_expression.rb",
+    "lib/glimmer/dsl/swt/table_items_data_binding_expression.rb",
+    "lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb",
+    "lib/glimmer/dsl/swt/tree_properties_expression.rb",
+    "lib/glimmer/dsl/swt/widget_expression.rb",
+    "lib/glimmer/dsl/swt/widget_listener_expression.rb",
+    "lib/glimmer/launcher.rb",
+    "lib/glimmer/rake_task.rb",
+    "lib/glimmer/rake_task/list.rb",
+    "lib/glimmer/rake_task/package.rb",
+    "lib/glimmer/rake_task/sample.rb",
+    "lib/glimmer/rake_task/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",
+    "lib/glimmer/swt/image_proxy.rb",
+    "lib/glimmer/swt/layout_data_proxy.rb",
+    "lib/glimmer/swt/layout_proxy.rb",
+    "lib/glimmer/swt/menu_proxy.rb",
+    "lib/glimmer/swt/message_box_proxy.rb",
+    "lib/glimmer/swt/packages.rb",
+    "lib/glimmer/swt/scrolled_composite_proxy.rb",
+    "lib/glimmer/swt/shell_proxy.rb",
+    "lib/glimmer/swt/style_constantizable.rb",
+    "lib/glimmer/swt/swt_proxy.rb",
+    "lib/glimmer/swt/tab_item_proxy.rb",
+    "lib/glimmer/swt/table_column_proxy.rb",
+    "lib/glimmer/swt/table_proxy.rb",
+    "lib/glimmer/swt/tree_proxy.rb",
+    "lib/glimmer/swt/widget_listener_proxy.rb",
+    "lib/glimmer/swt/widget_proxy.rb",
+    "lib/glimmer/ui/custom_shell.rb",
+    "lib/glimmer/ui/custom_widget.rb",
+    "lib/glimmer/util/proc_tracker.rb",
+    "samples/elaborate/contact_manager.rb",
+    "samples/elaborate/contact_manager/contact.rb",
+    "samples/elaborate/contact_manager/contact_manager_presenter.rb",
+    "samples/elaborate/contact_manager/contact_repository.rb",
+    "samples/elaborate/login.rb",
+    "samples/elaborate/tic_tac_toe.rb",
+    "samples/elaborate/tic_tac_toe/board.rb",
+    "samples/elaborate/tic_tac_toe/cell.rb",
+    "samples/elaborate/user_profile.rb",
+    "samples/hello/hello_browser.rb",
+    "samples/hello/hello_combo.rb",
+    "samples/hello/hello_computed.rb",
+    "samples/hello/hello_computed/contact.rb",
+    "samples/hello/hello_custom_shell.rb",
+    "samples/hello/hello_custom_widget.rb",
+    "samples/hello/hello_drag_and_drop.rb",
+    "samples/hello/hello_list_multi_selection.rb",
+    "samples/hello/hello_list_single_selection.rb",
+    "samples/hello/hello_menu_bar.rb",
+    "samples/hello/hello_message_box.rb",
+    "samples/hello/hello_pop_up_context_menu.rb",
+    "samples/hello/hello_tab.rb",
+    "samples/hello/hello_world.rb",
+    "vendor/swt/linux/swt.jar",
+    "vendor/swt/mac/swt.jar",
+    "vendor/swt/windows/swt.jar"
+  ]
+  s.homepage = "http://github.com/AndyObtiva/glimmer-dsl-swt".freeze
+  s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.5.3".freeze)
+  s.rubygems_version = "3.1.4".freeze
+  s.summary = "Glimmer DSL for SWT".freeze
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
+
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.1"])
+    s.add_runtime_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
+    s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
+    s.add_runtime_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
+    s.add_runtime_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
+    s.add_runtime_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
+    s.add_runtime_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
+    s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
+    s.add_runtime_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
+    s.add_runtime_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
+    s.add_runtime_dependency(%q<tty-markdown>.freeze, [">= 0.6.0", "< 2.0.0"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
+    s.add_development_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
+    s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+    s.add_development_dependency(%q<coveralls>.freeze, ["= 0.8.23"])
+    s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
+    s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+  else
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.1"])
+    s.add_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
+    s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
+    s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
+    s.add_dependency(%q<rake-tui>.freeze, [">= 0.2.3", "< 2.0.0"])
+    s.add_dependency(%q<git-glimmer>.freeze, ["= 1.7.0"])
+    s.add_dependency(%q<logging>.freeze, [">= 2.3.0", "< 3.0.0"])
+    s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
+    s.add_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
+    s.add_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
+    s.add_dependency(%q<tty-markdown>.freeze, [">= 0.6.0", "< 2.0.0"])
+    s.add_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
+    s.add_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
+    s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
+    s.add_dependency(%q<coveralls>.freeze, ["= 0.8.23"])
+    s.add_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
+    s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
+  end
+end
+

data/lib/ext/glimmer/config.rb

@@ -33,11 +33,6 @@ module Glimmer
       'org.eclipse.swt.dnd',  
     ]
     
-    # This may be configured with extra sample directories from custom widget/shell gems
-    # following the convention of a `samples/subdirectory` where subdirectory is the 
-    # custom widget/shell name or something representative of a group of samples (e.g. c_date_time).
-    SAMPLE_DIRECTORIES = []
-  
     class << self
       # Tells Glimmer to import SWT packages into including class (default: true)
       def import_swt_packages=(value)

data/lib/glimmer-dsl-swt.rb

@@ -22,6 +22,12 @@
 $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 # External requires
+if !['', 'false'].include?(ENV['GLIMMER_BUNDLER_SETUP'].to_s.strip.downcase)
+  bundler_group = ENV['GLIMMER_BUNDLER_SETUP'].to_s.strip.downcase
+  bundler_group = 'default' if bundler_group == 'true'
+  require 'bundler'
+  Bundler.setup(bundler_group)
+end
 require 'java'
 require 'puts_debuggerer' if ("#{ENV['pd']}#{ENV['PD']}").to_s.downcase.include?('true')
 require 'glimmer'

data/lib/glimmer/launcher.rb

@@ -19,6 +19,10 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+if ARGV.include?('--bundler') && File.exist?(File.expand_path('./Gemfile'))
+  require 'bundler'
+  Bundler.setup(:default)
+end
 require 'fileutils'
 require 'os'
 
@@ -28,7 +32,7 @@ module Glimmer
     
     TEXT_USAGE = <<~MULTI_LINE_STRING
       Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}      
-      Usage: glimmer [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
+      Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
       Runs Glimmer applications and tasks.    
     
@@ -38,7 +42,9 @@ module Glimmer
       Optionally, extra Glimmer options, JRuby options, and/or environment variables may be passed in.
     
       Glimmer options:
-      - "--quiet"           : Does not announce file path of Glimmer application being launched
+      - "--bundler=GROUP"   : Activates gems in Bundler default group in Gemfile
+      - "--pd=BOOLEAN"      : Requires puts_debuggerer to enable pd method
+      - "--quiet=BOOLEAN"   : Does not announce file path of Glimmer application being launched
       - "--debug"           : Displays extra debugging information, passes "--debug" to JRuby, and enables debug logging
       - "--log-level=VALUE" : Sets Glimmer's Ruby logger level ("ERROR" / "WARN" / "INFO" / "DEBUG"; default is none)
     
@@ -50,9 +56,11 @@ module Glimmer
 
     GLIMMER_LIB_LOCAL = File.expand_path(File.join('lib', 'glimmer-dsl-swt.rb'))
     GLIMMER_LIB_GEM = 'glimmer-dsl-swt'
-    GLIMMER_OPTIONS = %w[--log-level --quiet]
+    GLIMMER_OPTIONS = %w[--log-level --quiet --bundler --pd]
     GLIMMER_OPTION_ENV_VAR_MAPPING = {
-      '--log-level' => 'GLIMMER_LOGGER_LEVEL'
+      '--log-level' => 'GLIMMER_LOGGER_LEVEL'   ,
+      '--bundler'   => 'GLIMMER_BUNDLER_SETUP'  ,
+      '--pd'        => 'PD'  ,
     }
     REGEX_RAKE_TASK_WITH_ARGS = /^([^\[]+)\[?([^\]]*)\]?$/
 
@@ -66,15 +74,11 @@ module Glimmer
       def swt_jar_file
         @swt_jar_file ||= File.expand_path(File.join(__FILE__, '..', '..', '..', 'vendor', 'swt', platform_os, 'swt.jar'))
       end
-
+ 
       def jruby_os_specific_options
         OS.mac? ? "-J-XstartOnFirstThread" : ""
       end
 
-      def jruby_swt_options
-        "#{jruby_os_specific_options} -J-classpath \"#{swt_jar_file}\""
-      end
-
       def glimmer_lib
         @@mutex.synchronize do
           unless @glimmer_lib
@@ -199,6 +203,9 @@ module Glimmer
     
     def display_tasks
       if OS.windows?
+        require 'rake'
+        Rake::TaskManager.record_task_metadata = true
+        require_relative 'rake_task'
         tasks = Rake.application.tasks
         task_lines = tasks.reject do |task|
           task.comment.nil?
@@ -206,8 +213,6 @@ module Glimmer
           max_task_size = tasks.map(&:name_with_args).map(&:size).max + 1
           task_name = task.name_with_args.sub('glimmer:', '')
           line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
-          bound = TTY::Screen.width - 6
-          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
         end
         puts task_lines.to_a
       else

data/lib/glimmer/rake_task.rb

@@ -19,93 +19,53 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'rake'
+module Glimmer
+  module RakeTask
+    RVM_FUNCTION = <<~MULTI_LINE_STRING
+      # Load RVM into a shell session *as a function*
+      if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+      
+        # First try to load from a user install
+        source "$HOME/.rvm/scripts/rvm"
+      
+      elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+      
+        # Then try to load from a root install
+        source "/usr/local/rvm/scripts/rvm"
+      
+      fi
+    MULTI_LINE_STRING
+  end
+end
 
-require_relative 'package'
+require 'rake'
+    
+require_relative 'rake_task/package'
 
 ENV['GLIMMER_LOGGER_ENABLED'] = 'false'
 require_relative '../ext/glimmer/config.rb'
 
-Glimmer::Config::SAMPLE_DIRECTORIES << File.expand_path('../../../samples/hello', __FILE__)
-Glimmer::Config::SAMPLE_DIRECTORIES << File.expand_path('../../../samples/elaborate', __FILE__)
+require 'puts_debuggerer' if ("#{ENV['pd']}#{ENV['PD']}").to_s.downcase.include?('true')
 
 namespace :glimmer do
   namespace :sample do
-    task :requires do
-      require 'text-table'
-      require 'facets/string/titlecase'
-      require 'facets/string/underscore'
-      
-      require_relative 'launcher'        
+    task :requires do      
+      require_relative 'rake_task/sample'      
     end
     
-    task :glimmer_gems do
-      glimmer_cw_gems = Gem.find_latest_files('glimmer-cw-*')
-      glimmer_cs_gems = Gem.find_latest_files('glimmer-cs-*')
-      glimmer_dsl_gems = Gem.find_latest_files('glimmer-dsl-*')
-      glimmer_gem_lib_files = glimmer_cw_gems + glimmer_cs_gems + glimmer_dsl_gems
-      glimmer_gem_lib_files = glimmer_gem_lib_files.map {|file| file.sub(/\.rb$/, '')}.uniq.reject {|file| file.include?('glimmer-cs-gladiator')}
-      glimmer_gem_lib_files.each {|file| require file}    
-    end
-  
     desc 'Runs a Glimmer internal sample [included in gem]. If no name is supplied, it runs all samples.'
-    task :run, [:name] => [:requires, :glimmer_gems] do |t, args|
-      name = args[:name]
-      name = name.underscore.downcase unless name.nil?
-      samples = Glimmer::Config::SAMPLE_DIRECTORIES.map {|dir| Dir.glob(File.join(dir, '*.rb'))}.reduce(:+).sort
-      samples = samples.select {|path| path.include?("#{name}.rb")} unless name.nil?      
-      Rake::Task['glimmer:sample:code'].invoke(name) if samples.size == 1
-      Glimmer::Launcher.new(samples << '--quiet=false').launch
+    task :run, [:name] => [:requires] do |t, args|
+      Glimmer::RakeTask::Sample.run(args[:name])
     end
     
     desc 'Lists Glimmer internal samples [included in gem]. Filters by query if specified (query is optional)'
-    task :list, [:query] => [:requires, :glimmer_gems] do |t, args|
-      Glimmer::Config::SAMPLE_DIRECTORIES.each do |dir|
-        sample_group_name = File.basename(dir)
-        human_sample_group_name = sample_group_name.underscore.titlecase
-        array_of_arrays = Dir.glob(File.join(dir, '*.rb')).map do |path| 
-          File.basename(path, '.rb')
-        end.select do |path| 
-          args[:query].nil? || path.include?(args[:query])
-        end.map do |path| 
-          [path, path.underscore.titlecase, "#{'bin/' if Glimmer::Launcher.dev_mode?}glimmer sample:run[#{path}]"]
-        end.sort
-        if array_of_arrays.empty?
-          puts "No Glimmer #{human_sample_group_name} Samples match the query."
-        else
-          puts 
-          puts "  Glimmer #{human_sample_group_name} Samples:"
-          puts Text::Table.new(
-            :head => %w[Name Description Run],
-            :rows => array_of_arrays,
-            :horizontal_padding    => 1,
-            :vertical_boundary     => ' ',
-            :horizontal_boundary   => ' ',
-            :boundary_intersection => ' '
-          )        
-        end
-      end
+    task :list, [:query] => [:requires] do |t, args|
+      Glimmer::RakeTask::Sample.list(args[:query])
     end
     
     desc 'Outputs code for a Glimmer internal sample [included in gem] (name is required)'
-    task :code, [:name] => [:requires, :glimmer_gems] do |t, args|
-      require 'tty-markdown' unless OS.windows?
-      samples = Glimmer::Config::SAMPLE_DIRECTORIES.map {|dir| Dir.glob(File.join(dir, '*.rb'))}.reduce(:+).sort
-      sample = samples.detect {|path| path.include?("#{args[:name].to_s.underscore.downcase}.rb")}
-      sample_additional_files = Dir.glob(File.join(sample.sub('.rb', ''), '**', '*.rb'))
-      code = ([sample] + sample_additional_files).map do |file|
-        <<~RUBY
-        
-        # #{file}
-        
-        #{File.read(file)}
-        
-        # # #
-        
-        RUBY
-      end.join("\n")
-      code = TTY::Markdown.parse("```ruby\n#{code}\n```") unless OS.windows?
-      puts code
+    task :code, [:name] => [:requires] do |t, args|
+      Glimmer::RakeTask::Sample.code(args[:name])
     end
     
   end
@@ -113,28 +73,28 @@ namespace :glimmer do
   namespace :package do
     desc 'Clean by removing "dist" and "packages" directories'
     task :clean do
-      Glimmer::Package.clean
+      Glimmer::RakeTask::Package.clean
     end
 
     desc 'Generate JAR config file'
     task :config do
-      Glimmer::Package.config
+      Glimmer::RakeTask::Package.config
     end
 
     desc 'Generate JAR file'
     task :jar do
-      Glimmer::Package.jar
+      Glimmer::RakeTask::Package.jar
     end
 
     desc 'Lock JARs'
     task :lock_jars do
-      Glimmer::Package.lock_jars
+      Glimmer::RakeTask::Package.lock_jars
     end
 
     desc 'Generate Native files. type can be dmg/pkg on the Mac, msi/exe on Windows, and rpm/deb on Linux (type is optional)'
     task :native, [:type] do |t, args|
       extra_args = ARGV.partition {|arg| arg.include?('package:native')}.last.to_a.join(' ')
-      Glimmer::Package.native(args[:type], extra_args)
+      Glimmer::RakeTask::Package.native(args[:type], extra_args)
     end
   end
 
@@ -149,15 +109,15 @@ namespace :glimmer do
 
   desc 'Scaffold Glimmer application directory structure to build a new app'
   task :scaffold, [:app_name] do |t, args|
-    require_relative 'scaffold'
-    Scaffold.app(args[:app_name])
+    require_relative 'rake_task/scaffold'
+    Glimmer::RakeTask::Scaffold.app(args[:app_name])
   end
 
   namespace :scaffold do
     desc 'Scaffold Glimmer::UI::CustomShell subclass (full window view) under app/views (namespace is optional) [alt: scaffold:cs]'
     task :customshell, [:name, :namespace] do |t, args|
-      require_relative 'scaffold'
-      Scaffold.custom_shell(args[:name], args[:namespace])
+      require_relative 'rake_task/scaffold'
+      Glimmer::RakeTask::Scaffold.custom_shell(args[:name], args[:namespace])
     end
     
     task :cs, [:name, :namespace] => :customshell
@@ -166,8 +126,8 @@ namespace :glimmer do
     
     desc 'Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under app/views (namespace is optional) [alt: scaffold:cw]'
     task :customwidget, [:name, :namespace] do |t, args|
-      require_relative 'scaffold'
-      Scaffold.custom_widget(args[:name], args[:namespace])
+      require_relative 'rake_task/scaffold'
+      Glimmer::RakeTask::Scaffold.custom_widget(args[:name], args[:namespace])
     end
     
     task :cw, [:name, :namespace] => :customwidget
@@ -177,8 +137,8 @@ namespace :glimmer do
     namespace :gem do
       desc 'Scaffold Glimmer::UI::CustomShell subclass (full window view) under its own Ruby gem + app project (namespace is required) [alt: scaffold:gem:cs]'
       task :customshell, [:name, :namespace] do |t, args|
-        require_relative 'scaffold'
-        Scaffold.custom_shell_gem(args[:name], args[:namespace])
+        require_relative 'rake_task/scaffold'
+        Glimmer::RakeTask::Scaffold.custom_shell_gem(args[:name], args[:namespace])
       end
       
       task :cs, [:name, :namespace] => :customshell
@@ -187,8 +147,8 @@ namespace :glimmer do
       
       desc 'Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under its own Ruby gem project (namespace is required) [alt: scaffold:gem:cw]'
       task :customwidget, [:name, :namespace] do |t, args|
-        require_relative 'scaffold'
-        Scaffold.custom_widget_gem(args[:name], args[:namespace])
+        require_relative 'rake_task/scaffold'
+        Glimmer::RakeTask::Scaffold.custom_widget_gem(args[:name], args[:namespace])
       end
     
       task :cw, [:name, :namespace] => :customwidget