gray_scott_gtk3 0.5.4 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d6144fd61b89a4f478d3551ed4648ce9fe10bba4b6c61b0dcb40aa596c21d82
-  data.tar.gz: 8cb60d9a0a48f7abbaae085fc11e8d1347d39879108ca904d0d809b464dedef9
+  metadata.gz: 977bfb0ebc9dffd914937d8e21d1613d71a014d401ec0410d32409597782d810
+  data.tar.gz: ce741a4ec404192dd1a7548576a9cd177f034c441e5912a27ecbe0c359434f73
 SHA512:
-  metadata.gz: '099e6543d57bdd095f6ff28ee74291dbca5ab089a07d7b304c9b91afe28583d2f71686fb66f97f8434c3e9b4ddeb5544890b6ac9b710944c8c3c04e0a24887ba'
-  data.tar.gz: 629899205425c0d7caab3c62f4adeec2e6694d66fa33bd22e6674045c787c02ce40f065855785a42a1515a5803bbf687477843d18b53885036af920c5f54c1a7
+  metadata.gz: e400b79c6dd8cf90f0aac55bc13c5932f51d411720b85db205ab71dbc560860c51c17a9bdc32df8e65898c0eb63df00318d644b8af19b9a55ca4814a81746a8b
+  data.tar.gz: 366eadb5b58d84a6901ed9d1bb411b1cc2ffcaf39db18856701528b9ab83b7981d079bbaec202e7e787360b768e36d6c14210a55777e2c1fa8177a9892c972e1

data/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: kojix2
+ko_fi: kojix2

data/.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: test
+on: [push, pull_request]
+jobs:
+  build:
+    name: ${{ matrix.os }} Ruby ${{ matrix.ruby }}
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      matrix:
+        os:   [ 'ubuntu' ]
+        ruby: [ '2.6', '2.7', '3.0' ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: |
+          sudo apt install -y xvfb libgtk-3-0
+      - run: | 
+          bundle install
+      - run: |
+          xvfb-run bundle exec rake spec

data/.gitignore

@@ -1,55 +1,7 @@
 *.gem
 *.rbc
 *.glade~
-/.config
 /coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
 /tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
 Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# rspec
-/spec/reports/
 .rspec_status

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/README.md

@@ -1,6 +1,10 @@
-# Gray-Scott
+# gray_scott_gtk3
 
-Ruby implementation of the Reaction diffusion system (Gray-Scott model).
+[![Gem](https://img.shields.io/gem/v/gray_scott_gtk3)](https://rubygems.org/gems/gray_scott_gtk3)
+[![test](https://github.com/kojix2/Gray-Scott/actions/workflows/ci.yml/badge.svg)](https://github.com/kojix2/Gray-Scott/actions/workflows/ci.yml)
+[![DOI](https://zenodo.org/badge/158914232.svg)](https://zenodo.org/badge/latestdoi/158914232)
+
+Ruby implementation of the [Reaction diffusion system](https://en.wikipedia.org/wiki/Reaction%E2%80%93diffusion_system) (Gray-Scott model).
 
 ![screenshot](https://raw.githubusercontent.com/kojix2/Gray-Scott/screenshot/screenshot/screenshot.gif)
 
@@ -10,6 +14,8 @@ Ruby implementation of the Reaction diffusion system (Gray-Scott model).
 gem install gray_scott_gtk3
 ```
 
+Support GPGPU with [Cumo](https://github.com/sonots/cumo).
+
 ## Usage
 
 ```bash
@@ -31,7 +37,7 @@ NOTE : You can set the width and height of the model, but the width and height o
 ## Known issue
 
 Glib::Timeout.add(number_of_seconds)
-If processing can not be completed within the time, it will not be displayed. 
+If processing can not be completed within the time, it will not be displayed.
 In this case, you should increase the number of seconds.
 
 ## Contributing

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/exe/grayscott

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 
-opt = {}
+opt = { width: 256, height: 256 }
 OptionParser.new do |op|
-  op.on('-h val', '--height', 'height of the model') { |v| opt[:height] = v.to_i }
-  op.on('-w val', '--width', 'width of the model') { |v| opt[:width] = v.to_i }
+  op.on('-h val', '--height', 'height of the model', Integer) { |v| opt[:height] = v }
+  op.on('-w val', '--width', 'width of the model', Integer) { |v| opt[:width] = v }
   op.on('-g', '--gpu', 'use GPU(Cumo)') { |v| opt[:gpu] = v }
   op.parse!(ARGV)
 end
@@ -19,7 +20,7 @@ module GrayScott
   class << self
     def run(opt)
       xml_path = File.expand_path('../resources/', __dir__)
-      Controller.new(xml_path, opt)
+      Controller.new(xml_path, height: opt[:height], width: opt[:width])
       Gtk.main
     end
   end

data/gray_scott_gtk3.gemspec

@@ -1,6 +1,6 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gray_scott/version'
+# frozen_string_literal: true
+
+require_relative 'lib/gray_scott/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'gray_scott_gtk3'
@@ -12,19 +12,17 @@ Gem::Specification.new do |spec|
   spec.description   = 'Reaction diffusion system (Gray-Scott model).'
   spec.homepage      = 'https://github.com/kojix2/Gray-Scott'
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = ['grayscott']
   spec.require_paths = ['lib']
 
   spec.add_dependency 'gtk3'
   spec.add_dependency 'numo-narray'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 end

data/lib/gray_scott/color.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 module GrayScott
   module Color
-    include XumoShortHand
-
     def colorize(ar, color_type)
       case color_type
       when 'colorful'
@@ -37,11 +37,11 @@ module GrayScott
     def hsv2rgb(h)
       i = UInt8.cast(h * 6)
       f = (h * 6.0) - i
-      p = UInt8.zeros *h.shape
+      p = UInt8.zeros(*h.shape)
       v = UInt8.new(*h.shape).fill 255
       q = (1.0 - f) * 256
       t = f * 256
-      rgb = UInt8.zeros *h.shape, 3
+      rgb = UInt8.zeros(*h.shape, 3)
       t = UInt8.cast(t)
       i = uInt8_dstack([i, i, i])
       rgb[i.eq 0] = uInt8_dstack([v, t, p])[i.eq 0]
@@ -79,7 +79,7 @@ module GrayScott
 
     def grayscale(ar)
       d = ar * 255
-      UInt8.dstack([d, d, d])
+      uInt8_dstack([d, d, d])
     end
 
     private

data/lib/gray_scott/controller/aboutdialog.rb

@@ -1,14 +1,21 @@
+# frozen_string_literal: true
+
 module GrayScott
   class Controller
     class AboutDialog
       def initialize(resource_dir)
-        @a = Gtk::AboutDialog.new
-        @a.program_name = 'Gray-Scott'
-        @a.logo = GdkPixbuf::Pixbuf.new(file: File.join(resource_dir, 'about_icon.png'))
-        @a.authors = ['kojix2']
-        @a.version = GrayScott::VERSION
-        @a.run
-        @a.destroy
+        Gtk::AboutDialog.new.tap do |d|
+          d.program_name = 'Gray-Scott'
+          d.comments = 'Reaction diffusion system'
+          d.logo = GdkPixbuf::Pixbuf.new(file: File.join(resource_dir, 'about_icon.png'))
+          d.copyright = 'Copyright (C) kojix2'
+          d.authors = ['kojix2']
+          d.version = GrayScott::VERSION
+          d.website = 'https://github.com/kojix2/gray_scott_gtk3'
+          d.website_label = 'Github kojix2/gray_scott_gtk3'
+          d.run
+          d.destroy
+        end
       end
     end
   end

data/lib/gray_scott/controller.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'controller/aboutdialog'
 
 module GrayScott
   class Controller
     include Color
-    include XumoShortHand
     attr_accessor :resource_dir, :height, :width, :model, :color
 
     def initialize(dir, height: 256, width: 256)
@@ -13,14 +14,14 @@ module GrayScott
       @model = Model.new(height: height, width: width)
       @show_u = false
       @color = 'colorful'
-      @frames = 1
+      @frames = 5
       @msec = 40
 
       builder = Gtk::Builder.new
       builder.add_from_file File.join(resource_dir, 'gray_scott.glade')
 
       %w[win execute_button gimage legend_image uv_combobox pen_density pen_radius].each do |s|
-        instance_variable_set('@' + s, builder.get_object(s))
+        instance_variable_set("@#{s}", builder.get_object(s))
       end
 
       builder.connect_signals { |handler| method(handler) }

data/lib/gray_scott/model.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module GrayScott
   # Gray-Scott model
   class Model
-    include XumoShortHand
-
     Dx = 0.01
 
     # Delta t is the change in time for each iteration

data/lib/gray_scott/utils/math.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrayScott
   module Utils
     module Math

data/lib/gray_scott/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrayScott
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.5.8'
 end

data/lib/gray_scott.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'gtk3'
 
+# Support for Cumo
 if Object.const_defined? :Cumo
   Xumo = Cumo
 else
@@ -7,13 +10,14 @@ else
   Xumo = Numo
 end
 
-module XumoShortHand
-  class Xumo::SFloat
+# Monkey patch
+module Xumo
+  class SFloat
     alias _ inplace
   end
-  SFloat = Xumo::SFloat
-  UInt8  = Xumo::UInt8
 end
+SFloat = Xumo::SFloat
+UInt8  = Xumo::UInt8
 
 require 'gray_scott/model'
 require 'gray_scott/color'