infraruby-shim 3.7.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8cff7e460cc859c8b703028fe7617ae9d578dcc
-  data.tar.gz: c3cdace46988d6043515237df6094f922a7b2b95
+  metadata.gz: 06fc05930b2a98bf1655c1fa083a70ef67a42f1d
+  data.tar.gz: 6de9d19931a545541506c9dcca906b9f18832073
 SHA512:
-  metadata.gz: b664d75c77887bb485e3a337f677fb6a645059f79b240b12e2aec77070f2caa0e401c55d77df600962865f02c13ed3d4387de4d9aeb01771a06875eb0116805f
-  data.tar.gz: 0383e6869687be27aa1caa17736c76b5ef0ea5694065ed68282ec81d49513d273bd34dee558876a9b8b31571c14b8fd64fbf28325c80ad8347b14420698cf923
+  metadata.gz: 30bbd09ac2346ed0e87c9fee09e934adf1870ba3d74a68356a18faac82e5ca0142e5aeda761da7f60a43c3a85a7b86b237939254b3245ae41b4373f7fe326438
+  data.tar.gz: baa613fb294e29d4fd058bdb10806453b8ab4f6c7482ab961accf59005bce523eb9d8d240fe3120e8fed92434f56312e6313b5949a38061f9a22cbcfc22a146f

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2015 InfraRuby Vision
+Copyright (C) 2011-2016 InfraRuby Vision
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/README.md

@@ -17,9 +17,4 @@ Example
 Support
 -------
 
-InfraRuby Vision
-rubygems@infraruby.com
-
 http://infraruby.com/
-https://github.com/InfraRuby
-https://twitter.com/InfraRuby

data/infraruby-shim.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.platform = "ruby"
 	s.name = "infraruby-shim"
-	s.version = "3.7.0"
+	s.version = "4.0.0"
 	s.licenses = ["MIT"]
 	s.author = "InfraRuby Vision"
 	s.email = "rubygems@infraruby.com"
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
 	s.summary = "InfraRuby shim for Ruby interpreters"
 	s.description = "InfraRuby shim for Ruby interpreters"
 	s.files = Dir["**/*"]
-	s.add_runtime_dependency "infraruby-base", "~> 3.7"
-	s.add_runtime_dependency "infraruby-java", "~> 3.7"
-	s.add_development_dependency "infraruby-task", "~> 3.7"
+	s.add_runtime_dependency "infraruby-base", "~> 4.0"
+	s.add_runtime_dependency "infraruby-java", "~> 4.0"
+	s.add_development_dependency "infraruby-task", "~> 4.0"
 	s.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/infraruby-shim.rb

@@ -1,3 +1,44 @@
 require "infraruby-java"
 
+module InfraRuby
+	module Index
+	end
+
+	module Closer
+	end
+
+	module Reader
+		include Closer
+	end
+
+	module Writer
+		include Closer
+
+		def <<(o)
+			write(o)
+			return self
+		end
+	end
+end
+
+InfraRuby.if(RUBY_ENGINE == "ruby") {
+
+	JAVA.module_eval do
+		__package(:java) {
+			__package(:lang) {
+				__interface "Cloneable" do
+				end
+
+				__interface "Comparable" do
+				end
+			}
+		}
+	end
+
+}
+
 InfraRuby.load_parent_library(__dir__)
+
+[Numeric, String, Symbol, Date, Time].each do |c|
+	c.include(Comparable)
+end

data/ruby/BasicObject.rb

@@ -0,0 +1,5 @@
+class BasicObject
+	def checkcast(s)
+		return self
+	end
+end

data/ruby/Comparable.rb

@@ -0,0 +1,7 @@
+module Comparable
+	include JAVA::java.lang.Comparable
+
+	def compareTo(t)
+		return (self <=> t).signum_as_int32
+	end
+end

data/ruby/Float32.rb

@@ -0,0 +1,7 @@
+class Float32
+	include JAVA::java.lang.Comparable
+
+	def compareTo(o)
+		return self <=> o
+	end
+end

data/ruby/Float64.rb

@@ -0,0 +1,7 @@
+class Float64
+	include JAVA::java.lang.Comparable
+
+	def compareTo(o)
+		return self <=> o
+	end
+end

data/ruby/InfraRuby/Condition.rb

@@ -10,10 +10,11 @@ module InfraRuby
 		def await(timeout = nix)
 			if timeout.nix?
 				@cv.wait(@mutex)
+				return
 			else
-				@cv.wait(@mutex, timeout)
+				@cv.wait(@mutex, timeout.as_ruby)
+				return true
 			end
-			return
 		end
 
 		def broadcast

data/ruby/InfraRuby/StringBuilder.rb

@@ -1,50 +1,50 @@
 module InfraRuby
 	class StringBuilder
-		include InfraRuby::IO
+		include InfraRuby::Writer
 
 		def initialize
 			super()
-			@m = Java::byte[0x20].new
+			@m = JAVA::byte[0x20].new
 			@n = 0.i32
 			return
 		end
 
 		def __copy(n)
-			m = Java::byte[n.as_i].new
-			Java::ARRAYCOPY(@m, 0, m, 0, @n.as_i)
+			m = JAVA::byte[n].new
+			JAVA::ARRAYCOPY(@m, 0, m, 0, @n)
 			return m
 		end
 
 		def __write_byte(b)
-			nn = @n + 1
-			raise RuntimeError if nn < 0
-			if nn > @m.length
-				nnn = nn + nn / 2
-				raise RuntimeError if nnn < 0
-				@m = __copy(nnn)
+			n = @n + 1
+			raise RuntimeError if n < 0
+			if n > @m.length
+				nn = n + n / 2
+				raise RuntimeError if nn < 0
+				@m = __copy(nn)
 			end
