jruby_art 0.2.0.pre → 0.2.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3828fdddac86cd22f16778671b86ca7177b73aa
-  data.tar.gz: 0cc177cf9d0e4d9027694777439ffd4330ed4ad2
+  metadata.gz: 14b6b25af68362b0935ec7fa7060ff94c6058082
+  data.tar.gz: 9c8a4949546e952b315aea6042c655f77ceeb0ca
 SHA512:
-  metadata.gz: 9493554519ee7744117ebfb307c0f9c48e78f0e447f3bc0dd98bd5ad1921605bd43debd6173d0ed46582bfae4c39670d1fd2e3674c9d5306c6857cc457ab7dc1
-  data.tar.gz: 2813e9daadee89de3bd19ca20f6a8d4252bb7a9f2e1c3171efde53ca5cfb0df720100c5ef65ca7cc0e55a5e1ba4cd2648e81ba4132e11b61f0122fa44fd4154e
+  metadata.gz: 593dd27469ab97670b0037298a947de4e2b7cefe8e8abeec3f4649b6c49ec1f68501637910226cfa3f54d7c4e27e090f81becb128deb435ecfd841f06714e873
+  data.tar.gz: d5b979d144d4acc91b490f5696d5fdbd28c8cead7aca9ad3b4cf85c007859e3fb2ec330dd51e578a24b49044b69011450c80f80384b1e3dbeeb7a32427d2602d

data/README.md

@@ -1,7 +1,7 @@
 ## JRubyArt
+[![Gem Version](https://badge.fury.io/rb/jruby_art.svg)](http://badge.fury.io/rb/jruby_art)
 
-
-Is a development fork of [ruby-processing][] that may soon have a somewhat independent existence, see [processing-core][] at least in the short term. Plan was that JRubyArt releases (pre-releases) would use jruby-9.0.0.0 from the start, but now I think it might be more sane to start with jruby-1.7.19.  However until that time:-
+Is a development fork of [ruby-processing][] that has a somewhat independent existence, see [processing-core][] at least in the short term. Plan was that JRubyArt releases (pre-releases) would use jruby-9.0.0.0 from the start, but now I think it might be more sane to start with jruby-1.7.18. Version 0.2.0.pre is now available from rubygems. To build from repo:-
 
 
 You should (like ruby-processing) install [processing-2.2.1][]
@@ -57,7 +57,8 @@ k9 setup install # requires wget (Now also downloads examples to users home)
 To run sketches with jruby-complete (rather than installed jruby)
 
 ```bash
-k9 run my_app.rb # NB: k9 setup install, is a one-time install to gem procedure
+k9 run my_app.rb # NB: k9 setup install, is a one-time 'install to gem' procedure
+that also downloads and install samples in examples folder in users directory
 ```
 
 [Contributing][]
@@ -72,7 +73,11 @@ k9 run my_app.rb # NB: k9 setup install, is a one-time install to gem procedure
 
 ###Ruby Versions
 
-jruby-9.0.0.0.pre1+ (when sketches run with jruby command)
+jruby-1.7.18 (when sketches run with jruby command)
+
+jruby-9.0.0.0.pre1 also seems to work
+
+or
 
 ruby-2.1.2+ (when sketches are run using k9 command, ie using jruby-complete)
 

data/Rakefile

@@ -21,11 +21,11 @@ spec = Gem::Specification.new do |s|
   s.executables << 'k9'
   s.files = %w(LICENSE.md README.md Rakefile) + Dir.glob("{bin,lib,spec,vendors}/**/*")
   s.require_path = 'lib'
-  s.add_development_dependency "rake", "~> 10.3"
+  s.add_development_dependency "rake", "~> 10.4"
+  s.add_development_dependency "rspec", "~> 3.1"
   s.add_development_dependency "rake-compiler", "~> 0.9"
   s.requirements << 'A decent graphics card'
   s.requirements << 'java runtime >= 1.7+'
-  s.requirements << 'processing = 2.2.1+'
 end
 
 # -*- ruby -*-

data/lib/jruby_art/version.rb

@@ -1,3 +1,3 @@
 module JRubyArt
-  VERSION = '0.2.0.pre'
+  VERSION = '0.2.1.pre'
 end

data/lib/jruby_art.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 VERBOSE = true
 
 unless defined? K9_ROOT
@@ -7,9 +9,26 @@ end
 
 # guard prevents issues with mri ruby when using creator
 if RUBY_PLATFORM == 'java'
+  def platform
+    host_os = RbConfig::CONFIG['host_os']
+    return '*mac-universal.jar' if host_os =~ /mac|darwin/
+    bit = ENV_JAVA['sun.arch.data.model']
+    if host_os =~ /linux/
+      bit.eql?('32') ? '*linux-i586.jar' : '*linux-amd64.jar'
+    elsif host_os =~ /cygwin|windows/
+      bit.eql?('32') ? '*windows-i586.jar' : '*windows-amd64.jar'
+    else
+      '*armv6hf.jar'
+    end
+  end
   working_directory = File.join(File.dirname(__FILE__))
   $LOAD_PATH << working_directory unless $LOAD_PATH.include?(working_directory)
   Dir[File.join(working_directory, '*.jar')].each do |jar|
+    # require_relative jar unless jar =~ /native/ (breaks netbeans)
+    require jar unless jar =~ /native/
+  end
+  Dir[File.join(working_directory, platform)].each do |jar|
+    # require_relative jar (break netbeans)
     require jar
   end
   Java::ProcessingFastmath::DeglutLibrary.new.load(JRuby.runtime, false)

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION      = '1.7.18'
+JRUBYC_VERSION      = '1.7.19'
 EXAMPLES                    = '0.0.4'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
@@ -27,7 +27,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "a1be3e1790aace5c99614a87785454d875eb21c2")
+  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "9973923de511c06d979e950801b51a95d19e8be3")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.1.pre
 platform: ruby
 authors:
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
   name: rake
   prerelease: false
   type: :development
@@ -23,7 +23,21 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  name: rspec
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -58,7 +72,6 @@ files:
 - lib/jogl-all.jar
 - lib/jogl-all-natives-windows-i586.jar
 - lib/jogl-all-natives-linux-armv6hf.jar
-- lib/export.txt
 - lib/jruby_art.rb
 - lib/gluegen-rt-natives-linux-amd64.jar
 - lib/gluegen-rt-natives-linux-i586.jar
@@ -107,7 +120,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 1.7+
-- processing = 2.2.1+
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key:

data/lib/export.txt

@@ -1,10 +0,0 @@
-# If you want to support more platforms, visit jogamp.org to get the 
-# natives libraries for the platform in question (i.e. Solaris). 
-
-name = OpenGL
-
-application.macosx=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-macosx-universal.jar,gluegen-rt-natives-macosx-universal.jar
-application.windows32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-i586.jar,gluegen-rt-natives-windows-i586.jar
-application.windows64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-amd64.jar,gluegen-rt-natives-windows-amd64.jar
-application.linux32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-i586.jar,gluegen-rt-natives-linux-i586.jar
-application.linux64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar