wxruby3 0.9.7 → 0.9.8

data/rakelib/prepost.rake

@@ -29,14 +29,21 @@ namespace 'wxruby' do
       $stdout.puts 'done!' if WXRuby3.config.run_silent?
       # cleanup
       rm_rf('rakelib', verbose: !WXRuby3.config.run_silent?)
+      rm_f('Rakefile', verbose: !WXRuby3.config.run_silent?)
+      rm_f('ext/mkrf_conf_ext.rb', verbose: !WXRuby3.config.run_silent?)
       rm_rf('ext/wxruby3', verbose: !WXRuby3.config.run_silent?)
       WXRuby3.config.cleanup_bootstrap
       File.open(File.join(WXRuby3::Config.wxruby_root, 'ext', 'wxruby.setup.done'), 'w') { |f| f << '1' }
     end
 
-    task :bingem => 'gem:install' do
+    task :binpkg => 'gem:install' do
       # cleanup
       rm_rf('rakelib')
+      rm_f('Rakefile')
+      rm_f('ext/mkrf_conf_ext.rb')
+      rm_rf('ext/wxruby3')
+      rm_f('*.pkg')
+      rm_f('*.sha')
       File.open(File.join(WXRuby3::Config.wxruby_root, 'ext', 'wxruby.setup.done'), 'w') { |f| f << '1' }
     end
 

data/rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css

@@ -90,4 +90,8 @@ div.wxrb-logo table td {
 
 #toc {
     position: fixed;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    top: 1em;
+    bottom: 0;
 }

data/samples/sampler/sample.rb

@@ -6,6 +6,8 @@
 # wxRuby3 sampler application
 ###
 
+require 'set'
+
 module WxRuby
 
   ART_FOLDER = File.join(__dir__, '..', 'art')

data/tests/lib/wxapp_runner.rb

@@ -67,7 +67,7 @@ module Test
     class TestCase
 
       def self.is_ci_build?
-        !!ENV['GITHUB_ACTION']
+        (ENV['GITHUB_ACTION'] || ENV['CI'])
       end
 
       def is_ci_build?

data/tests/test_config.rb

@@ -203,13 +203,16 @@ class TestConfig < Test::Unit::TestCase
   def run_env_var_tests(cfg)
     # by default expansion is on
 
+    # Cirrus CI Linux builds run in privileged container without proper user env
+    has_user = Wx::PLATFORM == 'WXMSW' || ENV['USER']
+
     # add a number of entries for env var in new group 'Environment'
     cfg['/Environment/HOME'] = '$HOME'
-    cfg['Environment'].USER = Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}'
+    cfg['Environment'].USER = Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}' if has_user
     cfg['/Environment/PATH'] = '$(PATH)'
 
     assert_equal(ENV['HOME'], cfg.Environment['HOME'])
-    assert_equal(ENV[Wx::PLATFORM == 'WXMSW' ?  'USERNAME' : 'USER'], cfg['/Environment/USER'])
+    assert_equal(ENV[Wx::PLATFORM == 'WXMSW' ?  'USERNAME' : 'USER'], cfg['/Environment/USER']) if has_user
     assert_equal(ENV['PATH'], cfg.Environment.PATH)
 
     # test escaping
@@ -225,9 +228,9 @@ class TestConfig < Test::Unit::TestCase
 
     assert_equal('${NonExistingLongNonsenseVariable}', cfg.Environment['NONSENSE'])
 
-    cfg['/Environment/MULTIPLE'] = "$HOME / #{Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}'}"
+    cfg['/Environment/MULTIPLE'] = "$HOME / #{Wx::PLATFORM == 'WXMSW' ? '%USERNAME%' : '${USER}'}" if has_user
 
-    assert_equal("#{ENV['HOME']} / #{Wx::PLATFORM == 'WXMSW' ? ENV['USERNAME'] : ENV['USER']}", cfg.Environment['MULTIPLE'])
+    assert_equal("#{ENV['HOME']} / #{Wx::PLATFORM == 'WXMSW' ? ENV['USERNAME'] : ENV['USER']}", cfg.Environment['MULTIPLE']) if has_user
 
     # disable env var expansion
     cfg.expand_env_vars = false

data/tests/test_secret_store.rb

@@ -0,0 +1,83 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+require_relative './lib/wxapp_runner'
+
+require 'digest'
+
+class TestSecretStore < Test::Unit::TestCase
+
+  unless is_ci_build?
+
+  def test_store
+    if Wx.has_feature?(:USE_SECRETSTORE)
+      state, err = Wx::SecretStore.get_default.ok?
+      if state
+        puts "SecretStore OK"
+
+        if Wx::WXWIDGETS_VERSION > '3.2.4'
+          password = Digest::SHA256.digest('My Secret Password!')
+        else
+          password = Digest::SHA256.hexdigest('My Secret Password!') # binary secrets does not work
+        end
+        secret_val = Wx::SecretValue.new(password)
+        assert_true(Wx::SecretStore.get_default.save('My/Service', 'a_user', secret_val))
+
+        secret_val2 = Wx::SecretValue.new
+        rc, user = Wx::SecretStore.get_default.load('My/Service', secret_val2)
+        assert_true(rc)
+        assert_equal('a_user', user)
+        assert_equal(secret_val, secret_val2)
+        assert_equal(password, secret_val2.get_data)
+
+        password = 'My Secret Password!'
+        secret_val = Wx::SecretValue.new(password)
+        assert_true(Wx::SecretStore.get_default.save('My/Service', 'a_user', secret_val))
+
+        secret_val2 = Wx::SecretValue.new
+        rc, user = Wx::SecretStore.get_default.load('My/Service', secret_val2)
+        assert_true(rc)
+        assert_equal('a_user', user)
+        assert_equal(secret_val, secret_val2)
+        assert_equal(password, secret_val2.get_as_string)
+
+        password = 'My Secret Password!'.encode('UTF-16')
+        secret_val = Wx::SecretValue.new(password)
+        assert_true(Wx::SecretStore.get_default.save('My/Service', 'a_user', secret_val))
+
+        secret_val2 = Wx::SecretValue.new
+        rc, user = Wx::SecretStore.get_default.load('My/Service', secret_val2)
+        assert_true(rc)
+        assert_equal('a_user', user)
+        assert_equal(secret_val, secret_val2)
+        assert_equal(password, secret_val2.get_as_string)
+        assert_not_equal('My Secret Password!'.encode('UTF-16'), secret_val2.get_as_string)
+        assert_equal('My Secret Password!'.encode('UTF-16'), secret_val2.get_as_string.encode('UTF-16'))
+
+        password = 'My Secret Password!'.encode('UTF-32')
+        secret_val = Wx::SecretValue.new(password)
+        assert_true(Wx::SecretStore.get_default.save('My/Service', 'a_user', secret_val))
+
+        secret_val2 = Wx::SecretValue.new
+        rc, user = Wx::SecretStore.get_default.load('My/Service', secret_val2)
+        assert_true(rc)
+        assert_equal('a_user', user)
+        assert_equal(secret_val, secret_val2)
+        assert_equal(password, secret_val2.get_as_string)
+        assert_not_equal('My Secret Password!'.encode('UTF-32'), secret_val2.get_as_string)
+        assert_equal('My Secret Password!'.encode('UTF-32'), secret_val2.get_as_string.encode('UTF-32'))
+
+        assert_true(Wx::SecretStore.get_default.delete('My/Service'))
+
+      else
+        puts "Default SecretStore not usable : #{err}"
+      end
+    else
+      puts 'Wx::SecretStore not available'
+    end
+  end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -66,12 +66,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: plat4m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: wxRuby3 is a Ruby library providing an extension for the wxWidgets C++
   UI framework
 email: mcorino@m2c-software.nl
 executables:
 - wxruby
-extensions: []
+extensions:
+- ext/mkrf_conf_ext.rb
 extra_rdoc_files: []
 files:
 - ".yardopts"
@@ -95,6 +110,7 @@ files:
 - assets/logo.xcf
 - assets/repo-social-preview.png
 - bin/wxruby
+- ext/mkrf_conf_ext.rb
 - ext/wxruby3/include/wxRubyApp.h
 - ext/wxruby3/include/wxruby-ClientData.h
 - ext/wxruby3/include/wxruby-ComboPopup.h
