jruby_art 0.2.1.pre → 0.2.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b6b25af68362b0935ec7fa7060ff94c6058082
-  data.tar.gz: 9c8a4949546e952b315aea6042c655f77ceeb0ca
+  metadata.gz: cc6b839d4a0522e7ee66e742f988458db321bd8c
+  data.tar.gz: 139442bd195106223036ab7d7e8af3090466c58b
 SHA512:
-  metadata.gz: 593dd27469ab97670b0037298a947de4e2b7cefe8e8abeec3f4649b6c49ec1f68501637910226cfa3f54d7c4e27e090f81becb128deb435ecfd841f06714e873
-  data.tar.gz: d5b979d144d4acc91b490f5696d5fdbd28c8cead7aca9ad3b4cf85c007859e3fb2ec330dd51e578a24b49044b69011450c80f80384b1e3dbeeb7a32427d2602d
+  metadata.gz: fd9a024eb64be8c46b8f505243e848928e922d525aa6c7485abf5e5c3de52141aa3110e047b7dfb62e72b1816ee568e8ec1e4a226aab16e6499865e7fb01bd27
+  data.tar.gz: 422611e5878dc76d27346b1c935ff5b3356dd1a5d8db86c46df25b1938c66a21a3ff8bb9beb909a79c120ddb29a60e4d8530d9e84fbca3005dfb715df3ab631f

data/README.md

@@ -1,65 +1,67 @@
 ## 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 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:-
+Is an alternative implementation of [ruby-processing][] that provides a ruby-wrapper for the java version of [processing][]. It is currently at the pre-release stage, but is ready for testing, and available from rubygems.org.
 
+### Requirements
 
-You should (like ruby-processing) install [processing-2.2.1][]
+Java runtime 7+, and ruby (can be MRI ruby), curl (to download jruby-complete and examples, although there is a  workaround). NB: it is not necessary to install vanilla [processing][] with this implementation, core jars are included in the gem.
 
-Then create a `~/.jruby_art/config.yml` config file, here is
-what mine looks like on arch-linux
-
-```ruby
----
-PROCESSING_ROOT: /usr/share/processing
+### Getting Started
 
+```bash
+gem install jruby-art --dev
+k9 setup install # uses curl to to download jruby-complete and examples
+cd examples/contributed
+k9 run clock.rb # if you've got jruby on your machine `jruby clock.rb` also works
 ```
-However unlike ruby-processing, the core jars become part of the gem and PROCESSING_ROOT is not used at runtime.
-
-The following config should work on macosx
 
-```ruby
----
-PROCESSING_ROOT: /Applications/Processing.app/Contents/Java
+### Creating your own
+```bash
+k9 create my_sketch 200 200
+vim my_sketch.rb # other editors are available
 ```
+Output:
+```ruby
+require 'jruby_art'
 
-To copy processing jars `rake processing_jars`
+class MySketch < Processing::App
+  def setup
+    size 200, 200
+  end
 
-To compile extensions `jruby -S rake compile` _requires rake-compiler gem_
+  def draw
 
-To build gem `jruby -S rake package`
+  end
+end
 
-To install `gem install pkg/jruby_art-0.2.pre.gem`
+MySketch.new(title: 'My Sketch')
+```
+The above is an example of class wrapped sketch (that can be run using `jruby my_sketch.rb` or `k9 run my_sketch.rb`), bare sketches also work. See [examples/bare_sketches][]
+```ruby
+def setup
+  size 200, 200
+end
 
-To create a new blank sketch
+def draw
 
-```bash
-k9 create my_app 200 200
+end
 ```
+However such sketches must be run with `k9 run sketch.rb`, however you can do 'k9 wrap sketch.rb` which converts bare sketches to a class wrapped form.
 
-or for 3D opengl sketch
+###Ruby Versions
 
-```bash
-k9 create my_app 200 200 p3d
-```
+jruby-1.7.19 (when sketches run with jruby command)
 
-To run most sketches, all you need is an installed jruby:-
+jruby-9.0.0.0.pre1 also seems to work (the next pre-release will target jruby-9.0.0.0-pre1)
 
-```bash
-jruby my_app.rb
-```
+or
 
-To run certain sketches, eg those with load_image (or shaders), either use [netbeans][] as your development ide or use the vendored jruby-complete (beyond our control something to do with jruby permissions?).  To install jruby-complete:-
+ruby-2.1.2+ (when sketches are run using k9 command, ie using jruby-complete)
 
-```bash
-k9 setup install # requires wget (Now also downloads examples to users home)
-```
-To run sketches with jruby-complete (rather than installed jruby)
+### Using netbeans as an ide for JRubyArt
 
-```bash
-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
-```
+See [netbeans][]
 
 [Contributing][]
 
@@ -71,20 +73,11 @@ that also downloads and install samples in examples folder in users directory
 
 [CHANGELOG][]
 
-###Ruby Versions
-
-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)
-
 [Acknowledgements]:ACKNOWLEDGEMENTS.md
 [CHANGELOG]:CHANGELOG.md
 [Contributing]:CONTRIBUTING.md
 [Examples]:https://github.com/ruby-processing/JRubyArt-examples
+[examples/bare_sketches]:https://github.com/ruby-processing/JRubyArt-examples/tree/master/bare_sketches
 [License]:LICENSE.md
 [processing]:https://github.com/processing/processing
 [ruby-processing]:https://github.com/jashkenas/ruby-processing

data/lib/jruby_art.rb

@@ -9,28 +9,28 @@ 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
+  #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|
+  #Dir[File.join(working_directory, platform)].each do |jar|
     # require_relative jar (break netbeans)
-    require jar
-  end
+   # require jar
+ # end
   Java::ProcessingFastmath::DeglutLibrary.new.load(JRuby.runtime, false)
   Java::ProcessingVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
   Java::ProcessingVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)

data/lib/jruby_art/version.rb

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

data/spec/vecmath_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../lib/ribiprocessing'
+require_relative '../lib/jruby_art'
 
 Java::ProcessingVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
 

data/vendors/Rakefile

@@ -1,9 +1,9 @@
 require 'rake/clean'
 
 WARNING = <<-EOS 
-   WARNING: you may not have wget installed, you could just download
+   WARNING: you may not have curl installed, you could just download
    the correct version of jruby-complete and/or examples to the vendors 
-   folder, and re-run k9 setup install instead of installing wget. Some 
+   folder, and re-run k9 setup install instead of installing curl. Some 
    systems may also require 'sudo' access to install jruby-complete, 
    NB: this is untested....
       
@@ -23,7 +23,7 @@ task :download => ["jruby-complete-#{JRUBYC_VERSION}.jar"]
 
 file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   begin
-    sh "wget https://s3.amazonaws.com/jruby.org/downloads/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"    
+    sh "curl -O https://s3.amazonaws.com/jruby.org/downloads/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"    
   rescue
     warn(WARNING)
   end
@@ -37,32 +37,17 @@ task :copy_ruby => ["../lib/ruby"] do
   sh "cp -v jruby-complete-#{JRUBYC_VERSION}.jar ../lib/ruby/jruby-complete.jar"
 end
 
-desc 'download and copy examples to user home'
-task :download_examples
-file "#{EXAMPLES}" do
-  begin
-    if MAC_OR_LINUX.nil?
-      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"      
-    else
-      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
-    end
-  rescue
-    warn(WARNING)
-  end
-end
-
 desc "download, and copy to JRubyArt"
 task :unpack_samples => [:download_examples, :copy_examples]
-
 desc 'download and copy examples to user home'
 task :download_examples
 file_name = (MAC_OR_LINUX.nil?) ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 file file_name do
   begin
     if MAC_OR_LINUX.nil?
-      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"      
+      sh "curl -Lo examples.zip https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
     else
-      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
+      sh "curl -Lo examples.tar.gz https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
     end
   rescue
     warn(WARNING)
@@ -72,15 +57,14 @@ end
 desc "copy examples"
 task :copy_examples => file_name do
   if MAC_OR_LINUX.nil?
-    sh "unzip #{EXAMPLES},zip"
+    sh "unzip examples.zip"
   else
-    sh "tar xzvf #{EXAMPLES}.tar.gz" 
+    sh "tar xzvf examples.tar.gz" 
   end
   sh "cp -r JRubyArt-examples-#{EXAMPLES} #{HOME_DIR}/examples"  
   sh "rm -r JRubyArt-examples-#{EXAMPLES}"     
 end
 
-
 def check_sha1(filename, expected_hash)
   require "digest/sha1"
   sha1 = Digest::SHA1.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre
+  version: 0.2.2.pre
 platform: ruby
 authors:
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement