jruby_art 0.2.3.pre → 0.2.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6583235100be711a51d787b016db40e373f058bb
-  data.tar.gz: 3e12254c7ba77564a7a43899e09b142a4add57f2
+  metadata.gz: 05c56a4fef1b06b3b0eef19527dd33a9b0d89333
+  data.tar.gz: 300a3b7e12a1883085fac9d467bcacbe46d268bc
 SHA512:
-  metadata.gz: 98e5d4dc74ed309290100e96f2d42fcfab4eb3346e46b86a8129f107fcabecea90cd63a5e557f87f1e3e08389c84115d491e98195392842dc0d0eb5e2df790a7
-  data.tar.gz: 39dbad9dbf14b0520dd8c9b0c350a1e200741e1bee9f9796474e466de41ed49006dc9828f09e390a9dec59db1731e9de2a8c6511318fbbcaff2786c3bd41a9cc
+  metadata.gz: 46e27c5d4f77c70155763fc0c0012d53ed6e42eb83dcf89b1657e1be452617181b3e7d618fd4991b8b280946cf711c2f7971b80fbe7e370375d6629e57f309e8
+  data.tar.gz: 040c4eee673e1b5816e0bdb6029e6218413df601a66eda8ef6e1b3a23224517b3e4c29d1aac36d0cb6bbd07b4144857f6908625b2b0823773df9c871a377ad67

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 It might seem a little of that this log starts at version 0.1.2, the reason for this is that previous version relate to earlier versions which were essentially a clone of ruby-processing.
 
+### Version 0.2.4
+
+Can't wait forever for jruby-9000, this release is require to promote the new toxiclibs gem.
+
 ### Version 0.2.3
 
 Now using curl instead of wget "following the path of least resistance for enfeebled Mac users" and also there might be better Windows support for curl vs wget. Now includes a library loader for jars (supports video and sound library etc), added control_panel and boids library.

data/README.md

@@ -63,6 +63,8 @@ ruby-2.1.2+ (when sketches are run using k9 command, ie using jruby-complete)
 
 See [netbeans][]
 
+___
+
 [Contributing][]
 
 [License][]

data/lib/jruby_art/app.rb

@@ -157,16 +157,20 @@ module Processing
       fail unless /opengl/ =~ mode
     end
     
-    def load_libraries(*args)
-      library_loader ||= LibraryLoader.new
-      library_loader.load_libraries(*args)
-    end
-    alias_method :load_library, :load_libraries
-    
-    # When certain special methods get added to the sketch, we need to let
-    # Processing call them by their expected Java names.
-    def self.method_added(method_name) #:nodoc:
-      if METHODS_TO_ALIAS.key?(method_name)
+    class << self
+      # Handy getters and setters on the class go here:
+      attr_accessor :sketch_class, :library_loader
+      
+      def load_libraries(*args)
+        library_loader ||= LibraryLoader.new
+        library_loader.load_libraries(*args)
+      end
+      alias_method :load_library, :load_libraries
+      
+      # When certain special methods get added to the sketch, we need to let
+      # Processing call them by their expected Java names.
+      def method_added(method_name) #:nodoc:
+        return unless METHODS_TO_ALIAS.key?(method_name)
         alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end

data/lib/jruby_art/library_loader.rb

@@ -76,11 +76,11 @@ class LibraryLoader
   end
   
   def platform
-    match = %w(Mac Linux Windows).find do |os|
-      java.lang.System.getProperty('os.name').index(os)
+    match = %w(mac linux windows).find do |os|
+      java.lang.System.getProperty('os.name').downcase.index(os)
     end
     return 'other' unless match
-    return match.downcase unless match =~ /Mac/
+    return match unless match =~ /mac/
     'macosx'
   end
   

data/lib/jruby_art/runner.rb

@@ -103,31 +103,11 @@ module Processing
       case choice
       when /install/  # download and install jruby-complete and unpack examples to user home
         system "cd #{K9_ROOT}/vendors && rake"
-        unless proc_root
-          set_processing_root
-          warn 'PROCESSING_ROOT set optimistically, run check to confirm'
-        end
       else
         puts usage
       end
     end
     
-    # Optimistically set processing root
-    def set_processing_root
-      require 'psych'
-      @os ||= host_os
-      data = {}
-      path = File.expand_path("#{ENV['HOME']}/.jruby_art/config.yml")
-      if os == :mac
-        data['PROCESSING_ROOT'] = '/Applications/Processing.app/Contents/Java'
-      else
-        root = "#{ENV['HOME']}/processing-2.2.1"
-        data['PROCESSING_ROOT'] = root
-      end
-      data['JRUBY'] = true
-      open(path, 'w:UTF-8') { |f| f.write(data.to_yaml) }
-    end
-    
     # Show the standard help/usage message.
     def show_help
       puts HELP_MESSAGE

data/lib/jruby_art/version.rb

@@ -1,4 +1,4 @@
 # The sole purpose of this module is to provide a name-space for version
 module JRubyArt
-  VERSION = '0.2.3.pre'
+  VERSION = '0.2.4.pre'
 end

data/library/grammar/grammar.rb

@@ -0,0 +1,31 @@
+############################
+# Simple lsystem grammar
+############################
+class Grammar
+
+  attr_reader :axiom, :rules
+  def initialize(axiom, rules)
+    @axiom = axiom
+    @rules = rules
+  end
+
+  def expand(production, iterations, &block)
+    production.each_char do |token|
+      if rules.key?(token) && iterations > 0
+        expand(rules[token], iterations - 1, &block)
+      else
+        yield token
+      end
+    end
+  end
+
+  def each(gen)
+    expand(axiom, gen) { |token| yield token }
+  end
+
+  def generate(gen)
+    output = []
+    each(gen) { |token| output << token }
+    return output
+  end
+end

data/vendors/Rakefile

@@ -1,4 +1,5 @@
 require 'rake/clean'
+require 'rbconfig'
 
 WARNING = <<-EOS 
    WARNING: you may not have curl installed, you could just download
@@ -16,7 +17,7 @@ MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar", "#{EXAMPLES}.tar.gz")
 
 desc "download, and copy to ruby-processing"
-task :default => [:download, :copy_ruby, :download_examples, :copy_examples]
+task :default => [:download, :copy_ruby, :download_examples, :copy_examples, :config]
 
 desc "download JRuby upstream sources"
 task :download => ["jruby-complete-#{JRUBYC_VERSION}.jar"]
@@ -65,6 +66,13 @@ task :copy_examples => file_name do
   sh "rm -r JRubyArt-examples-#{EXAMPLES}"     
 end
 
+desc "config"
+task :config => file_name do
+  next if FileTest.exist?("#{HOME_DIR}/.jruby_art/config.yml")
+  sh "tar xzvf config.tar.gz"
+  sh "cp -r .jruby_art #{HOME_DIR}"
+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.3.pre
+  version: 0.2.4.pre
 platform: ruby
 authors:
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - lib/jruby_art/helpers/camel_string.rb
 - lib/jruby_art/helpers/numeric.rb
 - lib/jruby_art/helpers/range.rb
+- library/grammar/grammar.rb
 - library/control_panel/control_panel.rb
 - library/boids/boids.rb
 - library/file_chooser/file_chooser.rb
@@ -106,6 +107,7 @@ files:
 - spec/app_spec.rb
 - spec/deglut_spec.rb
 - vendors/Rakefile
+- vendors/config.tar.gz
 homepage: https://github.com/ruby-processing/JRubyArt
 licenses:
 - MIT