jnlp 0.0.5.3 → 0.0.5.4

data/History.txt

@@ -1,3 +1,23 @@
+== 0.0.5.4 2010-02-11
+
+addition optional parameter: arch for Jnlp::Jnlp instance methods:
+  j2se_version(os=nil, arch=nil)
+  max_heap_size(os=nil, arch=nil)
+  initial_heap_size(os=nil, arch=nil)
+
+new method Jnlp::Jnlp#java_vm_args(os=nil, arch=nil)
+
+works with additional specific j2se elements such as:
+
+  <resources os="Mac OS X" arch="ppc i386">
+    <j2se version="1.5" max-heap-size="128m" initial-heap-size="32m"/>
+  </resources>
+  <resources os="Mac OS X" arch="x86_64">
+    <j2se version="1.5" max-heap-size="128m" initial-heap-size="32m" java-vm-args="-d32"/>
+  </resources>
+
+new specs for new behaviors
+
 == 0.0.5.3 2009-12-23
 
 remove older files, specs for jnlp with jars without explicit version attributes

data/README.txt

@@ -41,3 +41,8 @@ The source code for the jnlp gem is on github[http://github.com/stepheneb/jnlp/t
 
   git clone git://github.com/stepheneb/jnlp.git
 
+=== Running the tests
+
+In JRuby: jruby -S rake spec
+In MRI:   rake spec
+

data/lib/jnlp/jnlp.rb

@@ -125,25 +125,50 @@ module Jnlp #:nodoc:
     #
     attr_reader :initial_heap_size
     #
+    # Contains the value of the optional java-vm-args attribute in
+    # in the J2SE element, the value is nil if not present:
+    # 
+    # Example:
+    #
+    #   "-d32"
+    #
+    attr_reader :java_vm_args
+    #
     # Contains the value of the os attribute in the 
     # parent <resources> element that contains this property 
-    # if the attribute was set in the parent.
+    # if the attribute was set in the parent. The attribute is normalized
+    # by converting to lowercase and changing ' ' characters to '_'
+    #
     # Example: 
     #
-    #   "Mac OS X"
+    #   "Mac OS X" => "mac_os_x"
     #
     attr_reader :os
     #
+    # Contains the value of the arch attribute in the 
+    # parent <resources> element that contains this property 
+    # if the attribute was set in the parent.The attribute is normalized
+    # by converting to lowercase and changing ' ' characters to '_'
+    #
+    # Examples: 
+    #
+    #   "ppc i386" => "ppc_i386"
+    #   "x86_64"   => "x86_64"
+    #
+    attr_reader :arch
+    #
     # Creates a new Jnlp::Property object.
     # * _prop_: the Hpricot parsing of the specific jnlp/resources/property element
     # * _os_: optional: include it if the resources parent element that contains the property has this attribute set
     #
-    def initialize(j2se, os=nil)
+    def initialize(j2se, os=nil, arch=nil)
       @j2se = j2se
       @version = j2se['version']
       @max_heap_size = j2se['max-heap-size']
       @initial_heap_size = j2se['initial-heap-size']
+      @java_vm_args = j2se['java-vm-args']
       @os = os
+      @arch = arch
     end
   end
 
@@ -882,20 +907,25 @@ module Jnlp #:nodoc:
       import_jnlp(path) unless path.empty?
     end
     
-    def j2se_version(os=nil)
-      j2se = j2ses.detect {|j2se| j2se.os == os }
+    def j2se_version(os=nil, arch=nil)
+      j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch}
       j2se ? j2se.version : nil
     end
     
-    def max_heap_size(os=nil)
-      j2se = j2ses.detect {|j2se| j2se.os == os }
+    def max_heap_size(os=nil, arch=nil)
+      j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch }
       j2se ? j2se.max_heap_size : nil      
     end
     
-    def initial_heap_size(os=nil)
-      j2se = j2ses.detect {|j2se| j2se.os == os }
+    def initial_heap_size(os=nil, arch=nil)
+      j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch }
       j2se ? j2se.initial_heap_size : nil            
     end
+
+    def java_vm_args(os=nil, arch=nil)
+      j2se = j2ses.detect { |j2se| j2se.os == os && j2se.arch == arch }
+      j2se ? j2se.java_vm_args : nil            
+    end
     
     
     #
@@ -957,7 +987,10 @@ module Jnlp #:nodoc:
         if os = resources[:os]
           os = os.strip.downcase.gsub(/\W+/, '_').gsub(/^_+|_+$/, '')
         end
-        (resources/"j2se").each { |j2se| @j2ses << J2se.new(j2se, os) }
+        if arch = resources[:arch]
+          arch = arch.strip.downcase.gsub(/\W+/, '_').gsub(/^_+|_+$/, '')
+        end
+        (resources/"j2se").each { |j2se| @j2ses << J2se.new(j2se, os, arch) }
         (resources/"property").each { |prop| @properties << Property.new(prop, os) }
         (resources/"jar").each { |res| @jars << Resource.new(res, @codebase, os) }
         (resources/"nativelib").each { |res| @nativelibs << Resource.new(res, @codebase, os) }

data/lib/jnlp/version.rb

@@ -1,5 +1,5 @@
 module Jnlp #:nodoc:
-  VERSION = '0.0.5.3'
+  VERSION = '0.0.5.4'
   #
   # Let's see if this patch:
   #

data/spec/jnlp_spec.rb

@@ -56,14 +56,18 @@ describe Jnlp do
     @first_jnlp.max_heap_size.should == '128m'
   end
 
-  it "should have an j2se_version attribute with the value '1.5+'" do
+  it "should have a j2se_version attribute with the value '1.5+'" do
     @first_jnlp.j2se_version.should == '1.5+'
   end
 
-  it "should have an j2se_version attribute with the value '1.5 if mac_os_x is specified'" do
+  it "should have a j2se_version attribute with the value '1.5' if the os: mac_os_x is specified" do
     @first_jnlp.j2se_version('mac_os_x').should == '1.5'
   end
 
+  it "should return nil in response to the j2se_version method if the os: mac_os_x and arch: x86_64 are specified" do
+    @first_jnlp.j2se_version('mac_os_x', 'x86_64').should == nil
+  end
+
   it "should have an vendor attribute with the value 'Concord Consortium'" do
     @first_jnlp.vendor.should == 'Concord Consortium'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnlp
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.3
+  version: 0.0.5.4
 platform: ruby
 authors: 
 - Stephen Bannasch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -05:00
+date: 2010-02-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency