glimmer-dsl-swt 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c023dda45b9c92e69ef9a44ef07fde1f45f5161284cf1b46b70d15a661b3ccc
-  data.tar.gz: 77be63700930812f4da66669003df863d77a1644495e2d37b776e97a5e5f145b
+  metadata.gz: 470667c11a2cadd8113d2067cffbf7db92647712dab8367a5b71ce0cbb990c02
+  data.tar.gz: 634143f2c4adbe46aeb5b09cbf373b20d1e513584fbfc405ceb5d74212d7ffd1
 SHA512:
-  metadata.gz: ce300717322a9a905a67c589bf1a9398adcd09abf33421283c5d3265ed68b8ce4dbdf25ac33a37812de355c00ba027d7fe33ce284a9c2eb2932817087130a281
-  data.tar.gz: 353b5a6f43cf7d070ae9a2f775ea2430a4eda54bf346210a8ca5e1ee899a35c44f639fbca3e2cd5338aa73c3f1c9b97209c84ea669c436f36f4ce31a0bf9b1b8
+  metadata.gz: cbe32cbaf2d2f2bc7670a982abbaac8c490f41b307a2500b08158aa30bc775425d29be576411ef9618e0a3c9cc1118913f2017b4374c90e70fb196dd76beff95
+  data.tar.gz: 6656c29c0221adc159007c3e8f728e355d8d5cb8dbe193d049e5e24d4da0b53c30525e2ee79fc5b303be3d0e2787bc890321d0b83ca0d1783052f680e3f3fefd

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.6.0 (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.1 (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/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/glimmer/launcher.rb

@@ -110,7 +110,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

@@ -41,7 +41,15 @@ module Glimmer
         system('warble')      
       end
       
-      def native
+      def lock_jars
+        puts 'Locking JARs with jar-dependencies...'
+        command = "lock_jars --vendor-dir vendor"
+        puts command
+        system command      
+      end
+      
+      def native(native_type=nil)
+        puts "Generating native executable with javapackager..."
         require 'facets/string/titlecase'
         require 'facets/string/underscore'
         project_name = File.basename(File.expand_path('.'))
@@ -51,14 +59,13 @@ 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 = "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}\" -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
         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..."
         puts command
         system command      
       end

data/lib/glimmer/rake_task.rb

@@ -19,17 +19,24 @@ 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 (DMG/PKG/APP on the Mac, MSI/EXE/IMAGE on Windows, RPM/DEB on Linux) (type is optional)'
+    task :native, [:type] do |t, args|
+      Glimmer::Package.native(args[:type])
     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['glimmer:package:config'].execute
     Rake::Task['glimmer:package:jar'].execute
-    Rake::Task['glimmer:package:native'].execute
+    Rake::Task['glimmer:package:lock_jars'].execute
+    Rake::Task['gemspec:generate'].execute
+    Rake::Task['glimmer:package:native'].execute(args)
   end
 
 

data/lib/glimmer/scaffold.rb

@@ -76,21 +76,7 @@ class Scaffold
       packages      
     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 +87,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,21 +109,30 @@ class Scaffold
     MULTI_LINE_STRING
 
     def app(app_name)
-      mkdir app_name
-      cd app_name
+      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 = 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?
+      if OS::Underlying.windows?
+        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}"
+      elsif 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
@@ -157,8 +140,15 @@ class Scaffold
       end
       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"
+      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'"
+        system "open packages/bundles/#{human_name(app_name).gsub(' ', '\ ')}.app" if OS.mac?
+      end
       # TODO generate rspec test suite
     end
 
@@ -188,13 +178,13 @@ 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(custom_shell_name, namespace, gem_name)
       append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
       mkdir 'lib/views'
@@ -203,14 +193,26 @@ 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?
+      write 'spec/spec_helper.rb', spec_helper_file
+      if OS::Underlying.windows?
+        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}"
+      elsif 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"
+      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'"
+        system "open packages/bundles/#{human_name(custom_shell_name).gsub(' ', '\ ')}.app" if OS.mac?
+      end
       puts "Finished creating #{gem_name} Ruby gem."
       puts 'Edit Rakefile to configure gem details.'
       puts 'Run `rake` to execute specs.'
@@ -228,19 +230,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.'
@@ -355,10 +361,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 +390,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 +419,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 +477,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 +485,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.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,7 @@ files:
 - bin/girb_runner.rb
 - bin/glimmer
 - icons/scaffold_app.icns
+- icons/scaffold_app.ico
 - lib/ext/glimmer.rb
 - lib/ext/glimmer/config.rb
 - lib/glimmer-dsl-swt.rb