gravitext-util 1.5.1-java → 1.6.b.0-java

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.6.b.0 (2012-1-29)
+* New jruby IOUtils, sample extension, and perf test for optimizing
+  text-intensive interop.
+* Simplify naming with PerfTest::BlockTestFactory
+* Narrow to slf4j ~> 1.6.1, logback ~> 1.0
+* Upgrade to tarpit ~> 2.0, bundler Gemfile, gemspec (dev)
+
 === 1.5.1 (2011-10-1)
 * Add ArrayHTMap.toString that is cycle aware, avoids stack overflow
   on value loops.

data/Manifest.txt

@@ -4,13 +4,16 @@ NOTICE.txt
 README.rdoc
 Rakefile
 pom.xml
+bin/gravitext-ioutil-perftest
 bin/gravitext-perftest
 lib/gravitext-util/version.rb
 lib/gravitext-util.rb
 lib/gravitext-util/concurrent.rb
 lib/gravitext-util/perftest.rb
 lib/gravitext-util/unimap.rb
+test/setup.rb
 test/test_concurrent.rb
+test/test_ioutils.rb
 test/test_perftest.rb
 test/test_unimap.rb
-lib/gravitext-util/gravitext-util-1.5.1.jar
+lib/gravitext-util/gravitext-util-1.6.b.0.jar

data/NOTICE.txt

@@ -1,2 +1,2 @@
 gravitext-util
-Copyright (c) 2007-2011 David Kellum
+Copyright (c) 2007-2012 David Kellum

data/README.rdoc

@@ -28,7 +28,7 @@ A collection of core java utilities, many with jruby adaptions:
 
 == License
 
