glimmer-dsl-libui 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f25a73b328f8f3edfab2fba17e5f2561291f6ea0d9138a6114263e1145f3f96b
-  data.tar.gz: a9985350bc4de488d12eeb5aaad8e9b20493d4d1eb911e2c8e247b7b622905f9
+  metadata.gz: f0fd65bf048edb4ec2556097bcbbe82b2dd2c1411e6a2c81d592901a40fdcf0f
+  data.tar.gz: 4e48a01e498afdf21fc72a82891106e8198360eeea971f98663e585b6c2ba6d1
 SHA512:
-  metadata.gz: da98d3cc5849995f84df95b87081a14abd55df599a420c340a3f780536e574ed2ffce55898a7e61f62cfdcff6c1efd616f1b62b0c58ab3ace4c875db3a7a0dd0
-  data.tar.gz: 8ee6d0c78ba2749e86acd8380888fac51025862e0428ded65532f23b297355cb45e75a9476c15ddea1a311f40bebffe1e4f35b4be8785bdef5210850f68565a0
+  metadata.gz: 45492206e1c62e3daf5199a6551029300a8f73a8fdf1cf40b38a3efdaddc49f8b123c18ae61c2b233ed2c19272aa9661c35043b2adccc2cc4f487f004486e8a1
+  data.tar.gz: 0c2b32d5c933da94e99f07926491d1423b29e36b91ad8e2a207472d5235d199a7761f9d768ce7a4eea02287515837aa4c35c0aeb6ed9b1d5c21d387fd796e9c6

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.9.3
+
+- Application Scaffolding via `glimmer scaffold[app_name]` includes a Model layer
+
+## 0.9.2
+
+- Add `glimmer` commands `glimmer package:gem`, `glimmer package:gemspec`, and `glimmer package:clean`
+
 ## 0.9.1
 
 - Scaffold an application via Glimmer Command: `glimmer scaffold[app_name]`

data/README.md

@@ -1,5 +1,5 @@
-# [<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 LibUI ([Fukuoka Award Winning](http://www.digitalfukuoka.jp/topics/187?locale=ja))
-## Prerequisite-Free Ruby Desktop Development Cross-Platform Native GUI Library
+# [<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 LibUI 0.9.3
+## Prerequisite-Free Ruby Desktop Development Cross-Platform Native GUI Library  ([Fukuoka Award Winning](http://www.digitalfukuoka.jp/topics/187?locale=ja))
 ### The Quickest Way From Zero To GUI
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -421,7 +421,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.9.1'
+gem 'glimmer-dsl-libui', '~> 0.9.3'
 ```
 
 Test that installation worked by running the [Glimmer Meta-Example](#examples):
@@ -645,6 +645,7 @@ Created hello_world/Gemfile
 Created hello_world/Rakefile
 Created hello_world/app/hello_world.rb
 Created hello_world/app/hello_world/view/hello_world.rb
+Created hello_world/app/hello_world/model/greeting.rb
 Created hello_world/icons/windows/Hello World.ico
 Created hello_world/icons/macosx/Hello World.icns
 Created hello_world/icons/linux/Hello World.png
@@ -655,6 +656,7 @@ Created hello_world/bin/hello_world
 They include a basic Hello, World! application with menus and about/preferences dialogs.
 
 Views live under `app/app_name/view` (e.g. `app/hello_world/view`)
+
 Models live under `app/app_name/model` (e.g. `app/hello_world/model`)
 
 Once you step into the application directory, you can run it in one of multiple ways:
@@ -681,16 +683,30 @@ glimmer run
 
 ![glimmer-dsl-libui-mac-scaffold-app-changed-greeting.png](images/glimmer-dsl-libui-mac-scaffold-app-changed-greeting.png)
 
-The application comes with `juwelier` for auto-generating an application gem from its `Rakefile` gem configuration.
+![glimmer-dsl-libui-mac-scaffold-app-about.png](images/glimmer-dsl-libui-mac-scaffold-app-about.png)
+
+The application comes with the [juwelier](https://rubygems.org/gems/juwelier) gem for auto-generating an application gem from the app `Rakefile` and `Gemfile` configuration (no need to manually declare gems in a gemspec... just use `Gemfile` normally and [juwelier](https://rubygems.org/gems/juwelier) takes care of the rest by generating an app gemspec automatically from `Gemfile`).
 
 You can package the newly scaffolded app as a Ruby gem by running this command:
 
+```
+glimmer package:gem
+```
+
+Or by using the raw rake command:
+
 ```
 rake build
 ```
 
 You can generate the application gemspec explicitly if needed with this command (though it is not needed to build the gem):
 
+```
+glimmer package:gemspec
+```
+
+Or by using the raw rake command:
+
 ```
 rake gemspec:generate
 ```

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.3

data/lib/glimmer/rake_task/package.rb

@@ -0,0 +1,43 @@
+# Copyright (c) 2021-2023 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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 'os'
+
+module Glimmer
+  module RakeTask
+    module Package
+      class << self
+        def clean
+          require 'fileutils'
+          FileUtils.rm_rf('pkg')
+        end
+        
+        def gemspec
+          system 'rake gemspec:generate'
+        end
+        
+        def gem
+          system 'rake build'
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/rake_task/scaffold.rb

@@ -155,6 +155,7 @@ module Glimmer
           mkdir_p "app/#{file_name(app_name)}/model"
           mkdir_p "app/#{file_name(app_name)}/view"
           custom_window(class_name(app_name), current_dir_name, window_type, custom_window_class_name: 'Application')
+          application_model(current_dir_name)
             
           mkdir_p 'icons/windows'
           icon_file = "icons/windows/#{human_name(app_name)}.ico"
@@ -366,6 +367,16 @@ module Glimmer
           puts 'Run `rake build` to build gem.'
           puts 'Run `rake release` to release into rubygems.org once ready.'
         end
+        
+        def application_model(current_dir_name)
+          model_name = 'Greeting'
+          namespace ||= current_dir_name
+          root_dir = File.exist?('app') ? 'app' : 'lib'
+          parent_dir = "#{root_dir}/#{file_name(namespace)}/model"
+          return puts("The file '#{parent_dir}/#{file_name(model_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(model_name)}.rb")
+          mkdir_p parent_dir unless File.exist?(parent_dir)
+          write "#{parent_dir}/#{file_name(model_name)}.rb", model_file(model_name, namespace)
+        end
     
         private
         
@@ -527,7 +538,16 @@ module Glimmer
           window_options[:custom_window_class_name] ||= 'CustomWindow'
           namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
     
-          custom_window_file_content = <<-MULTI_LINE_STRING
+          custom_window_file_content = ''
+          
+          if %i[gem app].include?(window_type)
+            custom_window_file_content += <<-MULTI_LINE_STRING
+require '#{current_dir_name}/model/greeting'
+
+            MULTI_LINE_STRING
+          end
+    
+          custom_window_file_content += <<-MULTI_LINE_STRING
 #{namespace_type} #{class_name(namespace)}
   module View
     class #{class_name(custom_window_name)}
@@ -543,15 +563,6 @@ module Glimmer
             MULTI_LINE_STRING
           end
           
-          if %i[gem app].include?(window_type)
-            custom_window_file_content += <<-MULTI_LINE_STRING
-      GREETINGS = [
-        'Hello, World!',
-        'Howdy, Partner!'
-      ]
-            MULTI_LINE_STRING
-          end
-          
           custom_window_file_content += <<-MULTI_LINE_STRING
           
       ## Add options like the following to configure CustomWindow by outside consumers
@@ -561,14 +572,6 @@ module Glimmer
       # option :height, default: 240
           MULTI_LINE_STRING
       
-          if %i[gem app].include?(window_type)
-            custom_window_file_content += <<-MULTI_LINE_STRING
-      
-      # GREETING Array selected index
-      option :greeting_index, default: 0
-            MULTI_LINE_STRING
-          end
-      
           custom_window_file_content += <<-MULTI_LINE_STRING
   
       ## Use before_body block to pre-initialize variables to use in body and
@@ -579,6 +582,8 @@ module Glimmer
           if %i[gem app].include?(window_type)
             custom_window_file_content += <<-MULTI_LINE_STRING
       before_body do
+        @greeting = Model::Greeting.new
+        
         menu('File') {
           menu_item('Preferences...') {
             on_clicked do
@@ -634,7 +639,7 @@ module Glimmer
           margined true
           
           label {
-            text <= [self, :greeting_index, on_read: -> { greeting }]
+            text <= [@greeting, :text]
           }
         }
       }
@@ -643,10 +648,6 @@ module Glimmer
           if %i[gem app].include?(window_type)
             custom_window_file_content += <<-MULTI_LINE_STRING
   
-      def greeting
-        GREETINGS[greeting_index]
-      end
-  
       def display_about_dialog
         message = "#{human_name(namespace)}#{" - #{human_name(custom_window_name)}" if window_type == :gem} \#{VERSION}\\n\\n\#{LICENSE}"
         msg_box('About', message)
@@ -674,8 +675,8 @@ module Glimmer
             radio_buttons {
               stretchy false
               
-              items GREETINGS
-              selected <=> [self, :greeting_index]
+              items Model::Greeting::GREETINGS
+              selected <=> [@greeting, :text_index]
             }
           }
         }.show
@@ -790,6 +791,37 @@ end
           MULTI_LINE_STRING
         end
         
+        def model_file(model_name, namespace)
+          namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
+    
+          <<-MULTI_LINE_STRING
+#{namespace_type} #{class_name(namespace)}
+  module Model
+    class #{class_name(model_name)}
+      GREETINGS = [
+        'Hello, World!',
+        'Howdy, Partner!'
+      ]
+      
+      attr_accessor :text
+      
+      def initialize
+        @text = GREETINGS.first
+      end
+      
+      def text_index=(new_text_index)
+        self.text = GREETINGS[new_text_index]
+      end
+      
+      def text_index
+        GREETINGS.index(text)
+      end
+    end
+  end
+end
+          MULTI_LINE_STRING
+        end
+        
       end
       
     end

data/lib/glimmer/rake_task.rb

@@ -66,6 +66,27 @@ namespace :glimmer do
     Glimmer::Launcher.new([File.expand_path('../../../examples/meta_example.rb', __FILE__)]).launch
   end
 
+  namespace :package do
+    task :package_dependencies do
+      require_relative 'rake_task/package'
+    end
+    
+    desc 'Clean by removing "pkg" directory'
+    task :clean => :package_dependencies do
+      Glimmer::RakeTask::Package.clean
+    end
+
+    desc 'Generate gemspec'
+    task :gemspec => :package_dependencies do
+      Glimmer::RakeTask::Package.gemspec
+    end
+
+    desc 'Generate gem under "pkg" directory'
+    task :gem => :package_dependencies do
+      Glimmer::RakeTask::Package.gem
+    end
+  end
+
   desc 'Scaffold Glimmer application directory structure to build a new app'
   task :scaffold, [:app_name] do |t, args|
     require_relative 'rake_task/scaffold'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2023-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -606,6 +606,7 @@ files:
 - lib/glimmer/proc_tracker.rb
 - lib/glimmer/rake_task.rb
 - lib/glimmer/rake_task/list.rb
+- lib/glimmer/rake_task/package.rb
 - lib/glimmer/rake_task/scaffold.rb
 - sounds/AlanWalker-Faded.mid
 - sounds/AlanWalker-SingMeToSleep.mid