cf3 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb9b632a3a5525bed8fd4b32f510abe90989add50b50ae31bfe5b60adef1c23b
-  data.tar.gz: 3ba5755cb4d30945ba2e320dbfea7b21c450e6b79b6915517553ad1e1a5e7f34
+  metadata.gz: d80640e4fdd9eeaafb72601432d9523a01b2aea81c479a10680bef3169357882
+  data.tar.gz: 5b233c6c88c67edb19c50abaeb2cd12ca81502708f8877b41aad689096dab03f
 SHA512:
-  metadata.gz: 7dec9e31905d9748f19d32cd3c6905d053901dfa72754e88259ba29f6349251e6b9611be8d49834fa86ebbc9ebd0fd82c31ed91925a9e82ab27cb0813d895066
-  data.tar.gz: e57f11ec2c5e561294efe2c21d71efc22d3dd7259fa6d01c89c9a291f1fd7037774942d15ad96763926b8853a2ea77273f3f60f715a9a641ef11d50359848177
+  metadata.gz: 04f17206aa306cb9b7a1e7fe0d735ce880bbce1ef8b50d65965088aa70f62cb6ba4d197b4addbf7d6fa4665c1ea699f1589f4ae8be396d3a97509eb15abad09f
+  data.tar.gz: febdfc1482e63dba911869f0f3212ce8b7c6a57ab0bdb873ccff838298c098b97e2289913a0a1341246b93f459dc359c98366a8a6d3b67103e29cec4990270ce

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+v1.2.0 Update to more recent JRuby, JRubyArt versions
+
 v1.0.1 Created a website in docs folder (gemfile points to new website, that links to wiki and back to repo). Re-factored `class_eval` to `instance_eval` and added guards, somewhat simplifies code
 
 v1.0.0 About time for a regular release number, fixed and update some examples NB: see also [Funatsufumiya san sketches][funniti]

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cf3ruby.gemspec
-ruby "2.3.3", :engine => "jruby", :engine_version => "9.1.15.0"
+ruby "2.5.0", :engine => "jruby", :engine_version => "9.2.19.0"
 gemspec

data/Rakefile

@@ -1,7 +1,7 @@
 #require "bundler/gem_tasks"
 
 task :install => :build do
-  sh "jruby -S gem install #{Dir.glob('*.gem').join(' ')} --no-ri --no-rdoc"
+  sh "jruby -S gem install #{Dir.glob('*.gem').join(' ')} --no-doc"
 end
 
 task :build do

data/bin/cf3samples

@@ -4,11 +4,11 @@
 #####
 
 
-home = ENV["HOME"]
+home = ENV['HOME']
 local = home + '/cf3work'
 file = __FILE__
-require "pathname"
-require "fileutils"
+require 'pathname'
+require 'fileutils'
 file = Pathname.new(file).realpath
 
 sample_dir = File.expand_path(File.dirname(file) + "/../samples")

data/cf3ruby.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.executables   = ['cf3samples']
   spec.require_paths = ['lib']
-  spec.add_runtime_dependency 'jruby_art', '~> 1.4'
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_runtime_dependency 'jruby_art', '~> 2.5'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

data/lib/cf3/version.rb

@@ -1,3 +1,3 @@
 module Cf3
-  VERSION = '1.0.1'
+  VERSION = '1.2.0'
 end

data/lib/cf3.rb

@@ -52,7 +52,8 @@ module Processing
       @rules[rule_name][:procs] << [(total...(prob + total)), proc]
       @rules[rule_name][:total] += prob
       return if ContextFree.method_defined? rule_name
-      self.instance_eval do
+
+      instance_eval do
         eval <<-METH
         def #{rule_name}(options)
           merge_options(@values, options)
@@ -78,6 +79,7 @@ module Processing
     # Many of them have different strategies for being merged.
     def merge_options(old_ops, new_ops)
       return unless new_ops
+
       # Do size first
       old_ops[:size] *= new_ops.fetch(:size, 1.0)
       new_ops.each do |key, value|

data/samples/levy.rb

@@ -25,7 +25,7 @@ def setup
   sketch_title 'Levy Fractal'
   setup_the_levy
   draw_it
-  save_frame("levy.png")
+  save_frame(data_path('levy.png'))
 end
 
 

data/samples/y.rb

@@ -35,7 +35,7 @@ def setup
   no_stroke
   color_mode RGB, 1
   draw_it
-  save_frame("y.png")
+  save_frame(data_path('y.png'))
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby_art
@@ -17,42 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: |2
       A library for JRubyArt, that allows the writing of context free
       sketches (like context free art) in a ruby DSL. It is a bit of a toy
@@ -144,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A ruby-DSL library for CF3 sketches