ruby_wordcram 2.0.1 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d472f8ac87f00a98bf9936e51ee22520775fd25
-  data.tar.gz: c2d9953b6a7ce9b0f4899e0912c666cb45ba2301
+SHA256:
+  metadata.gz: 74e3ab5e7ad6b83f1d10115656ffa3498736013372e794dcf1bf46e9565501f2
+  data.tar.gz: 247c74a5363978b52217e8f570033ed23adbcec8f082562a360db8c3cc2613ac
 SHA512:
-  metadata.gz: '08a6898e378a4069e8e2cbc380d22d488396b4e14f5a5448760e7bc66bcd30bb3286d9455d77777b7988b5d77566d1d68866b99d5a5a7c37dcee2b20ace3b553'
-  data.tar.gz: c8cb64646d9c30b45f67b97abb9d541d21dcd09bc8ac283e89cd452d89f5f8b4862ee8efec3230390ec6951ba711a23c00a1b60adc3b2fbfb2955114a5903664
+  metadata.gz: 6562decf79d471e76a115ffccf3b06ffb5434ef59fcd3520d468813064718593b726ac268fc8729d74b98b8f9a954c0ff8d27e2d14c0288c80176ba19abf8f63
+  data.tar.gz: f31c908dee03e5d5338050079ebcf0d8b3fb81828df8d943c9e48f399019c639a102ddf9070f30780c774fefc395484f2c48fc629b822401d52b346b4c38fbf4

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.19</version>
+    <version>0.4.4</version>
   </extension>
 </extensions>

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 sudo: false
 
 rvm:
-  - jruby-9.1.12.0
+  - jruby-9.2.11.1
 jdk:
-  - oraclejdk8
+  - oraclejdk11
 os:
   - linux

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+**v2.0.5**
+Bump jsoup-1.13.1 version for PiCrate-1.2.2+, JRubyArt-1.2.2+, propane-3.4.0+
+
+**v2.0.5**
+Bump jsoup-1.12.1 version for PiCrate-1.2.2+, JRubyArt-1.2.2+, propane-3.4.0+
+
+**v2.0.4**
+JRubyArt-1.6.3 and processing-3.5.3
+
+**v2.0.3**
+JRubyArt-1.4.6 and processing-3.3.6
+
+**v2.0.2**
+JRubyArt-1.4.2 and processing-3.3.5
+
+**v2.0.1**
+JRubyArt-1.3.3 and processing-3.3.4
+
+**v2.0.0**
+We now compile our own version of WordCram, which for this release is essentially the the same code as Dan Bernier (and Jonathan Feinberg cue.language), except we have dropped java-1.5 compatibility in favour of updating to JDK8. So where possible instead of using an anonymous class expression, we now use a lambda expression, and other jdk goodness. Future releases might actually include some jruby java code to compile. Update to use jsoup-1.10.2.jar
+
 **v1.0.2** Bump for processing and jsoup updates add travis
 
 **v1.0.1** Supports Placers, specifically ShapeBasedPlacer, and Observer (hence callbacks)

data/Rakefile

@@ -1,25 +1,10 @@
 require_relative 'lib/ruby_wordcram/version'
 
-def create_manifest
-  title = 'Implementation-Title: WordCram for JRubyArt and propane)'
-  version = format('Implementation-Version: %s', WordCram::VERSION)
-  File.open('MANIFEST.MF', 'w') do |f|
-    f.puts(title)
-    f.puts(version)
-    f.puts('Class-Path: jsoup-1.10.3.jar')
-  end
-end
-
-task default: [:init, :compile, :install]
-
-desc 'Create Manifest'
-task :init do
-  create_manifest
-end
+task default: [:compile, :install, :gem]
 
 desc 'Install'
 task :install do
-  sh 'mvn dependency:copy'
+	sh './mvnw dependency:copy'
   sh 'mv target/WordCram.jar lib'
 end
 
@@ -30,5 +15,5 @@ end
 
 desc 'Compile'
 task :compile do
-  sh 'mvn package'
+	sh './mvnw package'
 end

data/docs/_posts/2017-03-07-getting_started.md

@@ -7,7 +7,7 @@ categories: wordcram update
 
 ### Requirements
 
-Requires JRubyArt-1.3.0+ (hence jruby-9.1.8.0+)
+Requires JRubyArt-1.4.6+ (hence jruby-9.1.16.0+)
 
 ### Install the ruby_wordcram gem
 

data/lib/ruby_wordcram.rb

@@ -2,7 +2,7 @@
 
 if RUBY_PLATFORM == 'java'
   require 'WordCram.jar'
-  require 'jsoup-1.10.3.jar'
+  require 'jsoup-1.13.1.jar'
   wc = %w[WordAngler WordColorer WordCram WordFonter WordPlacer WordSkipReason]
   sh = %w[Colorers ImageShaper Observer Placers Word ShapeBasedPlacer]
   WC = wc.concat(sh).freeze

data/lib/ruby_wordcram/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WordCram
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.6'.freeze
 end

data/mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+        
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

data/mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

data/pom.rb

@@ -1,61 +1,66 @@
 project 'Wordcram' do
 
   model_version '4.0.0'
-  id 'wordcram:WordCram:2.0.1'
+  id 'wordcram:WordCram:2.0.6'
   packaging 'jar'
+
   description 'WordCram for JRubyArt and propane'
-  organization 'ruby-processing', 'https://ruby-processing.github.io'
-  { 'danbernier' => 'Dan Bernier', 'jdf' => 'Jonathan Feinberg', 'monkstone' => 'Martin Prout' }.each do |key, value|
-    developer key do
-      name value
-      roles 'developer'
-    end
+
+  developer 'danbernier' do
+    name 'Dan Bernier'
+    roles 'developer'
   end
 
-  properties(
-  'source.directory' => 'src',
-  'wordcram.basedir' => '${project.basedir}',
-  'polyglot.dump.pom' => 'pom.xml',
-  'maven.compiler.source' => '1.8',
-  'project.build.sourceEncoding' => 'utf-8',
-  'maven.compiler.target' => '1.8'
-  )
-
-  overrides do
-    plugin( :jar,
-    'archive' => {
-      'manifestEntries' => {
-        'Built-By' =>  'monkstone'
-      }
-      } )
-    end
-
-    jar 'org.processing:core:3.3.4'
-    jar 'org.jsoup:jsoup:1.10.3'
-
-    build do
-      default_goal 'package'
-      source_directory '${source.directory}'
-      final_name 'WordCram'
-      resource do
-        directory 'src'
-        includes
-        excludes '**/*.java'
-      end
-    end
+  developer 'jdf' do
+    name 'Jonathan Feinberg'
+    roles 'developer'
+  end
 
-    overrides do
-      plugin :resources, '2.6'
-      plugin :dependency, '2.10' do
-        execute_goals( id: 'default-cli',
-        artifactItems: [ { groupId:  'org.jsoup',
-          artifactId:  'jsoup',
-          version:  '1.10.3',
-          type:  'jar',
-          outputDirectory: '${wordcram.basedir}/lib'
-        }
-      ]
-      )
-    end
+  developer 'monkstone' do
+    name 'Martin Prout'
+    roles 'developer'
   end
-end
+
+  properties( 'source.directory' => 'src',
+              'polyglot.dump.pom' => 'pom.xml',
+              'project.build.sourceEncoding' => 'UTF-8',
+              'target.release' => '11',
+              'polyglot.dump.pom' => 'pom.xml',
+              'wordcram.basedir' => '${project.basedir}'
+            )
+
+    jar 'org.processing:core:4.0.0'
+    jar 'org.jsoup:jsoup:1.13.1'
+
+    overrides do
+      plugin( :compiler, '3.8.1',
+              'release' =>  '${target.release}' )
+      plugin( :jar, '3.2.0',
+        'archive' => {
+          'manifestEntries' => {
+            'Automatic-Module-Name' =>  'org.processing.core'
+          }
+          } )
+          plugin :resources, '2.6'
+          plugin :dependency, '2.10' do
+            execute_goals( :id => 'default-cli',
+              'artifactItems' => [ { 'groupId' =>  'org.jsoup',
+                'artifactId' =>  'jsoup',
+                'version' =>  '1.13.1',
+                'type' =>  'jar',
+                'outputDirectory' =>  '${wordcram.basedir}/lib' } ] )
+              end
+            end
+
+
+            build do
+              default_goal 'package'
+              source_directory '${source.directory}'
+              final_name 'WordCram'
+
+              resource do
+                directory 'src'
+                excludes '**/*.java'
+              end
+            end
+          end

data/pom.xml

@@ -11,13 +11,9 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>wordcram</groupId>
   <artifactId>WordCram</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.6</version>
   <name>Wordcram</name>
   <description>WordCram for JRubyArt and propane</description>
-  <organization>
-    <name>ruby-processing</name>
-    <url>https://ruby-processing.github.io</url>
-  </organization>
   <developers>
     <developer>
       <id>danbernier</id>
@@ -42,23 +38,22 @@ DO NOT MODIFIY - GENERATED CODE
     </developer>
   </developers>
   <properties>
+    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <source.directory>src</source.directory>
+    <target.release>11</target.release>
     <wordcram.basedir>${project.basedir}</wordcram.basedir>
-    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
-    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.4</version>
+      <version>4.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
-      <version>1.10.3</version>
+      <version>1.13.1</version>
     </dependency>
   </dependencies>
   <build>
@@ -75,12 +70,20 @@ DO NOT MODIFIY - GENERATED CODE
     <finalName>WordCram</finalName>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+          <configuration>
+            <release>${target.release}</release>
+          </configuration>
+        </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
           <configuration>
             <archive>
               <manifestEntries>
-                <Built-By>monkstone</Built-By>
+                <Automatic-Module-Name>org.processing.core</Automatic-Module-Name>
               </manifestEntries>
             </archive>
           </configuration>
@@ -100,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.jsoup</groupId>
                     <artifactId>jsoup</artifactId>
-                    <version>1.10.3</version>
+                    <version>1.13.1</version>
                     <type>jar</type>
                     <outputDirectory>${wordcram.basedir}/lib</outputDirectory>
                   </artifactItem>

data/ruby_wordcram.gemspec

@@ -6,11 +6,10 @@ require 'ruby_wordcram/version'
 Gem::Specification.new do |spec|
   spec.name = 'ruby_wordcram'
   spec.version = WordCram::VERSION
-  spec.has_rdoc = true
   spec.extra_rdoc_files = %w{README.md LICENSE}
   spec.summary = %q{Updated and extended WordCram library for JRubyArt and propane}
   spec.description =<<-EOS
-  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.3.3 and processing-3.4
+  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-2.5.0
   EOS
   spec.licenses = %w{Apache-2.0}
   spec.authors = %w{Dan\ Bernier Jonathan\ Feinberg  Martin\ Prout}
@@ -18,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'http://ruby-processing.github.io/WordCram/'
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.files << 'lib/WordCram.jar'
-  spec.files << 'lib/jsoup-1.10.3.jar'
+  spec.files << 'lib/jsoup-1.13.1.jar'
   spec.require_paths = ['lib']
   spec.add_development_dependency 'rake', '~> 12', '>= 12.0'
 end

data/src/wordcram/Word.java

@@ -290,6 +290,7 @@ public class Word implements Comparable {
     /**
      * Displays the word, and its weight (in parentheses).
      * <code>new Word("hello", 1.3).toString()</code> will return "hello (0.3)".
+     * @return 
      */
     @Override
     public String toString() {
@@ -309,6 +310,7 @@ public class Word implements Comparable {
     /**
      * Compares Words based on weight only. Words with equal weight are arbitrarily sorted.
      * @param w
+     * @return 
      */
     @Override
     public int compareTo(Word w) {

data/src/wordcram/WordAngler.java

@@ -16,5 +16,5 @@ public interface WordAngler {
      *            The Word that WordCram is about to draw, and wants to rotate
      * @return the rotation angle for the Word, in radians
      */
-    public float angleFor(wordcram.Word word);
+    public float angleFor(Word word);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wordcram
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.6
 platform: ruby
 authors:
 - Dan Bernier
@@ -10,30 +10,29 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
     - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
     - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
-description: "  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.3.3
-  and processing-3.4\n"
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+description: "  WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-2.5.0\n"
 email: mamba2928@yahoo.co.uk
 executables: []
 extensions: []
@@ -76,9 +75,11 @@ files:
 - example/data/MINYN___.TTF
 - example/test.rb
 - lib/WordCram.jar
-- lib/jsoup-1.10.3.jar
+- lib/jsoup-1.13.1.jar
 - lib/ruby_wordcram.rb
 - lib/ruby_wordcram/version.rb
+- mvnw
+- mvnw.cmd
 - pom.rb
 - pom.xml
 - ruby_wordcram.gemspec
@@ -187,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Updated and extended WordCram library for JRubyArt and propane