Spring clean

Author: monkstone

.mvn/extensions.xml

@@ -3,7 +3,7 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.3.0
-    </version>
+    <version>0.4.3</version>
   </extension>
 </extensions>
+

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1,2 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar

README.md

@@ -1,23 +1,35 @@
 # ArcBall
 ArcBall functionality for processing (ruby versions) as gem
 
-### Example Usage 
-The sketch class need to to inherit from PApplet to work and self should return such an instance. The following is a ruby-processing example, which currently supplies arcball via a library, but gem distribution has its attractions. Drag mouse to rotate. Hold down 'x', 'y' or 'z' keys to constrain axis of rotation, mouse-wheel to zoom.
+### Example Usage
+The sketch class need to to inherit from PApplet to work and self should return such an instance. The following is a propane example. Drag mouse to rotate. Hold down 'x', 'y' or 'z' keys to constrain axis of rotation, mouse-wheel to zoom.
 
 ```ruby
-require 'arcball'
+class ArcBallBox < Propane::App
+  ############################
+  # Use mouse drag to rotate
+  # the arcball. Use mousewheel
+  # to zoom. Hold down x, y, z
+  # to constrain rotation axis.
+  ############################
+  def setup
+    sketch_title 'Arcball Box'
+    Processing::ArcBall.init self, 300, 300
+    fill 180
+  end
 
-def setup
-  size(600, 600, P3D)
-  smooth(8)
-  Processing::ArcBall.init(self, 300, 300)
-  fill 180
-end
+  def draw
+    background 50
+    box 300, 300, 300
+  end
 
-def draw
-  background(50)  
-  box(300, 300, 300)
+  def settings
+    size 600, 600, P3D
+    smooth 8
+  end
 end
+
+ArcBallBox.new
 ```
 Since version 0.0.2, you can also fix rotation to one axis at initialization
 

Rakefile

@@ -1,5 +1,5 @@
-# encoding: utf-8
 # frozen_string_literal: false
+
 require_relative 'lib/arcball/version'
 
 def create_manifest
@@ -11,7 +11,7 @@ def create_manifest
   end
 end
 
-task default: [:init, :compile, :install, :gem]
+task default: %i[init compile install gem]
 
 desc 'Create Manifest'
 task :init do
@@ -20,28 +20,28 @@ end
 
 desc 'Build gem'
 task :gem do
-  sh 'gem build arcball.gemspec' 
+  system 'gem build arcball.gemspec'
 end
 
 desc 'Install'
 task :install do
-  sh 'mv target/arcball.jar lib'
+  system 'mv target/arcball.jar lib'
 end
 
 desc 'Document'
 task :javadoc do
-  sh 'mvn javadoc:javadoc'
+  system '.mvnw javadoc:javadoc'
 end
 
 desc 'Compile'
 task :compile do
-  sh 'mvn package'
+  system '.mvnw package'
 end
 
 desc 'clean'
 task :clean do
   Dir['./**/*.%w{jar gem}'].each do |path|
-    puts 'Deleting #{path} ...'
+    puts "Deleting #{path} ..."
     File.delete(path)
   end
   FileUtils.rm_rf('./target')

arcball.gemspec

@@ -6,17 +6,15 @@ Gem::Specification.new do |s|
   s.name = 'arcball'
   s.version = ArcBall::VERSION
   s.licenses = ['GPL-3.0']
-  s.has_rdoc = false
-  s.extra_rdoc_files = ['README.md', 'LICENSE.md']
   s.authors = ['Martin Prout']
-  s.date = %q{2016-03-13}
-  s.description = %q{A ArcBall in java for propane}
+  s.date = %q{2020-04-09}
+  s.description = %q{A ArcBall in java for propane and PiCrate}
   s.summary = %q{Provides arcball functionality to processing, from a ruby environment}