@@ -199,6 +215,7 @@ files:
 - lib/wx/core/real_point.rb
 - lib/wx/core/rect.rb
 - lib/wx/core/region_iterator.rb
+- lib/wx/core/secret_store.rb
 - lib/wx/core/simplehelpprovider.rb
 - lib/wx/core/size.rb
 - lib/wx/core/sizer.rb
@@ -318,6 +335,7 @@ files:
 - lib/wx/doc/rtc/richtext_style_sheet.rb
 - lib/wx/doc/scaled_dc.rb
 - lib/wx/doc/screen_dc.rb
+- lib/wx/doc/secret_store.rb
 - lib/wx/doc/sizer.rb
 - lib/wx/doc/static_bitmap.rb
 - lib/wx/doc/stc/styled_text_ctrl.rb
@@ -395,10 +413,10 @@ files:
 - lib/wx/stc/styled_text_ctrl.rb
 - lib/wx/version.rb
 - lib/wx/wxruby/base.rb
+- lib/wx/wxruby/cmd/check.rb
 - lib/wx/wxruby/cmd/sampler.rb
 - lib/wx/wxruby/cmd/setup.rb
 - lib/wx/wxruby/cmd/test.rb
-- rakefile
 - rakelib/bin.rake
 - rakelib/bin.rb
 - rakelib/build.rake
@@ -412,18 +430,14 @@ files:
 - rakelib/install.rake
 - rakelib/install.rb
 - rakelib/lib/config.rb
-- rakelib/lib/config/cygwin.rb
+- rakelib/lib/config/freebsd.rb
 - rakelib/lib/config/linux.rb
 - rakelib/lib/config/macosx.rb
 - rakelib/lib/config/mingw.rb
-- rakelib/lib/config/netbsd.rb
-- rakelib/lib/config/pkgman/arch.rb
-- rakelib/lib/config/pkgman/base.rb
-- rakelib/lib/config/pkgman/debian.rb
+- rakelib/lib/config/pkgman/linux.rb
 - rakelib/lib/config/pkgman/macosx.rb
-- rakelib/lib/config/pkgman/rhel.rb
-- rakelib/lib/config/pkgman/suse.rb
 - rakelib/lib/config/unixish.rb
+- rakelib/lib/config/unknown.rb
 - rakelib/lib/core/include/client_data.inc
 - rakelib/lib/core/include/enum.inc
 - rakelib/lib/core/include/funcall.inc
@@ -633,6 +647,7 @@ files:
 - rakelib/lib/director/scroll_bar.rb
 - rakelib/lib/director/scrolled_t.rb
 - rakelib/lib/director/searchctrl.rb
+- rakelib/lib/director/secret_store.rb
 - rakelib/lib/director/sizer.rb
 - rakelib/lib/director/sizer_item.rb
 - rakelib/lib/director/slider.rb
@@ -753,6 +768,7 @@ files:
 - rakelib/lib/generate/doc/scrolled_canvas.yaml
 - rakelib/lib/generate/doc/scrolled_control.yaml
 - rakelib/lib/generate/doc/scrolled_window.yaml
+- rakelib/lib/generate/doc/secret_store.yaml
 - rakelib/lib/generate/doc/sizer.yaml
 - rakelib/lib/generate/doc/splash_screen.yaml
 - rakelib/lib/generate/doc/static_box.yaml
@@ -1126,6 +1142,7 @@ files:
 - tests/test_pg.rb
 - tests/test_proof_check.rb
 - tests/test_richtext.rb
+- tests/test_secret_store.rb
 - tests/test_sizer.rb
 - tests/test_std_controls.rb
 - tests/test_styled_text_ctrl.rb
@@ -1141,17 +1158,19 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/mcorino/wxRuby3/issues
-  source_code_uri: https://github.com/mcorino/wxRuby3
-  documentation_uri: https://mcorino.github.io/wxRuby3
   homepage_uri: https://github.com/mcorino/wxRuby3