-Copyright (c) 2007-2011 David Kellum
+Copyright (c) 2007-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -1,41 +1,7 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-require 'gravitext-util/version'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.4'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-t = RJack::TarPit.new( 'gravitext-util',
-                       Gravitext::Util::VERSION,
-                       :no_assembly, :java_platform )
-
-t.specify do |h|
-  h.developer( "David Kellum", "dek-oss@gravitext.com" )
-
-  h.testlib = :minitest
-  h.extra_dev_deps += [ [ 'rjack-slf4j',   '>= 1.5.8',  '< 1.7' ],
-                        [ 'rjack-logback', '>= 0.9.18', '< 2.0' ],
-                        [ 'minitest',      '~> 2.3'             ] ]
-
-  h.rubyforge_name = "gravitext"
-end
-
-file 'Manifest.txt' => [ 'lib/gravitext-util/version.rb' ]
-
-task :check_pom_version do
-  t.test_line_match( 'pom.xml', /<version>/, /#{t.version}/ )
-end
-task :check_history_version do
-  t.test_line_match( 'History.rdoc', /^==/, / #{t.version} / )
-end
-task :check_history_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :check_pom_version, :check_history_version                      ]
-task :tag  => [ :check_pom_version, :check_history_version, :check_history_date ]
-task :push => [                                             :check_history_date ]
-
-t.define_tasks
+RJack::TarPit.new( 'gravitext-util' ).define_tasks

data/bin/gravitext-ioutil-perftest

@@ -0,0 +1,150 @@
+#!/usr/bin/env jruby
+# -*- ruby -*-
+#--
+# Copyright (c) 2012 David Kellum
+#
+# Licensed 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.
+#++
+
+$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
+
+require 'gravitext-util'
+require 'gravitext-util/perftest'
+
+require 'java'
+
+# Magic loader hook -> IOTestService
+require 'com/gravitext/jruby/IOTest'
+
+class IOUtilsPerfTest
+  include Gravitext
+  include Gravitext::Util
+  include Gravitext::Concurrent
+
+  import 'com.gravitext.jruby.TextSampler'
+
+  def run( length = 0 )
+    #FIXME: passed length not used
+
+    puts "(1) Full set of tests, length 103 characters"
+    PerfTest::Harness.new( create_tests( 103, true ) ).execute
+
+    puts
+    puts "(2) Main tests, varied lengths"
+    tests = [ 8, 79, 271, 997, 3413, 9833 ].map { |l| create_tests( l ) }.flatten
+    h2 = PerfTest::Harness.new( tests )
+
+    # Relax warmup, as we ran it all already
+    h2.warmup_exec_target = 1.0
+    h2.warmup_total_target = 5.0
+    h2.warmup_tolerance = 0.2
+    h2.execute
+
+  end
+
+  def create_tests( length, extras = false )
+    tests = []
+
+    reps = 1000
+
+    tests << perf_test_raw( length, 'string' ) do |ts|
+      i = 0
+      reps.times { i += ts.string.to_s.length }
+      i
+    end
+
+    tests << perf_test_raw( length, 'string_sequence' ) do |ts|
+      i = 0
+      reps.times { i += ts.string_sequence.to_s.length }
+      i
+    end if extras
+
+    tests << perf_test_ext( length, 'string' ) do |ts|
+      i = 0
+      reps.times { i += ts.string_to_ruby.to_s.length }
+      i
+    end
+
+    tests << perf_test_helper( length, 'string' ) do |ts,rs|
+      i = 0
+      reps.times { i += rs.string_to_ruby( ts ).to_s.length }
+      i
+    end
+
+    tests << perf_test_raw( length, 'bytes' ) do |ts|
+      i = 0
+      reps.times { i += String.from_java_bytes( ts.bytes ).length }
+      i
+    end if extras
+
+    tests << perf_test_raw( length, 'char_buffer' ) do |ts|
+      i = 0
+      reps.times { i += ts.char_buffer.to_s.length }
+      i
+    end
+
+    tests << perf_test_raw( length, 'char_buffer_sequence' ) do |ts|
+      i = 0
+      reps.times { i += ts.char_buffer_sequence.to_s.length }
+      i
+    end if extras
+
+    tests << perf_test_ext( length, 'char_buffer' ) do |ts|
+      i = 0
+      reps.times { i += ts.char_buffer_to_ruby.to_s.length }
+      i
+    end
+
+    tests << perf_test_helper( length, 'char_buffer' ) do |ts,rs|
+      i = 0
+      reps.times { i += rs.char_buffer_to_ruby( ts ).to_s.length }
+      i
+    end
+
+    tests << perf_test_raw( length, 'byte_list' ) do |ts|
+      i = 0
+      reps.times { i += ts.byte_list.to_s.length }
+      i
+    end if extras
+
+    tests << perf_test_raw( length, 'control' ) do |ts|
+      i = 0
+      reps.times { i += ts.length }
+      i
+    end if extras
+
+    tests
+  end
+
+  def perf_test_raw( length, name )
+    BlockTestFactory.new( "#{length}-#{name}" ) do |run,random|
+      yield TextSampler.new( length, random.next_int )
+    end
+  end
+
+  def perf_test_ext( length, name )
+    BlockTestFactory.new( "#{length}-#{name}-ext" ) do |run,random|
+      yield RubySampler.new( length, random.next_int )
+    end
+  end
+
+  def perf_test_helper( length, name )
+    BlockTestFactory.new( "#{length}-#{name}-helper" ) do |run,random|
+      yield( TextSampler.new( length, random.next_int ),
+             RubySampleHelper )
+    end
+  end
+
+end
+
+IOUtilsPerfTest.new.run( ( ARGV.shift || 0 ).to_i )

data/bin/gravitext-perftest

@@ -1,7 +1,7 @@
 #!/usr/bin/env jruby
 # -*- ruby -*-
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/gravitext-util.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/gravitext-util/concurrent.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -58,7 +58,7 @@ module Gravitext
     # :call-seq:
     #   execute_test(runs,threads = available_cores) { |run,random| ... } -> Integer
     def self.execute_test( runs, threads = available_cores, &block )
-      TestExecutor::run( BlockTestFactory.new( block ), runs, threads )
+      TestExecutor::run( BlockTestFactory.new( &block ), runs, threads )
     end
 
     class BlockTestFactory
@@ -66,9 +66,9 @@ module Gravitext
 
       attr_accessor :name
 
-      def initialize( proc = nil, &block )
-        @name = 'BlockTestFactory'
-        @block = proc || block
+      def initialize( name = 'BlockTestFactory', &block )
+        @name = name
+        @block = block
       end
 
       def create_test_runnable( seed )

data/lib/gravitext-util/perftest.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/gravitext-util/unimap.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You

data/lib/gravitext-util/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -16,7 +16,7 @@
 
 module Gravitext
   module Util
-    VERSION = '1.5.1'
+    VERSION = '1.6.b.0'
 
     LIB_DIR = File.dirname(__FILE__) # :nodoc:
   end

data/pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.gravitext</groupId>
   <artifactId>gravitext-util</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.1</version>
+  <version>1.6.b.0</version>
   <name>Gravitext Utilities</name>
   <url>http://gravitext.com/oss/gravitext-util</url>
 
@@ -32,7 +32,7 @@
   <parent>
     <groupId>com.gravitext</groupId>
     <artifactId>gravitext-parent</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <relativePath>../gravitext-parent/pom.xml</relativePath>
   </parent>
 
@@ -63,6 +63,20 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>org.jruby.extras</groupId>
+      <artifactId>bytelist</artifactId>
+      <version>1.0.10</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-core</artifactId>
+      <version>1.6.5.1</version>
+      <optional>true</optional>
+    </dependency>
+
   </dependencies>
 
   <build>

data/test/setup.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'minitest/unit'
+require 'minitest/autorun'
+
+require 'rjack-logback'
+
+module TestSetup
+  include RJack
+  Logback.config_console( :stderr => true, :thread => true )
+
+  if ( ARGV & %w[ -v --verbose --debug ] ).empty?
+    Logback.root.level = Logback::WARN
+  else
+    Logback.root.level = Logback::DEBUG
+  end
+
+  ARGV.delete( '--debug' )
+end

data/test/test_concurrent.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -15,9 +17,7 @@
 # permissions and limitations under the License.
 #++
 
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
-
-require 'minitest/unit'
+require File.join( File.dirname( __FILE__ ), "setup" )
 
 require 'gravitext-util'
 

data/test/test_ioutils.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+
+#--
+# Copyright (c) 2007-2012 David Kellum
+#
+# Licensed 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.
+#++
+
+require File.join( File.dirname( __FILE__ ), "setup" )
+
+require 'gravitext-util'
+require 'java'
+
+# Magic loader hook -> IOTestService
+require 'com/gravitext/jruby/IOTest'
+
+class TestIOUtils < MiniTest::Unit::TestCase
+  include Gravitext::Util
+
+  import 'com.gravitext.jruby.TextSampler'
+
+  def test_text_sampler
+    ts = TextSampler.new( 300, 2 )
+
+    assert_instance_of( String, ts.string )
+    # IF to UTF-8 bytes, will be longer than 300
+    assert_operator( ts.string.length, :>, 300 )
+
+    assert_instance_of( String, ts.string_sequence )
+    assert_operator( ts.string_sequence.length, :>, 300 )
+
+    if JRUBY_VERSION =~ /^1.7/
+      assert_instance_of( String, ts.char_buffer )
+      assert_instance_of( String, ts.char_buffer_sequence )
+    else
+      # In Jruby < 1.7, CharBuffer isn't converted to String until
+      # to_s
+      assert_equal( 'java.nio.HeapCharBuffer',
+                    ts.char_buffer.java_class.name )
+      assert_equal( 'java.nio.HeapCharBuffer',
+                    ts.char_buffer_sequence.java_class.name )
+    end
+    assert_operator( ts.char_buffer.to_s.length, :>, 300 )
+    assert_operator( ts.char_buffer_sequence.to_s.length, :>, 300 )
+
+    assert_operator( ts.byte_list.to_s.length, :>, 300 )
+
+    s = String.from_java_bytes( ts.bytes )
+    assert_instance_of( String, s )
+    assert_operator( s.length, :>, 300 )
+  end
+
+  def test_ruby_sampler
+    rs = RubySampler.new( 300, 2 )
+    assert_instance_of( String, rs.char_buffer_to_ruby )
+    assert_operator( rs.char_buffer_to_ruby.length, :>, 300 )
+
+    assert_instance_of( String, rs.string_to_ruby )
+    assert_operator( rs.string_to_ruby.length, :>, 300 )
+  end
+
+  def test_ruby_sample_helper
+    ts = TextSampler.new( 300, 2 )
+    rs = RubySampleHelper
+
+    assert_instance_of( String, rs.char_buffer_to_ruby( ts ) )
+    assert_operator( rs.char_buffer_to_ruby( ts ).length, :>, 300 )
+
+    assert_instance_of( String, rs.string_to_ruby( ts ) )
+    assert_operator( rs.string_to_ruby( ts ).length, :>, 300 )
+  end
+
+end

data/test/test_perftest.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env jruby
+#.hashdot.profile += jruby-shortlived
+
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You may
@@ -15,21 +17,11 @@
 # permissions and limitations under the License.
 #++
 
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
-
-require 'minitest/unit'
+require File.join( File.dirname( __FILE__ ), "setup" )
 
 require 'gravitext-util/perftest'
-
 require 'java'
 
-require 'rubygems'
-
-require 'rjack-slf4j'
-require 'rjack-logback' #Or, turn off logging: require 'rjack-slf4j/nop'
-
-RJack::Logback.config_console( :level => RJack::Logback::DEBUG )
-
 class TestPerfTest < MiniTest::Unit::TestCase
   include Gravitext::PerfTest
 

data/test/test_unimap.rb

@@ -2,7 +2,7 @@
 #.hashdot.profile += jruby-shortlived
 
 #--
-# Copyright (c) 2007-2011 David Kellum
+# Copyright (c) 2007-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -17,14 +17,7 @@
 # permissions and limitations under the License.
 #++
 
-require 'rubygems'
-
-require 'minitest/unit'
-
-require 'rjack-logback'
-RJack::Logback.config_console
-
-$LOAD_PATH.unshift File.join( File.dirname(__FILE__), "..", "lib" )
+require File.join( File.dirname( __FILE__ ), "setup" )
 
 require 'gravitext-util'
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: gravitext-util
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.5.1
+  prerelease: 4
+  version: 1.6.b.0
 platform: java
 authors: 
   - David Kellum
@@ -10,82 +10,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-slf4j
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.5.8
-        - - <
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "1.7"
-    type: :development
-    version_requirements: *id001
+            version: 1.6.1
+    requirement: *id001
+    prerelease: false
+    type: :runtime
   - !ruby/object:Gem::Dependency 
     name: rjack-logback
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.9.18
-        - - <
+        - - ~>
           - !ruby/object:Gem::Version 
-            version: "2.0"
-    type: :development
-    version_requirements: *id002
+            version: "1.0"
+    requirement: *id002
+    prerelease: false
+    type: :runtime
   - !ruby/object:Gem::Dependency 
     name: minitest
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.3"
+    requirement: *id003
+    prerelease: false
     type: :development
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: rjack-tarpit
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: "2.0"
+    requirement: *id004
+    prerelease: false
     type: :development
-    version_requirements: *id004
-description: |-
-  A collection of core java utilities, many with jruby adaptions:
-  
-  * A concurrent (thread safety) testing facility for java JUnit,
-    ruby Test::Unit, or other test harnesses.
-  
-  * A concurrent performance testing facility for java/ruby with simple
-    test wiring in ruby.
-  
-  * A Heterogeneous Type-safe Map implementation in java with
-    dynamically generated ruby accessors.
-  
-  * A set of core java utility classes (resizable buffers, a stopwatch,
-    SI unit formatting, fast random number generator), in support of the
-    above and of general utility.
+description: 
 email: 
   - dek-oss@gravitext.com
 executables: 
+  - gravitext-ioutil-perftest
   - gravitext-perftest
 extensions: []
 
 extra_rdoc_files: 
-  - Manifest.txt
-  - NOTICE.txt
   - History.rdoc
   - README.rdoc
 files: 
@@ -95,17 +74,19 @@ files:
   - README.rdoc
   - Rakefile
   - pom.xml
+  - bin/gravitext-ioutil-perftest
   - bin/gravitext-perftest
   - lib/gravitext-util/version.rb
   - lib/gravitext-util.rb
   - lib/gravitext-util/concurrent.rb
   - lib/gravitext-util/perftest.rb
   - lib/gravitext-util/unimap.rb
+  - test/setup.rb
   - test/test_concurrent.rb
+  - test/test_ioutils.rb
   - test/test_perftest.rb
   - test/test_unimap.rb
-  - lib/gravitext-util/gravitext-util-1.5.1.jar
-  - .gemtest
+  - lib/gravitext-util/gravitext-util-1.6.b.0.jar
 homepage: http://gravitext.rubyforge.org
 licenses: []
 
@@ -120,21 +101,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
-rubyforge_project: gravitext
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: "A collection of core java utilities, many with jruby adaptions:  * A concurrent (thread safety) testing facility for java JUnit, ruby Test::Unit, or other test harnesses"
-test_files: 
-  - test/test_concurrent.rb
-  - test/test_unimap.rb
-  - test/test_perftest.rb
+summary: A collection of core java utilities, many with jruby adaptions.
+test_files: []
+