-  s.email = %q{[email protected]}
+  s.email = %q{[email protected]}
   s.files = ['Rakefile', 'lib/arcball.rb', 'lib/arcball.jar', 'lib/arcball/version.rb']
   s.homepage = %q{http://rubygems.org/gems/arcball}
   s.require_paths = ['lib']
-  s.add_development_dependency 'rake', '~> 12'
-  s.platform='java'
-  s.rubygems_version = %q{2.5.2}
+  s.add_development_dependency 'rake', '~> 12.3'
+  s.platform      = 'java'
+  s.requirements << 'java runtime == 8'
 end

lib/arcball.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
-# frozen_string_literal: false
-require 'java'
+# frozen_string_literal: true
+
+require 'jruby'
 require_relative 'arcball.jar'
 Java::MonkstoneArcball::ArcBallLibrary.load(JRuby.runtime)

lib/arcball/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ArcBall
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

pom.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require 'fileutils'
+
 project 'arcball', 'https://github.com/ruby-processing/ArcBall' do
   model_version '4.0.0'
-  id 'arcball:arcball', '1.0.1'
+  id 'arcball:arcball', '1.0.2'
   packaging 'jar'
   description 'arcball for arcball'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -18,37 +21,31 @@
     url: 'https://github.com/ruby-processing/ArcBall',
     connection: 'scm:git:git://github.com/ruby-processing/ArcBall',
     developer_connection: 'scm:git:[email protected]/ruby-processing/ArcBall.git'
-    )
+  )
 
   properties('source.directory' => 'src',
-    'arcball.basedir' => '${project.basedir}',
-    'polyglot.dump.pom' => 'pom.xml',
-    'maven.compiler.source' => '1.8',
-    'project.build.sourceEncoding' => 'utf-8',
-    'maven.compiler.target' => '1.8',
-    'jruby.api' => 'http://jruby.org/apidocs/',
-    'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
-    'jruby.api' => 'http://jruby.org/apidocs/',
-    )
-
-  pom('org.jruby:jruby:9.1.17.0')
+             'arcball.basedir' => '${project.basedir}',
+             'polyglot.dump.pom' => 'pom.xml',
+             'maven.compiler.source' => '1.8',
+             'project.build.sourceEncoding' => 'utf-8',
+             'maven.compiler.target' => '1.8',
+             'jruby.api' => 'http://jruby.org/apidocs/',
+             'processing.api' => 'http://processing.github.io/processing-javadocs/core/')
+
+  pom('org.jruby:jruby:9.2.11.1')
   jar('org.processing:core:3.3.7')
 
-  plugin_management do
-    plugin :resources, '2.6'
-    plugin :dependency, '2.10'
-
-    plugin( :compiler, '3.7.0',
-      source: '${maven.compiler.source}',
-      target: '${maven.compiler.target}'
-    )
-    plugin( :javadoc, '2.10.4',
-      detect_offline_links:  'false',
-      links: ['${jruby.api}', '${processing.api}']
-    )
-    plugin( :jar, '3.0.2',
-      archive: { manifestFile: 'MANIFEST.MF' }
-    )
+  overrides do
+    plugin :dependency, '3.1.2'
+    plugin(:compiler, '3.8.1',
+           source: '${maven.compiler.source}',
+           target: '${maven.compiler.target}')
+    plugin(:javadoc, '2.10.4',
+           'detectOfflineLinks' => 'false',
+           'links' => ['${processing.api}',
+                       '${jruby.api}'])
+    plugin(:jar, '3.2.0',
+           archive: { manifestFile: 'MANIFEST.MF' })
   end
 
   build do

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>arcball</groupId>
   <artifactId>arcball</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <name>arcball</name>
   <description>arcball for arcball</description>
   <url>https://github.com/ruby-processing/ArcBall</url>
@@ -38,20 +38,20 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/monkstone/arcball/issues</url>
   </issueManagement>
   <properties>
-    <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
-    <source.directory>src</source.directory>
-    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <arcball.basedir>${project.basedir}</arcball.basedir>
-    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
+    <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
+    <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    <source.directory>src</source.directory>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.17.0</version>
+      <version>9.2.11.1</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -66,17 +66,13 @@ DO NOT MODIFIY - GENERATED CODE
     <finalName>arcball</finalName>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
+          <version>3.1.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
+          <version>3.8.1</version>
           <configuration>
             <source>${maven.compiler.source}</source>
             <target>${maven.compiler.target}</target>
@@ -88,14 +84,14 @@ DO NOT MODIFIY - GENERATED CODE
           <configuration>
             <detectOfflineLinks>false</detectOfflineLinks>
             <links>
-              <link>${jruby.api}</link>
               <link>${processing.api}</link>
+              <link>${jruby.api}</link>
             </links>
           </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.2</version>
+          <version>3.2.0</version>
           <configuration>
             <archive>
               <manifestFile>MANIFEST.MF</manifestFile>