-post_install_message: |2+
-
-  The wxRuby3 Gem has been successfully installed.
-  Before being able to use wxRuby3 you need to run the post-install setup process
-  by executing the command 'wxruby setup'.
-
-  Run 'wxruby setup -h' to see information on the available commandline options.
-
+  documentation_uri: https://mcorino.github.io/wxRuby3
+  github_repo: https://github.com/mcorino/wxRuby3
+post_install_message: "\nThe wxRuby3 Gem has been successfully installed including
+  the 'wxruby' utility.\n\nIn case no suitable binary release package was available
+  for your platform you  \nwill need to run the post-install setup process by executing:\n\n$
+  wxruby setup\n\nTo check whether wxRuby3 is ready to run or not you can at any time
+  execute the \nfollowing command:\n\n$ wxruby check\n\nRun 'wxruby check -h' for
+  more information.\n\nWhen the wxRuby3 setup has been fully completed you can start
+  using wxRuby3.\n\nYou can run the regression tests to verify the installation by
+  executing:\n\n$ wxruby test\n\nThe wxRuby3 sample explorer can be run by executing:\n\n$
+  wxruby sampler\n\nHave fun using wxRuby3.\n\nRun 'wxruby -h' to see information
+  on the available commands.\n\n"
 rdoc_options:
 - "--exclude=\\.dll"
 - "--exclude=\\.so"
@@ -1171,7 +1190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby

data/rakefile

@@ -1,14 +0,0 @@
-###
-# wxRuby3 rake file
-# Copyright (c) M.J.N. Corino, The Netherlands
-###
-
-# Influential environment variables
-# WXRUBY_VERBOSE    : define verbosity for (rake) build scripts
-# WXRUBY_VERSION    : define the version info (x.x.x) for this tree
-# WXRUBY_EXCLUDED   : exclude certain classes from being compiled, even if present
-#
-# WXWIN             : install folder of wxWidgets library if not system default
-# WXXML             : folder containing doxygen generated wxWidgets XML interface specs if not using wxRuby bootstrap
-
-task :default => 'wxruby:help'

data/rakelib/lib/config/pkgman/arch.rb

@@ -1,53 +0,0 @@
-# Copyright (c) 2023 M.J.N. Corino, The Netherlands
-#
-# This software is released under the MIT license.
-
-###
-# wxRuby3 buildtools platform pkg manager for Arch Linux type systems
-###
-
-module WXRuby3
-
-  module Config
-
-    module Platform
-
-      module PkgManager
-
-        PLATFORM_DEPS = %w[pkg-config gtk3 webkit2gtk gspell libunwind gstreamer curl libsecret libnotify libpng12]
-
-        class << self
-
-          private
-
-          def do_install(distro, pkgs)
-            run_pacman(make_install_cmd(pkgs))
-          end
-
-          def add_platform_pkgs(pkgs)
-            if pkgs.include?('g++')
-              pkgs.delete('g++')
-              pkgs << 'gcc'
-            end
-            # find pkgs we need
-            PLATFORM_DEPS.inject(pkgs) { |list, pkg| list << pkg unless system("pacman -Qq #{pkg} >/dev/null 2>&1"); list }
-          end
-
-          def run_pacman(cmd)
-            run("pacman -q --noconfirm #{cmd}")
-          end
-
-          def make_install_cmd(pkgs)
-            # create install command
-            "-S --needed #{ pkgs.join(' ') }"
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/rakelib/lib/config/pkgman/debian.rb

