fxruby 1.6.38-x64-mingw32 → 1.6.39-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c5095530ffbb6836a38690388ebf34537bccf9b
-  data.tar.gz: a9ef571fd6221067ad53d0a9a67ff5d7baab3f40
+  metadata.gz: 846d77512aec56a08e038b9fc10be7b0d772b6fe
+  data.tar.gz: 7efa2339a2cd06d9fb9718f2ba2674d53e3f162a
 SHA512:
-  metadata.gz: fef38eeee20a769bbf7584ac05459d29e4bb83e111a3832b0c7a3f78e77aee8757d167bef1264f6d7d7a72ebe6c48baa75c9900eb5e26eb0a27645e5fa4f1894
-  data.tar.gz: 8efc60df043c60bf3ab20240defaeb11622a67aa914d781fa9543e2bead4cc23bd418c2231fb5d4f6bea3f77bbab2c572de0c6bca657034737dd8b5e34f366be
+  metadata.gz: c0325cca9cf4bb74b02ea9f1446ebecd1ba10f6134965f71fef956cb43e0236055ffe8753ce24398ef6a47aeaa64824808c83eacaaf67ba4b00ecc2e0a315e3d
+  data.tar.gz: cedefb493abbc68928c95f086fefeba472e2b5203984298a8aa50f40c621f3a1de2049806e7e6474cd69e204e25d4ed621e3ab371a10da8259c099cf2991ad15

data/Gemfile

@@ -3,9 +3,13 @@ source 'https://rubygems.org'
 # Specify your gem's runtime dependencies in fxruby.gemspec
 gemspec
 
+# For some reason this is required in addition to the gemspec
+# when 'bundle config force_ruby_platform true' is active:
+gem 'mini_portile2'
+
 group :development do
   gem 'rake-compiler', '~> 1.0'
-  gem 'rake-compiler-dock', '~> 0.6.0'
+  gem 'rake-compiler-dock', '~> 0.6.2'
   gem 'yard', '~> 0.8'
   gem "bundler", "~> 1.12"
   gem "rake", "~> 12.0"

data/History.md

@@ -1,3 +1,8 @@
+=== 1.6.39 / 2017-12-26
+
+* Fix FXGLVisual.supported and .supported?
+* Add support for RubyInstaller-2.5
+
 === 1.6.38 / 2017-07-27
 
 * Update dependent libraries for Windows binary gem.

data/appveyor.yml

@@ -2,6 +2,11 @@ init:
   - SET PATH=c:/Ruby%ruby_version%/bin;c:/msys64/%MSYSTEM%/bin;%PATH%
   - SET RAKEOPT=-rdevkit
 install:
+  - ps: |
+      if ($env:RUBYDOWNLOAD -ne $null) {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-$env:RUBYDOWNLOAD.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
+      }
   - ruby --version
   - gem --version
   - ridk version
@@ -9,6 +14,8 @@ install:
   - c:/msys64/usr/bin/bash -lc "pacman -Su --noconfirm"
   - c:/msys64/usr/bin/bash -lc "pacman -S --noconfirm --needed ${MINGW_PACKAGE_PREFIX}-fox ${MINGW_PACKAGE_PREFIX}-swig"
   - swig -version
+  - gem install bundler --conservative
+  - bundle config force_ruby_platform true
   - bundle install
 build_script:
   - bundle exec rake compile
@@ -16,9 +23,20 @@ test_script:
   - bundle exec rake test
 environment:
   matrix:
-    - ruby_version: "24"
+    - ruby_version: "head"
+      RUBYDOWNLOAD: x86
       MINGW_PACKAGE_PREFIX: "mingw-w64-i686"
       MSYSTEM: "MINGW32"
     - ruby_version: "24-x64"
       MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
       MSYSTEM: "MINGW64"
+    - ruby_version: "24"
+      MINGW_PACKAGE_PREFIX: "mingw-w64-i686"
+      MSYSTEM: "MINGW32"
+    - ruby_version: "head"
+      RUBYDOWNLOAD: x64
+      MINGW_PACKAGE_PREFIX: "mingw-w64-x86_64"
+      MSYSTEM: "MINGW64"
+matrix:
+  allow_failures:
+    - ruby_version: "head"

data/lib/fox16/aliases.rb

@@ -1976,7 +1976,7 @@ module Fox
   end
   class FXGLVisual
     def FXGLVisual.supported?(*args) # :nodoc:
-      FXGLVisual.supported(*args)
+      FXGLVisual.supported(*args)[0]
     end
     def redSize(*args) # :nodoc:
       getRedSize(*args)

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.38"
+    "1.6.39"
   end
 end

data/rdoc-sources/FXGLVisual.rb

@@ -77,6 +77,14 @@ module Fox
     # even support no OpenGL at all!  This function returns the lesser
     # of the client support level and the display server support level.
     #
+    # Return an array with the following 3 elements: [supported, major, minor]
+    #
+    def FXGLVisual.supported(app); end
+
+    # Test if OpenGL is possible.
+    #
+    # Same as {FXGLVisual.supported?}, but returns the first element (true/false) only.
+    #
     def FXGLVisual.supported?(app); end
 
     # Return +true+ if double-buffered

data/swig-interfaces/FXGLVisual.i

@@ -41,7 +41,7 @@ public:
    * of the client support level and the display server support level.
    */
   %extend {
-    static FXbool supported(FXApp* application){
+    static VALUE supported(FXApp* application){
       int major,minor;
       FXbool answer=FXGLVisual::supported(application,major,minor);
       return rb_ary_new3(3,answer?Qtrue:Qfalse,INT2NUM(major),INT2NUM(minor));

data/swig-interfaces/FXMemoryBuffer.i

@@ -33,7 +33,7 @@ public:
   FXuint getSize() const;
 
   %extend {
-    // Returns the data as an array of Bignums
+    // Returns the data as an array of Integers
     VALUE getData() const {
       FXColor* data = self->getData();
       if (data) {

data/test/TC_FXGLViewer.rb

@@ -12,7 +12,14 @@ class TC_FXGLViewer < Fox::TestCase
   end
 
   def test_supported
-    assert FXGLVisual.supported?(app)
+    arr = FXGLVisual.supported(app)
+    assert_equal 3, arr.length, "return array should have elements [support, major, minor]"
+    assert_true arr[0], "OpenGL should be supported"
+    assert_operator 1, :<=, arr[1], "OpenGL should be version 1.0 or greater"
+  end
+
+  def test_supported?
+    assert_true FXGLVisual.supported?(app), "OpenGL should be supported"
   end
 
   def test_nil_app_raises_argument_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.38
+  version: 1.6.39
 platform: x64-mingw32
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -431,6 +431,7 @@ files:
 - lib/2.2/fox16_c.so
 - lib/2.3/fox16_c.so
 - lib/2.4/fox16_c.so
+- lib/2.5/fox16_c.so
 - lib/fox16.rb
 - lib/fox16/accel_table.rb
 - lib/fox16/aliases.rb
@@ -1006,7 +1007,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1014,7 +1015,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: FXRuby is the Ruby binding to the FOX GUI toolkit.