processing 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 530906b18ffcfc45cd88141c8c68857f9e05e4503399d5300188cfb105d1990f
-  data.tar.gz: e98b0aa812bbc7a1c3d58b548fe2216631eaba2c5486cca907ec33b5500536f4
+  metadata.gz: be2fa3f6b3e5b132cb08255a0591b8d896594cc803a53078c03d3ab299569fd6
+  data.tar.gz: 1d704d15285d063e1e24e4ee6d0e689a26bb2c92d0465c22dce3c36bb2880419
 SHA512:
-  metadata.gz: 0e3daa052843fb58bb0842f5eaef522962c32dafdcb295c0e0bc02d0a9476d66d1106f4cc79532285060e776e7d82cebe3c8877908951dc44f8986af72d09f0a
-  data.tar.gz: 79b8e742b6922e46c31dcb5f2f0abb3d679fe29ef0bccbf0a188526ae20d771f5950b62351f3c7fa579690a4af26efb823bb25bfa1a39a1fd87ef0ed37c71dd9
+  metadata.gz: f60d36a8162be8b116f469a88c4acb294a2f0b3ad79ba7c03b987a308a4d3ad6c78fde70a5edc7bfe85c94dd9b6c6768f38440ef81e3d0c5da98be657b216863
+  data.tar.gz: 52ff4e98095ccb6ff4a81caf6c66b43304047ac953364ef8c82835a0fbf9f5b210b4f107786d0b35798e77ffec33b1ee80f53c2668760fb941d1520e618d2644

data/.github/workflows/{release.yml → release-gem.yml}

@@ -1,4 +1,4 @@
-name: Release
+name: Release Gem
 
 on:
   push:
@@ -9,46 +9,46 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
       - name: ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.2
 
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
+
       - name: install gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+        run: gem install yard
 
-      - name: version
-        id: version
-        run: |
-          echo value=$(ruby -e 'print "${{ github.ref }}"[/\/v([\w\.\-]+)/, 1]') >> $GITHUB_OUTPUT
+      - name: test
+        run: rake test
 
       - name: create gem
-        run: rake clean gem
+        id: gem
+        run: |
+          rake gem
+          echo path=$(ruby -e 'print Dir.glob("*.gem").first') >> $GITHUB_OUTPUT
 
-      - name: create release
-        id: create_release
+      - name: create github release
+        id: release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
-          draft: false
-          prerelease: false
 
-      - name: upload to releases
+      - name: upload to github release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./processing-${{ steps.version.outputs.value }}.gem
-          asset_name:   processing-${{ steps.version.outputs.value }}.gem
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: ./${{ steps.gem.outputs.path }}
+          asset_name:   ${{ steps.gem.outputs.path }}
           asset_content_type: application/zip
 
       - name: upload to rubygems

data/.github/workflows/tag.yml

@@ -0,0 +1,35 @@
+name: Tag
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
+
+      - name: checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies only: :xot'"
+
+      - name: setup user name and email
+        run: |
+          git config --global user.email "xordog@gmail.com"
+          git config --global user.name "xord"
+
+      - name: tag versions
+        run: "ruby -I.github/workflows -rutils -e 'tag_versions'"
+
+      - name: push tags
+        run: git push origin --tags

data/.github/workflows/test.yml

@@ -11,17 +11,16 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v2
-
       - name: ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.2
 
-      - name: install gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: setup dependencies
+        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
         run: rake test

data/.github/workflows/utils.rb

@@ -0,0 +1,55 @@
+RENAMES = {reflex: 'reflexion'}
+
+def sh(cmd)
+  puts cmd
+  system cmd
+end
+
+def setup_dependencies(build: true, only: nil)
+  gemspec_path = `git ls-files`.lines(chomp: true).find {|l| l =~ /\.gemspec$/}
+  return unless gemspec_path
+
+  gemspec = File.read gemspec_path
+  name    = File.basename gemspec_path, '.gemspec'
+
+  exts = File.readlines('Rakefile')
+    .map {|l| l[%r|^\s*require\W+(\w+)/extension\W+$|, 1]}
+    .compact
+    .reject {|ext| ext == name}
+  exts = exts & [only].flatten.map(&:to_s) if only
+
+  exts.each do |ext|
+    gem   = RENAMES[ext.to_sym].then {|s| s || ext}
+    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
+    ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+
+    # 'rake subtree:push' pushes all subrepos, so cloning by new tag
+    # often fails before tagging each new tag
+    sh %( #{clone} --branch v#{ver} || #{clone} )
+    sh %( cd ../#{ext} && rake ext )
+  end
+end
+
+def tag_versions()
+  tags = `git tag`.lines chomp: true
+  vers = `git log --oneline ./VERSION`
+    .lines(chomp: true)
+    .map {|line| line.split.first[/^\w+$/]}
+    .map {|hash| [`git cat-file -p #{hash}:./VERSION 2>/dev/null`[/[\d\.]+/], hash]}
+    .select {|ver, hash| ver && hash}
+    .reverse
+    .to_h
+
+  changes = File.read('ChangeLog.md')
+    .split(/^\s*##\s*\[\s*v([\d\.]+)\s*\].*$/)
+    .slice(1..-1)
+    .each_slice(2)
+    .to_h
+    .transform_values(&:strip!)
+
+  vers.to_a.reverse.each do |ver, hash|
+    tag = "v#{ver}"
+    break if tags.include?(tag)
+    sh %( git tag -a -m \"#{changes[ver]&.gsub '"', '\\"'}\" #{tag} #{hash} )
+  end
+end

data/ChangeLog.md

@@ -1,21 +1,31 @@
-# Processing for CRuby ChangeLog
+# processing ChangeLog
 
 
-## [0.5.0] - 2023-02-09
+## [v0.5.2] - 2023-03-02
+
+- delete rubysketch.rb and rubysketch-processing.rb
+
+
+## [v0.5.1] - 2023-03-01
+
+- requiring 'rubysketch-processing' is deprecated
+
+
+## [v0.5.0] - 2023-02-09
 
 - requiring 'processing/include' is deprecated
 - require 'processing' and 'using Processing' is now required
 - do not show the window if a draw block is not given
 
 
-## [0.4.0] - 2022-12-29
+## [v0.4.0] - 2022-12-29
 
 - renamed from rubysketch.gem to processing.gem
 - renamed from RubySketch Pod to RubyProcessing Pod
 - delete glsl mode
 
 
-## [0.3.22] - 2022-11-14
+## [v0.3.22] - 2022-11-14
 
 RubySketch::Processing
 - add Shader class
@@ -29,7 +39,7 @@ RubySketch::GLSL
 - displays with pixel density 1.0
 
 
-## [0.3.21] - 2022-09-05
+## [v0.3.21] - 2022-09-05
 
 - add rubysketch-glsl.rb
 - add blend(), createImage(), setTitle(), tint() and noTint()
@@ -39,7 +49,7 @@ RubySketch::GLSL
 - change initial values for strokeCap and strokeJoin to ROUND and MITER
 
 
-## [0.3.20] - 2022-07-24
+## [v0.3.20] - 2022-07-24
 
 - add mouseClicked()
 - add blendMode()
@@ -48,73 +58,73 @@ RubySketch::GLSL
 - fix that resizing canvas consumes too much memory
 
 
-## [0.3.19] - 2021-12-5
+## [v0.3.19] - 2021-12-5
 
 - fix runtime error
 
 
-## [0.3.18] - 2021-12-5
+## [v0.3.18] - 2021-12-5
 
 - add 'mouseButton'
 - pointer cancel event calls pointer_up block
 
 
-## [0.3.17] - 2021-12-5
+## [v0.3.17] - 2021-12-5
 
 - add Touch#id
 
 
-## [0.3.16] - 2021-2-14
+## [v0.3.16] - 2021-2-14
 
 - add key, keyCode and keyPressed system values
 - add keyPressed(), keyReleased() and keyTyped() functions
 - add motionGravity value and motion() function
 
 
-## [0.3.15] - 2020-12-12
+## [v0.3.15] - 2020-12-12
 
 - delete temporary directory on launch
 
 
-## [0.3.14] - 2020-12-12
+## [v0.3.14] - 2020-12-12
 
 - fix loadImage() fails when Encoding.default_internal is not nil
 
 
-## [0.3.13] - 2020-12-12
+## [v0.3.13] - 2020-12-12
 
 - size(), createCanvas(): default pixelDensity is same as current value
 
 
-## [0.3.12] - 2020-12-10
+## [v0.3.12] - 2020-12-10
 
 - size() and createCanvas() take 'pixelDensity' parameter and default value is 1
 
 
-## [0.3.11] - 2020-12-9
+## [v0.3.11] - 2020-12-9
 
 - add size(), createCanvas() and pixelDensity()
 
 
-## [0.3.10] - 2020-12-1
+## [v0.3.10] - 2020-12-1
 
 - invert angle parameter value for arc() to fix compatibility to processing API
 
 
-## [0.3.9] - 2020-11-30
+## [v0.3.9] - 2020-11-30
 
 - Graphics#beginDraw() can take block to call endDraw automatically
 - Capture#start() always returns nil
 - add delay_camera.rb
 
 
-## [0.3.8] - 2020-11-27
+## [v0.3.8] - 2020-11-27
 
 - Capture#initialize() can take requestWidth, requestHeight and cameraName
 - add Capture#width and Capture#height
 
 
-## [0.3.7] - 2020-11-18
+## [v0.3.7] - 2020-11-18
 
 - add Capture class
 - add log(), exp(), sqrt() and PI
@@ -123,13 +133,13 @@ RubySketch::GLSL
 - fix error on calling image()
 
 
-## [0.3.6] - 2020-08-02
+## [v0.3.6] - 2020-08-02
 
 - random() can take array or nothing
 - use github actions to release gem package
 
 
-## [0.3.5] - 2020-08-02
+## [v0.3.5] - 2020-08-02
 
 - add random()
 - add sin(), cos(), tan(), asin(), acos(), atan() and atan2()
@@ -137,17 +147,17 @@ RubySketch::GLSL
 - fix error on calling rotate()
 
 
-## [0.3.4] - 2020-08-02
+## [v0.3.4] - 2020-08-02
 
 - delete Utility module
 
 
-## [0.3.3] - 2020-08-01
+## [v0.3.3] - 2020-08-01
 
 - add Vector class
 
 
-## [0.3.2] - 2020-07-22
+## [v0.3.2] - 2020-07-22
 
 - text() draws to the baseline by default
 - add textWidth(), textAscent(), textDescent() and textAlign()
@@ -155,24 +165,24 @@ RubySketch::GLSL
 - change initial background color to grayscale 0.8
 
 
-## [0.3.1] - 2020-07-17
+## [v0.3.1] - 2020-07-17
 
 - add touchStarted(), touchEnded(), touchMoved() and touches()
 - make all event handler drawable
 - limit font max size to 256
 
 
-## [0.3.0] - 2020-05-21
+## [v0.3.0] - 2020-05-21
 
 - add createGraphics()
 
 
-## [0.2.7] - 2020-04-17
+## [v0.2.7] - 2020-04-17
 
 - add strokeCap() and strokeJoin()
 
 
-## [0.2.6] - 2020-04-17
+## [v0.2.6] - 2020-04-17
 
 - push(), pushMatrix() and pushStyle() take block to automatic pop
 - refine startup process
@@ -181,7 +191,7 @@ RubySketch::GLSL
 - add loop(), noLoop() and redraw()
 
 
-## [0.2.5] - 2020-03-29
+## [v0.2.5] - 2020-03-29
 
 - delete debug prints
 - show unsupported image type

data/Rakefile

@@ -1,50 +1,25 @@
 # -*- mode: ruby -*-
 
 
-%w[../xot ../rucy ../rays ../reflex .]
+%w[../xot ../rucy ../beeps ../rays ../reflex .]
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'rucy/rake'
 
-require 'xot/module'
-require 'rucy/module'
-require 'rays/module'
-require 'reflex/module'
-require 'processing/module'
+require 'xot/extension'
+require 'rucy/extension'
+require 'beeps/extension'
+require 'rays/extension'
+require 'reflex/extension'
+require 'processing/extension'
 
 
-MODULES = [Xot, Rucy, Rays, Reflex, Processing]
+EXTENSIONS = [Xot, Rucy, Beeps, Rays, Reflex, Processing]
 
 ENV['RDOC'] = 'yardoc --no-private'
 
+default_tasks
 test_ruby_extension
 generate_documents
 build_ruby_gem
-
-task :default
-
-
-namespace :version do
-
-  namespace :bump do
-
-    task :major do
-      update_and_tag_version 0
-    end
-
-    task :minor do
-      update_and_tag_version 1
-    end
-
-    task :patch do
-      update_and_tag_version 2
-    end
-
-    task :build do
-      update_and_tag_version 3
-    end
-
-  end# bump
-
-end# version

data/RubyProcessing.podspec

@@ -3,7 +3,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "RubyProcessing"
-  s.version      = File.readlines(File.expand_path 'VERSION', __dir__)[0].chomp
+  s.version      = File.read(File.expand_path 'VERSION', __dir__)[/[\d\.]+/]
   s.summary      = "Yet Another Processing implementation for Ruby"
   s.description  = "Yet Another Processing implementation for Ruby"
   s.license      = "MIT"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.2

data/lib/processing/all.rb

@@ -5,7 +5,7 @@ require 'tmpdir'
 require 'open-uri'
 require 'reflex'
 
-require 'processing/module'
+require 'processing/extension'
 require 'processing/app'
 require 'processing/window'
 

data/lib/processing/{module.rb → extension.rb}

@@ -1,7 +1,7 @@
 module Processing
 
 
-  module Module
+  module Extension
 
     module_function
 
@@ -10,14 +10,14 @@ module Processing
     end
 
     def version()
-      open(root_dir 'VERSION') {|f| f.readline.chomp}
+      File.read(root_dir 'VERSION')[/[\d\.]+/]
     end
 
     def root_dir(path = '')
       File.expand_path "../../#{path}", __dir__
     end
 
-  end# Module
+  end# Extension
 
 
 end# Processing

data/processing.gemspec

@@ -4,7 +4,7 @@
 File.expand_path('lib', __dir__)
   .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'processing/module'
+require 'processing/extension'
 
 
 Gem::Specification.new do |s|
@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
     patterns.map {|pat| Dir.glob(pat).to_a}.flatten
   end
 
-  mod   = Processing::Module
-  name  = mod.name.downcase
+  ext   = Processing::Extension
+  name  = ext.name.downcase
   rdocs = glob.call *%w[README]
 
   s.name        = name
   s.summary     = 'Processing compatible Creative Coding Framework.'
   s.description = 'Creative Coding Framework has API compatible to Processing or p5.js.'
-  s.version     = mod.version
+  s.version     = ext.version
 
   s.authors  = %w[xordog]
   s.email    = 'xordog@gmail.com'
@@ -28,8 +28,14 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'reflexion', '~> 0.1.30'
+  s.add_runtime_dependency 'xot',       '~> 0.1.32'
+  s.add_runtime_dependency 'rucy',      '~> 0.1.32'
+  s.add_runtime_dependency 'beeps',     '~> 0.1.32'
+  s.add_runtime_dependency 'rays',      '~> 0.1.32'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.32'
 
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'test-unit'
   s.add_development_dependency 'yard'
 
   s.files            = `git ls-files`.split $/

metadata

@@ -1,29 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: xot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: rucy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: beeps
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: rays
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.32
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -44,8 +128,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/release.yml"
+- ".github/workflows/release-gem.yml"
+- ".github/workflows/tag.yml"
 - ".github/workflows/test.yml"
+- ".github/workflows/utils.rb"
 - ".gitignore"
 - ".yardopts"
 - ChangeLog.md
@@ -67,17 +153,15 @@ files:
 - lib/processing/app.rb
 - lib/processing/capture.rb
 - lib/processing/context.rb
+- lib/processing/extension.rb
 - lib/processing/font.rb
 - lib/processing/graphics.rb
 - lib/processing/graphics_context.rb
 - lib/processing/image.rb
-- lib/processing/module.rb
 - lib/processing/shader.rb
 - lib/processing/touch.rb
 - lib/processing/vector.rb
 - lib/processing/window.rb
-- lib/rubysketch-processing.rb
-- lib/rubysketch.rb
 - processing.gemspec
 - src/RubyProcessing.h
 - src/RubyProcessing.mm
@@ -104,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Processing compatible Creative Coding Framework.

data/lib/rubysketch-processing.rb

@@ -1 +0,0 @@
-require 'processing'

data/lib/rubysketch.rb

@@ -1 +0,0 @@
-require 'processing/all'