@@ -1,66 +0,0 @@
-# Copyright (c) 2023 M.J.N. Corino, The Netherlands
-#
-# This software is released under the MIT license.
-
-###
-# wxRuby3 buildtools platform pkg manager for Debian type systems
-###
-
-module WXRuby3
-
-  module Config
-
-    module Platform
-
-      module PkgManager
-
-        PLATFORM_DEPS = %w[libgtk-3-dev libwebkit2gtk-4.0-dev libgspell-1-dev libunwind-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcurl4-openssl-dev libsecret-1-dev libnotify-dev]
-
-        class << self
-
-          private
-
-          def do_install(distro, pkgs)
-            run_apt(make_install_cmd(pkgs))
-          end
-
-          def add_platform_pkgs(pkgs)
-            # get architecture
-            arch = expand('dpkg --print-architecture').strip
-            # find pkgs we need
-            PLATFORM_DEPS.inject(pkgs) do |list, pkg|
-              list << pkg unless (system("dpkg-query -s \"#{pkg}:#{arch}\" >/dev/null 2>&1") ||
-                                    system("dpkg-query -s \"#{pkg}:all\" >/dev/null 2>&1") ||
-                                    (expand("dpkg-query -s \"#{pkg}\" 2>/dev/null").strip =~ /Architecture: (#{arch}|all)/))
-              list
-            end
-          end
-
-          def run_apt(cmd)
-            run("DEBIAN_FRONTEND=noninteractive apt-get -q -o=Dpkg::Use-Pty=0 #{cmd}")
-          end
-
-          def update_pkgs
-            run_apt('update')
-          end
-
-          def make_install_cmd(pkgs)
-            # update cache
-            update_pkgs
-            # get list of available packages
-            apt_cache = `apt-cache pkgnames`.chomp.split("\n").collect { |s| s.strip }
-            # remove un-installables
-            pkgs = pkgs.select { |pkg| apt_cache.include?(pkg) }
-            # create install command
-            "install -y #{ pkgs.join(' ') }"
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/rakelib/lib/config/pkgman/rhel.rb

@@ -1,54 +0,0 @@
-# Copyright (c) 2023 M.J.N. Corino, The Netherlands
-#
-# This software is released under the MIT license.
-
-###
-# wxRuby3 buildtools platform pkg manager for RHEL type systems
-###
-
-module WXRuby3
-
-  module Config
-
-    module Platform
-
-      module PkgManager
-
-        PLATFORM_DEPS = %w[expat-devel findutils gspell-devel gstreamer1-plugins-base-devel gtk3-devel libcurl-devel libjpeg-devel libnotify-devel libpng-devel libSM-devel libsecret-devel libtiff-devel SDL-devel webkit2gtk4.1-devel zlib-devel]
-
-        class << self
-
-          private
-
-          def do_install(distro, pkgs)
-            run_dnf(make_install_cmd(pkgs))
-          end
-
-          def add_platform_pkgs(pkgs)
-            # add build tools
-            if pkgs.include?('git')
-              pkgs.delete('git')
-              pkgs << 'git-core'
-            end
-            # find pkgs we need
-            PLATFORM_DEPS.inject(pkgs) { |list, pkg| list << pkg unless system("dnf list installed #{pkg} >/dev/null 2>&1"); list }
-          end
-
-          def run_dnf(cmd)
-            run("dnf #{cmd}")
-          end
-
-          def make_install_cmd(pkgs)
-            # create install command
-            "install -y #{ pkgs.join(' ') }"
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/rakelib/lib/config/pkgman/suse.rb

@@ -1,54 +0,0 @@
-# Copyright (c) 2023 M.J.N. Corino, The Netherlands
-#
-# This software is released under the MIT license.
-
-###
-# wxRuby3 buildtools platform pkg manager for SuSE type systems
-###
-
-module WXRuby3
-
-  module Config
-
-    module Platform
-
-      module PkgManager
-
-        PLATFORM_DEPS = %w[gtk3-devel webkit2gtk3-devel gspell-devel gstreamer-devel gstreamer-plugins-base-devel libcurl-devel libsecret-devel libnotify-devel libSDL-devel zlib-devel libjpeg-devel libpng-devel]
-
-        class << self
-
-          private
-
-          def do_install(distro, pkgs)
-            run_zypper(make_install_cmd(pkgs))
-          end
-
-          def add_platform_pkgs(pkgs)
-            # add build tools
-            if pkgs.include?('g++')
-              pkgs.delete('g++')
-              pkgs << 'gcc-c++'
-            end
-            # find pkgs we need
-            PLATFORM_DEPS.inject(pkgs) { |list, pkg| list << pkg unless system("rpm -q --whatprovides #{pkg} >/dev/null 2>&1"); list }
-          end
-
-          def run_zypper(cmd)
-            run("zypper -t -i #{cmd}")
-          end
-
-          def make_install_cmd(pkgs)
-            # create install command
-            "install -y #{ pkgs.join(' ') }"
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end