ruby-processing 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e35013f3111ccdac477b271d45a0774a6dfd6cb
-  data.tar.gz: c0ba3dc3c1b5c87ded476f3bb189d363a0d160d4
+  metadata.gz: 9941a815cfe461f91e8276a38dc04b779e6a5433
+  data.tar.gz: 2f8a60fa95307af91dc82c5e7cc0a87cbf68f7d3
 SHA512:
-  metadata.gz: ecdb759d819121d7e12b51e8cf718d5cbc9cb8ce1a5054ca1edee7360b3d798b08d3c6099c61f7a233bdd0e08f9dfffb4e7dd989324f7f4bbb38c06d86decd6d
-  data.tar.gz: fd8eff69ce65e76ba53c2225468e01f115659541edffa9ce80ed7c423764899fcb308811b7bd345894aac1b30ffdf0588b903fcdc47861aa29839ee543a5a46e
+  metadata.gz: cf0f7703d59a95ad938025098a3407b9f5a7b6d2640830e7750c9d3ddd3219912117d33de94c8cf474fd5c2978644307a8bb9370243020592ad13a3f662450b2
+  data.tar.gz: c60b0d6ebce9418fe2ced947505fa1f717a1fd44891ccb3a2cbd5f22655e97995e1be7a21fd7b249b7f3f52fda241e8c2a510cd9dd116927056d5e7c7e211582

data/CHANGELOG

@@ -1,10 +1,12 @@
-v2.4.2 First release to to return to rubygems since processing 1.0.11
+v2.4.2 Update to JRuby-1.7.10
+* Revised suggestions for PROCESSING_ROOT on MacOSX
+
+v2.4.1 First release to return to rubygems since processing 1.0.11
 * Features a post-install download of jruby-complete (version 1.7.9)
 * Features use of jars from an installed version of vanilla processing,
 * on linux and windows use version 2.1.0 (later versions may also work).
 * For Mac, especially if you are using Mac "java" stick with version 2.0.3
-
-v2.4.1 Update gemspec to match modern expectations
+* Update gemspec to match modern expectations
 
 v2.4.0 Returning to rubygems distribution, by not including any jars
 * Use jars from an installed version of vanilla processing-2.0.3 (or version 2.1.0 linux and windows)

data/LICENSE.md

@@ -3,7 +3,7 @@ You can do pretty much whatever you'd like with it.
 
 ___
 
-Copyright (c) 2008 omygawshkenas
+Copyright (c) 2008-2014 omygawshkenas
 
 Permission is hereby granted, free of charge, 
 to any person obtaining a copy of this software 

data/README.md

@@ -1,4 +1,5 @@
 # Ruby-Processing
+[![Gem Version](https://badge.fury.io/rb/ruby-processing.png)](http://badge.fury.io/rb/ruby-processing)
 
 Is a ruby wrapper around the [Processing][] code art framework, built using [JRuby][].
 
@@ -11,17 +12,19 @@ Is a ruby wrapper around the [Processing][] code art framework, built using [JRu
 
 ## Installation
 
-Ideally you should install [jruby](http://jruby.org/download), at the very least you will have at least ruby-1.9.3 installed.  You should [download][] and install vanilla [processing-2.0.3](https://processing.org/download/) (MacOSX) or [processing-2.1.0](https://processing.org/download/) (Windows, Linux) prior to installing this version of ruby-processing. You must also set the `PROCESSING_ROOT` in the .rp5rc yaml configuration file, the easiest way is by running the [SetProcessingRoot.pde](https://gist.github.com/monkstone/7438749) sketch in the processing ide. The vendored jruby-complete-1.7.9 is added by running `install_jruby_complete` post install (required for application export), see wiki.
+Ideally you should install [jruby](http://jruby.org/download), at the very least you will have at least ruby-1.9.3 installed.  You should [download][] and install vanilla [processing-2.0.3](https://processing.org/download/) (MacOSX) or [processing-2.1.0](https://processing.org/download/) (Windows, Linux) prior to installing this version of ruby-processing. You must also set the `PROCESSING_ROOT` in the .rp5rc yaml configuration file, the easiest way is by running the [SetProcessingRoot.pde](https://gist.github.com/monkstone/7438749) sketch in the processing ide. 
 
 Then install ruby-processing (from rubygems-org) in the usual way
 
-`gem install ruby-processing` some systems eg Ubuntu my require `sudo` access
+`gem install ruby-processing` some systems eg Ubuntu may require `sudo` access
 
-To install jruby-complete use our built in tool (relies on `wget` to download [jruby-complete-1.7.9](http://jruby.org/download))
+To install jruby-complete use our built in tool (relies on `wget` to download [jruby-complete-1.7.10](http://jruby.org/download))
 
 `install_jruby_complete`
 
-If you haven't got `wget` just download jruby-complete-1.7.9 to the vendors folder (then run above tool)
+If you haven't got `wget` just download jruby-complete-1.7.10 to the vendors folder (then run above tool)
+
+The vendored jruby-complete-1.7.10 is only required for application export, and running certain sketches (eg shader sketches see wiki).
 
 
 ## Documentation

data/lib/ruby-processing/exporters/application_exporter.rb

@@ -17,7 +17,7 @@ module Processing
     def export!(sketch)
       # Check to make sure that the main file exists
       @main_file_path, @main_file, @main_folder = *get_main_file(sketch)
-      usage( @main_file_path && File.exists?(@main_file_path) )
+      usage( @main_file_path && File.exist?(@main_file_path) )
       
       extract_information
       
@@ -47,7 +47,7 @@ module Processing
       @necessary_files += @real_requires
       NECESSARY_FOLDERS.each do |folder| 
         resource_path = File.join(@main_folder, folder)
-        @necessary_files << resource_path if File.exists?(resource_path)
+        @necessary_files << resource_path if File.exist?(resource_path)
       end
       @necessary_files.uniq!
       cp_r(@necessary_files, File.join(@dest, @prefix))

data/lib/ruby-processing/exporters/base_exporter.rb

@@ -115,7 +115,7 @@ module Processing
     end
     
     def wipe_and_recreate_destination
-      remove_entry_secure @dest if File.exists?(@dest)
+      remove_entry_secure @dest if File.exist?(@dest)
       mkdir_p @dest
     end
     

data/lib/ruby-processing/exporters/creator.rb

@@ -10,7 +10,7 @@ module Processing
       usage path
       main_file = File.basename(path, ".rb")
       # Check to make sure that the main file exists
-      already_exists = File.exists?(path) || File.exists?("#{File.dirname(path)}/#{main_file.underscore}.rb")
+      already_exists = File.exist?(path) || File.exist?("#{File.dirname(path)}/#{main_file.underscore}.rb")
       if already_exists
         puts "That sketch already exists."
         exit

data/lib/ruby-processing/library_loader.rb

@@ -113,7 +113,7 @@ module Processing
           "#{@sketchbook_library_path}/#{library_name}/library",
           "#{@sketchbook_library_path}/#{library_name}" 
         ].each do |path| 
-          if File.exists?(path) && !Dir.glob(path + "/*.#{ext}").empty?
+          if File.exist?(path) && !Dir.glob(path + "/*.#{ext}").empty?
             return path
           end
         end

data/lib/ruby-processing/runner.rb

@@ -161,7 +161,7 @@ module Processing
       arg_file = "#{File.dirname(sketch)}/data/java_args.txt"
       args = []
       args += dock_icon
-      if File.exists?(arg_file)
+      if File.exist?(arg_file)
         args += File.read(arg_file).split(/\s+/)
       elsif Processing::CONFIG["java_args"]
         args += Processing::CONFIG["java_args"].split(/\s+/)
@@ -171,12 +171,12 @@ module Processing
     end
 
     def ensure_exists(sketch)
-      puts "Couldn't find: #{sketch}" and exit unless File.exists?(sketch)
+      puts "Couldn't find: #{sketch}" and exit unless File.exist?(sketch)
     end
 
     def jruby_complete
       rcomplete = File.join(RP5_ROOT, 'lib/ruby/jruby-complete.jar')
-      if File.exists?(rcomplete)
+      if File.exist?(rcomplete)
         return rcomplete
       else
 	warn "#{rcomplete} does not exist\nTry running `install_jruby_complete`"

data/lib/ruby-processing/runners/live.rb

@@ -2,7 +2,8 @@
 # This flavor will either load up empty Ruby-Processing, 
 # or will start with your sketch.
 
-require "#{File.dirname(__FILE__)}/base.rb"
+root = File.dirname(__FILE__)
+require "#{root}/base.rb"
 Processing.load_and_run_sketch
 
 ARGV.clear # So that IRB doesn't try to load them as files.

data/lib/ruby-processing/runners/watch.rb

@@ -19,7 +19,7 @@ module Processing
     def start_watching
       start_runner
       loop do
-        if @files.detect { |file| File.exists?(file) && File.stat(file).mtime > @time }
+        if @files.detect { |file| File.exist?(file) && File.stat(file).mtime > @time }
           puts "reloading sketch..."
           $app && $app.close
           @time = Time.now

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION="2.4.1"
+  VERSION="2.4.2"
 end

data/ruby-processing.gemspec

@@ -44,8 +44,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.1"
   spec.requirements << 'A decent graphics card'
   spec.requirements << 'java runtime >= 1.6+'
   spec.requirements << 'processing = 2.0.3+'

data/samples/contributed/jwishy.rb

@@ -17,7 +17,6 @@ attr_accessor :x_wiggle, :y_wiggle, :magnitude, :bluish, :panel, :laf, :hide
 
 def setup
   size 600, 600  
-  @show = false
   control_panel do |c|
     c.look_feel "Nimbus"
     c.slider    :bluish, 0.0..1.0, 0.5

data/samples/processing_app/topics/file_io/save_frames.rb

@@ -15,7 +15,7 @@ def setup
   smooth
   @recording = false
   directory = "output"
-  Dir::mkdir(directory) unless File.exists?(directory) 
+  Dir::mkdir(directory) unless File.exist?(directory) 
 end
 
 def draw

data/test/rp5_test.rb

@@ -28,7 +28,16 @@ class Rp5Test < Minitest::Test
     end
     assert_match %r%ok%, out, "Failed P2D sketch"     
   end
-  
+
+  def test_proc_root
+    require 'psych'
+    path = File.expand_path("~/.rp5rc")
+    config = File.exist?(path)? Psych.load_file(path) : {}
+    root = config.empty? ? '' : config['PROCESSING_ROOT']
+    assert root =~ /processing/, "You need to set your PROCESSING_ROOT in .rp5rc"
+  end
+
+
   def test_p3d    
     out, err = capture_io do
       open("|../bin/rp5 run p3d.rb", "r") do |io|

data/vendors/Rakefile

@@ -1,6 +1,6 @@
 require 'rake/clean'
 
-JRUBY_VERSION      = "1.7.9"
+JRUBY_VERSION      = "1.7.10"
 
 CLOBBER.include("jruby-complete-#{JRUBY_VERSION}.jar")
 
@@ -12,7 +12,7 @@ task :download => ["jruby-complete-#{JRUBY_VERSION}.jar"]
 
 file "jruby-complete-#{JRUBY_VERSION}.jar" do
   sh "wget http://jruby.org.s3.amazonaws.com/downloads/#{JRUBY_VERSION}/jruby-complete-#{JRUBY_VERSION}.jar"
-  check_sha1("jruby-complete-#{JRUBY_VERSION}.jar", "93c1906ed4d212ec7fb2fc810da206f1f2a034b4")
+  check_sha1("jruby-complete-#{JRUBY_VERSION}.jar", "f74a8b29da11e2ea430a1d1d92b72d424f7ee311")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,30 +38,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 description: "\n  Ruby-Processing is a Ruby wrapper for the Processing code art framework.
   It's\n  this thin little shim that squeezes between Processing and JRuby, passing\n
   \ along some neat goodies like:\n\n  * Application exporting of your sketches. Hand
@@ -866,3 +866,4 @@ test_files:
 - test/p3d.rb
 - test/rp5_test.rb
 - test/setup_ex.rb
+has_rdoc: