jvmargs 0.0.2 → 0.0.3

data/lib/jvmargs/args.rb

@@ -83,7 +83,7 @@ module JVMArgs
       if boolean
         [
          "-Djava.rmi.server.hostname=127.0.0.1",
-         "-Dcom.sun.management.jmxremote",
+         "-Djava.net.preferIPv4Stack=true",
          "-Dcom.sun.management.jmxremote",
          "-Dcom.sun.management.jmxremote.port=9000",
          "-Dcom.sun.management.jmxremote.authenticate=false",
@@ -95,18 +95,36 @@ module JVMArgs
       end
     end
 
-    def heap_size(percentage)
-      percentage =~ /([0-9]+)%/
-      percent = $1.to_i * 0.01
-      if percent > 1
-        raise ArgumentError, "heap_size percentage must be less than 100%, you provided #{$1}%"
-      elsif percent < 0.01
-        raise ArgumentError, "heap_size percentage must be between 100% - 1%, you provided #{$1}%"
+    def heap_size(size)
+      if (size =~ /([0-9]+)%/)
+        percent = $1.to_i * 0.01
+        if percent > 1
+          raise ArgumentError, "heap_size percentage must be less than 100%, you provided #{$1}%"
+        elsif percent < 0.01
+          raise ArgumentError, "heap_size percentage must be between 100% - 1%, you provided #{$1}%"
+        end
+        system_ram = JVMArgs::Util.get_system_ram_m.sub(/M/,'').to_i
+        size_ram = "#{(system_ram * percent).to_i}M"
+      else
+        begin
+          size_ram = JVMArgs::Util.convert_to_m(size)
+        rescue ArgumentError
+           raise ArgumentError, "heap_size percentage must be a percentage or a fixed size in KiloBytes(K), MegaBytes (M), or Gigabytes(G)"
+        end 
       end
-      percent_int = JVMArgs::Util.get_system_ram_m.sub(/M/,'').to_i
-      percentage_ram = (percent_int * percent).to_i
-      @args[:nonstandard]["Xmx"] = JVMArgs::NonStandard.new("-Xmx#{percentage_ram}M")
-      @args[:nonstandard]["Xms"] = JVMArgs::NonStandard.new("-Xms#{percentage_ram}M")
+      @args[:nonstandard]["Xmx"] = JVMArgs::NonStandard.new("-Xmx#{size_ram}")
+      @args[:nonstandard]["Xms"] = JVMArgs::NonStandard.new("-Xms#{size_ram}")
+    end
+
+    def permgen(size)
+      size_ram = JVMArgs::Util.convert_to_m(size)
+      @args[:unstable]["MaxPermSize"] = JVMArgs::Unstable.new("-XX:MaxPermSize=#{size_ram}")
+    end
+
+    def newgen(size)
+      size_ram = JVMArgs::Util.convert_to_m(size)
+      # @args[:unstable]["NewSize"] = JVMArgs::Unstable.new("-XX:NewSize=#{size_ram}")
+      @args[:unstable]["MaxNewSize"] = JVMArgs::Unstable.new("-XX:MaxNewSize=#{size_ram}")
     end
 
     def add_rule(rule_name, &block)

data/lib/jvmargs/rules.rb

@@ -13,7 +13,7 @@ module JVMArgs
     
     def add(rule_name, block)
       new_rule_name = "rule_#{rule_name.to_s}".to_sym
-      JVMArgs::Rules.define_method(new_rule_name) {|args| block.call(args) }
+      self.class.send(:define_method, new_rule_name) {|args| block.call(args) }
     end
 
     def rules

data/lib/jvmargs/version.rb

@@ -1,4 +1,4 @@
 module JVMArgs
   # The gem version
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jvmargs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -115,6 +115,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: jvmargs-0.0.2
+summary: jvmargs-0.0.3
 test_files: []
 has_rdoc: