ruby_wordcram 2.0.4 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2e766b311eb43ae18d909ffef8776f654bc9f55a8593be84899f8d2ac007f18f
4
- data.tar.gz: a031afbb735326763639113ee7d803bb29fdbe8dad80e85db92c979d784eefb8
3
+ metadata.gz: 9358c60d608d2cd7dcb8be8a903bdc022098286721d58db0d4b628d8aca86a81
4
+ data.tar.gz: 50b0fb08121c1a52cfac83fa27f87b78bccb6d325cd17ee2e4d918216d1c6aef
5
5
  SHA512:
6
- metadata.gz: b1aa46543631f143fb5ab055b942640398a5879214de7a504e789181dcc4bb32feb2ba86c56255fd569c2abac350e397f4a4b5c8c1aad4ae79286aace24b924e
7
- data.tar.gz: 5540f19ce511bdf1b9a8979f2206cdd9786f634348efd0238f89d1d230be423c41e221c6d96be279dede04ae1e272b96feaab9335e6f20c2a5ca6b326dca9c16
6
+ metadata.gz: d99c7b170dcb6aad09b1e3c94d0a12cf2f73e82cebc8c366c09c6081f62a5ce471edca06a6688db5ca6b3d1dc84e567e45e89a4e1057445c98f9b54395b1ab1e
7
+ data.tar.gz: ccd9e4e26f3f35246c5451ff94bbea1a14452d78f9314c302d87972599193ece1a4cf68e11db3fbef14435cae3459df1b87d942f2ed48f925c0af764c8d9b779
data/.mvn/extensions.xml CHANGED
@@ -3,6 +3,6 @@
3
3
  <extension>
4
4
  <groupId>io.takari.polyglot</groupId>
5
5
  <artifactId>polyglot-ruby</artifactId>
6
- <version>0.4.0</version>
6
+ <version>0.4.6</version>
7
7
  </extension>
8
8
  </extensions>
@@ -1 +1,2 @@
1
- distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip
1
+ distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
2
+ wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
data/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ **v2.1.0**
2
+ Bump jsoup-1.14.2 version
3
+
4
+ **v2.1.0**
5
+ for PiCrate-2.4.0+, JRubyArt-2.5.0+, propane-3.10.0+
6
+
7
+ **v2.0.6**
8
+ Bump jsoup-1.13.1 version
9
+
10
+ **v2.0.5**
11
+ Bump jsoup-1.12.1 version for PiCrate-1.2.2+, JRubyArt-1.2.2+, propane-3.4.0+
12
+
1
13
  **v2.0.4**
2
14
  JRubyArt-1.6.3 and processing-3.5.3
3
15
 
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # Ruby Word Cram
2
2
 
3
- [![Gem Version](https://badge.fury.io/rb/ruby_wordcram.svg)](https://badge.fury.io/rb/ruby_wordcram) [![Travis CI](https://travis-ci.org/ruby-processing/WordCram.svg)](https://travis-ci.org/ruby-processing/WordCram)
3
+ [![Gem Version](https://badge.fury.io/rb/ruby_wordcram.svg)](https://badge.fury.io/rb/ruby_wordcram)
4
4
 
5
5
  A gem wrapper for the WordCram library
6
6
 
data/Rakefile CHANGED
@@ -1,25 +1,10 @@
1
1
  require_relative 'lib/ruby_wordcram/version'
2
2
 
3
- def create_manifest
4
- title = 'Implementation-Title: WordCram for JRubyArt and propane)'
5
- version = format('Implementation-Version: %s', WordCram::VERSION)
6
- File.open('MANIFEST.MF', 'w') do |f|
7
- f.puts(title)
8
- f.puts(version)
9
- f.puts('Class-Path: jsoup-1.10.3.jar')
10
- end
11
- end
12
-
13
- task default: [:init, :compile, :install]
14
-
15
- desc 'Create Manifest'
16
- task :init do
17
- create_manifest
18
- end
3
+ task default: [:compile, :install, :gem]
19
4
 
20
5
  desc 'Install'
21
6
  task :install do
22
- sh 'mvn dependency:copy'
7
+ sh './mvnw dependency:copy'
23
8
  sh 'mv target/WordCram.jar lib'
24
9
  end
25
10
 
@@ -30,5 +15,5 @@ end
30
15
 
31
16
  desc 'Compile'
32
17
  task :compile do
33
- sh 'mvn package'
18
+ sh './mvnw package'
34
19
  end
data/lib/WordCram.jar CHANGED
Binary file
Binary file
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module WordCram
4
- VERSION = '2.0.4'.freeze
4
+ VERSION = '2.1.1'.freeze
5
5
  end
data/lib/ruby_wordcram.rb CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  if RUBY_PLATFORM == 'java'
4
4
  require 'WordCram.jar'
5
- require 'jsoup-1.10.3.jar'
5
+ require 'jsoup-1.14.2.jar'
6
6
  wc = %w[WordAngler WordColorer WordCram WordFonter WordPlacer WordSkipReason]
7
7
  sh = %w[Colorers ImageShaper Observer Placers Word ShapeBasedPlacer]
8
8
  WC = wc.concat(sh).freeze
data/mvnw ADDED
@@ -0,0 +1,310 @@
1
+ #!/bin/sh
2
+ # ----------------------------------------------------------------------------
3
+ # Licensed to the Apache Software Foundation (ASF) under one
4
+ # or more contributor license agreements. See the NOTICE file
5
+ # distributed with this work for additional information
6
+ # regarding copyright ownership. The ASF licenses this file
7
+ # to you under the Apache License, Version 2.0 (the
8
+ # "License"); you may not use this file except in compliance
9
+ # with the License. You may obtain a copy of the License at
10
+ #
11
+ # http://www.apache.org/licenses/LICENSE-2.0
12
+ #
13
+ # Unless required by applicable law or agreed to in writing,
14
+ # software distributed under the License is distributed on an
15
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16
+ # KIND, either express or implied. See the License for the
17
+ # specific language governing permissions and limitations
18
+ # under the License.
19
+ # ----------------------------------------------------------------------------
20
+
21
+ # ----------------------------------------------------------------------------
22
+ # Maven2 Start Up Batch script
23
+ #
24
+ # Required ENV vars:
25
+ # ------------------
26
+ # JAVA_HOME - location of a JDK home dir
27
+ #
28
+ # Optional ENV vars
29
+ # -----------------
30
+ # M2_HOME - location of maven2's installed home dir
31
+ # MAVEN_OPTS - parameters passed to the Java VM when running Maven
32
+ # e.g. to debug Maven itself, use
33
+ # set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
34
+ # MAVEN_SKIP_RC - flag to disable loading of mavenrc files
35
+ # ----------------------------------------------------------------------------
36
+
37
+ if [ -z "$MAVEN_SKIP_RC" ] ; then
38
+
39
+ if [ -f /etc/mavenrc ] ; then
40
+ . /etc/mavenrc
41
+ fi
42
+
43
+ if [ -f "$HOME/.mavenrc" ] ; then
44
+ . "$HOME/.mavenrc"
45
+ fi
46
+
47
+ fi
48
+
49
+ # OS specific support. $var _must_ be set to either true or false.
50
+ cygwin=false;
51
+ darwin=false;
52
+ mingw=false
53
+ case "`uname`" in
54
+ CYGWIN*) cygwin=true ;;
55
+ MINGW*) mingw=true;;
56
+ Darwin*) darwin=true
57
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
58
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
59
+ if [ -z "$JAVA_HOME" ]; then
60
+ if [ -x "/usr/libexec/java_home" ]; then
61
+ export JAVA_HOME="`/usr/libexec/java_home`"
62
+ else
63
+ export JAVA_HOME="/Library/Java/Home"
64
+ fi
65
+ fi
66
+ ;;
67
+ esac
68
+
69
+ if [ -z "$JAVA_HOME" ] ; then
70
+ if [ -r /etc/gentoo-release ] ; then
71
+ JAVA_HOME=`java-config --jre-home`
72
+ fi
73
+ fi
74
+
75
+ if [ -z "$M2_HOME" ] ; then
76
+ ## resolve links - $0 may be a link to maven's home
77
+ PRG="$0"
78
+
79
+ # need this for relative symlinks
80
+ while [ -h "$PRG" ] ; do
81
+ ls=`ls -ld "$PRG"`
82
+ link=`expr "$ls" : '.*-> \(.*\)$'`
83
+ if expr "$link" : '/.*' > /dev/null; then
84
+ PRG="$link"
85
+ else
86
+ PRG="`dirname "$PRG"`/$link"
87
+ fi
88
+ done
89
+
90
+ saveddir=`pwd`
91
+
92
+ M2_HOME=`dirname "$PRG"`/..
93
+
94
+ # make it fully qualified
95
+ M2_HOME=`cd "$M2_HOME" && pwd`
96
+
97
+ cd "$saveddir"
98
+ # echo Using m2 at $M2_HOME
99
+ fi
100
+
101
+ # For Cygwin, ensure paths are in UNIX format before anything is touched
102
+ if $cygwin ; then
103
+ [ -n "$M2_HOME" ] &&
104
+ M2_HOME=`cygpath --unix "$M2_HOME"`
105
+ [ -n "$JAVA_HOME" ] &&
106
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
107
+ [ -n "$CLASSPATH" ] &&
108
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
109
+ fi
110
+
111
+ # For Mingw, ensure paths are in UNIX format before anything is touched
112
+ if $mingw ; then
113
+ [ -n "$M2_HOME" ] &&
114
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
115
+ [ -n "$JAVA_HOME" ] &&
116
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
117
+ fi
118
+
119
+ if [ -z "$JAVA_HOME" ]; then
120
+ javaExecutable="`which javac`"
121
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
122
+ # readlink(1) is not available as standard on Solaris 10.
123
+ readLink=`which readlink`
124
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
125
+ if $darwin ; then
126
+ javaHome="`dirname \"$javaExecutable\"`"
127
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
128
+ else
129
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
130
+ fi
131
+ javaHome="`dirname \"$javaExecutable\"`"
132
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
133
+ JAVA_HOME="$javaHome"
134
+ export JAVA_HOME
135
+ fi
136
+ fi
137
+ fi
138
+
139
+ if [ -z "$JAVACMD" ] ; then
140
+ if [ -n "$JAVA_HOME" ] ; then
141
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
142
+ # IBM's JDK on AIX uses strange locations for the executables
143
+ JAVACMD="$JAVA_HOME/jre/sh/java"
144
+ else
145
+ JAVACMD="$JAVA_HOME/bin/java"
146
+ fi
147
+ else
148
+ JAVACMD="`which java`"
149
+ fi
150
+ fi
151
+
152
+ if [ ! -x "$JAVACMD" ] ; then
153
+ echo "Error: JAVA_HOME is not defined correctly." >&2
154
+ echo " We cannot execute $JAVACMD" >&2
155
+ exit 1
156
+ fi
157
+
158
+ if [ -z "$JAVA_HOME" ] ; then
159
+ echo "Warning: JAVA_HOME environment variable is not set."
160
+ fi
161
+
162
+ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
163
+
164
+ # traverses directory structure from process work directory to filesystem root
165
+ # first directory with .mvn subdirectory is considered project base directory
166
+ find_maven_basedir() {
167
+
168
+ if [ -z "$1" ]
169
+ then
170
+ echo "Path not specified to find_maven_basedir"
171
+ return 1
172
+ fi
173
+
174
+ basedir="$1"
175
+ wdir="$1"
176
+ while [ "$wdir" != '/' ] ; do
177
+ if [ -d "$wdir"/.mvn ] ; then
178
+ basedir=$wdir
179
+ break
180
+ fi
181
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
182
+ if [ -d "${wdir}" ]; then
183
+ wdir=`cd "$wdir/.."; pwd`
184
+ fi
185
+ # end of workaround
186
+ done
187
+ echo "${basedir}"
188
+ }
189
+
190
+ # concatenates all lines of a file
191
+ concat_lines() {
192
+ if [ -f "$1" ]; then
193
+ echo "$(tr -s '\n' ' ' < "$1")"
194
+ fi
195
+ }
196
+
197
+ BASE_DIR=`find_maven_basedir "$(pwd)"`
198
+ if [ -z "$BASE_DIR" ]; then
199
+ exit 1;
200
+ fi
201
+
202
+ ##########################################################################################
203
+ # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
204
+ # This allows using the maven wrapper in projects that prohibit checking in binary data.
205
+ ##########################################################################################
206
+ if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
207
+ if [ "$MVNW_VERBOSE" = true ]; then
208
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
209
+ fi
210
+ else
211
+ if [ "$MVNW_VERBOSE" = true ]; then
212
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
213
+ fi
214
+ if [ -n "$MVNW_REPOURL" ]; then
215
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
216
+ else
217
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
218
+ fi
219
+ while IFS="=" read key value; do
220
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
221
+ esac
222
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
223
+ if [ "$MVNW_VERBOSE" = true ]; then
224
+ echo "Downloading from: $jarUrl"
225
+ fi
226
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
227
+ if $cygwin; then
228
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
229
+ fi
230
+
231
+ if command -v wget > /dev/null; then
232
+ if [ "$MVNW_VERBOSE" = true ]; then
233
+ echo "Found wget ... using wget"
234
+ fi
235
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
236
+ wget "$jarUrl" -O "$wrapperJarPath"
237
+ else
238
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
239
+ fi
240
+ elif command -v curl > /dev/null; then
241
+ if [ "$MVNW_VERBOSE" = true ]; then
242
+ echo "Found curl ... using curl"
243
+ fi
244
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
245
+ curl -o "$wrapperJarPath" "$jarUrl" -f
246
+ else
247
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
248
+ fi
249
+
250
+ else
251
+ if [ "$MVNW_VERBOSE" = true ]; then
252
+ echo "Falling back to using Java to download"
253
+ fi
254
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
255
+ # For Cygwin, switch paths to Windows format before running javac
256
+ if $cygwin; then
257
+ javaClass=`cygpath --path --windows "$javaClass"`
258
+ fi
259
+ if [ -e "$javaClass" ]; then
260
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
261
+ if [ "$MVNW_VERBOSE" = true ]; then
262
+ echo " - Compiling MavenWrapperDownloader.java ..."
263
+ fi
264
+ # Compiling the Java class
265
+ ("$JAVA_HOME/bin/javac" "$javaClass")
266
+ fi
267
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
268
+ # Running the downloader
269
+ if [ "$MVNW_VERBOSE" = true ]; then
270
+ echo " - Running MavenWrapperDownloader.java ..."
271
+ fi
272
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
273
+ fi
274
+ fi
275
+ fi
276
+ fi
277
+ ##########################################################################################
278
+ # End of extension
279
+ ##########################################################################################
280
+
281
+ export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
282
+ if [ "$MVNW_VERBOSE" = true ]; then
283
+ echo $MAVEN_PROJECTBASEDIR
284
+ fi
285
+ MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
286
+
287
+ # For Cygwin, switch paths to Windows format before running java
288
+ if $cygwin; then
289
+ [ -n "$M2_HOME" ] &&
290
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
291
+ [ -n "$JAVA_HOME" ] &&
292
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
293
+ [ -n "$CLASSPATH" ] &&
294
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
295
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
296
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
297
+ fi
298
+
299
+ # Provide a "standardized" way to retrieve the CLI args that will
300
+ # work with both Windows and non-Windows executions.
301
+ MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
302
+ export MAVEN_CMD_LINE_ARGS
303
+
304
+ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
305
+
306
+ exec "$JAVACMD" \
307
+ $MAVEN_OPTS \
308
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
309
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
310
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
data/mvnw.cmd ADDED
@@ -0,0 +1,182 @@
1
+ @REM ----------------------------------------------------------------------------
2
+ @REM Licensed to the Apache Software Foundation (ASF) under one
3
+ @REM or more contributor license agreements. See the NOTICE file
4
+ @REM distributed with this work for additional information
5
+ @REM regarding copyright ownership. The ASF licenses this file
6
+ @REM to you under the Apache License, Version 2.0 (the
7
+ @REM "License"); you may not use this file except in compliance
8
+ @REM with the License. You may obtain a copy of the License at
9
+ @REM
10
+ @REM http://www.apache.org/licenses/LICENSE-2.0
11
+ @REM
12
+ @REM Unless required by applicable law or agreed to in writing,
13
+ @REM software distributed under the License is distributed on an
14
+ @REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15
+ @REM KIND, either express or implied. See the License for the
16
+ @REM specific language governing permissions and limitations
17
+ @REM under the License.
18
+ @REM ----------------------------------------------------------------------------
19
+
20
+ @REM ----------------------------------------------------------------------------
21
+ @REM Maven2 Start Up Batch script
22
+ @REM
23
+ @REM Required ENV vars:
24
+ @REM JAVA_HOME - location of a JDK home dir
25
+ @REM
26
+ @REM Optional ENV vars
27
+ @REM M2_HOME - location of maven2's installed home dir
28
+ @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
29
+ @REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
30
+ @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
31
+ @REM e.g. to debug Maven itself, use
32
+ @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
33
+ @REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
34
+ @REM ----------------------------------------------------------------------------
35
+
36
+ @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
37
+ @echo off
38
+ @REM set title of command window
39
+ title %0
40
+ @REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
41
+ @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
42
+
43
+ @REM set %HOME% to equivalent of $HOME
44
+ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
45
+
46
+ @REM Execute a user defined script before this one
47
+ if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
48
+ @REM check for pre script, once with legacy .bat ending and once with .cmd ending
49
+ if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
50
+ if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
51
+ :skipRcPre
52
+
53
+ @setlocal
54
+
55
+ set ERROR_CODE=0
56
+
57
+ @REM To isolate internal variables from possible post scripts, we use another setlocal
58
+ @setlocal
59
+
60
+ @REM ==== START VALIDATION ====
61
+ if not "%JAVA_HOME%" == "" goto OkJHome
62
+
63
+ echo.
64
+ echo Error: JAVA_HOME not found in your environment. >&2
65
+ echo Please set the JAVA_HOME variable in your environment to match the >&2
66
+ echo location of your Java installation. >&2
67
+ echo.
68
+ goto error
69
+
70
+ :OkJHome
71
+ if exist "%JAVA_HOME%\bin\java.exe" goto init
72
+
73
+ echo.
74
+ echo Error: JAVA_HOME is set to an invalid directory. >&2
75
+ echo JAVA_HOME = "%JAVA_HOME%" >&2
76
+ echo Please set the JAVA_HOME variable in your environment to match the >&2
77
+ echo location of your Java installation. >&2
78
+ echo.
79
+ goto error
80
+
81
+ @REM ==== END VALIDATION ====
82
+
83
+ :init
84
+
85
+ @REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
86
+ @REM Fallback to current working directory if not found.
87
+
88
+ set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
89
+ IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
90
+
91
+ set EXEC_DIR=%CD%
92
+ set WDIR=%EXEC_DIR%
93
+ :findBaseDir
94
+ IF EXIST "%WDIR%"\.mvn goto baseDirFound
95
+ cd ..
96
+ IF "%WDIR%"=="%CD%" goto baseDirNotFound
97
+ set WDIR=%CD%
98
+ goto findBaseDir
99
+
100
+ :baseDirFound
101
+ set MAVEN_PROJECTBASEDIR=%WDIR%
102
+ cd "%EXEC_DIR%"
103
+ goto endDetectBaseDir
104
+
105
+ :baseDirNotFound
106
+ set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
107
+ cd "%EXEC_DIR%"
108
+
109
+ :endDetectBaseDir
110
+
111
+ IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
112
+
113
+ @setlocal EnableExtensions EnableDelayedExpansion
114
+ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
115
+ @endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
116
+
117
+ :endReadAdditionalConfig
118
+
119
+ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
120
+ set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
121
+ set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
122
+
123
+ set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
124
+
125
+ FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
126
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
127
+ )
128
+
129
+ @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
130
+ @REM This allows using the maven wrapper in projects that prohibit checking in binary data.
131
+ if exist %WRAPPER_JAR% (
132
+ if "%MVNW_VERBOSE%" == "true" (
133
+ echo Found %WRAPPER_JAR%
134
+ )
135
+ ) else (
136
+ if not "%MVNW_REPOURL%" == "" (
137
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
138
+ )
139
+ if "%MVNW_VERBOSE%" == "true" (
140
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
141
+ echo Downloading from: %DOWNLOAD_URL%
142
+ )
143
+
144
+ powershell -Command "&{"^
145
+ "$webclient = new-object System.Net.WebClient;"^
146
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
147
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
148
+ "}"^
149
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
150
+ "}"
151
+ if "%MVNW_VERBOSE%" == "true" (
152
+ echo Finished downloading %WRAPPER_JAR%
153
+ )
154
+ )
155
+ @REM End of extension
156
+
157
+ @REM Provide a "standardized" way to retrieve the CLI args that will
158
+ @REM work with both Windows and non-Windows executions.
159
+ set MAVEN_CMD_LINE_ARGS=%*
160
+
161
+ %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
162
+ if ERRORLEVEL 1 goto error
163
+ goto end
164
+
165
+ :error
166
+ set ERROR_CODE=1
167
+
168
+ :end
169
+ @endlocal & set ERROR_CODE=%ERROR_CODE%
170
+
171
+ if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
172
+ @REM check for post script, once with legacy .bat ending and once with .cmd ending
173
+ if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
174
+ if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
175
+ :skipRcPost
176
+
177
+ @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
178
+ if "%MAVEN_BATCH_PAUSE%" == "on" pause
179
+
180
+ if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
181
+
182
+ exit /B %ERROR_CODE%
data/pom.rb CHANGED
@@ -1,61 +1,66 @@
1
1
  project 'Wordcram' do
2
2
 
3
3
  model_version '4.0.0'
4
- id 'wordcram:WordCram:2.0.4'
4
+ id 'wordcram:WordCram:2.1.1'
5
5
  packaging 'jar'
6
- description 'WordCram for JRubyArt and propane'
7
- organization 'ruby-processing', 'https://ruby-processing.github.io'
8
- { 'danbernier' => 'Dan Bernier', 'jdf' => 'Jonathan Feinberg', 'monkstone' => 'Martin Prout' }.each do |key, value|
9
- developer key do
10
- name value
11
- roles 'developer'
12
- end
6
+
7
+ description 'WordCram for JRubyArt, PiCrate and propane'
8
+
9
+ developer 'danbernier' do
10
+ name 'Dan Bernier'
11
+ roles 'developer'
13
12
  end
14
13
 
15
- properties(
16
- 'source.directory' => 'src',
17
- 'wordcram.basedir' => '${project.basedir}',
18
- 'polyglot.dump.pom' => 'pom.xml',
19
- 'maven.compiler.source' => '1.8',
20
- 'project.build.sourceEncoding' => 'utf-8',
21
- 'maven.compiler.target' => '1.8'
22
- )
23
-
24
- overrides do
25
- plugin( :jar,
26
- 'archive' => {
27
- 'manifestEntries' => {
28
- 'Built-By' => 'monkstone'
29
- }
30
- } )
31
- end
32
-
33
- jar 'org.processing:core:3.3.6'
34
- jar 'org.jsoup:jsoup:1.10.3'
35
-
36
- build do
37
- default_goal 'package'
38
- source_directory '${source.directory}'
39
- final_name 'WordCram'
40
- resource do
41
- directory 'src'
42
- includes
43
- excludes '**/*.java'
44
- end
45
- end
14
+ developer 'jdf' do
15
+ name 'Jonathan Feinberg'
16
+ roles 'developer'
17
+ end
46
18
 
47
- overrides do
48
- plugin :resources, '2.6'
49
- plugin :dependency, '2.10' do
50
- execute_goals( id: 'default-cli',
51
- artifactItems: [ { groupId: 'org.jsoup',
52
- artifactId: 'jsoup',
53
- version: '1.10.3',
54
- type: 'jar',
55
- outputDirectory: '${wordcram.basedir}/lib'
56
- }
57
- ]
58
- )
59
- end
19
+ developer 'monkstone' do
20
+ name 'Martin Prout'
21
+ roles 'developer'
60
22
  end
61
- end
23
+
24
+ properties( 'source.directory' => 'src',
25
+ 'polyglot.dump.pom' => 'pom.xml',
26
+ 'project.build.sourceEncoding' => 'UTF-8',
27
+ 'target.release' => '11',
28
+ 'polyglot.dump.pom' => 'pom.xml',
29
+ 'wordcram.basedir' => '${project.basedir}'
30
+ )
31
+
32
+ jar 'org.processing:core:4.0.0'
33
+ jar 'org.jsoup:jsoup:1.14.2'
34
+
35
+ overrides do
36
+ plugin( :compiler, '3.8.1',
37
+ 'release' => '${target.release}' )
38
+ plugin( :jar, '3.2.0',
39
+ 'archive' => {
40
+ 'manifestEntries' => {
41
+ 'Automatic-Module-Name' => 'org.processing.core'
42
+ }
43
+ } )
44
+ plugin :resources, '2.6'
45
+ plugin :dependency, '2.10' do
46
+ execute_goals( :id => 'default-cli',
47
+ 'artifactItems' => [ { 'groupId' => 'org.jsoup',
48
+ 'artifactId' => 'jsoup',
49
+ 'version' => '1.14.2',
50
+ 'type' => 'jar',
51
+ 'outputDirectory' => '${wordcram.basedir}/lib' } ] )
52
+ end
53
+ end
54
+
55
+
56
+ build do
57
+ default_goal 'package'
58
+ source_directory '${source.directory}'
59
+ final_name 'WordCram'
60
+
61
+ resource do
62
+ directory 'src'
63
+ excludes '**/*.java'
64
+ end
65
+ end
66
+ end
data/pom.xml CHANGED
@@ -2,22 +2,18 @@
2
2
  <!--
3
3
 
4
4
 
5
- DO NOT MODIFIY - GENERATED CODE
5
+ DO NOT MODIFY - GENERATED CODE
6
6
 
7
7
 
8
8
  -->
9
- <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
9
+ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
10
10
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
11
11
  <modelVersion>4.0.0</modelVersion>
12
12
  <groupId>wordcram</groupId>
13
13
  <artifactId>WordCram</artifactId>
14
- <version>2.0.4</version>
14
+ <version>2.1.1</version>
15
15
  <name>Wordcram</name>
16
- <description>WordCram for JRubyArt and propane</description>
17
- <organization>
18
- <name>ruby-processing</name>
19
- <url>https://ruby-processing.github.io</url>
20
- </organization>
16
+ <description>WordCram for JRubyArt, PiCrate and propane</description>
21
17
  <developers>
22
18
  <developer>
23
19
  <id>danbernier</id>
@@ -42,23 +38,22 @@ DO NOT MODIFIY - GENERATED CODE
42
38
  </developer>
43
39
  </developers>
44
40
  <properties>
45
- <maven.compiler.source>1.8</maven.compiler.source>
46
- <maven.compiler.target>1.8</maven.compiler.target>
47
41
  <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
48
- <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
42
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
49
43
  <source.directory>src</source.directory>
44
+ <target.release>11</target.release>
50
45
  <wordcram.basedir>${project.basedir}</wordcram.basedir>
51
46
  </properties>
52
47
  <dependencies>
53
48
  <dependency>
54
49
  <groupId>org.processing</groupId>
55
50
  <artifactId>core</artifactId>
56
- <version>3.3.6</version>
51
+ <version>4.0.0</version>
57
52
  </dependency>
58
53
  <dependency>
59
54
  <groupId>org.jsoup</groupId>
60
55
  <artifactId>jsoup</artifactId>
61
- <version>1.10.3</version>
56
+ <version>1.14.2</version>
62
57
  </dependency>
63
58
  </dependencies>
64
59
  <build>
@@ -75,12 +70,20 @@ DO NOT MODIFIY - GENERATED CODE
75
70
  <finalName>WordCram</finalName>
76
71
  <pluginManagement>
77
72
  <plugins>
73
+ <plugin>
74
+ <artifactId>maven-compiler-plugin</artifactId>
75
+ <version>3.8.1</version>
76
+ <configuration>
77
+ <release>${target.release}</release>
78
+ </configuration>
79
+ </plugin>
78
80
  <plugin>
79
81
  <artifactId>maven-jar-plugin</artifactId>
82
+ <version>3.2.0</version>
80
83
  <configuration>
81
84
  <archive>
82
85
  <manifestEntries>
83
- <Built-By>monkstone</Built-By>
86
+ <Automatic-Module-Name>org.processing.core</Automatic-Module-Name>
84
87
  </manifestEntries>
85
88
  </archive>
86
89
  </configuration>
@@ -100,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
100
103
  <artifactItem>
101
104
  <groupId>org.jsoup</groupId>
102
105
  <artifactId>jsoup</artifactId>
103
- <version>1.10.3</version>
106
+ <version>1.14.2</version>
104
107
  <type>jar</type>
105
108
  <outputDirectory>${wordcram.basedir}/lib</outputDirectory>
106
109
  </artifactItem>
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
9
9
  spec.extra_rdoc_files = %w{README.md LICENSE}
10
10
  spec.summary = %q{Updated and extended WordCram library for JRubyArt and propane}
11
11
  spec.description =<<-EOS
12
- WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.6.3 and processing-3.5.3
12
+ WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-2.5.8
13
13
  EOS
14
14
  spec.licenses = %w{Apache-2.0}
15
15
  spec.authors = %w{Dan\ Bernier Jonathan\ Feinberg Martin\ Prout}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
17
17
  spec.homepage = 'http://ruby-processing.github.io/WordCram/'
18
18
  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
19
19
  spec.files << 'lib/WordCram.jar'
20
- spec.files << 'lib/jsoup-1.10.3.jar'
20
+ spec.files << 'lib/jsoup-1.14.2.jar'
21
21
  spec.require_paths = ['lib']
22
- spec.add_development_dependency 'rake', '~> 12', '>= 12.0'
22
+ spec.add_development_dependency 'rake', '~> 13', '>= 13.0'
23
23
  end
@@ -52,7 +52,7 @@ public class SentenceIterator extends IterableText {
52
52
  }
53
53
 
54
54
  private static final Pattern ABBREVS = Pattern
55
- .compile("(?:Mrs?|Ms|Dr|Rev)\\.\\s*$");
55
+ .compile("(?:Mrs?|Ms|Dr|Rev|e.g|i.e)\\.\\s*$");
56
56
 
57
57
  private void advance() {
58
58
  start = end;
@@ -271,7 +271,7 @@ public class WordCram {
271
271
 
272
272
  /**
273
273
  * Make a WordCram from the text in any elements on a web page that match the
274
- * <tt>cssSelector</tt>.
274
+ * <b>cssSelector</b>.
275
275
  * Just before the WordCram is drawn, it'll load the web page's HTML, scrape
276
276
  * out the text, and count and sort the words.
277
277
  *
@@ -303,7 +303,7 @@ public class WordCram {
303
303
 
304
304
  /**
305
305
  * Make a WordCram from the text in any elements on a web page that match the
306
- * <tt>cssSelector</tt>.
306
+ * <b>cssSelector</b>.
307
307
  * Just before the WordCram is drawn, it'll load the file's HTML, scrape out the text,
308
308
  * and count and sort the words.
309
309
  *
@@ -709,6 +709,7 @@ public class WordCram {
709
709
  * @param canvas the canvas to draw to
710
710
  * @return The WordCram, for further setup or drawing.
711
711
  */
712
+ @Deprecated
712
713
  public WordCram withCustomCanvas(PGraphics canvas) {
713
714
  return toCanvas(canvas);
714
715
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby_wordcram
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dan Bernier
@@ -10,30 +10,29 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2019-03-25 00:00:00.000000000 Z
13
+ date: 2021-08-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rake
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - ">="
20
- - !ruby/object:Gem::Version
21
- version: '12.0'
22
19
  - - "~>"
23
20
  - !ruby/object:Gem::Version
24
- version: '12'
21
+ version: '13'
22
+ - - ">="
23
+ - !ruby/object:Gem::Version
24
+ version: '13.0'
25
25
  type: :development
26
26
  prerelease: false
27
27
  version_requirements: !ruby/object:Gem::Requirement
28
28
  requirements:
29
- - - ">="
30
- - !ruby/object:Gem::Version
31
- version: '12.0'
32
29
  - - "~>"
33
30
  - !ruby/object:Gem::Version
34
- version: '12'
35
- description: " WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-1.6.3
36
- and processing-3.5.3\n"
31
+ version: '13'
32
+ - - ">="
33
+ - !ruby/object:Gem::Version
34
+ version: '13.0'
35
+ description: " WordCram library wrapped in a rubygem. Compiled and tested with JRubyArt-2.5.8\n"
37
36
  email: mamba2928@yahoo.co.uk
38
37
  executables: []
39
38
  extensions: []
@@ -44,7 +43,6 @@ files:
44
43
  - ".gitignore"
45
44
  - ".mvn/extensions.xml"
46
45
  - ".mvn/wrapper/maven-wrapper.properties"
47
- - ".travis.yml"
48
46
  - CHANGELOG.md
49
47
  - LICENSE
50
48
  - README.md
@@ -76,9 +74,11 @@ files:
76
74
  - example/data/MINYN___.TTF
77
75
  - example/test.rb
78
76
  - lib/WordCram.jar
79
- - lib/jsoup-1.10.3.jar
77
+ - lib/jsoup-1.14.2.jar
80
78
  - lib/ruby_wordcram.rb
81
79
  - lib/ruby_wordcram/version.rb
80
+ - mvnw
81
+ - mvnw.cmd
82
82
  - pom.rb
83
83
  - pom.xml
84
84
  - ruby_wordcram.gemspec
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
187
187
  - !ruby/object:Gem::Version
188
188
  version: '0'
189
189
  requirements: []
190
- rubygems_version: 3.0.3
190
+ rubygems_version: 3.1.2
191
191
  signing_key:
192
192
  specification_version: 4
193
193
  summary: Updated and extended WordCram library for JRubyArt and propane
data/.travis.yml DELETED
@@ -1,9 +0,0 @@
1
- language: ruby
2
- sudo: false
3
-
4
- rvm:
5
- - jruby-9.1.12.0
6
- jdk:
7
- - oraclejdk8
8
- os:
9
- - linux
data/lib/jsoup-1.10.3.jar DELETED
Binary file