-			@m[@n.as_i] = b.as_i
-			@n = nn
+			@m[@n] = b
+			@n = n
 			return
 		end
 
 		def __write_array(m)
-			n = m.length.i32
-			if n > 0
-				nn = @n + n
-				raise RuntimeError if nn < 0
-				if nn > @m.length
-					nnn = nn + nn / 2
-					raise RuntimeError if nnn < 0
-					@m = __copy(nnn)
+			d = m.length
+			if d > 0
+				n = @n + d
+				raise RuntimeError if n < 0
+				if n > @m.length
+					nn = n + n / 2
+					raise RuntimeError if nn < 0
+					@m = __copy(nn)
 				end
-				Java::ARRAYCOPY(m, 0, @m, @n.as_i, n.as_i)
-				@n = nn
+				JAVA::ARRAYCOPY(m, 0, @m, @n, d)
+				@n = n
 			end
 			return
 		end
 
-		def to_java_bytes
+		def to_j_bytes
 			return __copy(@__n)
 		end
 
@@ -52,20 +52,16 @@ module InfraRuby
 			if encoding.nix?
 				encoding = Encoding::UTF_8
 			end
-			return String.from_java_bytes_unsafe(__copy(@n), encoding)
-		end
-
-		def read(o = nix)
-			raise NotImplementedError
+			return String.from_j_bytes_unsafe(__copy(@n)).with_encoding(encoding)
 		end
 
 		def write(o)
 			case o
-			when Java::byte[]
+			when JAVA::byte[]
 				__write_array(o)
 				return
 			when String
-				__write_array(o.to_java_bytes_unsafe)
+				__write_array(o.to_j_bytes_unsafe)
 				return
 			else
 				raise TypeError

data/ruby/Int16.rb

@@ -0,0 +1,7 @@
+class Int16
+	include JAVA::java.lang.Comparable
+
+	def compareTo(o)
+		return self <=> o
+	end
+end

data/ruby/Int32.rb

@@ -0,0 +1,9 @@
+class Int32
+	include InfraRuby::Index
+
+	include JAVA::java.lang.Comparable
+
+	def compareTo(o)
+		return self <=> o
+	end
+end

data/ruby/Int64.rb

@@ -0,0 +1,9 @@
+class Int64
+	include InfraRuby::Index
+
+	include JAVA::java.lang.Comparable
+
+	def compareTo(o)
+		return self <=> o
+	end
+end

data/ruby/Integer.rb

@@ -1,4 +1,6 @@
 class Integer
+	include InfraRuby::Index
+
 	def is_a?(c)
 		return c === self
 	end

data/ruby/JAVA.rb

@@ -0,0 +1,18 @@
+JAVA::java.lang.Throwable.class_eval do
+	def message
+		s = getMessage
+		if s.nil?
+			return getClass.getName.to_s
+		else
+			return s.to_s
+		end
+	end
+
+	def backtrace
+		a = []
+		getStackTrace.each do |e|
+			a.push("#{e.getFileName}:#{e.getLineNumber}:in `#{e.getMethodName}'")
+		end
+		return a
+	end
+end

data/ruby/Object.rb

@@ -1,5 +1,3 @@
 class Object
-	def cast(s)
-		return self
-	end
+	include JAVA::java.lang.Cloneable
 end

data/ruby/SecureRandom.rb

@@ -1,19 +1,19 @@
 module SecureRandom
 	class << self
-		def random_java_bytes(o = nix)
+		def random_j_bytes(o = nix)
 			if o.nix?
 				s = random_bytes
 			else
-				s = random_bytes(o.as_i)
+				s = random_bytes(o.as_ruby)
 			end
-			return s.to_java_bytes_unsafe
+			return s.to_j_bytes_unsafe
 		end
 
 		def random_number_as_int32(o = nix)
 			if o.nix?
 				return Int32[random_number(1 << 32)]
 			else
-				return Int32[random_number(o.as_i)]
+				return Int32[random_number(o.as_ruby)]
 			end
 		end
 
@@ -21,7 +21,7 @@ module SecureRandom
 			if o.nix?
 				return Int64[random_number(1 << 64)]
 			else
-				return Int64[random_number(o.as_i)]
+				return Int64[random_number(o.as_ruby)]
 			end
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infraruby-shim
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 4.0.0
 platform: ruby
 authors:
 - InfraRuby Vision
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: infraruby-base
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: infraruby-java
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: infraruby-task
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -77,17 +77,24 @@ files:
 - infraruby-shim.gemspec
 - lib/infraruby-shim.rb
 - ruby/Array.rb
+- ruby/BasicObject.rb
 - ruby/Bignum.rb
+- ruby/Comparable.rb
 - ruby/Date.rb
 - ruby/Enumerable.rb
 - ruby/Fixnum.rb
 - ruby/Float.rb
+- ruby/Float32.rb
+- ruby/Float64.rb
 - ruby/Hash.rb
 - ruby/InfraRuby.rb
 - ruby/InfraRuby/Condition.rb
-- ruby/InfraRuby/IO.rb
 - ruby/InfraRuby/StringBuilder.rb
+- ruby/Int16.rb
+- ruby/Int32.rb
+- ruby/Int64.rb
 - ruby/Integer.rb
+- ruby/JAVA.rb
 - ruby/MatchData.rb
 - ruby/Object.rb
 - ruby/SecureRandom.rb
@@ -119,3 +126,4 @@ signing_key:
 specification_version: 4
 summary: InfraRuby shim for Ruby interpreters
 test_files: []
+has_rdoc: 

data/ruby/InfraRuby/IO.rb

@@ -1,8 +0,0 @@
-module InfraRuby
-	module IO
-	end
-end
-
-class IO
-	include InfraRuby::IO
-end